Merge branch 'v4-dev' into v4-split-buttons

4 files changed, 10 insertions, 6 deletions

diff --git a/docs/_includes/callout-warning-color-assistive-technologies.md b/docs/_includes/callout-warning-color-assistive-technologies.md
new file mode 100644
index 000000000..b92a1c341
--- /dev/null
+++ b/docs/_includes/callout-warning-color-assistive-technologies.md
@@ -0,0 +1,5 @@
+{% callout warning %}
+#### Conveying meaning to assistive technologies
+
+Using color to add meaning only provides a visual indication, which will not be conveyed to users of assistive technologies – such as screen readers. Ensure that information denoted by the color is either obvious from the content itself (e.g. the visible text), or is included through alternative means, such as additional text hidden with the `.sr-only` class.
+{% endcallout %}
\ No newline at end of file
diff --git a/docs/_includes/footer.html b/docs/_includes/footer.html
index 662ea1133..bfd657efe 100644
--- a/docs/_includes/footer.html
+++ b/docs/_includes/footer.html
@@ -1,4 +1,4 @@
-<footer class="bd-footer text-muted" role="contentinfo">
+<footer class="bd-footer text-muted">
   <div class="container">
     <ul class="bd-footer-links">
       <li><a href="{{ site.repo }}">GitHub</a></li>
@@ -43,15 +43,15 @@ SimpleJekyllSearch.init({
   resultsContainer: document.getElementById('search-results'),
   searchResultTemplate: '<a class="dropdown-item" href="{url}">{title}</a>',
   noResultsText: '<div class="dropdown-item no-results">Sorry, there are no results for that search.</div>',
-  json: '/search.json'
+  json: '{{ site.baseurl }}/search.json'
 })
 </script>
 {% endif %}
 
 <script>
 Holder.addTheme('gray', {
-  background: '#777',
-  foreground: 'rgba(255,255,255,.75)',
+  bg: '#777',
+  fg: 'rgba(255,255,255,.75)',
   font: 'Helvetica',
   fontweight: 'normal'
 })
diff --git a/docs/_includes/header.html b/docs/_includes/header.html
index e7ecb12ab..51b3cda8b 100644
--- a/docs/_includes/header.html
+++ b/docs/_includes/header.html
@@ -2,7 +2,6 @@
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
 <meta name="description" content="Bootstrap, a sleek, intuitive, and powerful mobile first front-end framework for faster and easier web development.">
-<meta name="keywords" content="HTML, CSS, JS, JavaScript, framework, bootstrap, front-end, frontend, web development">
 <meta name="author" content="Mark Otto, Jacob Thornton, and Bootstrap contributors">
 
 <title>
diff --git a/docs/_includes/nav-home.html b/docs/_includes/nav-home.html
index a347a5f7c..0436e2dbe 100644
--- a/docs/_includes/nav-home.html
+++ b/docs/_includes/nav-home.html
@@ -1,4 +1,4 @@
-<header class="navbar navbar-light navbar-static-top bd-navbar" role="banner">
+<header class="navbar navbar-light navbar-static-top bd-navbar">
   <div class="container">
     {% comment %}
     <nav class="nav navbar-nav pull-xs-right">