From 8aa5181126d9480eef502403aa98e469a3597826 Mon Sep 17 00:00:00 2001
From: Chris Rebert <code@rebertia.com>
Date: Mon, 23 Sep 2013 13:00:43 -0700
Subject: [PATCH 1/2] move /assets/ to /docs-assets/ ; fixes #10715

---
 Gruntfile.js                                  |   2 +-
 _includes/footer.html                         |  18 +++++++++---------
 _includes/header.html                         |  12 ++++++------
 {assets => docs-assets}/css/docs.css          |   0
 .../css/pygments-manni.css                    |   0
 .../ico/apple-touch-icon-144-precomposed.png  | Bin
 {assets => docs-assets}/ico/favicon.png       | Bin
 {assets => docs-assets}/js/application.js     |   0
 {assets => docs-assets}/js/customizer.js      |   0
 {assets => docs-assets}/js/filesaver.js       |   0
 {assets => docs-assets}/js/holder.js          |   0
 {assets => docs-assets}/js/html5shiv.js       |   0
 {assets => docs-assets}/js/jquery.js          |   0
 {assets => docs-assets}/js/jszip.js           |   0
 {assets => docs-assets}/js/less.js            |   0
 {assets => docs-assets}/js/raw-files.js       |   0
 {assets => docs-assets}/js/respond.min.js     |   0
 {assets => docs-assets}/js/uglify.js          |   0
 examples/carousel/index.html                  |  10 +++++-----
 examples/grid/index.html                      |   6 +++---
 examples/jumbotron-narrow/index.html          |   6 +++---
 examples/jumbotron/index.html                 |   8 ++++----
 examples/justified-nav/index.html             |   6 +++---
 examples/navbar-fixed-top/index.html          |   8 ++++----
 examples/navbar-static-top/index.html         |   8 ++++----
 examples/navbar/index.html                    |   8 ++++----
 examples/non-responsive/index.html            |   8 ++++----
 examples/offcanvas/index.html                 |   8 ++++----
 examples/signin/index.html                    |   6 +++---
 examples/starter-template/index.html          |   8 ++++----
 examples/sticky-footer-navbar/index.html      |   8 ++++----
 examples/sticky-footer/index.html             |   6 +++---
 examples/theme/index.html                     |  10 +++++-----
 getting-started.html                          |   4 ++--
 34 files changed, 75 insertions(+), 75 deletions(-)
 rename {assets => docs-assets}/css/docs.css (100%)
 rename {assets => docs-assets}/css/pygments-manni.css (100%)
 rename {assets => docs-assets}/ico/apple-touch-icon-144-precomposed.png (100%)
 rename {assets => docs-assets}/ico/favicon.png (100%)
 rename {assets => docs-assets}/js/application.js (100%)
 rename {assets => docs-assets}/js/customizer.js (100%)
 rename {assets => docs-assets}/js/filesaver.js (100%)
 rename {assets => docs-assets}/js/holder.js (100%)
 rename {assets => docs-assets}/js/html5shiv.js (100%)
 rename {assets => docs-assets}/js/jquery.js (100%)
 rename {assets => docs-assets}/js/jszip.js (100%)
 rename {assets => docs-assets}/js/less.js (100%)
 rename {assets => docs-assets}/js/raw-files.js (100%)
 rename {assets => docs-assets}/js/respond.min.js (100%)
 rename {assets => docs-assets}/js/uglify.js (100%)

diff --git a/Gruntfile.js b/Gruntfile.js
index ccb49ed52..cb641c87e 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -216,6 +216,6 @@ module.exports = function(grunt) {
 
     var customize = fs.readFileSync('customize.html', 'utf-8')
     var files = getFiles('js') + getFiles('less') + getFiles('fonts')
-    fs.writeFileSync('assets/js/raw-files.js', files)
+    fs.writeFileSync('docs-assets/js/raw-files.js', files)
   });
 };
diff --git a/_includes/footer.html b/_includes/footer.html
index d187f95d5..9e66c58a1 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -1,21 +1,21 @@
 <!-- Bootstrap core JavaScript
 ================================================== -->
 <!-- Placed at the end of the document so the pages load faster -->
