From e20d2dfe9d1f43e164d8fdbef64f4041df70b762 Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Sun, 15 Jul 2012 16:13:25 -0700
Subject: docs cleanup and blockquote cleanup for .pull-right option

---
 docs/templates/pages/base-css.mustache    |  5 ++---
 docs/templates/pages/scaffolding.mustache | 12 ++++++------
 2 files changed, 8 insertions(+), 9 deletions(-)

(limited to 'docs/templates')

diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 7e7106fb6..a630acfed 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -190,7 +190,7 @@
 </pre>
 
         <h4>{{_i}}Alternate displays{{/i}}</h4>
-        <p>{{_i}}Use <code>.pull-left</code> and <code>.pull-right</code> classes for floated, right-aligned blockquote content.{{/i}}</p>
+        <p>{{_i}}Use <code>.pull-right</code> for a floated, right-aligned blockquote.{{/i}}</p>
         <div class="bs-docs-example" style="overflow: hidden;">
           <blockquote class="pull-right">
             <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.</p>
@@ -199,8 +199,7 @@
         </div>
 <pre class="prettyprint linenums">
 &lt;blockquote class="pull-right"&gt;
-  &lt;p&gt;Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.&lt;/p&gt;
-  &lt;small&gt;{{_i}}Someone famous &lt;cite title="Source Title"&gt;Source Title&lt;/cite&gt;{{/i}}&lt;/small&gt;
+  ...
 &lt;/blockquote&gt;
 </pre>
 
diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache
index 86806bb56..4b9d4c5b2 100644
--- a/docs/templates/pages/scaffolding.mustache
+++ b/docs/templates/pages/scaffolding.mustache
@@ -97,7 +97,7 @@
         </div>
 
         <h3>{{_i}}Basic grid HTML{{/i}}</h3>
-        <p>{{_i}}For a simple two column layout, create a <code>.row</code> and add the appropriate number of <code>.span*</code> columns. As this is a 12-column grid, each <code>.span*</code> spans a number of those 12 columns, and should always add up to 12 for each row.{{/i}}</p>
+        <p>{{_i}}For a simple two column layout, create a <code>.row</code> and add the appropriate number of <code>.span*</code> columns. As this is a 12-column grid, each <code>.span*</code> spans a number of those 12 columns, and should always add up to 12 for each row (or the number of columns in the parent).{{/i}}</p>
 <pre class="prettyprint linenums">
 &lt;div class="row"&gt;
   &lt;div class="span4"&gt;...&lt;/div&gt;
@@ -136,10 +136,10 @@
             <div class="span9">
               {{_i}}Level 1 of column{{/i}}
               <div class="row show-grid">
-                <div class="span5">
+                <div class="span6">
                   {{_i}}Level 2{{/i}}
                 </div>
-                <div class="span4">
+                <div class="span3">
                   {{_i}}Level 2{{/i}}
                 </div>
               </div>
@@ -147,11 +147,11 @@
           </div>
 <pre class="prettyprint linenums">
 &lt;div class="row"&gt;
-  &lt;div class="span10"&gt;
+  &lt;div class="span9"&gt;
     {{_i}}Level 1 column{{/i}}
     &lt;div class="row"&gt;
-      &lt;div class="span5"&gt;{{_i}}Level 2{{/i}}&lt;/div&gt;
-      &lt;div class="span5"&gt;{{_i}}Level 2{{/i}}&lt;/div&gt;
+      &lt;div class="span6"&gt;{{_i}}Level 2{{/i}}&lt;/div&gt;
+      &lt;div class="span3"&gt;{{_i}}Level 2{{/i}}&lt;/div&gt;
     &lt;/div&gt;
   &lt;/div&gt;
 &lt;/div&gt;
-- 
cgit v1.2.3