Merge branch 'master' into cursor_var

3 files changed, 9 insertions, 9 deletions

diff --git a/docs/_includes/components/button-groups.html b/docs/_includes/components/button-groups.html
index 018d66ed5..216e4426b 100644
--- a/docs/_includes/components/button-groups.html
+++ b/docs/_includes/components/button-groups.html
@@ -202,16 +202,16 @@
   <p>Just wrap a series of <code>.btn</code>s in <code>.btn-group.btn-group-justified</code>.</p>
   <div class="bs-example">
     <div class="btn-group btn-group-justified">
-      <a class="btn btn-default" role="button">Left</a>
-      <a class="btn btn-default" role="button">Middle</a>
-      <a class="btn btn-default" role="button">Right</a>
+      <a href="#" class="btn btn-default" role="button">Left</a>
+      <a href="#" class="btn btn-default" role="button">Middle</a>
+      <a href="#" class="btn btn-default" role="button">Right</a>
     </div>
     <br>
     <div class="btn-group btn-group-justified">
-      <a class="btn btn-default" role="button">Left</a>
-      <a class="btn btn-default" role="button">Middle</a>
+      <a href="#" class="btn btn-default" role="button">Left</a>
+      <a href="#" class="btn btn-default" role="button">Middle</a>
       <div class="btn-group">
-        <a class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+        <a href="#" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
           Dropdown <span class="caret"></span>
         </a>
         <ul class="dropdown-menu" role="menu">
diff --git a/docs/_includes/components/jumbotron.html b/docs/_includes/components/jumbotron.html
index 4c6bdb739..f5de9753e 100644
--- a/docs/_includes/components/jumbotron.html
+++ b/docs/_includes/components/jumbotron.html
@@ -6,14 +6,14 @@
     <div class="jumbotron">
       <h1>Hello, world!</h1>
       <p>This is a simple hero unit, a simple jumbotron-style component for calling extra attention to featured content or information.</p>
-      <p><a class="btn btn-primary btn-lg" role="button">Learn more</a></p>
+      <p><a class="btn btn-primary btn-lg" href="#" role="button">Learn more</a></p>
     </div>
   </div>
 {% highlight html %}
 <div class="jumbotron">
   <h1>Hello, world!</h1>
   <p>...</p>
-  <p><a class="btn btn-primary btn-lg" role="button">Learn more</a></p>
+  <p><a class="btn btn-primary btn-lg" href="#" role="button">Learn more</a></p>
 </div>
 {% endhighlight %}
   <p>To make the jumbotron full width, and without rounded corners, place it outside all <code>.container</code>s and instead add a <code>.container</code> within.</p>
diff --git a/docs/_includes/components/navs.html b/docs/_includes/components/navs.html
index 0e9af578a..c9fc189c5 100644
--- a/docs/_includes/components/navs.html
+++ b/docs/_includes/components/navs.html
@@ -60,7 +60,7 @@
   <p><strong class="text-danger">Justified navbar nav links are currently not supported.</strong></p>
   <div class="bs-callout bs-callout-warning">
     <h4>Safari and responsive justified navs</h4>
-    <p>As of v7.1, Safari exhibits a bug in which resizing your browser horizontally causes rendering errors in the justified nav that are cleared upon refreshing. This bug is also shown in the <a href="../examples/justified-nav/">justified nav example</a>.</p>
+    <p>As of v8.0, Safari exhibits a bug in which resizing your browser horizontally causes rendering errors in the justified nav that are cleared upon refreshing. This bug is also shown in the <a href="../examples/justified-nav/">justified nav example</a>.</p>
   </div>
   <div class="bs-example">
     <ul class="nav nav-tabs nav-justified" role="tablist">