diff options
| -rw-r--r-- | doc/contributing/glossary.md | 2 | ||||
| -rw-r--r-- | doc/globals.rdoc | 2 | ||||
| -rw-r--r-- | doc/optparse/option_params.rdoc | 2 | ||||
| -rw-r--r-- | doc/optparse/ruby/descriptions.rb | 2 | ||||
| -rw-r--r-- | doc/optparse/tutorial.rdoc | 4 | ||||
| -rw-r--r-- | doc/rdoc/markup_reference.rb | 10 | ||||
| -rw-r--r-- | doc/syntax/operators.rdoc | 4 |
7 files changed, 13 insertions, 13 deletions
diff --git a/doc/contributing/glossary.md b/doc/contributing/glossary.md index 0d27d28c96..86c6671fbd 100644 --- a/doc/contributing/glossary.md +++ b/doc/contributing/glossary.md @@ -10,7 +10,7 @@ Just a list of acronyms I've run across in the Ruby source code and their meanin | `cd` | Call Data. A data structure that points at the `ci` and the `cc`. `iseq` objects points at the `cd`, and access call information and call caches via this structure | | `cfp`| Control Frame Pointer. Represents a Ruby stack frame. Calling a method pushes a new frame (cfp), returning pops a frame. Points at the `pc`, `sp`, `ep`, and the corresponding `iseq`| | `ci` | Call Information. Refers to an `rb_callinfo` struct. Contains call information about the call site, including number of parameters to be passed, whether it they are keyword arguments or not, etc. Used in conjunction with the `cc` and `cd`. | -| `cref` | Class reference. A structure pointing to the class reference where `klass_or_self`, visibility scope, and refinements are stored. It also stores a pointer to the next class in the hierachy referenced by `rb_cref_struct * next`. The Class reference is lexically scoped. | +| `cref` | Class reference. A structure pointing to the class reference where `klass_or_self`, visibility scope, and refinements are stored. It also stores a pointer to the next class in the hierarchy referenced by `rb_cref_struct * next`. The Class reference is lexically scoped. | | CRuby | Implementation of Ruby written in C | | `cvar` | Class Variable. Refers to a Ruby class variable like `@@foo` | | `dvar` | Dynamic Variable. Used by the parser to refer to local variables that are defined outside of the current lexical scope. For example `def foo; bar = 1; -> { p bar }; end` the "bar" inside the block is a `dvar` | diff --git a/doc/globals.rdoc b/doc/globals.rdoc index 3ffe1ada5d..1bf78a60ab 100644 --- a/doc/globals.rdoc +++ b/doc/globals.rdoc @@ -307,7 +307,7 @@ The standard error stream (the default value for <tt>$stderr</tt>): STDERR # => #<IO:<STDERR>> -== Enviroment +== Environment === ENV diff --git a/doc/optparse/option_params.rdoc b/doc/optparse/option_params.rdoc index 55f9b53dff..3c929c1aaf 100644 --- a/doc/optparse/option_params.rdoc +++ b/doc/optparse/option_params.rdoc @@ -437,7 +437,7 @@ Executions: adipiscing elit. Aenean commodo ligula eget. Aenean massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur - ridiculus mus. Donec quam felis, ultricies + ridiculous mus. Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem. $ ruby descriptions.rb --xxx ["--xxx", true] diff --git a/doc/optparse/ruby/descriptions.rb b/doc/optparse/ruby/descriptions.rb index 9aec80aae2..f1baa06fcb 100644 --- a/doc/optparse/ruby/descriptions.rb +++ b/doc/optparse/ruby/descriptions.rb @@ -5,7 +5,7 @@ Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget. Aenean massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur -ridiculus mus. Donec quam felis, ultricies +ridiculous mus. Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem. EOT descriptions = description.split($/) diff --git a/doc/optparse/tutorial.rdoc b/doc/optparse/tutorial.rdoc index b104379cf7..dfc4d0e8ec 100644 --- a/doc/optparse/tutorial.rdoc +++ b/doc/optparse/tutorial.rdoc @@ -570,7 +570,7 @@ Execution: Aenean massa. Cum sociis natoque penatibus -y, --yyy YYY Lorem ipsum dolor sit amet, consectetuer. -z, --zzz [ZZZ] Et magnis dis parturient montes, nascetur - ridiculus mus. Donec quam felis, ultricies + ridiculous mus. Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem. The program name is included in the default banner: @@ -609,7 +609,7 @@ Execution: Aenean massa. Cum sociis natoque penatibus -y, --yyy YYY Lorem ipsum dolor sit amet, consectetuer. -z, --zzz [ZZZ] Et magnis dis parturient montes, nascetur - ridiculus mus. Donec quam felis, ultricies + ridiculous mus. Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem. === Top List and Base List diff --git a/doc/rdoc/markup_reference.rb b/doc/rdoc/markup_reference.rb index d726fdfc93..a1bbe13e2d 100644 --- a/doc/rdoc/markup_reference.rb +++ b/doc/rdoc/markup_reference.rb @@ -1216,13 +1216,13 @@ require 'rdoc' # class RDoc::MarkupReference - # exmaple class + # example class class DummyClass; end - # exmaple module + # example module module DummyModule; end - # exmaple singleton method + # example singleton method def self.dummy_singleton_method(foo, bar); end # example instance method @@ -1230,12 +1230,12 @@ class RDoc::MarkupReference alias dummy_instance_alias dummy_instance_method - # exmaple attribute + # example attribute attr_accessor :dummy_attribute alias dummy_attribute_alias dummy_attribute - # exmaple constant + # example constant DUMMY_CONSTANT = '' # :call-seq: diff --git a/doc/syntax/operators.rdoc b/doc/syntax/operators.rdoc index f972309412..236b3413b5 100644 --- a/doc/syntax/operators.rdoc +++ b/doc/syntax/operators.rdoc @@ -47,9 +47,9 @@ of the operation. === <code>&&</code>, <code>and</code> Both <code>&&</code>/<code>and</code> operators provide short-circuiting by executing each -side of the operator, left to right, and stopping at the first occurence of a +side of the operator, left to right, and stopping at the first occurrence of a falsey expression. The expression that defines the result is the last one -executed, whether it be the final expression, or the first occurence of a falsey +executed, whether it be the final expression, or the first occurrence of a falsey expression. Some examples: |