follow up to #1702, add callout on component alignment in tabs/pills

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 3c655b03a1dc2174c6325d0e3691c9371c5ca2fd..d3f2da9ad2106e660e66d763f57ad33d936dc9ca 100644 (file)
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ

diff --git a/docs/components.html b/docs/components.html
index 1c5bc5abe21281ae8f9be0811c35f786d2fb9a65..06ca2560cc199ab6bbe47f904c4f8bd94e6a9c58 100644 (file)
--- 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 1f466aa5ddb7a5915027471c22444351984ddad9..0a7affafeeb5008716f81963ceff753546a0364a 100644 (file)
--- 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>