From 7e758f60fcb8f5391ea48cacf432c76e8b747909 Mon Sep 17 00:00:00 2001
From: Chris Rebert <code@rebertia.com>
Date: Fri, 5 Dec 2014 11:49:53 -0800
Subject: Repeat warning comment about keeping "What's included" sections in
 sync

Refs #15238
[skip sauce]
---
 docs/_includes/getting-started/whats-included.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'docs/_includes/getting-started')

diff --git a/docs/_includes/getting-started/whats-included.html b/docs/_includes/getting-started/whats-included.html
index d18fb0278..42e2ea482 100644
--- a/docs/_includes/getting-started/whats-included.html
+++ b/docs/_includes/getting-started/whats-included.html
@@ -30,7 +30,8 @@ bootstrap/
     ├── glyphicons-halflings-regular.ttf
     └── glyphicons-halflings-regular.woff
 {% endhighlight %}
-
+<!-- NOTE: This info is intentionally duplicated in the README.
+Copy any changes made here over to the README too. -->
   <p>This is the most basic form of Bootstrap: precompiled files for quick drop-in usage in nearly any web project. We provide compiled CSS and JS (<code>bootstrap.*</code>), as well as compiled and minified CSS and JS (<code>bootstrap.min.*</code>). CSS <a href="https://developers.google.com/chrome-developer-tools/docs/css-preprocessors">source maps</a> (<code>bootstrap.*.map</code>) are available for use with certain browsers' developer tools. Fonts from Glyphicons are included, as is the optional Bootstrap theme.</p>
 
   <h2 id="whats-included-source">Bootstrap source code</h2>
-- 
cgit v1.2.3


From c8855a7ad120b37fd9a25125f90093478656362f Mon Sep 17 00:00:00 2001
From: Bastien <bmoulia@gmail.com>
Date: Fri, 12 Dec 2014 14:22:41 +0100
Subject: Add glyphicons fonts in woff2

---
 docs/_includes/getting-started/whats-included.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'docs/_includes/getting-started')

diff --git a/docs/_includes/getting-started/whats-included.html b/docs/_includes/getting-started/whats-included.html
index 42e2ea482..8aa8cf2a9 100644
--- a/docs/_includes/getting-started/whats-included.html
+++ b/docs/_includes/getting-started/whats-included.html
@@ -28,7 +28,8 @@ bootstrap/
     ├── glyphicons-halflings-regular.eot
     ├── glyphicons-halflings-regular.svg
     ├── glyphicons-halflings-regular.ttf
-    └── glyphicons-halflings-regular.woff
+    ├── glyphicons-halflings-regular.woff
+    └── glyphicons-halflings-regular.woff2
 {% endhighlight %}
 <!-- NOTE: This info is intentionally duplicated in the README.
 Copy any changes made here over to the README too. -->
-- 
cgit v1.2.3


From 2d41894ce51a1ae3b6e9d96eb63bf9cc3b50f64b Mon Sep 17 00:00:00 2001
From: "Patrick H. Lauke" <redux@splintered.co.uk>
Date: Sun, 14 Dec 2014 14:47:05 +0000
Subject: Expand/clarify advice about skip links

---
 docs/_includes/getting-started/accessibility.html | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'docs/_includes/getting-started')

diff --git a/docs/_includes/getting-started/accessibility.html b/docs/_includes/getting-started/accessibility.html
index 37c19315c..cbb528dce 100644
--- a/docs/_includes/getting-started/accessibility.html
+++ b/docs/_includes/getting-started/accessibility.html
@@ -3,12 +3,13 @@
   <p class="lead">Bootstrap follows common web standards and&mdash;with minimal extra effort&mdash;can be used to create sites that are accessible to those using <abbr title="Assistive Technology" class="initialism">AT</abbr>.</p>
 
   <h3>Skip navigation</h3>
