guides assets are now centralized in the assets directory, with standard subdirs

78 files changed, 22 insertions, 23 deletions

diff --git a/railties/guides/images/belongs_to.png b/railties/guides/assets/images/belongs_to.png
index 44243edbca..44243edbca 100644
--- a/railties/guides/images/belongs_to.png
+++ b/railties/guides/assets/images/belongs_to.png
diff --git a/railties/guides/images/book_icon.gif b/railties/guides/assets/images/book_icon.gif
index c81d5db520..c81d5db520 100644
--- a/railties/guides/images/book_icon.gif
+++ b/railties/guides/assets/images/book_icon.gif
diff --git a/railties/guides/images/bullet.gif b/railties/guides/assets/images/bullet.gif
index 95a26364a4..95a26364a4 100644
--- a/railties/guides/images/bullet.gif
+++ b/railties/guides/assets/images/bullet.gif
diff --git a/railties/guides/images/challenge.png b/railties/guides/assets/images/challenge.png
index d163748640..d163748640 100644
--- a/railties/guides/images/challenge.png
+++ b/railties/guides/assets/images/challenge.png
diff --git a/railties/guides/images/chapters_icon.gif b/railties/guides/assets/images/chapters_icon.gif
index 06fb415f4a..06fb415f4a 100644
--- a/railties/guides/images/chapters_icon.gif
+++ b/railties/guides/assets/images/chapters_icon.gif
diff --git a/railties/guides/images/check_bullet.gif b/railties/guides/assets/images/check_bullet.gif
index 1fcfeba250..1fcfeba250 100644
--- a/railties/guides/images/check_bullet.gif
+++ b/railties/guides/assets/images/check_bullet.gif
diff --git a/railties/guides/images/credits_pic_blank.gif b/railties/guides/assets/images/credits_pic_blank.gif
index f6f654fc65..f6f654fc65 100644
--- a/railties/guides/images/credits_pic_blank.gif
+++ b/railties/guides/assets/images/credits_pic_blank.gif
diff --git a/railties/guides/images/csrf.png b/railties/guides/assets/images/csrf.png
index ab73baafe8..ab73baafe8 100644
--- a/railties/guides/images/csrf.png
+++ b/railties/guides/assets/images/csrf.png
diff --git a/railties/guides/images/customized_error_messages.png b/railties/guides/assets/images/customized_error_messages.png
index fa676991e3..fa676991e3 100644
--- a/railties/guides/images/customized_error_messages.png
+++ b/railties/guides/assets/images/customized_error_messages.png
diff --git a/railties/guides/images/edge_badge.png b/railties/guides/assets/images/edge_badge.png
index cddd46c4b8..cddd46c4b8 100644
--- a/railties/guides/images/edge_badge.png
+++ b/railties/guides/assets/images/edge_badge.png
diff --git a/railties/guides/images/error_messages.png b/railties/guides/assets/images/error_messages.png
index 428892194a..428892194a 100644
--- a/railties/guides/images/error_messages.png
+++ b/railties/guides/assets/images/error_messages.png
diff --git a/railties/guides/images/feature_tile.gif b/railties/guides/assets/images/feature_tile.gif
index 75469361db..75469361db 100644
--- a/railties/guides/images/feature_tile.gif
+++ b/railties/guides/assets/images/feature_tile.gif
diff --git a/railties/guides/images/footer_tile.gif b/railties/guides/assets/images/footer_tile.gif
index bb33fc1ff0..bb33fc1ff0 100644
--- a/railties/guides/images/footer_tile.gif
+++ b/railties/guides/assets/images/footer_tile.gif
diff --git a/railties/guides/images/fxn.png b/railties/guides/assets/images/fxn.png
index 9b531ee584..9b531ee584 100644
--- a/railties/guides/images/fxn.png
+++ b/railties/guides/assets/images/fxn.png
diff --git a/railties/guides/images/grey_bullet.gif b/railties/guides/assets/images/grey_bullet.gif
index e75e8e93a1..e75e8e93a1 100644
--- a/railties/guides/images/grey_bullet.gif
+++ b/railties/guides/assets/images/grey_bullet.gif
diff --git a/railties/guides/images/habtm.png b/railties/guides/assets/images/habtm.png
index fea78b0b5c..fea78b0b5c 100644
--- a/railties/guides/images/habtm.png
+++ b/railties/guides/assets/images/habtm.png
diff --git a/railties/guides/images/has_many.png b/railties/guides/assets/images/has_many.png
index 6cff58460d..6cff58460d 100644
--- a/railties/guides/images/has_many.png
+++ b/railties/guides/assets/images/has_many.png
diff --git a/railties/guides/images/has_many_through.png b/railties/guides/assets/images/has_many_through.png
index 85d7599925..85d7599925 100644
--- a/railties/guides/images/has_many_through.png
+++ b/railties/guides/assets/images/has_many_through.png
diff --git a/railties/guides/images/has_one.png b/railties/guides/assets/images/has_one.png
index a70ddaaa86..a70ddaaa86 100644
--- a/railties/guides/images/has_one.png
+++ b/railties/guides/assets/images/has_one.png
diff --git a/railties/guides/images/has_one_through.png b/railties/guides/assets/images/has_one_through.png
index 89a7617a30..89a7617a30 100644
--- a/railties/guides/images/has_one_through.png
+++ b/railties/guides/assets/images/has_one_through.png
diff --git a/railties/guides/images/header_backdrop.png b/railties/guides/assets/images/header_backdrop.png
index ff2982175e..ff2982175e 100644
--- a/railties/guides/images/header_backdrop.png
+++ b/railties/guides/assets/images/header_backdrop.png
diff --git a/railties/guides/images/header_tile.gif b/railties/guides/assets/images/header_tile.gif
index e2c878d492..e2c878d492 100644
--- a/railties/guides/images/header_tile.gif
+++ b/railties/guides/assets/images/header_tile.gif
diff --git a/railties/guides/images/i18n/demo_localized_pirate.png b/railties/guides/assets/images/i18n/demo_localized_pirate.png
index 9134709573..9134709573 100644
--- a/railties/guides/images/i18n/demo_localized_pirate.png
+++ b/railties/guides/assets/images/i18n/demo_localized_pirate.png
diff --git a/railties/guides/images/i18n/demo_translated_en.png b/railties/guides/assets/images/i18n/demo_translated_en.png
index ecdd878d38..ecdd878d38 100644
--- a/railties/guides/images/i18n/demo_translated_en.png
+++ b/railties/guides/assets/images/i18n/demo_translated_en.png
diff --git a/railties/guides/images/i18n/demo_translated_pirate.png b/railties/guides/assets/images/i18n/demo_translated_pirate.png
index 41c580923a..41c580923a 100644
--- a/railties/guides/images/i18n/demo_translated_pirate.png
+++ b/railties/guides/assets/images/i18n/demo_translated_pirate.png
diff --git a/railties/guides/images/i18n/demo_translation_missing.png b/railties/guides/assets/images/i18n/demo_translation_missing.png
index af9e2d0427..af9e2d0427 100644
--- a/railties/guides/images/i18n/demo_translation_missing.png
+++ b/railties/guides/assets/images/i18n/demo_translation_missing.png
diff --git a/railties/guides/images/i18n/demo_untranslated.png b/railties/guides/assets/images/i18n/demo_untranslated.png
index 3603f43463..3603f43463 100644
--- a/railties/guides/images/i18n/demo_untranslated.png
+++ b/railties/guides/assets/images/i18n/demo_untranslated.png
diff --git a/railties/guides/images/icons/README b/railties/guides/assets/images/icons/README
index f12b2a730c..f12b2a730c 100644
--- a/railties/guides/images/icons/README
+++ b/railties/guides/assets/images/icons/README
diff --git a/railties/guides/images/icons/callouts/1.png b/railties/guides/assets/images/icons/callouts/1.png
index 7d473430b7..7d473430b7 100644
--- a/railties/guides/images/icons/callouts/1.png
+++ b/railties/guides/assets/images/icons/callouts/1.png
diff --git a/railties/guides/images/icons/callouts/10.png b/railties/guides/assets/images/icons/callouts/10.png
index 997bbc8246..997bbc8246 100644
--- a/railties/guides/images/icons/callouts/10.png
+++ b/railties/guides/assets/images/icons/callouts/10.png
diff --git a/railties/guides/images/icons/callouts/11.png b/railties/guides/assets/images/icons/callouts/11.png
index ce47dac3f5..ce47dac3f5 100644
--- a/railties/guides/images/icons/callouts/11.png
+++ b/railties/guides/assets/images/icons/callouts/11.png
diff --git a/railties/guides/images/icons/callouts/12.png b/railties/guides/assets/images/icons/callouts/12.png
index 31daf4e2f2..31daf4e2f2 100644
--- a/railties/guides/images/icons/callouts/12.png
+++ b/railties/guides/assets/images/icons/callouts/12.png
diff --git a/railties/guides/images/icons/callouts/13.png b/railties/guides/assets/images/icons/callouts/13.png
index 14021a89c2..14021a89c2 100644
--- a/railties/guides/images/icons/callouts/13.png
+++ b/railties/guides/assets/images/icons/callouts/13.png
diff --git a/railties/guides/images/icons/callouts/14.png b/railties/guides/assets/images/icons/callouts/14.png
index 64014b75fe..64014b75fe 100644
--- a/railties/guides/images/icons/callouts/14.png
+++ b/railties/guides/assets/images/icons/callouts/14.png
diff --git a/railties/guides/images/icons/callouts/15.png b/railties/guides/assets/images/icons/callouts/15.png
index 0d65765fcf..0d65765fcf 100644
--- a/railties/guides/images/icons/callouts/15.png
+++ b/railties/guides/assets/images/icons/callouts/15.png
diff --git a/railties/guides/images/icons/callouts/2.png b/railties/guides/assets/images/icons/callouts/2.png
index 5d09341b2f..5d09341b2f 100644
--- a/railties/guides/images/icons/callouts/2.png
+++ b/railties/guides/assets/images/icons/callouts/2.png
diff --git a/railties/guides/images/icons/callouts/3.png b/railties/guides/assets/images/icons/callouts/3.png
index ef7b700471..ef7b700471 100644
--- a/railties/guides/images/icons/callouts/3.png
+++ b/railties/guides/assets/images/icons/callouts/3.png
diff --git a/railties/guides/images/icons/callouts/4.png b/railties/guides/assets/images/icons/callouts/4.png
index adb8364eb5..adb8364eb5 100644
--- a/railties/guides/images/icons/callouts/4.png
+++ b/railties/guides/assets/images/icons/callouts/4.png
diff --git a/railties/guides/images/icons/callouts/5.png b/railties/guides/assets/images/icons/callouts/5.png
index 4d7eb46002..4d7eb46002 100644
--- a/railties/guides/images/icons/callouts/5.png
+++ b/railties/guides/assets/images/icons/callouts/5.png
diff --git a/railties/guides/images/icons/callouts/6.png b/railties/guides/assets/images/icons/callouts/6.png
index 0ba694af6c..0ba694af6c 100644
--- a/railties/guides/images/icons/callouts/6.png
+++ b/railties/guides/assets/images/icons/callouts/6.png
diff --git a/railties/guides/images/icons/callouts/7.png b/railties/guides/assets/images/icons/callouts/7.png
index 472e96f8ac..472e96f8ac 100644
--- a/railties/guides/images/icons/callouts/7.png
+++ b/railties/guides/assets/images/icons/callouts/7.png
diff --git a/railties/guides/images/icons/callouts/8.png b/railties/guides/assets/images/icons/callouts/8.png
index 5e60973c21..5e60973c21 100644
--- a/railties/guides/images/icons/callouts/8.png
+++ b/railties/guides/assets/images/icons/callouts/8.png
diff --git a/railties/guides/images/icons/callouts/9.png b/railties/guides/assets/images/icons/callouts/9.png
index a0676d26cc..a0676d26cc 100644
--- a/railties/guides/images/icons/callouts/9.png
+++ b/railties/guides/assets/images/icons/callouts/9.png
diff --git a/railties/guides/images/icons/caution.png b/railties/guides/assets/images/icons/caution.png
index cb9d5ea0df..cb9d5ea0df 100644
--- a/railties/guides/images/icons/caution.png
+++ b/railties/guides/assets/images/icons/caution.png
diff --git a/railties/guides/images/icons/example.png b/railties/guides/assets/images/icons/example.png
index bba1c0010d..bba1c0010d 100644
--- a/railties/guides/images/icons/example.png
+++ b/railties/guides/assets/images/icons/example.png
diff --git a/railties/guides/images/icons/home.png b/railties/guides/assets/images/icons/home.png
index 37a5231bac..37a5231bac 100644
--- a/railties/guides/images/icons/home.png
+++ b/railties/guides/assets/images/icons/home.png
diff --git a/railties/guides/images/icons/important.png b/railties/guides/assets/images/icons/important.png
index 1096c23295..1096c23295 100644
--- a/railties/guides/images/icons/important.png
+++ b/railties/guides/assets/images/icons/important.png
diff --git a/railties/guides/images/icons/next.png b/railties/guides/assets/images/icons/next.png
index 64e126bdda..64e126bdda 100644
--- a/railties/guides/images/icons/next.png
+++ b/railties/guides/assets/images/icons/next.png
diff --git a/railties/guides/images/icons/note.png b/railties/guides/assets/images/icons/note.png
index 841820f7c4..841820f7c4 100644
--- a/railties/guides/images/icons/note.png
+++ b/railties/guides/assets/images/icons/note.png
diff --git a/railties/guides/images/icons/prev.png b/railties/guides/assets/images/icons/prev.png
index 3e8f12fe24..3e8f12fe24 100644
--- a/railties/guides/images/icons/prev.png
+++ b/railties/guides/assets/images/icons/prev.png
diff --git a/railties/guides/images/icons/tip.png b/railties/guides/assets/images/icons/tip.png
index a3a029d898..a3a029d898 100644
--- a/railties/guides/images/icons/tip.png
+++ b/railties/guides/assets/images/icons/tip.png
diff --git a/railties/guides/images/icons/up.png b/railties/guides/assets/images/icons/up.png
index 2db1ce62fa..2db1ce62fa 100644
--- a/railties/guides/images/icons/up.png
+++ b/railties/guides/assets/images/icons/up.png
diff --git a/railties/guides/images/icons/warning.png b/railties/guides/assets/images/icons/warning.png
index 0b0c419df2..0b0c419df2 100644
--- a/railties/guides/images/icons/warning.png
+++ b/railties/guides/assets/images/icons/warning.png
diff --git a/railties/guides/images/nav_arrow.gif b/railties/guides/assets/images/nav_arrow.gif
index c4f57658d7..c4f57658d7 100644
--- a/railties/guides/images/nav_arrow.gif
+++ b/railties/guides/assets/images/nav_arrow.gif
diff --git a/railties/guides/images/polymorphic.png b/railties/guides/assets/images/polymorphic.png
index ff2fd9f76d..ff2fd9f76d 100644
--- a/railties/guides/images/polymorphic.png
+++ b/railties/guides/assets/images/polymorphic.png
diff --git a/railties/guides/images/posts_index.png b/railties/guides/assets/images/posts_index.png
index f6cd2f9b80..f6cd2f9b80 100644
--- a/railties/guides/images/posts_index.png
+++ b/railties/guides/assets/images/posts_index.png
diff --git a/railties/guides/images/rails_guides_logo.gif b/railties/guides/assets/images/rails_guides_logo.gif
index a24683a34e..a24683a34e 100644
--- a/railties/guides/images/rails_guides_logo.gif
+++ b/railties/guides/assets/images/rails_guides_logo.gif
diff --git a/railties/guides/images/rails_logo_remix.gif b/railties/guides/assets/images/rails_logo_remix.gif
index 58960ee4f9..58960ee4f9 100644
--- a/railties/guides/images/rails_logo_remix.gif
+++ b/railties/guides/assets/images/rails_logo_remix.gif
diff --git a/railties/guides/images/rails_welcome.png b/railties/guides/assets/images/rails_welcome.png
index 0e02cf5a8c..0e02cf5a8c 100644
--- a/railties/guides/images/rails_welcome.png
+++ b/railties/guides/assets/images/rails_welcome.png
diff --git a/railties/guides/images/session_fixation.png b/railties/guides/assets/images/session_fixation.png
index 6b084508db..6b084508db 100644
--- a/railties/guides/images/session_fixation.png
+++ b/railties/guides/assets/images/session_fixation.png
diff --git a/railties/guides/images/tab_grey.gif b/railties/guides/assets/images/tab_grey.gif
index e9680b7136..e9680b7136 100644
--- a/railties/guides/images/tab_grey.gif
+++ b/railties/guides/assets/images/tab_grey.gif
diff --git a/railties/guides/images/tab_info.gif b/railties/guides/assets/images/tab_info.gif
index 458fea9a61..458fea9a61 100644
--- a/railties/guides/images/tab_info.gif
+++ b/railties/guides/assets/images/tab_info.gif
diff --git a/railties/guides/images/tab_note.gif b/railties/guides/assets/images/tab_note.gif
index 1d5c171ed6..1d5c171ed6 100644
--- a/railties/guides/images/tab_note.gif
+++ b/railties/guides/assets/images/tab_note.gif
diff --git a/railties/guides/images/tab_red.gif b/railties/guides/assets/images/tab_red.gif
index daf140b5a8..daf140b5a8 100644
--- a/railties/guides/images/tab_red.gif
+++ b/railties/guides/assets/images/tab_red.gif
diff --git a/railties/guides/images/tab_yellow.gif b/railties/guides/assets/images/tab_yellow.gif
index dc961c99dd..dc961c99dd 100644
--- a/railties/guides/images/tab_yellow.gif
+++ b/railties/guides/assets/images/tab_yellow.gif
diff --git a/railties/guides/images/tab_yellow.png b/railties/guides/assets/images/tab_yellow.png
index cceea6581f..cceea6581f 100644
--- a/railties/guides/images/tab_yellow.png
+++ b/railties/guides/assets/images/tab_yellow.png
diff --git a/railties/guides/images/validation_error_messages.png b/railties/guides/assets/images/validation_error_messages.png
index 622d35da5d..622d35da5d 100644
--- a/railties/guides/images/validation_error_messages.png
+++ b/railties/guides/assets/images/validation_error_messages.png
diff --git a/railties/guides/files/javascripts/code_highlighter.js b/railties/guides/assets/javascripts/code_highlighter.js
index ce983dad52..ce983dad52 100755
--- a/railties/guides/files/javascripts/code_highlighter.js
+++ b/railties/guides/assets/javascripts/code_highlighter.js
diff --git a/railties/guides/files/javascripts/guides.js b/railties/guides/assets/javascripts/guides.js
index c4e4d459ea..c4e4d459ea 100755
--- a/railties/guides/files/javascripts/guides.js
+++ b/railties/guides/assets/javascripts/guides.js
diff --git a/railties/guides/files/javascripts/highlighters.js b/railties/guides/assets/javascripts/highlighters.js
index 4f5f0779d7..4f5f0779d7 100644
--- a/railties/guides/files/javascripts/highlighters.js
+++ b/railties/guides/assets/javascripts/highlighters.js
diff --git a/railties/guides/files/stylesheets/main.css b/railties/guides/assets/stylesheets/main.css
index 2fd0a2f37e..7ccae2c87e 100644
--- a/railties/guides/files/stylesheets/main.css
+++ b/railties/guides/assets/stylesheets/main.css
@@ -92,7 +92,7 @@ body {
 }
 
 #header {