-<script src="{{ page.base_url }}assets/js/jquery.js"></script>
+<script src="{{ page.base_url }}docs-assets/js/jquery.js"></script>
 <script src="{{ page.base_url }}dist/js/bootstrap.js"></script>
 
 <script src="http://platform.twitter.com/widgets.js"></script>
-<script src="{{ page.base_url }}assets/js/holder.js"></script>
+<script src="{{ page.base_url }}docs-assets/js/holder.js"></script>
 
-<script src="{{ page.base_url }}assets/js/application.js"></script>
+<script src="{{ page.base_url }}docs-assets/js/application.js"></script>
 
 {% if page.slug == "customize" %}
-<script src="{{ page.base_url }}assets/js/less.js"></script>
-<script src="{{ page.base_url }}assets/js/jszip.js"></script>
-<script src="{{ page.base_url }}assets/js/uglify.js"></script>
-<script src="{{ page.base_url }}assets/js/filesaver.js"></script>
-<script src="{{ page.base_url }}assets/js/raw-files.js"></script>
-<script src="{{ page.base_url }}assets/js/customizer.js"></script>
+<script src="{{ page.base_url }}docs-assets/js/less.js"></script>
+<script src="{{ page.base_url }}docs-assets/js/jszip.js"></script>
+<script src="{{ page.base_url }}docs-assets/js/uglify.js"></script>
+<script src="{{ page.base_url }}docs-assets/js/filesaver.js"></script>
+<script src="{{ page.base_url }}docs-assets/js/raw-files.js"></script>
+<script src="{{ page.base_url }}docs-assets/js/customizer.js"></script>
 {% endif %}
 
 <!-- Analytics
diff --git a/_includes/header.html b/_includes/header.html
index 982c9e02e..2be9dc110 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -15,18 +15,18 @@
 <link href="{{ page.base_url }}dist/css/bootstrap.css" rel="stylesheet">
 
 <!-- Documentation extras -->
-<link href="{{ page.base_url }}assets/css/docs.css" rel="stylesheet">
-<link href="{{ page.base_url }}assets/css/pygments-manni.css" rel="stylesheet">
+<link href="{{ page.base_url }}docs-assets/css/docs.css" rel="stylesheet">
+<link href="{{ page.base_url }}docs-assets/css/pygments-manni.css" rel="stylesheet">
 
 <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
 <!--[if lt IE 9]>
-  <script src="{{ page.base_url }}assets/js/html5shiv.js"></script>
-  <script src="{{ page.base_url }}assets/js/respond.min.js"></script>
+  <script src="{{ page.base_url }}docs-assets/js/html5shiv.js"></script>
+  <script src="{{ page.base_url }}docs-assets/js/respond.min.js"></script>
 <![endif]-->
 
 <!-- Favicons -->
-<link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ page.base_url }}assets/ico/apple-touch-icon-144-precomposed.png">
-                               <link rel="shortcut icon" href="{{ page.base_url }}assets/ico/favicon.png">
+<link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ page.base_url }}docs-assets/ico/apple-touch-icon-144-precomposed.png">
+                               <link rel="shortcut icon" href="{{ page.base_url }}docs-assets/ico/favicon.png">
 
 <script>
   var _gaq = _gaq || [];
