From c6affe79b7fa9766ef4153d9130406dbe346e31e Mon Sep 17 00:00:00 2001
From: Chris Rebert <code@rebertia.com>
Date: Mon, 29 Dec 2014 18:27:41 -0800
Subject: [PATCH 1/2] account for XL size tier in grid docs

---
 docs/layout/grid.md | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/docs/layout/grid.md b/docs/layout/grid.md
index 3e59a785f1..bfa4af63a1 100644
--- a/docs/layout/grid.md
+++ b/docs/layout/grid.md
@@ -37,18 +37,22 @@ See how aspects of the Bootstrap grid system work across multiple devices with a
         <th></th>
         <th>
           Extra small devices
-          <small>Phones (&lt;768px)</small>
+          <small>Portrait phones (&lt;???px)</small>
         </th>
         <th>
           Small devices
-          <small>Tablets (&ge;768px)</small>
+          <small>Landscape phones (&ge;???px)</small>
         </th>
         <th>
           Medium devices
-          <small>Desktops (&ge;992px)</small>
+          <small>Tablets (&ge;768px)</small>
         </th>
         <th>
           Large devices
+          <small>Desktops (&ge;992px)</small>
+        </th>
+        <th>
+          Extra large devices
           <small>Desktops (&ge;1200px)</small>
         </th>
       </tr>
@@ -57,11 +61,12 @@ See how aspects of the Bootstrap grid system work across multiple devices with a
       <tr>
         <th class="text-nowrap" scope="row">Grid behavior</th>
         <td>Horizontal at all times</td>
-        <td colspan="3">Collapsed to start, horizontal above breakpoints</td>
+        <td colspan="4">Collapsed to start, horizontal above breakpoints</td>
       </tr>
       <tr>
         <th class="text-nowrap" scope="row">Container width</th>
         <td>None (auto)</td>
+        <td>???px</td>
         <td>750px</td>
         <td>970px</td>
         <td>1170px</td>
@@ -72,33 +77,35 @@ See how aspects of the Bootstrap grid system work across multiple devices with a
         <td><code>.col-sm-</code></td>
         <td><code>.col-md-</code></td>
         <td><code>.col-lg-</code></td>
+        <td><code>.col-xl-</code></td>
       </tr>
       <tr>
         <th class="text-nowrap" scope="row"># of columns</th>
-        <td colspan="4">12</td>
+        <td colspan="5">12</td>
       </tr>
       <tr>
         <th class="text-nowrap" scope="row">Column width</th>
         <td class="text-muted">Auto</td>
+        <td>~??px</td>
         <td>~62px</td>
         <td>~81px</td>
         <td>~97px</td>
       </tr>
       <tr>
         <th class="text-nowrap" scope="row">Gutter width</th>
-        <td colspan="4">30px (15px on each side of a column)</td>
+        <td colspan="5">30px (15px on each side of a column)</td>
       </tr>
       <tr>
         <th class="text-nowrap" scope="row">Nestable</th>
-        <td colspan="4">Yes</td>
+        <td colspan="5">Yes</td>
       </tr>
       <tr>
         <th class="text-nowrap" scope="row">Offsets</th>
-        <td colspan="4">Yes</td>
+        <td colspan="5">Yes</td>
       </tr>
       <tr>
         <th class="text-nowrap" scope="row">Column ordering</th>
-        <td colspan="4">Yes</td>
+        <td colspan="5">Yes</td>
       </tr>
     </tbody>
   </table>

From fb176a97e19b4ecdf2baca5c9528eac9dfc73279 Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Wed, 31 Dec 2014 10:46:50 -0800
Subject: [PATCH 2/2] change values, remove grid column size row

---
 docs/layout/grid.md | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/docs/layout/grid.md b/docs/layout/grid.md
index bfa4af63a1..1232262a2a 100644
--- a/docs/layout/grid.md
+++ b/docs/layout/grid.md
@@ -37,23 +37,23 @@ See how aspects of the Bootstrap grid system work across multiple devices with a
         <th></th>
         <th>
           Extra small devices
-          <small>Portrait phones (&lt;???px)</small>
+          <small>Portrait phones (&lt;34em)</small>
         </th>
         <th>
           Small devices
-          <small>Landscape phones (&ge;???px)</small>
+          <small>Landscape phones (&ge;38em)</small>
         </th>
         <th>
           Medium devices
-          <small>Tablets (&ge;768px)</small>
+          <small>Tablets (&ge;48em)</small>
         </th>
         <th>
           Large devices
-          <small>Desktops (&ge;992px)</small>
+          <small>Desktops (&ge;62em)</small>
         </th>
         <th>
           Extra large devices
-          <small>Desktops (&ge;1200px)</small>
+          <small>Desktops (&ge;75em)</small>
         </th>
       </tr>
     </thead>
@@ -66,10 +66,10 @@ See how aspects of the Bootstrap grid system work across multiple devices with a
       <tr>
         <th class="text-nowrap" scope="row">Container width</th>
         <td>None (auto)</td>
-        <td>???px</td>
-        <td>750px</td>
-        <td>970px</td>
-        <td>1170px</td>
+        <td>34rem</td>
+        <td>45rem</td>
+        <td>60rem</td>
+        <td>72.25rem</td>
       </tr>
       <tr>
         <th class="text-nowrap" scope="row">Class prefix</th>
@@ -83,14 +83,6 @@ See how aspects of the Bootstrap grid system work across multiple devices with a
         <th class="text-nowrap" scope="row"># of columns</th>
         <td colspan="5">12</td>
       </tr>
-      <tr>
-        <th class="text-nowrap" scope="row">Column width</th>
-        <td class="text-muted">Auto</td>
-        <td>~??px</td>
-        <td>~62px</td>
-        <td>~81px</td>
-        <td>~97px</td>
-      </tr>
       <tr>
         <th class="text-nowrap" scope="row">Gutter width</th>
         <td colspan="5">30px (15px on each side of a column)</td>