-	background: #c52f24 url(../../images/header_tile.gif) repeat-x;
+	background: #c52f24 url(../images/header_tile.gif) repeat-x;
 	color: #FFF;
 	padding: 1.5em 0;
 	position: relative;
@@ -100,7 +100,7 @@ body {
 	}
 
 #feature {
-	background: #d5e9f6 url(../../images/feature_tile.gif) repeat-x;
+	background: #d5e9f6 url(../images/feature_tile.gif) repeat-x;
 	color: #333;
 	padding: 0.5em 0 1.5em;
 }
@@ -132,7 +132,7 @@ body {
 
 #footer {
 	padding: 2em 0;
-	background: url(../../images/footer_tile.gif) repeat-x;
+	background: url(../images/footer_tile.gif) repeat-x;
 	}
 #footer .wrapper {
 	padding-left: 2em;
@@ -179,7 +179,7 @@ a, a:link, a:visited {
 }
 
 #header .nav .index a {
-	background: #980905 url(../../images/nav_arrow.gif) no-repeat right top;
+	background: #980905 url(../images/nav_arrow.gif) no-repeat right top;
 	padding-right: 1em;	
 	position: relative;
 	z-index: 15;
@@ -285,7 +285,7 @@ h6 {
 
 #header h1 {
 	float: left;
-	background: url(../../images/rails_guides_logo.gif) no-repeat;
+	background: url(../images/rails_guides_logo.gif) no-repeat;
 	width: 297px;
 	text-indent: -9999em;
 	margin: 0;
@@ -306,7 +306,7 @@ h6 {
 #feature ul {margin-left: 0;}
 #feature ul li {
 	list-style: none;
-	background: url(../../images/check_bullet.gif) no-repeat left 0.5em;
+	background: url(../images/check_bullet.gif) no-repeat left 0.5em;
 	padding: 0.5em 1.75em 0.5em 1.75em;
 	font-size: 1.1428em;
 	font-weight: bold;
@@ -325,12 +325,12 @@ h6 {
 	font-size: 1.2857em;
 	padding: 0.125em 0 0.25em 0;
 	margin-bottom: 0;
-	/*background: url(../../images/book_icon.gif) no-repeat left top;
+	/*background: url(../images/book_icon.gif) no-repeat left top;
 	padding: 0.125em 0 0.25em 28px;*/
 }
 
 #mainCol dd.ticket, #subCol dd.ticket {
-	background: #fff9d8 url(../../images/tab_yellow.gif) no-repeat left top;
+	background: #fff9d8 url(../images/tab_yellow.gif) no-repeat left top;
 	border: none;
 	padding: 1.25em 1em 1.25em 48px;
 	margin-left: 0;
@@ -338,7 +338,7 @@ h6 {
 }
 
 #mainCol div.warning, #subCol dd.warning {
-	background: #f9d9d8 url(../../images/tab_red.gif) no-repeat left top;
+	background: #f9d9d8 url(../images/tab_red.gif) no-repeat left top;
 	border: none;
 	padding: 1.25em 1.25em 1.25em 48px;
 	margin-left: 0;
@@ -355,7 +355,7 @@ h6 {
 #subCol .chapters ul li {
 	list-style: none;
 	padding: 0 0 0 1em;
-	background: url(../../images/bullet.gif) no-repeat left 0.45em;
+	background: url(../images/bullet.gif) no-repeat left 0.45em;
 	margin-left: 0;
 	font-size: 1em;
 	font-weight: normal;
@@ -366,7 +366,7 @@ tt {
 }
 
 div.code_container {
-	background: #EEE url(../../images/tab_grey.gif) no-repeat left top;
+	background: #EEE url(../images/tab_grey.gif) no-repeat left top;
 	padding: 0.25em 1em 0.5em 48px;    
 }
 
@@ -378,14 +378,14 @@ code {
 }
 
 .note {
-	background: #fff9d8 url(../../images/tab_note.gif) no-repeat left top;
+	background: #fff9d8 url(../images/tab_note.gif) no-repeat left top;
 	border: none;
 	padding: 1em 1em 0.25em 48px;
 	margin: 0.25em 0 1.5em 0;
 }
 
 .info {
-	background: #d5e9f6 url(../../images/tab_info.gif) no-repeat left top;
+	background: #d5e9f6 url(../images/tab_info.gif) no-repeat left top;
 	border: none;
 	padding: 1em 1em 0.25em 48px;
 	margin: 0.25em 0 1.5em 0;
@@ -395,7 +395,7 @@ code {
 
 #mainCol ul li {
 	list-style:none;
-	background: url(../../images/grey_bullet.gif) no-repeat left 0.5em;
+	background: url(../images/grey_bullet.gif) no-repeat left 0.5em;
 	padding-left: 1em;
 	margin-left: 0;
 }
diff --git a/railties/guides/files/stylesheets/print.css b/railties/guides/assets/stylesheets/print.css
index 628da105d4..628da105d4 100755
--- a/railties/guides/files/stylesheets/print.css
+++ b/railties/guides/assets/stylesheets/print.css
diff --git a/railties/guides/files/stylesheets/reset.css b/railties/guides/assets/stylesheets/reset.css
index cb14fbcc55..cb14fbcc55 100755
--- a/railties/guides/files/stylesheets/reset.css
+++ b/railties/guides/assets/stylesheets/reset.css
diff --git a/railties/guides/files/stylesheets/style.css b/railties/guides/assets/stylesheets/style.css
index 89b2ab885a..89b2ab885a 100755
--- a/railties/guides/files/stylesheets/style.css
+++ b/railties/guides/assets/stylesheets/style.css
diff --git a/railties/guides/files/stylesheets/syntax.css b/railties/guides/assets/stylesheets/syntax.css
index 55fc5b209f..55fc5b209f 100644
--- a/railties/guides/files/stylesheets/syntax.css
+++ b/railties/guides/assets/stylesheets/syntax.css
diff --git a/railties/guides/rails_guides/generator.rb b/railties/guides/rails_guides/generator.rb
index 1454aed6e4..b8c1913819 100644
--- a/railties/guides/rails_guides/generator.rb
+++ b/railties/guides/rails_guides/generator.rb
@@ -107,8 +107,7 @@ module RailsGuides
     end
 
     def copy_assets
-      FileUtils.cp_r(File.join(guides_dir, 'images'), output_dir)
-      FileUtils.cp_r(File.join(guides_dir, 'files'), output_dir)
+      FileUtils.cp_r(Dir.glob("#{guides_dir}/assets/*"), output_dir)
     end
 
     def output_file_for(guide)
diff --git a/railties/guides/source/contribute.textile b/railties/guides/source/contribute.textile
index 1203e38a4e..8c64df5362 100644
--- a/railties/guides/source/contribute.textile
+++ b/railties/guides/source/contribute.textile
@@ -9,7 +9,7 @@ h3. How to Contribute?
 * We have an open commit policy: anyone is welcome to contribute, but you'll need to ask for commit access.
 * PM lifo at "GitHub":http://github.com asking for "docrails":http://github.com/lifo/docrails/tree/master commit access.
 * Guides are written in Textile, and reside at railties/guides/source in the docrails project.
-* All images are in the railties/guides/images directory.
+* Assets are stored in the +railties/guides/assets+ directory.
 * Sample format : "Active Record Associations":http://github.com/lifo/docrails/blob/3e56a3832415476fdd1cb963980d0ae390ac1ed3/railties/guides/source/association_basics.textile
 * Sample output : "Active Record Associations":association_basics.html
 * You can build the Guides during testing by running +rake generate_guides+ in the +railties+ directory.
diff --git a/railties/guides/source/layout.html.erb b/railties/guides/source/layout.html.erb
index 9819db1f89..b280101d25 100644
--- a/railties/guides/source/layout.html.erb
+++ b/railties/guides/source/layout.html.erb
@@ -7,13 +7,13 @@
 
 <title><%= yield(:page_title) || 'Ruby on Rails guides' %></title>
 
-<link rel="stylesheet" type="text/css" href="files/stylesheets/style.css" />
-<link rel="stylesheet" type="text/css" href="files/stylesheets/syntax.css" />
-<link rel="stylesheet" type="text/css" href="files/stylesheets/print.css" media="print" />
+<link rel="stylesheet" type="text/css" href="stylesheets/style.css" />
+<link rel="stylesheet" type="text/css" href="stylesheets/syntax.css" />
+<link rel="stylesheet" type="text/css" href="stylesheets/print.css" media="print" />
 
-<script type="text/javascript" src="files/javascripts/guides.js"></script>
-<script type="text/javascript" src="files/javascripts/code_highlighter.js"></script>
-<script type="text/javascript" src="files/javascripts/highlighters.js"></script>
+<script type="text/javascript" src="javascripts/guides.js"></script>
+<script type="text/javascript" src="javascripts/code_highlighter.js"></script>
+<script type="text/javascript" src="javascripts/highlighters.js"></script>
 
 </head>
 <body class="guide">