diff --git a/assets/css/docs.css b/docs-assets/css/docs.css
similarity index 100%
rename from assets/css/docs.css
rename to docs-assets/css/docs.css
diff --git a/assets/css/pygments-manni.css b/docs-assets/css/pygments-manni.css
similarity index 100%
rename from assets/css/pygments-manni.css
rename to docs-assets/css/pygments-manni.css
diff --git a/assets/ico/apple-touch-icon-144-precomposed.png b/docs-assets/ico/apple-touch-icon-144-precomposed.png
similarity index 100%
rename from assets/ico/apple-touch-icon-144-precomposed.png
rename to docs-assets/ico/apple-touch-icon-144-precomposed.png
diff --git a/assets/ico/favicon.png b/docs-assets/ico/favicon.png
similarity index 100%
rename from assets/ico/favicon.png
rename to docs-assets/ico/favicon.png
diff --git a/assets/js/application.js b/docs-assets/js/application.js
similarity index 100%
rename from assets/js/application.js
rename to docs-assets/js/application.js
diff --git a/assets/js/customizer.js b/docs-assets/js/customizer.js
similarity index 100%
rename from assets/js/customizer.js
rename to docs-assets/js/customizer.js
diff --git a/assets/js/filesaver.js b/docs-assets/js/filesaver.js
similarity index 100%
rename from assets/js/filesaver.js
rename to docs-assets/js/filesaver.js
diff --git a/assets/js/holder.js b/docs-assets/js/holder.js
similarity index 100%
rename from assets/js/holder.js
rename to docs-assets/js/holder.js
diff --git a/assets/js/html5shiv.js b/docs-assets/js/html5shiv.js
similarity index 100%
rename from assets/js/html5shiv.js
rename to docs-assets/js/html5shiv.js
diff --git a/assets/js/jquery.js b/docs-assets/js/jquery.js
similarity index 100%
rename from assets/js/jquery.js
rename to docs-assets/js/jquery.js
diff --git a/assets/js/jszip.js b/docs-assets/js/jszip.js
similarity index 100%
rename from assets/js/jszip.js
rename to docs-assets/js/jszip.js
diff --git a/assets/js/less.js b/docs-assets/js/less.js
similarity index 100%
rename from assets/js/less.js
rename to docs-assets/js/less.js
diff --git a/assets/js/raw-files.js b/docs-assets/js/raw-files.js
similarity index 100%
rename from assets/js/raw-files.js
rename to docs-assets/js/raw-files.js
diff --git a/assets/js/respond.min.js b/docs-assets/js/respond.min.js
similarity index 100%
rename from assets/js/respond.min.js
rename to docs-assets/js/respond.min.js
diff --git a/assets/js/uglify.js b/docs-assets/js/uglify.js
similarity index 100%
rename from assets/js/uglify.js
rename to docs-assets/js/uglify.js
diff --git a/examples/carousel/index.html b/examples/carousel/index.html
index f716a6309..8d1169247 100644
--- a/examples/carousel/index.html
+++ b/examples/carousel/index.html
@@ -5,7 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link rel="shortcut icon" href="../../assets/ico/favicon.png">
+    <link rel="shortcut icon" href="../../docs-assets/ico/favicon.png">
 
     <title>Carousel Template for Bootstrap</title>
 
@@ -14,8 +14,8 @@
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
-      <script src="../../assets/js/html5shiv.js"></script>
-      <script src="../../assets/js/respond.min.js"></script>
+      <script src="../../docs-assets/js/html5shiv.js"></script>
+      <script src="../../docs-assets/js/respond.min.js"></script>
     <![endif]-->
 
     <!-- Custom styles for this template -->
@@ -194,8 +194,8 @@
     <!-- Bootstrap core JavaScript
     ================================================== -->
     <!-- Placed at the end of the document so the pages load faster -->
-    <script src="../../assets/js/jquery.js"></script>
+    <script src="../../docs-assets/js/jquery.js"></script>
     <script src="../../dist/js/bootstrap.min.js"></script>
-    <script src="../../assets/js/holder.js"></script>
+    <script src="../../docs-assets/js/holder.js"></script>
   </body>
 </html>
diff --git a/examples/grid/index.html b/examples/grid/index.html
index 779eacfe5..2282d8066 100644
--- a/examples/grid/index.html
+++ b/examples/grid/index.html
@@ -5,7 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link rel="shortcut icon" href="../../assets/ico/favicon.png">
+    <link rel="shortcut icon" href="../../docs-assets/ico/favicon.png">
 
     <title>Grid Template for Bootstrap</title>
 
