aboutsummaryrefslogtreecommitdiffstats
path: root/guides
diff options
context:
space:
mode:
authorRobin Dupret <robin.dupret@gmail.com>2015-03-05 14:17:01 +0100
committerRobin Dupret <robin.dupret@gmail.com>2015-03-05 14:18:09 +0100
commitd969405acd98a6e6b39391e45fc3803fd3f26d32 (patch)
tree48da629602a9797863a2afaceaba731ae069f643 /guides
parent95cfeb968d189d5cd7f8ebcf53edfa3e2cd5f335 (diff)
downloadrails-d969405acd98a6e6b39391e45fc3803fd3f26d32.tar.gz
rails-d969405acd98a6e6b39391e45fc3803fd3f26d32.tar.bz2
rails-d969405acd98a6e6b39391e45fc3803fd3f26d32.zip
Some documentation edits [ci skip]
* Fix a few typos * Wrap some lines around 80 chars * Rephrase some statements
Diffstat (limited to 'guides')
-rw-r--r--guides/source/autoloading_and_reloading_constants.md5
-rw-r--r--guides/source/configuring.md4
-rw-r--r--guides/source/layouts_and_rendering.md5
3 files changed, 10 insertions, 4 deletions
diff --git a/guides/source/autoloading_and_reloading_constants.md b/guides/source/autoloading_and_reloading_constants.md
index 9e78eebf82..c6149abcba 100644
--- a/guides/source/autoloading_and_reloading_constants.md
+++ b/guides/source/autoloading_and_reloading_constants.md
@@ -465,7 +465,10 @@ by adding this to `config/application.rb`:
```ruby
config.autoload_paths << "#{Rails.root}/lib"
```
-`config.autoload_paths` is accessible from environment-specific configuration files, but any changes made to it outside `config/application.rb` don't have an effect.
+
+`config.autoload_paths` is accessible from environment-specific configuration
+files, but any changes made to it outside `config/application.rb` don't have any
+effect.
The value of `autoload_paths` can be inspected. In a just generated application
it is (edited):
diff --git a/guides/source/configuring.md b/guides/source/configuring.md
index e0b09be782..4ebd634cd6 100644
--- a/guides/source/configuring.md
+++ b/guides/source/configuring.md
@@ -110,7 +110,9 @@ numbers. New applications filter out passwords by adding the following `config.f
* `config.log_formatter` defines the formatter of the Rails logger. This option defaults to an instance of `ActiveSupport::Logger::SimpleFormatter` for all modes except production, where it defaults to `Logger::Formatter`.
-* `config.log_level` defines the verbosity of the Rails logger. This option defaults to `:debug` for all environments. The available log levels are: :debug, :info, :warn, :error, :fatal, and :unknown.
+* `config.log_level` defines the verbosity of the Rails logger. This option
+defaults to `:debug` for all environments. The available log levels are: `:debug`,
+`:info`, `:warn`, `:error`, `:fatal`, and `:unknown`.
* `config.log_tags` accepts a list of methods that the `request` object responds to. This makes it easy to tag log lines with debug information like subdomain and request id - both very helpful in debugging multi-user production applications.
diff --git a/guides/source/layouts_and_rendering.md b/guides/source/layouts_and_rendering.md
index 54db23bb32..c57fa358d6 100644
--- a/guides/source/layouts_and_rendering.md
+++ b/guides/source/layouts_and_rendering.md
@@ -428,12 +428,13 @@ Rails understands both numeric status codes and the corresponding symbols shown
| | 510 | :not_extended |
| | 511 | :network_authentication_required |
-NOTE: If you try to render content along with a non-content status code
+NOTE: If you try to render content along with a non-content status code
(100-199, 204, 205 or 304), it will be dropped from the response.
##### The `:formats` Option
-Rails uses the format specified in request (or `:html` by default). You can change this adding the `:formats` option with a symbol or an array:
+Rails uses the format specified in the request (or `:html` by default). You can
+change this passing the `:formats` option with a symbol or an array:
```ruby
render formats: :xml