From f4c86ffc77227e700ce962bf159431b0dd7c9e19 Mon Sep 17 00:00:00 2001
From: Heiko Jansen <heikojansen@users.noreply.github.com>
Date: Fri, 13 May 2016 14:36:46 +0200
Subject: Remove reference to "loaded.bs.modal" event

Since the "remote" option is no longer available in v4 the reference to the "loaded.bs.modal" event is no longer needed, too.
---
 docs/components/modal.md | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'docs/components')

diff --git a/docs/components/modal.md b/docs/components/modal.md
index f3c29dac6..55a0878b6 100644
--- a/docs/components/modal.md
+++ b/docs/components/modal.md
@@ -480,10 +480,6 @@ Bootstrap's modal class exposes a few events for hooking into modal functionalit
        <td>hidden.bs.modal</td>
        <td>This event is fired when the modal has finished being hidden from the user (will wait for CSS transitions to complete).</td>
      </tr>
-     <tr>
-       <td>loaded.bs.modal</td>
-       <td>This event is fired when the modal has loaded content using the <code>remote</code> option.</td>
-     </tr>
     </tbody>
   </table>
 </div>
-- 
cgit v1.2.3


From d12804eb4d9dfc8185946c5e21163362cb806ad5 Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Sun, 12 Jun 2016 21:25:04 -0700
Subject: Fixes #17193: Remove mention and link to non-existant transitions
 plugin; that intro paragraph was two dupe sentences

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

(limited to 'docs/components')

diff --git a/docs/components/collapse.md b/docs/components/collapse.md
index e328e589e..f3a6fdc6c 100644
--- a/docs/components/collapse.md
+++ b/docs/components/collapse.md
@@ -4,7 +4,7 @@ title: Collapse
 group: components
 ---
 
-The Bootstrap collapse plugin allows you to toggle content on your pages with a bit of JavaScript and some classes. Flexible plugin that utilizes a handful of classes (from the **required [transitions plugin]({{ site.baseurl }}/components/transitions/)**) for easy toggle behavior.
+The Bootstrap collapse plugin allows you to toggle content on your pages with a few classes thanks to some helpful JavaScript.
 
 ## Contents
 
-- 
cgit v1.2.3


From ef9099a23761aa97b874953a2ac0cfaba7abefc0 Mon Sep 17 00:00:00 2001
From: Pvanhesteren <pavanhesteren@gmail.com>
Date: Sun, 17 Jul 2016 00:17:18 -0700
Subject: Port #19410 to v4

Clarify valid values of Carousel's `pause` option

Fixes #18205

[skip sauce]
---
 docs/components/carousel.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'docs/components')

diff --git a/docs/components/carousel.md b/docs/components/carousel.md
index 76278281e..5f177432f 100644
--- a/docs/components/carousel.md
+++ b/docs/components/carousel.md
@@ -158,9 +158,9 @@ Options can be passed via data attributes or JavaScript. For data attributes, ap
      </tr>
      <tr>
        <td>pause</td>
-       <td>string</td>
+       <td>string | null</td>
        <td>"hover"</td>
-       <td>Pauses the cycling of the carousel on mouseenter and resumes the cycling of the carousel on mouseleave.</td>
+       <td>If set to <code>"hover"</code>, pauses the cycling of the carousel on <code>mouseenter</code> and resumes the cycling of the carousel on <code>mouseleave</code>. If set to <code>null</code>, hovering over the carousel won't pause it.</td>
      </tr>
      <tr>
        <td>wrap</td>
-- 
cgit v1.2.3