Skip to content

Commit

Permalink
Merge pull request #14820 from akshay-vishnoi/doc_changes
Browse files Browse the repository at this point in the history
[ci skip] builtin -> built-in
  • Loading branch information
schneems committed Apr 20, 2014
2 parents 0044bfb + 0c2854f commit 86b0282
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion actionpack/lib/action_controller/metal/responder.rb
Expand Up @@ -22,7 +22,7 @@ module ActionController #:nodoc:
#
# 3) if the responder does not <code>respond_to :to_xml</code>, call <code>#to_format</code> on it.
#
# === Builtin HTTP verb semantics
# === Built-in HTTP verb semantics
#
# The default \Rails responder holds semantics for each HTTP verb. Depending on the
# content type, verb and the resource status, it will behave differently.
Expand Down
Expand Up @@ -20,7 +20,7 @@ class Time
:iso8601 => lambda { |time| time.iso8601 }
}

# Converts to a formatted string. See DATE_FORMATS for builtin formats.
# Converts to a formatted string. See DATE_FORMATS for built-in formats.
#
# This method is aliased to <tt>to_s</tt>.
#
Expand Down
4 changes: 2 additions & 2 deletions activesupport/lib/active_support/inflector/methods.rb
Expand Up @@ -173,7 +173,7 @@ def dasherize(underscored_word)
# 'ActiveRecord::CoreExtensions::String::Inflections'.demodulize # => "Inflections"
# 'Inflections'.demodulize # => "Inflections"
# '::Inflections'.demodulize # => "Inflections"
# ''.demodulize # => ''
# ''.demodulize # => ""
#
# See also +deconstantize+.
def demodulize(path)
Expand Down Expand Up @@ -230,7 +230,7 @@ def foreign_key(class_name, separate_class_name_and_id_with_underscore = true)
def constantize(camel_cased_word)
names = camel_cased_word.split('::')

# Trigger a builtin NameError exception including the ill-formed constant in the message.
# Trigger a built-in NameError exception including the ill-formed constant in the message.
Object.const_get(camel_cased_word) if names.empty?

# Remove the first blank element in case of '::ClassName' notation.
Expand Down
4 changes: 2 additions & 2 deletions guides/source/active_support_core_extensions.md
Expand Up @@ -761,7 +761,7 @@ Arguments may be bare constant names:
Math.qualified_const_get("E") # => 2.718281828459045
```

These methods are analogous to their builtin counterparts. In particular,
These methods are analogous to their built-in counterparts. In particular,
`qualified_constant_defined?` accepts an optional second argument to be
able to say whether you want the predicate to look in the ancestors.
This flag is taken into account for each constant in the expression while
Expand Down Expand Up @@ -792,7 +792,7 @@ N.qualified_const_defined?("C::X") # => true
As the last example implies, the second argument defaults to true,
as in `const_defined?`.

For coherence with the builtin methods only relative paths are accepted.
For coherence with the built-in methods only relative paths are accepted.
Absolute qualified constant names like `::Math::PI` raise `NameError`.

NOTE: Defined in `active_support/core_ext/module/qualified_const.rb`.
Expand Down
2 changes: 1 addition & 1 deletion guides/source/configuring.md
Expand Up @@ -56,7 +56,7 @@ These configuration methods are to be called on a `Rails::Railtie` object, such
end
```

* `config.asset_host` sets the host for the assets. Useful when CDNs are used for hosting assets, or when you want to work around the concurrency constraints builtin in browsers using different domain aliases. Shorter version of `config.action_controller.asset_host`.
* `config.asset_host` sets the host for the assets. Useful when CDNs are used for hosting assets, or when you want to work around the concurrency constraints built-in in browsers using different domain aliases. Shorter version of `config.action_controller.asset_host`.

* `config.autoload_once_paths` accepts an array of paths from which Rails will autoload constants that won't be wiped per request. Relevant if `config.cache_classes` is false, which is the case in development mode by default. Otherwise, all autoloading happens only once. All elements of this array must also be in `autoload_paths`. Default is an empty array.

Expand Down
2 changes: 1 addition & 1 deletion guides/source/form_helpers.md
Expand Up @@ -1008,4 +1008,4 @@ As a convenience you can instead pass the symbol `:all_blank` which will create

### Adding Fields on the Fly

Rather than rendering multiple sets of fields ahead of time you may wish to add them only when a user clicks on an 'Add new address' button. Rails does not provide any builtin support for this. When generating new sets of fields you must ensure the key of the associated array is unique - the current JavaScript date (milliseconds after the epoch) is a common choice.
Rather than rendering multiple sets of fields ahead of time you may wish to add them only when a user clicks on an 'Add new address' button. Rails does not provide any built-in support for this. When generating new sets of fields you must ensure the key of the associated array is unique - the current JavaScript date (milliseconds after the epoch) is a common choice.

0 comments on commit 86b0282

Please sign in to comment.