diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2014-02-09 23:33:55 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2014-02-09 23:33:55 +0530 |
| commit | 92fdd6516287f677cd6687e5c31298fa68931baa (patch) | |
| tree | 4dcf9071b9f5940974bac3168357151cf92c340b /guides/source/configuring.md | |
| parent | 33be58b2060b1e859e8da370b911822c20028690 (diff) | |
| parent | ae7580ac287df477e7f5dd57136d5eec3813629d (diff) | |
| download | rails-92fdd6516287f677cd6687e5c31298fa68931baa.tar.gz rails-92fdd6516287f677cd6687e5c31298fa68931baa.tar.bz2 rails-92fdd6516287f677cd6687e5c31298fa68931baa.zip | |
Merge branch 'master' of github.com:rails/docrails
Conflicts:
guides/source/active_record_validations.md
guides/source/api_documentation_guidelines.md
guides/source/configuring.md
Diffstat (limited to 'guides/source/configuring.md')
| -rw-r--r-- | guides/source/configuring.md | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/guides/source/configuring.md b/guides/source/configuring.md index fa136eda1e..d3bd5c1c18 100644 --- a/guides/source/configuring.md +++ b/guides/source/configuring.md @@ -473,7 +473,6 @@ There are a few configuration options available in Active Support: * `ActiveSupport::Deprecation.silenced` sets whether or not to display deprecation warnings. -* `ActiveSupport::Logger.silencer` is set to `false` to disable the ability to silence logging in a block. The default is `true`. ### Configuring a Database @@ -722,7 +721,7 @@ Rails will now prepend "/app1" when generating links. #### Using Passenger -Passenger makes it easily to run your application in a subdirectory. You can find +Passenger makes it easy to run your application in a subdirectory. You can find the relevant configuration in the [passenger manual](http://www.modrails.com/documentation/Users%20guide%20Apache.html#deploying_rails_to_sub_uri). |