Merge branch 'master' of github.com:twbs/bootstrap

2 files changed, 7 insertions, 1 deletions

diff --git a/components.html b/components.html
index e409e3d94..26756f481 100644
--- a/components.html
+++ b/components.html
@@ -1416,6 +1416,10 @@ base_url: "../"
       <h4>Customize the collapsing point</h4>
       <p>Depending on the content in your navbar, you might need to change the point at which your navbar switches between collapsed and horizontal mode. Customize the <code>@grid-float-breakpoint</code> variable or add your own media query.</p>
     </div>
+    <div class="bs-callout bs-callout-warning" id="multiple-navbars-warning">
+      <h4>Multiple navbars require custom code</h4>
+      <p>Multiple nearby navbars with dropdown menus are not supported by default. You will need to override the <code>z-index</code>es of the dropdown menus yourself. Otherwise, the dropdown menu will display behind the other navbar.</p>
+    </div>
 
     <div class="bs-example">
       <nav class="navbar navbar-default" role="navigation">
diff --git a/getting-started.html b/getting-started.html
index 709bf09dc..e6d43349f 100644
--- a/getting-started.html
+++ b/getting-started.html
@@ -64,6 +64,8 @@ base_url: "../"
     <p class="lead">Within the download you'll find the following directories and files, logically grouping common resources and providing both compiled and minified variations.</p>
     <p>Once downloaded, unzip the compressed folder to see the structure of (the compiled) Bootstrap. You'll see something like this:</p>
 
+<!-- NOTE: This info is intentionally duplicated in the README.
+Copy any changes made here over to the README too. -->
 {% highlight bash %}
 bootstrap/
 ├── css/
@@ -781,7 +783,7 @@ if (navigator.userAgent.match(/IEMobile\/10\.0/)) {
     <p>As a heads up, we include this in the Bootstrap docs as an example.</p>
 
     <h3>Safari percent rounding</h3>
-    <p>In the latest Safari for Mac, its rendering engine has a little trouble with the long decimal places of our <code>.col-*-1</code> grid classes, meaning if you have 12 individual columns you'll notice they come up short compared to other rows of columns. We can't do much here (<a href="https://github.com/twbs/bootstrap/issues/9282">see #9282</a>) but you do have some options:</p>
+    <p>As of Safari v6.1 for OS X and Safari for iOS v7.0.1, Safari's rendering engine has some trouble with the number of decimal places used in our <code>.col-*-1</code> grid classes. So if you have 12 individual grid columns, you'll notice that they come up short compared to other rows of columns. We can't do much here (<a href="https://github.com/twbs/bootstrap/issues/9282">see #9282</a>) but you do have some options:</p>
     <ul>
       <li>Add <code>.pull-right</code> to your last grid column to get the hard-right alignment</li>
       <li>Tweak your percentages manually to get the perfect rounding for Safari (more difficult than the first option)</li>