From 102bb8e68439d28334c2c9f6e4579fdd9950c102 Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Sat, 11 Feb 2012 10:38:41 -0800
Subject: [PATCH] clear up some messaging in docs on fluid grid system and
 nesting overall

---
 docs/assets/bootstrap.zip                 | Bin 52675 -> 52675 bytes
 docs/scaffolding.html                     |  18 +++++++++++++++++-
 docs/templates/pages/scaffolding.mustache |  18 +++++++++++++++++-
 3 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 81a5fd5ba756729e18566025939a8f5d506768c7..ed52bb8304c4ec6143df66100860dee9ac612f43 100644
GIT binary patch
delta 428
zcmX>+oB8l;W}X0VW)?065I7eykw=kj@m4ecrCTTeFA(K`3kRsOErAJ3GXd4jumuY&
z*}C!eSq`AU<W-!GP?60aIfL0jLT-XaV4=lZH`fWiGyn-@I+?*#Ep^h>1DO;cGx<XS
zC&E^c@sni=oxvhNt*M2T0wAFWjkYi$<)&(|(1J-SVAH^^1?zi0$p9*{Saz}^)A^9e
z@>@*UmI9r=Wb5Y0Etf?=Ch48jXIi{<@`qF6ljogb1Buj~G-g@?5|IV*E}is7;@O?@
zN8+tJ<$%QFKkWkHA(<pIdBSONi1}dCPMi)z;#r;XMzed_86zYUf1a^}@qmtxIP1g&
J^xT}Y>Hy9rz_b7W

delta 428
zcmX>+oB8l;W}X0VW)?065ZDqpkw=m3%6c>ZYwIWfFA(K`2yYFX7@*2_6(%gr1QeKI
z3l_M#e&g-496*7|t2iB@BAY*Q2D5{N+ysrlLRZ#rt`mG|020b{GJ~mF>ZGg31hg?g
zX7YyuPK2$}K*7l}h0b6Rpw`sFN&%42gGO7JkaAPC0LZijlT^T_fn5u7*5v1t44@*5
zWhX0wMC7-auw4T>{p$M7ky|c{fK1Xmsn2v}{p1g)#3#=?!v<1RchZ>YDo8{Y#JhCT
z8;NIk${&fh?vw)(kN>m_ga<JRXm;I6naLAQi$lzp1=)7ubRZJX>Wnv<-OJ7xA({B|
Sj2#j$;;a)B&~tOnssjKRGQ<`D

diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index 6ed5857fff..58bf88b24e 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -173,7 +173,8 @@
   <div class="row">
     <div class="span6">
       <p>With the static (non-fluid) grid system in Bootstrap, nesting is easy. To nest your content, just add a new <code>.row</code> and set of <code>.span*</code> columns within an existing <code>.span*</code> column.</p>
-      <h4>Example</h4>
+      <h3>Example</h3>
+      <p>Nested rows should include a set of columns that add up to the number of columns of it's parent. For example, two nested <code>.span3</code> columns should be placed within a <code>.span6</code>.</p>
       <div class="row show-grid">
         <div class="span6">
           Level 1 of column
@@ -187,6 +188,21 @@
           </div>
         </div>
       </div>
+      <h3>Fluid example</h3>
+      <p>Nesting with fluid grids is a bit different: the number of nested columns doesn't need to match the parent. Instead, your columns are reset at each level because each row takes up 100% of the parent column.</p>
+      <div class="row-fluid show-grid">
+        <div class="span12">
+          Fluid 12
+          <div class="row-fluid show-grid">
+            <div class="span6">
+              Fluid 6
+            </div>
+            <div class="span6">
+              Fluid 6
+            </div>
+          </div>
+        </div>
+      </div>
     </div>
     <div class="span6">
 <pre class="prettyprint linenums">
diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache
index 46437782ba..74b824d9ca 100644
--- a/docs/templates/pages/scaffolding.mustache
+++ b/docs/templates/pages/scaffolding.mustache
@@ -97,7 +97,8 @@
   <div class="row">
     <div class="span6">
       <p>{{_i}}With the static (non-fluid) grid system in Bootstrap, nesting is easy. To nest your content, just add a new <code>.row</code> and set of <code>.span*</code> columns within an existing <code>.span*</code> column.{{/i}}</p>
-      <h4>{{_i}}Example{{/i}}</h4>
+      <h3>{{_i}}Example{{/i}}</h3>
+      <p>{{_i}}Nested rows should include a set of columns that add up to the number of columns of it's parent. For example, two nested <code>.span3</code> columns should be placed within a <code>.span6</code>.{{/i}}</p>
       <div class="row show-grid">
         <div class="span6">
           {{_i}}Level 1 of column{{/i}}
@@ -111,6 +112,21 @@
           </div>
         </div>
       </div>
+      <h3>{{_i}}Fluid example{{/i}}</h3>
+      <p>{{_i}}Nesting with fluid grids is a bit different: the number of nested columns doesn't need to match the parent. Instead, your columns are reset at each level because each row takes up 100% of the parent column.{{/i}}</p>
+      <div class="row-fluid show-grid">
+        <div class="span12">
+          {{_i}}Fluid 12{{/i}}
+          <div class="row-fluid show-grid">
+            <div class="span6">
+              {{_i}}Fluid 6{{/i}}
+            </div>
+            <div class="span6">
+              {{_i}}Fluid 6{{/i}}
+            </div>
+          </div>
+        </div>
+      </div>
     </div>
     <div class="span6">
 <pre class="prettyprint linenums">