Merge remote branch 'fork/master'
Add perform_caching to config guide
Add documentation for page_cache_directory and page_cache_extension t…
…o config guide
re-add config.action_controller.asset_host and asset_path to config g…
Bring order description in line with actual text.
Use ARel for Range Conditions section, remove Date & Time section bec…
…ause users should *never* do that.
Fix documentation regarding the initialization events of the Rails stack
asset_host and asset_path are now set at the global level
Reorder logger and middleware global config options
Add mention of helper_paths to config guide
Mention encoding in config guide
Add asset_host and asset_path to the configuring guide
No more app_generators method in 3.1
Mention controller_paths in the config guide
Move threadsafe warning to threadsafe's new location in config guide
Move consider_all_requests_local to global config methods in config g…
Change coloriz_logging description to follow the standard for this guide
Mention threadsafe! method in config guide
allow_concurrency is a "global" configuration option in Rails 3
Add documentation for secret_token to config guide
Mention filter_parameters for config
make it clear that recompilation happens only in
Added a space before "do" keyword
Resolves LH #6063, should be :expires_in not :expire_in
Merge branch 'master' of git://github.com/lifo/docrails
Add methods for configuring middleware to config guide
Add "Configuring Middleware" section to config guide, starting with m…
…entioning what every bit of middleware does.
Add explicit statement that verify_authenticity_token can be turned o…
…ff for actions.
Add mention of config.serve_static_assets to config guide
Mentioning catch with Bundler remembering options between different c…
Added missing word.
Resolving LH #5986, cookies doc updates
Only convert direct hash instances in hash with indifferent access.