Permalink
Browse files

re-add config.action_controller.asset_host and asset_path to config g…

…uide
  • Loading branch information...
radar authored and fxn committed Nov 29, 2010
1 parent abc7e38 commit 7d334c492f2ace5cba5d480da8a51a5eed2af74e
Showing with 6 additions and 2 deletions.
  1. +6 −2 railties/guides/source/configuring.textile
@@ -49,9 +49,9 @@ h4. Rails General Configuration
* +config.allow_concurrency+ should be set to +true+ to allow concurrent (threadsafe) action processing. Set to +false+ by default. You probably don't want to call this one directly, though, because a series of other adjustments need to be made for threadsafe mode to work properly. Can also be enabled with +threadsafe!+.
-* +config.asset_host+ sets the host for the assets. Useful when CDNs are used for hosting assets rather than the application server itself.
+* +config.asset_host+ sets the host for the assets. Useful when CDNs are used for hosting assets rather than the application server itself. Shorter version of +config.action_controller.asset_host+.
-* +config.asset_path+ takes a block which configures where assets can be found.
+* +config.asset_path+ takes a block which configures where assets can be found. Shorter version of +config.action_controller.asset_path+.
<ruby>
config.asset_path = proc { |asset_path| "assets/#{asset_path}" }
@@ -222,6 +222,10 @@ h4. Configuring Action Controller
<tt>config.action_controller</tt> includes a number of configuration settings:
+* +config.action_controller.asset_host+ sets the host for the assets. Useful when CDNs are used for hosting assets rather than the application server itself.
+
+* +config.action_controller.asset_path+ takes a block which configures where assets can be found. Shorter version of +config.action_controller.asset_path+.
+
* +config.action_controller.default_charset+ specifies the default character set for all renders. The default is "utf-8".
* +config.action_controller.logger+ accepts a logger conforming to the interface of Log4r or the default Ruby 1.8+ Logger class, which is then used to log information from Action Controller. Set to nil to disable logging.

0 comments on commit 7d334c4

Please sign in to comment.