@@ -17,8 +17,8 @@
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
-      <script src="../../assets/js/html5shiv.js"></script>
-      <script src="../../assets/js/respond.min.js"></script>
+      <script src="../../docs-assets/js/html5shiv.js"></script>
+      <script src="../../docs-assets/js/respond.min.js"></script>
     <![endif]-->
   </head>
 
diff --git a/examples/jumbotron-narrow/index.html b/examples/jumbotron-narrow/index.html
index 270cbdf70..0b45b9e23 100644
--- a/examples/jumbotron-narrow/index.html
+++ b/examples/jumbotron-narrow/index.html
@@ -5,7 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link rel="shortcut icon" href="../../assets/ico/favicon.png">
+    <link rel="shortcut icon" href="../../docs-assets/ico/favicon.png">
 
     <title>Narrow Jumbotron Template for Bootstrap</title>
 
@@ -17,8 +17,8 @@
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
-      <script src="../../assets/js/html5shiv.js"></script>
-      <script src="../../assets/js/respond.min.js"></script>
+      <script src="../../docs-assets/js/html5shiv.js"></script>
+      <script src="../../docs-assets/js/respond.min.js"></script>
     <![endif]-->
   </head>
 
diff --git a/examples/jumbotron/index.html b/examples/jumbotron/index.html
index 1032a7e42..4cf2f9293 100644
--- a/examples/jumbotron/index.html
+++ b/examples/jumbotron/index.html
@@ -5,7 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link rel="shortcut icon" href="../../assets/ico/favicon.png">
+    <link rel="shortcut icon" href="../../docs-assets/ico/favicon.png">
 
     <title>Jumbotron Template for Bootstrap</title>
 
@@ -17,8 +17,8 @@
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
-      <script src="../../assets/js/html5shiv.js"></script>
-      <script src="../../assets/js/respond.min.js"></script>
+      <script src="../../docs-assets/js/html5shiv.js"></script>
+      <script src="../../docs-assets/js/respond.min.js"></script>
     <![endif]-->
   </head>
 
@@ -88,7 +88,7 @@
     <!-- Bootstrap core JavaScript
     ================================================== -->
     <!-- Placed at the end of the document so the pages load faster -->
-    <script src="../../assets/js/jquery.js"></script>
+    <script src="../../docs-assets/js/jquery.js"></script>
     <script src="../../dist/js/bootstrap.min.js"></script>
   </body>
 </html>
diff --git a/examples/justified-nav/index.html b/examples/justified-nav/index.html
index d49718c9e..f2fd078c9 100644
--- a/examples/justified-nav/index.html
+++ b/examples/justified-nav/index.html
@@ -5,7 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link rel="shortcut icon" href="../../assets/ico/favicon.png">
+    <link rel="shortcut icon" href="../../docs-assets/ico/favicon.png">
 
     <title>Justified Nav Template for Bootstrap</title>
 
@@ -17,8 +17,8 @@
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
-      <script src="../../assets/js/html5shiv.js"></script>
-      <script src="../../assets/js/respond.min.js"></script>
+      <script src="../../docs-assets/js/html5shiv.js"></script>
+      <script src="../../docs-assets/js/respond.min.js"></script>
     <![endif]-->
   </head>
 
diff --git a/examples/navbar-fixed-top/index.html b/examples/navbar-fixed-top/index.html
index 1b1c708aa..258a0baf7 100644
--- a/examples/navbar-fixed-top/index.html
+++ b/examples/navbar-fixed-top/index.html
@@ -5,7 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link rel="shortcut icon" href="../../assets/ico/favicon.png">
+    <link rel="shortcut icon" href="../../docs-assets/ico/favicon.png">
 
     <title>Fixed Top Navbar Example for Bootstrap</title>
 
@@ -17,8 +17,8 @@
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
-      <script src="../../assets/js/html5shiv.js"></script>
-      <script src="../../assets/js/respond.min.js"></script>
+      <script src="../../docs-assets/js/html5shiv.js"></script>
+      <script src="../../docs-assets/js/respond.min.js"></script>
     <![endif]-->
   </head>
 
