From 20389c10daee25976bdc4eaec03bcfa08604c67f Mon Sep 17 00:00:00 2001
From: Waldson Moura <mourawaldson@gmail.com>
Date: Wed, 8 Feb 2017 00:22:48 -0300
Subject: [PATCH 1/2] Fix fallback jquery filename (#21940)

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

diff --git a/docs/_includes/footer.html b/docs/_includes/footer.html
index bfd657efe8..68626962f2 100644
--- a/docs/_includes/footer.html
+++ b/docs/_includes/footer.html
@@ -12,7 +12,7 @@
 </footer>
 
 <script src="{{ site.cdn.jquery }}" integrity="{{ site.cdn.jquery_hash }}" crossorigin="anonymous"></script>
-<script>window.jQuery || document.write('<script src="{{ site.baseurl }}/assets/js/vendor/jquery.min.js"><\/script>')</script>
+<script>window.jQuery || document.write('<script src="{{ site.baseurl }}/assets/js/vendor/jquery-slim.min.js"><\/script>')</script>
 
 <script src="{{ site.baseurl }}/assets/js/vendor/tether.min.js"></script>
 

From 29a8f9fc99bc2d4f0487b84ba8c6a83030178428 Mon Sep 17 00:00:00 2001
From: Matt Eason <github@matteason.co.uk>
Date: Thu, 9 Feb 2017 16:17:32 +0000
Subject: [PATCH 2/2] Change 'has no affect' to 'has no effect'

---
 docs/components/modal.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/components/modal.md b/docs/components/modal.md
index 16689f6ae0..81f917f250 100644
--- a/docs/components/modal.md
+++ b/docs/components/modal.md
@@ -21,7 +21,7 @@ Before getting started with Bootstrap's modal component, be sure to read the fol
 - Bootstrap only supports one modal window at a time. Nested modals aren't supported as we believe them to be poor user experiences.
 - Modals use `position: fixed`, which can sometimes be a bit particular about its rendering. Whenever possible, place your modal HTML in a top-level position to avoid potential interference from other elements. You'll likely run into issues when nesting a `.modal` within another fixed element.
 - One again, due to `position: fixed`, there are some caveats with using modals on mobile devices. [See our browser support docs]({{ site.baseurl }}/getting-started/browsers-devices/#modals-and-dropdowns-on-mobile) for details.
-- Lastly, the `autofocus` HTML attribute has no affect in modals. Here's how you can achieve the same effect with custom JavaScript.
+- Lastly, the `autofocus` HTML attribute has no effect in modals. Here's how you can achieve the same effect with custom JavaScript.
 
 Keep reading for demos and usage guidelines.