Merge branch 'master' into restore_grid_mixins

Conflicts:
	dist/css/bootstrap.min.css

1 files changed, 3 insertions, 3 deletions

diff --git a/getting-started.html b/getting-started.html
index e6d43349f..b37ad1cfe 100644
--- a/getting-started.html
+++ b/getting-started.html
@@ -111,7 +111,7 @@ bootstrap/
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
-      <script src="../../docs-assets/js/html5shiv.js"></script>
+      <script src="https://oss.maxcdn.com/libs/html5shiv/3.6.2/html5shiv.js"></script>
       <script src="../../docs-assets/js/respond.min.js"></script>
     <![endif]-->
   </head>
@@ -119,7 +119,7 @@ bootstrap/
     <h1>Hello, world!</h1>
 
     <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-    <script src="//code.jquery.com/jquery.js"></script>
+    <script src="https://code.jquery.com/jquery.js"></script>
     <!-- Include all compiled plugins (below), or include individual files as needed -->
     <script src="js/bootstrap.min.js"></script>
   </body>
@@ -995,7 +995,7 @@ if (navigator.userAgent.match(/IEMobile\/10\.0/)) {
     <p><strong>In summary, here's the basic workflow:</strong></p>
     <ul>
       <li>For each element you want to customize, find its code in the compiled Bootstrap CSS.</li>
-      <li>Copy the component's selector and styles and paste them in your custom stylesheet. For instance, to customize the navbar background, just copy the <code>.navbar</code> style specificaton.</li>
+      <li>Copy the component's selector and styles and paste them in your custom stylesheet. For instance, to customize the navbar background, just copy the <code>.navbar</code> style specification.</li>
       <li>In your custom stylesheet, edit the CSS you just copied from the Bootstrap source. No need for prepending additional classes, or appending <code>!important</code> here.  Keep it simple.</li>
       <li>Rinse and repeat until you're happy with your customizations.</li>
     </ul>