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

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


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/carousel.md | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/docs/components/carousel.md b/docs/components/carousel.md
index 5f177432f..5bc299774 100644
--- a/docs/components/carousel.md
+++ b/docs/components/carousel.md
@@ -1,6 +1,7 @@
 ---
 layout: docs
 title: Carousel
+description: A slideshow component for cycling through elements—images or slides of text—like a carousel.
 group: components
 ---
 
-- 
cgit v1.2.3


From 2e69dfa8c1679238579ef6f5ec85deb755e4fb6d Mon Sep 17 00:00:00 2001
From: Bardi Harborow <bardi@bardiharborow.com>
Date: Tue, 4 Oct 2016 02:55:59 +1000
Subject: Fix broken/redirected links, moving to HTTPS where possible. (#20557)

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

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

diff --git a/docs/components/carousel.md b/docs/components/carousel.md
index 5bc299774..64b012b0e 100644
--- a/docs/components/carousel.md
+++ b/docs/components/carousel.md
@@ -5,7 +5,7 @@ description: A slideshow component for cycling through elements—images or slid
 group: components
 ---
 
-A slideshow component for cycling through elements—images or slides of text—like a carousel. In browsers where the [Page Visibility API](http://www.w3.org/TR/page-visibility/) is supported, the carousel will avoid sliding when the webpage is not visible to the user (such as when the browser tab is inactive, the browser window is minimized, etc.). **Nested carousels are not supported.**
+A slideshow component for cycling through elements—images or slides of text—like a carousel. In browsers where the [Page Visibility API](https://www.w3.org/TR/page-visibility/) is supported, the carousel will avoid sliding when the webpage is not visible to the user (such as when the browser tab is inactive, the browser window is minimized, etc.). **Nested carousels are not supported.**
 
 ## Contents
 
-- 
cgit v1.2.3