diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 91d731edba..7cfe0eb399 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index a35012e9c8..ea95796d54 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -486,13 +486,13 @@
             <td class="muted" colspan="2">Fluid columns, no fixed widths</td>
           </tr>
           <tr>
-            <td>Portrait tablets</td>
-            <td>480px to 768px</td>
+            <td>Smartphones to tablets</td>
+            <td>767px and below</td>
             <td class="muted" colspan="2">Fluid columns, no fixed widths</td>
           </tr>
           <tr>
-            <td>Landscape tablets</td>
-            <td>768px to 979px</td>
+            <td>Portrait tablets</td>
+            <td>768px and above</td>
             <td>42px</td>
             <td>20px</td>
           </tr>
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 72b09c2718..8345e4a248 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -589,10 +589,16 @@
         </thead>
         <tbody>
           <tr>
-            <td>1</td>
-            <td colspan="2">Mark Otto</td>
+            <td rowspan="2">1</td>
+            <td>Mark</td>
+            <td>Otto</td>
             <td>CSS</td>
           </tr>
+          <tr>
+            <td>Mark</td>
+            <td>Otto</td>
+            <td>HTML</td>
+          </tr>
           <tr>
             <td>2</td>
             <td>Jacob</td>
diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache
index fff47d4383..d9a2f50d19 100644
--- a/docs/templates/pages/scaffolding.mustache
+++ b/docs/templates/pages/scaffolding.mustache
@@ -410,13 +410,13 @@
             <td class="muted" colspan="2">{{_i}}Fluid columns, no fixed widths{{/i}}</td>
           </tr>
           <tr>
-            <td>{{_i}}Portrait tablets{{/i}}</td>
-            <td>480px to 768px</td>
+            <td>{{_i}}Smartphones to tablets{{/i}}</td>
+            <td>767px and below</td>
             <td class="muted" colspan="2">{{_i}}Fluid columns, no fixed widths{{/i}}</td>
           </tr>
           <tr>
-            <td>{{_i}}Landscape tablets{{/i}}</td>
-            <td>768px to 979px</td>
+            <td>{{_i}}Portrait tablets{{/i}}</td>
+            <td>768px and above</td>
             <td>42px</td>
             <td>20px</td>
           </tr>