Merge branch '2.0-wip'

Conflicts:
	docs/assets/bootstrap.zip

2 files changed, 13 insertions, 42 deletions

diff --git a/docs/templates/pages/examples.mustache b/docs/templates/pages/examples.mustache
index 850ac0fa6..22d78b982 100644
--- a/docs/templates/pages/examples.mustache
+++ b/docs/templates/pages/examples.mustache
@@ -1,56 +1,31 @@
-<div class="alert">
-  <strong>Heads up!</strong> This page is still under construction and is missing plenty of documentation. Hang tight!
-</div>
-
 <!-- Masthead
 ================================================== -->
 <header class="jumbotron subhead" id="overview">
   <h1>{{_i}}Bootstrap examples{{/i}}</h1>
-  <p class="lead">{{_i}}Use these examples as starting points for your work with Bootstrap. We encourage everyone to iterate on these examples and not simply use them as an end result.{{/i}}</p>
+  <p class="lead">{{_i}}We've included a few basic examples as starting points for your work with Bootstrap. We encourage folks to iterate on these examples and not simply use them as an end result.{{/i}}</p>
 </header>
 
 
 <ul class="thumbnails bootstrap-examples">
   <li class="span4">
-    <a href="../examples/hero.html" class="thumbnail">
-      <img src="http://placehold.it/360x240" alt="">
-    </a>
-    <h3>Basic marketing site</h3>
-    <p></p>
-  </li>
-  <li class="span4">
-    <a href="../examples/fluid.html" class="thumbnail">
-      <img src="http://placehold.it/360x240" alt="">
-    </a>
-    <h3>Fluid layout</h3>
-    <p></p>
-  </li>
-  <li class="span4">
-    <a href="../examples/fluid-reverse.html" class="thumbnail">
-      <img src="http://placehold.it/360x240" alt="">
-    </a>
-    <h3>Fluid layout reversed</h3>
-    <p></p>
-  </li>
-  <li class="span4">
-    <a href="../examples/container-app.html" class="thumbnail">
-      <img src="http://placehold.it/360x240" alt="">
+    <a class="thumbnail" href="../examples/hero.html">
+      <img src="assets/img/examples/bootstrap-example-hero.jpg" alt="">
     </a>
-    <h3>Container application</h3>
-    <p></p>
+    <h3>{{_i}}Basic marketing site{{/i}}</h3>
+    <p>{{_i}}Featuring a hero unit for a primary message and three supporting elements.{{/i}}</p>
   </li>
   <li class="span4">
-    <a href="#" class="thumbnail">
-      <img src="http://placehold.it/360x240" alt="">
+    <a class="thumbnail" href="../examples/fluid.html">
+      <img src="assets/img/examples/bootstrap-example-fluid.jpg" alt="">
     </a>
-    <h3>Fullscreen</h3>
-    <p></p>
+    <h3>{{_i}}Fluid layout{{/i}}</h3>
+    <p>{{_i}}Uses are new responsive, fluid grid system to create seamless liquid layout.{{/i}}</p>
   </li>
   <li class="span4">
-    <a href="#" class="thumbnail">
-      <img src="http://placehold.it/360x240" alt="">
+    <a class="thumbnail" href="../examples/starter-template.html">
+      <img src="assets/img/examples/bootstrap-example-starter.jpg" alt="">
     </a>
-    <h3>Simple layout</h3>
-    <p></p>
+    <h3>{{_i}}Starter template{{/i}}</h3>
+    <p>{{_i}}A barebones HTML document with all the Bootstrap CSS and javascript included.{{/i}}</p>
   </li>
 </ul>
diff --git a/docs/templates/pages/less.mustache b/docs/templates/pages/less.mustache
index 52ea659bb..70432cea1 100644
--- a/docs/templates/pages/less.mustache
+++ b/docs/templates/pages/less.mustache
@@ -1,7 +1,3 @@
-<div class="alert">
-  <strong>Heads up!</strong> This page is still under construction and is missing plenty of documentation. Hang tight!
-</div>
-
 <!-- Masthead
 ================================================== -->
 <header class="jumbotron subhead" id="overview">