From f29e3263b04fd2ecbd42e864e03abc15439b4a1b Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Sun, 5 Feb 2012 00:16:25 -0800
Subject: [PATCH] follow up to #1702, add callout on component alignment in
 tabs/pills

---
 docs/assets/bootstrap.zip                | Bin 52391 -> 52391 bytes
 docs/components.html                     |   7 ++++---
 docs/templates/pages/components.mustache |   7 ++++---
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 3c655b03a1dc2174c6325d0e3691c9371c5ca2fd..d3f2da9ad2106e660e66d763f57ad33d936dc9ca 100644
GIT binary patch
delta 445
zc-mV&lX>|}W}X0VW)?065MW}O$fKxy*h<g;C=i!ca5FHnd}m}}U=aaIq9_YcWjg{^
zHkq$Lnh7W{!xk#A@%AYWpuptioQ_bD&F?q^*+D{%f<|m0!;e^Pt`y8M00}*JG=r&9
zcG{;4GATf2^8b8Jw!_HAPu4DQhG{J+s1yJRy>GCE2^lq3gN4>lR6%vt<ZlxVVCL&g
zdac03%rseYvkBW#h*0q6y&@o0LMQZ@4qHwBe@c9Ez$rG6NW>|b$#o~hnT~)&WkDj_
zPIx2nlur61@g|*gfanMFKA&`f$RU|#j3mG2R3H*h?zA_W-Cd`Rkj%b&+78A8I^O1t
L6BE#P4QJE=(0P|F

delta 445
zc-mV&lX>|}W}X0VW)?065b$A~$fKy7Z>i^B0K}yg+zgB?-x(PgSVVx5D9Qp<*$TkQ
zCi4|YGXVu=*g^$1-af?v6qvl6(-A7N`5k8<J4nb;(1;CU_~uH%90QQhb4N3nDrKjA
zx*(GRWG4U5=Y%SR8b4XPz!@x(Z@Iaopi%%N^uECsCS=rD4HjBIQ3cgmlfO+gfSIo|
z>9qn#NOH3YOelEsUJ;Ox&<TB}e9OuIPl-<sIK>7Mi8v)Qx$cBGQvpa+79_Imgf|jT
z>7+jrZ_-Hzh<-5d^GO$o9Fl3qNb+k=1tRg}PJ5%--F4as$?UtQ?T~mjXPiL1hBN8_
DdMlCw

diff --git a/docs/components.html b/docs/components.html
index 1c5bc5abe2..06ca2560cc 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -354,9 +354,10 @@
     <div class="span4">
       <h3>Powerful base class</h3>
       <p>All nav components here&mdash;tabs, pills, and lists&mdash;<strong>share the same base markup and styles</strong> through the <code>.nav</code> class.</p>
-      <h3>Why tabs and pills</h3>
-      <p>Tabs and pills in Bootstrap are built on a <code>&lt;ul&gt;</code> with the same core HTML, a list of links. Swap between tabs or pills with only a class.</p>
-      <p>Both options are great for sub-sections of content or navigating between pages of related content.</p>
+      <h3>When to use</h3>
+      <p>Tabs and pills are great for sections of content or navigating between pages of related content.</p>
+      <h3>Component alignment</h3>
+      <p>To align nav links, use the <code>.pull-left</code> or <code>.pull-right</code> utility classes. Both classes will add a CSS float in the specified direction.</p>
     </div>
     <div class="span4">
       <h3>Basic tabs</h3>
diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index 1f466aa5dd..0a7affafee 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -278,9 +278,10 @@
     <div class="span4">
       <h3>{{_i}}Powerful base class{{/i}}</h3>
       <p>{{_i}}All nav components here&mdash;tabs, pills, and lists&mdash;<strong>share the same base markup and styles</strong> through the <code>.nav</code> class.{{/i}}</p>
-      <h3>{{_i}}Why tabs and pills{{/i}}</h3>
-      <p>{{_i}}Tabs and pills in Bootstrap are built on a <code>&lt;ul&gt;</code> with the same core HTML, a list of links. Swap between tabs or pills with only a class.{{/i}}</p>
-      <p>{{_i}}Both options are great for sub-sections of content or navigating between pages of related content.{{/i}}</p>
+      <h3>{{_i}}When to use{{/i}}</h3>
+      <p>{{_i}}Tabs and pills are great for sections of content or navigating between pages of related content.{{/i}}</p>
+      <h3>{{_i}}Component alignment{{/i}}</h3>
+      <p>{{_i}}To align nav links, use the <code>.pull-left</code> or <code>.pull-right</code> utility classes. Both classes will add a CSS float in the specified direction.{{/i}}</p>
     </div>
     <div class="span4">
       <h3>{{_i}}Basic tabs{{/i}}</h3>
-- 
2.47.3