-  <p>If your navigation contains many links and comes before the main content in the DOM, add a <code>Skip to main content</code> link immediately after your opening <code>&lt;body&gt;</code> tag. <a href="http://a11yproject.com/posts/skip-nav-links/">(read why)</a></p>
+  <p>If your navigation contains many links and comes before the main content in the DOM, add a <code>Skip to main content</code> link before the navigation <a href="http://a11yproject.com/posts/skip-nav-links/">(read why)</a>. Using the <code>.sr-only</code> class will visually hide the skip link, and the <code>.sr-only-focusable</code> class will ensure that the link becomes visible once focused (for sighted keyboard users).</p>
 {% highlight html %}
 <body>
   <a href="#content" class="sr-only sr-only-focusable">Skip to main content</a>
+  ...
   <div class="container" id="content">
-    The main page content.
+    <!-- The main page content -->
   </div>
 </body>
 {% endhighlight %}
-- 
cgit v1.2.3


From 4f1000d77242f3cd9e363da9db9021cb1a227e59 Mon Sep 17 00:00:00 2001
From: Chris Rebert <code@rebertia.com>
Date: Tue, 30 Dec 2014 18:33:40 -0800
Subject: Document that Autoprefixer is required

Closes #14937
[skip sauce]
---
 docs/_includes/getting-started/download.html | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'docs/_includes/getting-started')

diff --git a/docs/_includes/getting-started/download.html b/docs/_includes/getting-started/download.html
index edc048df5..fd81a405b 100644
--- a/docs/_includes/getting-started/download.html
+++ b/docs/_includes/getting-started/download.html
@@ -43,4 +43,7 @@
   <h3 id="download-bower">Install with Bower</h3>
   <p>You can also install and manage Bootstrap's Less, CSS, JavaScript, and fonts using <a href="http://bower.io">Bower</a>:</p>
   {% highlight bash %}$ bower install bootstrap{% endhighlight %}
+
+  <h3 id="download-autoprefixer">Autoprefixer required for Less/Sass</h3>
+  <p>Bootstrap uses <a href="https://github.com/postcss/autoprefixer">Autoprefixer</a> to deal with <a href="http://webdesign.about.com/od/css/a/css-vendor-prefixes.htm">CSS vendor prefixes</a>. If you're compiling Bootstrap from its Less/Sass source and not using our Gruntfile, you'll need to integrate Autoprefixer into your build process yourself. If you're using precompiled Bootstrap or using our Gruntfile, you don't need to worry about this because Autoprefixer is already integrated into our Gruntfile.</p>
 </div>
-- 
cgit v1.2.3


From 1b375420fa1491f724c6c5a685b61bb93b803f05 Mon Sep 17 00:00:00 2001
From: Nate Eagleson <nate@nateeag.com>
Date: Tue, 30 Dec 2014 21:48:34 -0500
Subject: Remove extra word  from disabling-responsiveness.html

---
 docs/_includes/getting-started/disabling-responsiveness.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/_includes/getting-started')

diff --git a/docs/_includes/getting-started/disabling-responsiveness.html b/docs/_includes/getting-started/disabling-responsiveness.html
index d154e204d..6102e02f3 100644
--- a/docs/_includes/getting-started/disabling-responsiveness.html
+++ b/docs/_includes/getting-started/disabling-responsiveness.html
@@ -2,7 +2,7 @@
   <h1 id="disable-responsive" class="page-header">Disabling responsiveness</h1>
 
   <p class="lead">Bootstrap automatically adapts your pages for various screen sizes.
-    Here's how to disable this feature so your page works like in <a href="../examples/non-responsive/">this non-responsive example</a>.</p>
+    Here's how to disable this feature so your page works like <a href="../examples/non-responsive/">this non-responsive example</a>.</p>
 
   <h3>Steps to disable page responsiveness</h3>
   <ol>
-- 
cgit v1.2.3


From 9db1de2a3aa734f41d9f5d0d1c0dfac5b77f4874 Mon Sep 17 00:00:00 2001
From: XhmikosR <xhmikosr@gmail.com>
Date: Tue, 6 Jan 2015 12:49:31 +0200
Subject: Update jQuery to v1.11.2.

---
 docs/_includes/getting-started/template.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/_includes/getting-started')

diff --git a/docs/_includes/getting-started/template.html b/docs/_includes/getting-started/template.html
index 47a0a8b67..84e009885 100644
--- a/docs/_includes/getting-started/template.html
+++ b/docs/_includes/getting-started/template.html
@@ -27,7 +27,7 @@
     <h1>Hello, world!</h1>
 
     <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
     <!-- Include all compiled plugins (below), or include individual files as needed -->
     <script src="js/bootstrap.min.js"></script>
   </body>