@@ -80,7 +80,7 @@
     <!-- Bootstrap core JavaScript
     ================================================== -->
     <!-- Placed at the end of the document so the pages load faster -->
-    <script src="../../assets/js/jquery.js"></script>
+    <script src="../../docs-assets/js/jquery.js"></script>
     <script src="../../dist/js/bootstrap.min.js"></script>
   </body>
 </html>
diff --git a/examples/navbar-static-top/index.html b/examples/navbar-static-top/index.html
index 6b5e4d35b..c921a0d75 100644
--- a/examples/navbar-static-top/index.html
+++ b/examples/navbar-static-top/index.html
@@ -5,7 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link rel="shortcut icon" href="../../assets/ico/favicon.png">
+    <link rel="shortcut icon" href="../../docs-assets/ico/favicon.png">
 
     <title>Static Top Navbar Example for Bootstrap</title>
 
@@ -17,8 +17,8 @@
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
-      <script src="../../assets/js/html5shiv.js"></script>
-      <script src="../../assets/js/respond.min.js"></script>
+      <script src="../../docs-assets/js/html5shiv.js"></script>
+      <script src="../../docs-assets/js/respond.min.js"></script>
     <![endif]-->
   </head>
 
@@ -81,7 +81,7 @@
     <!-- Bootstrap core JavaScript
     ================================================== -->
     <!-- Placed at the end of the document so the pages load faster -->
-    <script src="../../assets/js/jquery.js"></script>
+    <script src="../../docs-assets/js/jquery.js"></script>
     <script src="../../dist/js/bootstrap.min.js"></script>
   </body>
 </html>
diff --git a/examples/navbar/index.html b/examples/navbar/index.html
index 834019445..b602cefd7 100644
--- a/examples/navbar/index.html
+++ b/examples/navbar/index.html
@@ -5,7 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link rel="shortcut icon" href="../../assets/ico/favicon.png">
+    <link rel="shortcut icon" href="../../docs-assets/ico/favicon.png">
 
     <title>Navbar Template for Bootstrap</title>
 
@@ -17,8 +17,8 @@
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
-      <script src="../../assets/js/html5shiv.js"></script>
-      <script src="../../assets/js/respond.min.js"></script>
+      <script src="../../docs-assets/js/html5shiv.js"></script>
+      <script src="../../docs-assets/js/respond.min.js"></script>
     <![endif]-->
   </head>
 
@@ -77,7 +77,7 @@
     <!-- Bootstrap core JavaScript
     ================================================== -->
     <!-- Placed at the end of the document so the pages load faster -->
-    <script src="../../assets/js/jquery.js"></script>
+    <script src="../../docs-assets/js/jquery.js"></script>
     <script src="../../dist/js/bootstrap.min.js"></script>
   </body>
 </html>
diff --git a/examples/non-responsive/index.html b/examples/non-responsive/index.html
index a5fd883bd..ce8ac517a 100644
--- a/examples/non-responsive/index.html
+++ b/examples/non-responsive/index.html
@@ -7,7 +7,7 @@
 
     <!-- Note there is no responsive meta tag here -->
 
-    <link rel="shortcut icon" href="../../assets/ico/favicon.png">
+    <link rel="shortcut icon" href="../../docs-assets/ico/favicon.png">
 
     <title>Non-responsive Template for Bootstrap</title>
 
@@ -19,8 +19,8 @@
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
-      <script src="../../assets/js/html5shiv.js"></script>
-      <script src="../../assets/js/respond.min.js"></script>
+      <script src="../../docs-assets/js/html5shiv.js"></script>
+      <script src="../../docs-assets/js/respond.min.js"></script>
     <![endif]-->
   </head>
 
@@ -90,7 +90,7 @@
     <!-- Bootstrap core JavaScript
     ================================================== -->
     <!-- Placed at the end of the document so the pages load faster -->
-    <script src="../../assets/js/jquery.js"></script>
+    <script src="../../docs-assets/js/jquery.js"></script>
     <script src="../../dist/js/bootstrap.min.js"></script>
   </body>
 </html>
