Merge branch 'v4-dev' into form-tweaks

5 files changed, 16 insertions, 8 deletions

diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html
index dab3d5665..e3642ac6d 100644
--- a/docs/_layouts/default.html
+++ b/docs/_layouts/default.html
@@ -12,9 +12,9 @@
 
     {% include nav-home.html %}
 
-    <div id="content">
+    <main id="content" role="main">
         {{ content }}
-    </div>
+    </main>
 
     {% include footer.html %}
   </body>
diff --git a/docs/_layouts/docs.html b/docs/_layouts/docs.html
index 4c719c5d8..c44275f1f 100644
--- a/docs/_layouts/docs.html
+++ b/docs/_layouts/docs.html
@@ -24,10 +24,10 @@
         <div class="col-12 col-md-3 push-md-9 bd-sidebar">
           {% include nav-docs.html %}
         </div>
-        <div class="col-12 col-md-9 pull-md-3 bd-content">
+        <main class="col-12 col-md-9 pull-md-3 bd-content" role="main">
           <h1 class="bd-title" id="content">{{ page.title }}</h1>
           {{ content }}
-        </div>
+        </main>
       </div>
     </div>
 
diff --git a/docs/components/navs.md b/docs/components/navs.md
index e92906229..5c3f2cf9d 100644
--- a/docs/components/navs.md
+++ b/docs/components/navs.md
@@ -14,7 +14,11 @@ Navigation available in Bootstrap share general markup and styles, from the base
 
 ## Base nav
 
-The base `.nav` component is built with flexbox and provide a strong foundation for building all types of navigation components. It includes some style overrides (for working with lists), some link padding for larger hit areas, and basic disabled styling. No active states are included in the base nav.
+The base `.nav` component is built with flexbox and provide a strong foundation for building all types of navigation components. It includes some style overrides (for working with lists), some link padding for larger hit areas, and basic disabled styling.
+
+{% callout info %}
+The base `.nav` component does not include any `.active` state. The following examples include the class, mainly to demonstrate that this particular class does not trigger any special styling.
+{% endcallout %}
 
 {% example html %}
 <ul class="nav">
@@ -235,6 +239,8 @@ If you need responsive nav variations, consider using a series of [flexbox utili
 
 If you're using navs to provide a navigation bar, be sure to add a `role="navigation"` to the most logical parent container of the `<ul>`, or wrap a `<nav>` element around the whole navigation. Do not add the role to the `<ul>` itself, as this would prevent it from being announced as an actual list by assistive technologies.
 
+Note that navigation bars, even if visually styled as tabs with the `.nav-tabs` class, should **not** be given `role="tablist"`, `role="tab"` or `role="tabpanel"` attributes. These are only appropriate for dynamic tabbed interfaces, as described in the [<abbr title="Web Accessibility Initiative">WAI</abbr> <abbr title="Accessible Rich Internet Applications">ARIA</abbr> Authoring Practices](https://www.w3.org/TR/wai-aria-practices/#tabpanel). See [JavaScript behavior for dynamic tabbed interfaces](#javascript-behavior-for-dynamic-tabbed-interfaces) in this section for an example.
+
 ## Using dropdowns
 
 Add dropdown menus with a little extra HTML and the [dropdowns JavaScript plugin]({{ site.baseurl }}/components/dropdowns/#usage).
@@ -291,10 +297,12 @@ Add dropdown menus with a little extra HTML and the [dropdowns JavaScript plugin
 </ul>
 {% endexample %}
 
-## JavaScript behavior
+## JavaScript behavior for dynamic tabbed interfaces
 
 Use the tab JavaScript plugin—include it individually or through the compiled `bootstrap.js` file—to extend our navigational tabs and pills to create tabbable panes of local content, even via dropdown menus.
 
+Dynamic tabbed interfaces, as described in the [<abbr title="Web Accessibility Initiative">WAI</abbr> <abbr title="Accessible Rich Internet Applications">ARIA</abbr> Authoring Practices](https://www.w3.org/TR/wai-aria-practices/#tabpanel), require `role="tablist"`, `role="tab"`, `role="tabpanel"`, and additional `aria-` attributes in order to convey their structure, functionality and current state to users of assistive technologies (such as screen readers).
+
 <div class="bd-example bd-example-tabs">
   <ul class="nav nav-tabs" id="myTab" role="tablist">
     <li class="nav-item">
diff --git a/docs/examples/dashboard/index.html b/docs/examples/dashboard/index.html
index 5270f1705..923c5a594 100644
--- a/docs/examples/dashboard/index.html
+++ b/docs/examples/dashboard/index.html
@@ -91,7 +91,7 @@
           </ul>
         </nav>
 
-        <main class="col-sm-9 offset-sm-3 col-md-10 offset-md-2 pt-3">
+        <main class="col-sm-9 offset-sm-3 col-md-10 offset-md-2 pt-3" role="main">
           <h1>Dashboard</h1>
 
           <section class="row text-center placeholders">
diff --git a/docs/index.html b/docs/index.html
index 3b6c9206e..ff037113a 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -2,7 +2,7 @@
 layout: home
 ---
 
-<main class="bd-masthead" id="content">
+<main class="bd-masthead" id="content" role="main">
   <div class="container">
     <span class="bd-booticon outline">B</span>
     <p class="lead">Bootstrap is the most popular HTML, CSS, and JS framework in the world for building responsive, mobile-first projects on the web.</p>