From: Mark Otto <markd.otto@gmail.com>
Date: Sun, 9 Oct 2016 21:57:31 +0000 (-0700)
Subject: Merge pull request #20864 from twbs/fix-20688
X-Git-Tag: v4.0.0-alpha.5~45
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b4d8367dbc7b801c61b63ccb76a826bc41a7424c;p=thirdparty%2Fbootstrap.git

Merge pull request #20864 from twbs/fix-20688

Update the grid table heading to clarify max width over width
---

b4d8367dbc7b801c61b63ccb76a826bc41a7424c
diff --cc docs/layout/grid.md
index 5d37880c0f,68e0d86ec7..55607e4648
--- a/docs/layout/grid.md
+++ b/docs/layout/grid.md
@@@ -91,11 -91,11 +91,11 @@@ See how aspects of the Bootstrap grid s
          <td colspan="4">Collapsed to start, horizontal above breakpoints</td>
        </tr>
        <tr>
-         <th class="text-nowrap" scope="row">Container width</th>
+         <th class="text-nowrap" scope="row">Max container width</th>
          <td>None (auto)</td>
 -        <td>576px</td>
 +        <td>540px</td>
          <td>720px</td>
 -        <td>940px</td>
 +        <td>960px</td>
          <td>1140px</td>
        </tr>
        <tr>