BS sync

Gemfile

@@ -1,9 +1,9 @@
 source 'https://rubygems.org'
 
 group :development, :test do
-  gem 'jekyll', '~> 3.0.1'
-  gem 'jekyll-redirect-from', '~> 0.9.0'
+  gem 'jekyll', '~> 3.1.0'
+  gem 'jekyll-redirect-from', '~> 0.9.1'
   gem 'jekyll-seo-tag', '~> 0.1.3'
-  gem 'jekyll-sitemap', '~> 0.9.0'
+  gem 'jekyll-sitemap', '~> 0.10.0'
   gem 'scss_lint', '~> 0.43'
 end

Gemfile.lock

@@ -3,7 +3,7 @@ GEM
   specs:
     colorator (0.1)
     ffi (1.9.10)
-    jekyll (3.0.2)
+    jekyll (3.1.0)
       colorator (~> 0.1)
       jekyll-sass-converter (~> 1.0)
       jekyll-watch (~> 1.1)
@@ -18,7 +18,7 @@ GEM
       sass (~> 3.4)
     jekyll-seo-tag (0.1.4)
       jekyll (>= 2.0)
-    jekyll-sitemap (0.9.0)
+    jekyll-sitemap (0.10.0)
     jekyll-watch (1.3.1)
       listen (~> 3.0)
     kramdown (1.9.0)
@@ -42,8 +42,8 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  jekyll (~> 3.0.1)
-  jekyll-redirect-from (~> 0.9.0)
+  jekyll (~> 3.1.0)
+  jekyll-redirect-from (~> 0.9.1)
   jekyll-seo-tag (~> 0.1.3)
-  jekyll-sitemap (~> 0.9.0)
+  jekyll-sitemap (~> 0.10.0)
   scss_lint (~> 0.43)

docs/components/forms.md

@@ -282,7 +282,7 @@ The `.form-group` class is the easiest way to add some structure to forms. Its o
 
 ### Inline forms
 
-Use the `.form-inline` class to to display a series of labels, form controls, and buttons on a single horizontal row. Form controls within inline forms behave differently:
+Use the `.form-inline` class to display a series of labels, form controls, and buttons on a single horizontal row. Form controls within inline forms behave differently:
 
 - Controls are `display: inline-block` to provide alignment control via `vertical-align` and `margin`.
 - Controls receive `width: auto` to override the Bootstrap default `width: 100%`.

docs/components/list-group.md

@@ -42,16 +42,16 @@ Add labels to any list group item to show unread counts, activity, etc.
 {% example html %}
 <ul class="list-group">
   <li class="list-group-item">
-    Cras justo odio
     <span class="label label-default label-pill pull-xs-right">14</span>
+    Cras justo odio
   </li>
   <li class="list-group-item">
-    Dapibus ac facilisis in
     <span class="label label-default label-pill pull-xs-right">2</span>
+    Dapibus ac facilisis in
   </li>
   <li class="list-group-item">
-    Morbi leo risus
     <span class="label label-default label-pill pull-xs-right">1</span>
+    Morbi leo risus
   </li>
 </ul>
 {% endexample %}

docs/components/popovers.md

@@ -279,7 +279,7 @@ Options can be passed via data attributes or JavaScript. For data attributes, ap
         <td>offsets</td>
         <td>string</td>
         <td>'0 0'</td>
-        <td>Offset of the popover relative to its target. For more information refer to Tether's <a href="http://github.hubspot.com/tether/#constraints">offset docs</a>.</td>
+        <td>Offset of the popover relative to its target. For more information refer to Tether's <a href="http://github.hubspot.com/tether/#offset">offset docs</a>.</td>
       </tr>
     </tbody>
   </table>

docs/content/typography.md

@@ -143,6 +143,8 @@ Styling for common inline HTML5 elements.
 <p><em>This line rendered as italicized text.</em></p>
 {% endexample %}
 
+`.mark` and `.small` classes are also available to apply the same styles as `<mark>` and `<small>` while avoiding any unwanted semantic implications that the tags would bring.
+
 While not shown above, feel free to use `<b>` and `<i>` in HTML5. `<b>` is meant to highlight words or phrases without conveying additional importance while `<i>` is mostly for voice, technical terms, etc.
 
 ## Abbreviations

docs/getting-started/browsers-devices.md

@@ -229,9 +229,13 @@ Bootstrap includes a workaround for this, although it is disabled by default. By
 
 Even in some modern browsers, printing can be quirky.
 
-In particular, as of Chrome v32 and regardless of margin settings, Chrome uses a viewport width significantly narrower than the physical paper size when resolving media queries while printing a webpage. This can result in Bootstrap's extra-small grid being unexpectedly activated when printing. [See #12078 for some details.](https://github.com/twbs/bootstrap/issues/12078) Suggested workarounds:
+In particular, as of Chrome v32 and regardless of margin settings, Chrome uses a viewport width significantly narrower than the physical paper size when resolving media queries while printing a webpage. This can result in Bootstrap's extra-small grid being unexpectedly activated when printing. See [issue #12078](https://github.com/twbs/bootstrap/issues/12078) for some details. Suggested workarounds:
 
-Also, as of Safari v8.0, fixed-width <code>.container</code>s can cause Safari to use an unusually small font size when printing. See <a href="https://github.com/twbs/bootstrap/issues/14868">#14868</a> for more details. One potential workaround for this is adding the following CSS:
+* Embrace the extra-small grid and make sure your page looks acceptable under it.
+* Customize the value of the `$grid-breakpoints` Sass variable so that your printer paper is considered larger than extra-small.
+* Add custom media queries to change the grid size breakpoints for print media only.
+
+Also, as of Safari v8.0, use of the fixed-width `.container` class can cause Safari to use an unusually small font size when printing. See [issue #14868](https://github.com/twbs/bootstrap/issues/14868) for more details. One potential workaround is the following CSS:
 
 {% highlight css %}
 @media print {

package.json

@@ -59,7 +59,7 @@
     "grunt-exec": "~0.4.6",
     "grunt-html": "~5.0.0",
     "grunt-jekyll": "~0.4.2",
-    "grunt-jscs": "~2.4.0",
+    "grunt-jscs": "~2.6.0",
     "grunt-postcss": "^0.7.0",
     "grunt-sass": "^1.0.0",
     "grunt-saucelabs": "~8.6.1",