diff --git a/examples/offcanvas/index.html b/examples/offcanvas/index.html
index 04f01c7f1..e967e6933 100644
--- a/examples/offcanvas/index.html
+++ b/examples/offcanvas/index.html
@@ -5,7 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link rel="shortcut icon" href="../../assets/ico/favicon.png">
+    <link rel="shortcut icon" href="../../docs-assets/ico/favicon.png">
 
     <title>Off Canvas Template for Bootstrap</title>
 
@@ -17,8 +17,8 @@
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
-      <script src="../../assets/js/html5shiv.js"></script>
-      <script src="../../assets/js/respond.min.js"></script>
+      <script src="../../docs-assets/js/html5shiv.js"></script>
+      <script src="../../docs-assets/js/respond.min.js"></script>
     <![endif]-->
   </head>
 
@@ -118,7 +118,7 @@
     <!-- Bootstrap core JavaScript
     ================================================== -->
     <!-- Placed at the end of the document so the pages load faster -->
-    <script src="../../assets/js/jquery.js"></script>
+    <script src="../../docs-assets/js/jquery.js"></script>
     <script src="../../dist/js/bootstrap.min.js"></script>
     <script src="offcanvas.js"></script>
   </body>
diff --git a/examples/signin/index.html b/examples/signin/index.html
index 5c0a4543a..de9fd5e3c 100644
--- a/examples/signin/index.html
+++ b/examples/signin/index.html
@@ -5,7 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link rel="shortcut icon" href="../../assets/ico/favicon.png">
+    <link rel="shortcut icon" href="../../docs-assets/ico/favicon.png">
 
     <title>Signin Template for Bootstrap</title>
 
@@ -17,8 +17,8 @@
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
-      <script src="../../assets/js/html5shiv.js"></script>
-      <script src="../../assets/js/respond.min.js"></script>
+      <script src="../../docs-assets/js/html5shiv.js"></script>
+      <script src="../../docs-assets/js/respond.min.js"></script>
     <![endif]-->
   </head>
 
diff --git a/examples/starter-template/index.html b/examples/starter-template/index.html
index fc22db662..244fe65f5 100644
--- a/examples/starter-template/index.html
+++ b/examples/starter-template/index.html
@@ -5,7 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link rel="shortcut icon" href="../../assets/ico/favicon.png">
+    <link rel="shortcut icon" href="../../docs-assets/ico/favicon.png">
 
     <title>Starter Template for Bootstrap</title>
 
@@ -17,8 +17,8 @@
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
-      <script src="../../assets/js/html5shiv.js"></script>
-      <script src="../../assets/js/respond.min.js"></script>
+      <script src="../../docs-assets/js/html5shiv.js"></script>
+      <script src="../../docs-assets/js/respond.min.js"></script>
     <![endif]-->
   </head>
 
@@ -57,7 +57,7 @@
     <!-- Bootstrap core JavaScript
     ================================================== -->
     <!-- Placed at the end of the document so the pages load faster -->
-    <script src="../../assets/js/jquery.js"></script>
+    <script src="../../docs-assets/js/jquery.js"></script>
     <script src="../../dist/js/bootstrap.min.js"></script>
   </body>
 </html>
diff --git a/examples/sticky-footer-navbar/index.html b/examples/sticky-footer-navbar/index.html
index 551212a80..ea1b1f5a1 100644
--- a/examples/sticky-footer-navbar/index.html
+++ b/examples/sticky-footer-navbar/index.html
@@ -5,7 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link rel="shortcut icon" href="../../assets/ico/favicon.png">
+    <link rel="shortcut icon" href="../../docs-assets/ico/favicon.png">
 
     <title>Sticky Footer Navbar Template for Bootstrap</title>
 
@@ -17,8 +17,8 @@
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
-      <script src="../../assets/js/html5shiv.js"></script>
-      <script src="../../assets/js/respond.min.js"></script>
+      <script src="../../docs-assets/js/html5shiv.js"></script>
+      <script src="../../docs-assets/js/respond.min.js"></script>
     <![endif]-->
   </head>
 