-- 
cgit v1.2.3


From ccc3eb5cc608b4642196581ab1678ecfdae812a4 Mon Sep 17 00:00:00 2001
From: Chris Rebert <code@rebertia.com>
Date: Wed, 14 Jan 2015 18:43:04 -0800
Subject: document usage of npm package; fixes #15127

[skip sauce]
---
 docs/_includes/getting-started/download.html | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'docs/_includes/getting-started')

diff --git a/docs/_includes/getting-started/download.html b/docs/_includes/getting-started/download.html
index fd81a405b..7059dc6d1 100644
--- a/docs/_includes/getting-started/download.html
+++ b/docs/_includes/getting-started/download.html
@@ -44,6 +44,16 @@
   <p>You can also install and manage Bootstrap's Less, CSS, JavaScript, and fonts using <a href="http://bower.io">Bower</a>:</p>
   {% highlight bash %}$ bower install bootstrap{% endhighlight %}
 
+  <h3 id="download-npm">Install with npm</h3>
+  <p>You can also install Bootstrap using <a href="https://www.npmjs.com">npm</a>:</p>
+  {% highlight bash %}$ npm install bootstrap{% endhighlight %}
+  <p><code>require('bootstrap')</code> will load all of Bootstrap's jQuery plugins onto the jQuery object. The <code>bootstrap</code> module itself does not export anything. You can manually load Bootstrap's jQuery plugins individually by loading the <code>/js/*.js</code> files under the package's top-level directory.</p>
+  <p>Bootstrap's <code>package.json</code> contains some additional metadata under the following keys:</p>
+  <ul>
+    <li><code>less</code> - path to Bootstrap's main <a href="lesscss.org">Less</a> source file</li>
+    <li><code>style</code> - path to Bootstrap's non-minified CSS that's been precompiled using the default settings (no customization)</li>
+  </ul>
+
   <h3 id="download-autoprefixer">Autoprefixer required for Less/Sass</h3>
   <p>Bootstrap uses <a href="https://github.com/postcss/autoprefixer">Autoprefixer</a> to deal with <a href="http://webdesign.about.com/od/css/a/css-vendor-prefixes.htm">CSS vendor prefixes</a>. If you're compiling Bootstrap from its Less/Sass source and not using our Gruntfile, you'll need to integrate Autoprefixer into your build process yourself. If you're using precompiled Bootstrap or using our Gruntfile, you don't need to worry about this because Autoprefixer is already integrated into our Gruntfile.</p>
 </div>
-- 
cgit v1.2.3


From f1cb639c3439d2cca006ebc28f05bc694c6c4ed2 Mon Sep 17 00:00:00 2001
From: Chris Rebert <github@rebertia.com>
Date: Thu, 15 Jan 2015 10:46:58 -0800
Subject: Docs: add missing "http://"

---
 docs/_includes/getting-started/download.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/_includes/getting-started')

diff --git a/docs/_includes/getting-started/download.html b/docs/_includes/getting-started/download.html
index 7059dc6d1..13a56bebd 100644
--- a/docs/_includes/getting-started/download.html
+++ b/docs/_includes/getting-started/download.html
@@ -50,7 +50,7 @@
   <p><code>require('bootstrap')</code> will load all of Bootstrap's jQuery plugins onto the jQuery object. The <code>bootstrap</code> module itself does not export anything. You can manually load Bootstrap's jQuery plugins individually by loading the <code>/js/*.js</code> files under the package's top-level directory.</p>
   <p>Bootstrap's <code>package.json</code> contains some additional metadata under the following keys:</p>
   <ul>
-    <li><code>less</code> - path to Bootstrap's main <a href="lesscss.org">Less</a> source file</li>
+    <li><code>less</code> - path to Bootstrap's main <a href="http://lesscss.org">Less</a> source file</li>
     <li><code>style</code> - path to Bootstrap's non-minified CSS that's been precompiled using the default settings (no customization)</li>
   </ul>
 
-- 
cgit v1.2.3