From 4871433519901c024477a969563aa9d160d08590 Mon Sep 17 00:00:00 2001
From: Guillermo Iguaran <guilleiguaran@gmail.com>
Date: Fri, 13 Jan 2012 20:05:42 -0500
Subject: Mention how use config.assets.prefix to avoid conflicting with an
 existing "/assets" route

---
 railties/guides/source/3_1_release_notes.textile | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'railties/guides')

diff --git a/railties/guides/source/3_1_release_notes.textile b/railties/guides/source/3_1_release_notes.textile
index bfe6db4651..f88d8624ba 100644
--- a/railties/guides/source/3_1_release_notes.textile
+++ b/railties/guides/source/3_1_release_notes.textile
@@ -46,13 +46,20 @@ gem 'jquery-rails'
 
 h5. config/application.rb
 
-The asset pipeline requires the following additions:
+* The asset pipeline requires the following additions:
 
 <ruby>
 config.assets.enabled = true
 config.assets.version = '1.0'
 </ruby>
 
+* If your application is using the "/assets" route for a resource you may want change the prefix used for assets to avoid conflicts:
+
+<ruby>
+# Defaults to '/assets'
+config.assets.prefix = '/asset-files'
+</ruby>
+
 h5. config/environments/development.rb
 
 * Remove the RJS setting <tt>config.action_view.debug_rjs = true</tt>.
-- 
cgit v1.2.3