@@ -80,7 +80,7 @@
     <!-- Bootstrap core JavaScript
     ================================================== -->
     <!-- Placed at the end of the document so the pages load faster -->
-    <script src="../../assets/js/jquery.js"></script>
+    <script src="../../docs-assets/js/jquery.js"></script>
     <script src="../../dist/js/bootstrap.min.js"></script>
   </body>
 </html>
diff --git a/examples/sticky-footer/index.html b/examples/sticky-footer/index.html
index aaafbc20d..325daa24c 100644
--- a/examples/sticky-footer/index.html
+++ b/examples/sticky-footer/index.html
@@ -5,7 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link rel="shortcut icon" href="../../assets/ico/favicon.png">
+    <link rel="shortcut icon" href="../../docs-assets/ico/favicon.png">
 
     <title>Sticky Footer Template for Bootstrap</title>
 
@@ -17,8 +17,8 @@
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
-      <script src="../../assets/js/html5shiv.js"></script>
-      <script src="../../assets/js/respond.min.js"></script>
+      <script src="../../docs-assets/js/html5shiv.js"></script>
+      <script src="../../docs-assets/js/respond.min.js"></script>
     <![endif]-->
   </head>
 
diff --git a/examples/theme/index.html b/examples/theme/index.html
index a0f3128bf..dbc4fdadd 100644
--- a/examples/theme/index.html
+++ b/examples/theme/index.html
@@ -5,7 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link rel="shortcut icon" href="../../assets/ico/favicon.png">
+    <link rel="shortcut icon" href="../../docs-assets/ico/favicon.png">
 
     <title>Theme Template for Bootstrap</title>
 
@@ -19,8 +19,8 @@
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
-      <script src="../../assets/js/html5shiv.js"></script>
-      <script src="../../assets/js/respond.min.js"></script>
+      <script src="../../docs-assets/js/html5shiv.js"></script>
+      <script src="../../docs-assets/js/respond.min.js"></script>
     <![endif]-->
   </head>
 
@@ -346,8 +346,8 @@
     <!-- Bootstrap core JavaScript
     ================================================== -->
     <!-- Placed at the end of the document so the pages load faster -->
-    <script src="../../assets/js/jquery.js"></script>
+    <script src="../../docs-assets/js/jquery.js"></script>
     <script src="../../dist/js/bootstrap.min.js"></script>
-    <script src="../../assets/js/holder.js"></script>
+    <script src="../../docs-assets/js/holder.js"></script>
   </body>
 </html>
diff --git a/getting-started.html b/getting-started.html
index 80069c45c..8c1652e00 100644
--- a/getting-started.html
+++ b/getting-started.html
@@ -109,8 +109,8 @@ bootstrap/
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
-      <script src="../../assets/js/html5shiv.js"></script>
-      <script src="../../assets/js/respond.min.js"></script>
+      <script src="../../docs-assets/js/html5shiv.js"></script>
+      <script src="../../docs-assets/js/respond.min.js"></script>
     <![endif]-->
   </head>
   <body>

From f503efc49086becc312665000fcbce4b9df3750d Mon Sep 17 00:00:00 2001
From: Chris Rebert <code@rebertia.com>
Date: Mon, 23 Sep 2013 13:01:11 -0700
Subject: [PATCH 2/2] avoid using the term "assets" due to potential confusion

---
 getting-started.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/getting-started.html b/getting-started.html
index 8c1652e00..4cc0aa4fe 100644
--- a/getting-started.html
+++ b/getting-started.html
@@ -61,7 +61,7 @@ base_url: "../"
     <div class="page-header">
       <h1 id="whats-included">What's included</h1>
     </div>
-    <p class="lead">Within the download you'll find the following directories and files, logically grouping common assets and providing both compiled and minified variations.</p>
+    <p class="lead">Within the download you'll find the following directories and files, logically grouping common resources and providing both compiled and minified variations.</p>
     <p>Once downloaded, unzip the compressed folder to see the structure of (the compiled) Bootstrap. You'll see something like this:</p>
 
 {% highlight bash %}