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/modal.md')

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 7bf868a709d5e278048f7fe5fd62d2fa9365d5bc Mon Sep 17 00:00:00 2001
From: Mark Otto <markd.otto@gmail.com>
Date: Sun, 2 Oct 2016 18:19:47 -0700
Subject: v4: Social meta tags (#20825)

* descriptions for getting started pages

* descriptions for layout

* add content page descriptions

* more descriptions, updates to some existing ones

* correct site url

* add social stuff to config for twitter cards

* add twitter meta tags; use large image for homepage and regular card for all others

* add the assets

* more site config

* more social shiz to partial, remove existing meta for the partial, remove page title from homepage for simpler if statements
---
 docs/components/modal.md | 1 +
 1 file changed, 1 insertion(+)

(limited to 'docs/components/modal.md')

diff --git a/docs/components/modal.md b/docs/components/modal.md
index 55a0878b6..26676cacc 100644
--- a/docs/components/modal.md
+++ b/docs/components/modal.md
@@ -1,6 +1,7 @@
 ---
 layout: docs
 title: Modal
+description: Learn how to use Bootstrap's modals to add dialog prompts to your site.
 group: components
 ---
 
-- 
cgit v1.2.3


From 98671231ecdc3870213f77fb20d1bf3fec1e08cf Mon Sep 17 00:00:00 2001
From: Patrick van Hesteren <pavanhesteren@gmail.com>
Date: Mon, 3 Oct 2016 08:05:59 +0200
Subject: Updated documentation of the focus option from the modal component.
 (#19409)

---
 docs/components/modal.md | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'docs/components/modal.md')

diff --git a/docs/components/modal.md b/docs/components/modal.md
index 26676cacc..dd4793d22 100644
--- a/docs/components/modal.md
+++ b/docs/components/modal.md
@@ -412,6 +412,12 @@ Options can be passed via data attributes or JavaScript. For data attributes, ap
        <td>true</td>
        <td>Closes the modal when escape key is pressed</td>
      </tr>
+     <tr>
+       <td>focus</td>
+       <td>boolean</td>
+       <td>true</td>
+       <td>Puts the focus on the modal when initialized.</td>
+     </tr>
      <tr>
        <td>show</td>
        <td>boolean</td>
-- 
cgit v1.2.3


From 6e2d46db867cad940110be65f7b04172888df848 Mon Sep 17 00:00:00 2001
From: Rodrigo Castro <rodrigocastro@id.uff.br>
Date: Thu, 13 Oct 2016 15:35:20 -0300
Subject: Fixes #20897 - Changed btn-default for btn-secondary on V4's Modal
 documentation page

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

(limited to 'docs/components/modal.md')

diff --git a/docs/components/modal.md b/docs/components/modal.md
index dd4793d22..72cdbe565 100644
--- a/docs/components/modal.md
+++ b/docs/components/modal.md
@@ -298,7 +298,7 @@ To take advantage of the Bootstrap grid system within a modal, just nest `.conta
         </div>
       </div>
       <div class="modal-footer">
-        <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+        <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
         <button type="button" class="btn btn-primary">Save changes</button>
       </div>
     </div>
-- 
cgit v1.2.3