Merge branch 'v4-dev' into fix-travis-v4

4 files changed, 13 insertions, 10 deletions

diff --git a/docs/getting-started/browsers-devices.md b/docs/getting-started/browsers-devices.md
index f3ce8fdc1..fab9a3fea 100644
--- a/docs/getting-started/browsers-devices.md
+++ b/docs/getting-started/browsers-devices.md
@@ -13,7 +13,7 @@ Bootstrap supports a wide variety of modern browsers and devices, and some older
 
 ## Supported browsers
 
-Bootstrap supports the **latest, stable releases** of all major browsers and platforms. On Windows, **we support Internet Explorer 9-11**. More specific support information is provided below.
+Bootstrap supports the **latest, stable releases** of all major browsers and platforms. On Windows, **we support Internet Explorer 9-11 / Microsoft Edge**. More specific support information is provided below.
 
 ### Mobile devices
 
@@ -64,6 +64,7 @@ Similarly, the latest versions of most desktop browsers are supported.
         <th>Chrome</th>
         <th>Firefox</th>
         <th>Internet Explorer</th>
+        <th>Microsoft Edge</th>
         <th>Opera</th>
         <th>Safari</th>
       </tr>
@@ -74,6 +75,7 @@ Similarly, the latest versions of most desktop browsers are supported.
         <td class="text-success">Supported</td>
         <td class="text-success">Supported</td>
         <td class="text-muted">N/A</td>
+        <td class="text-muted">N/A</td>
         <td class="text-success">Supported</td>
         <td class="text-success">Supported</td>
       </tr>
@@ -83,6 +85,7 @@ Similarly, the latest versions of most desktop browsers are supported.
         <td class="text-success">Supported</td>
         <td class="text-success">Supported</td>
         <td class="text-success">Supported</td>
+        <td class="text-success">Supported</td>
         <td class="text-danger">Not supported</td>
       </tr>
     </tbody>
@@ -91,7 +94,7 @@ Similarly, the latest versions of most desktop browsers are supported.
 
 Unofficially, Bootstrap should look and behave well enough in Chromium and Chrome for Linux, Firefox for Linux, and Internet Explorer 8 and below, though they are not officially supported.
 
-For a list of some of the browser bugs that Bootstrap has to grapple with, see our [Wall of browser bugs](../browser-bugs/).
+For a list of some of the browser bugs that Bootstrap has to grapple with, see our [Wall of browser bugs]({{ site.baseurl }}/browser-bugs/).
 
 ## Internet Explorer 9
 
diff --git a/docs/getting-started/download.md b/docs/getting-started/download.md
index 5dc3d5c38..7255fbba5 100644
--- a/docs/getting-started/download.md
+++ b/docs/getting-started/download.md
@@ -21,7 +21,7 @@ Download just the compiled and minified CSS and JavaScript. Doesn't include any
   <div class="col-sm-6">
 {% markdown %}
 ### Source files
-Download everything: source Sass, JavaScript, and documentation files. **Requires a Sass compiler, [Autoprefixer](https://github.com/postcss/autoprefixer), and [some setup](../compiling).**
+Download everything: source Sass, JavaScript, and documentation files. **Requires a Sass compiler, [Autoprefixer](https://github.com/postcss/autoprefixer), and [some setup]({{ site.baseurl }}/getting-started/build-tools/#tooling-setup).**
 
 <a href="{{ site.download.source }}" class="btn btn-bs btn-outline" onclick="ga('send', 'event', 'Getting started', 'Download', 'Download source');">Download source</a>
 {% endmarkdown %}
diff --git a/docs/getting-started/flexbox.md b/docs/getting-started/flexbox.md
index 1c3aef613..f8ab4e8ae 100644
--- a/docs/getting-started/flexbox.md
+++ b/docs/getting-started/flexbox.md
@@ -23,7 +23,7 @@ Vendor prefixes are provided in our compiled CSS with Autoprefixer via Grunt.
 
 ## Why flexbox?
 
-In a nutshell, flexbix provides simpler and more flexible layout options in CSS. More specifically, it provides:
+In a nutshell, flexbox provides simpler and more flexible layout options in CSS. More specifically, it provides:
 
 - Easy vertical alignment of content within a parent element.
 - Easy reordering of content across devices and screen resolutions with the help of media queries.
@@ -39,13 +39,13 @@ If you're familiar with modifying variables in Sass—or any other CSS preproces
 2. Change it from `false` to `true`.
 3. Recompile, and done!
 
-Alternatively, if you don't need the source Sass files, you may swap the default Bootstrap compiled CSS with the compiled flexbox variation. [Head to the download page](/getting-started/download) for more information.
+Alternatively, if you don't need the source Sass files, you may swap the default Bootstrap compiled CSS with the compiled flexbox variation. [Head to the download page]({{ site.baseurl }}/getting-started/download) for more information.
 
 ## Browser support
 
 Enabling flexbox means **reduced browser and device support:**
 
 - Internet Explorer 9 and below do not support flexbox.
-- Internet Explorer 10 has a few known quirks.
+- Internet Explorer 10 has a few known quirks (see the "Known issues" tab in [Can I use...](http://caniuse.com/#feat=flexbox)), requires using a prefix, and only supports the syntax from the old 2012 version of the spec.
 
-Please be extra conscious of your user base when enabling flexbox in your project.
+Please be extra conscious of your user base when enabling flexbox in your project. Visit [Can I use...](http://caniuse.com/#feat=flexbox) for details on browser support of flexbox.
diff --git a/docs/getting-started/introduction.md b/docs/getting-started/introduction.md
index f5e650cae..7ca3e5cce 100644
--- a/docs/getting-started/introduction.md
+++ b/docs/getting-started/introduction.md
@@ -38,7 +38,7 @@ And that's it—you're your way to a fully Bootstrapped site. If you're at all u
 Be sure to have your pages set up with the latest design and development standards. That means:
 
 * Using an HTML5 doctype
-* Forcing Internet Explorer to use its latest rendering mode ([read more]())
+* Forcing Internet Explorer to use its latest rendering mode ([read more](http://stackoverflow.com/q/6771258))
 * And, utilizing the viewport meta tag.
 
 Put it all together and your pages should look like this:
@@ -65,7 +65,7 @@ Put it all together and your pages should look like this:
 </html>
 {% endhighlight %}
 
-That's all you need for overall page requirements. Visit the [Layout docs]({{ site.baseurl }}/layout/scaffolding) or [our official examples](../examples/) to start laying out your site's content and components.
+That's all you need for overall page requirements. Visit the [Layout docs]({{ site.baseurl }}/layout/scaffolding) or [our official examples]({{ site.baseurl }}/examples/) to start laying out your site's content and components.
 
 ## Important globals
 
@@ -90,7 +90,7 @@ Bootstrap is developed *mobile first*, a strategy in which we optimize code for
 <meta name="viewport" content="width=device-width, initial-scale=1">
 {% endhighlight %}
 
-You can see an example of this in action in the [started template](#starter-template).
+You can see an example of this in action in the [starter template](#starter-template).
 
 ### Box-sizing