From 5c1852fb74b095a73fefbfd1544da10034c7b5f8 Mon Sep 17 00:00:00 2001
From: Quy Ton <quy@fluxbb.org>
Date: Mon, 27 Jan 2014 09:17:57 -0800
Subject: Change positioning reference from left to right in affix's example.

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

(limited to 'docs/javascript.html')

diff --git a/docs/javascript.html b/docs/javascript.html
index 7d41a0378..a8ba01911 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -2031,7 +2031,7 @@ $('#myCarousel').on('slide.bs.carousel', function () {
   <h1 id="affix" class="page-header">Affix <small>affix.js</small></h1>
 
   <h2 id="affix-examples">Example</h2>
-  <p>The subnavigation on the left is a live demo of the affix plugin.</p>
+  <p>The subnavigation on the right is a live demo of the affix plugin.</p>
 
   <hr class="bs-docs-separator">
 
-- 
cgit v1.2.3


From e08e871f01fd8848101e152c9afdd758280de27d Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Mon, 27 Jan 2014 09:24:51 -0800
Subject: document id requirement in carousels per #12393

---
 docs/javascript.html | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'docs/javascript.html')

diff --git a/docs/javascript.html b/docs/javascript.html
index 7d41a0378..225f48dab 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -1923,6 +1923,9 @@ $('#myCollapsible').on('hidden.bs.collapse', function () {
 
   <h2 id="carousel-usage">Usage</h2>
 
+  <h3>Multiple carousels</h3>
+  <p>Carousels require the use of an <code>id</code> on the outter most container, <code>.carousel</code>, for carousel controls to properly function. When adding multiple carousels, or when changing a carousel's <code>id</code>, be sure to update the relevant controls.</p>
+
   <h3>Via data attributes</h3>
   <p>Use data attributes to easily control the position of the carousel. <code>data-slide</code> accepts the keywords <code>prev</code> or <code>next</code>, which alters the slide position relative to its current position. Alternatively, use <code>data-slide-to</code> to pass a raw slide index to the carousel <code>data-slide-to="2"</code>, which shifts the slide position to a particular index beginning with <code>0</code>.</p>
   <p>The <code>data-ride="carousel"</code> attribute is used to mark a carousel as animating starting at page load.</p>
-- 
cgit v1.2.3


From 0a5cb2f9089d57bb9b027a6b39eabf8138e40aa3 Mon Sep 17 00:00:00 2001
From: Julian Thilo <bigj95t@gmail.com>
Date: Mon, 27 Jan 2014 23:07:14 +0100
Subject: Fix typo

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

(limited to 'docs/javascript.html')

diff --git a/docs/javascript.html b/docs/javascript.html
index f5c8516fe..e9b4879dd 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -1924,7 +1924,7 @@ $('#myCollapsible').on('hidden.bs.collapse', function () {
   <h2 id="carousel-usage">Usage</h2>
 
   <h3>Multiple carousels</h3>
-  <p>Carousels require the use of an <code>id</code> on the outter most container, <code>.carousel</code>, for carousel controls to properly function. When adding multiple carousels, or when changing a carousel's <code>id</code>, be sure to update the relevant controls.</p>
+  <p>Carousels require the use of an <code>id</code> on the outermost container, <code>.carousel</code>, for carousel controls to properly function. When adding multiple carousels, or when changing a carousel's <code>id</code>, be sure to update the relevant controls.</p>
 
   <h3>Via data attributes</h3>
   <p>Use data attributes to easily control the position of the carousel. <code>data-slide</code> accepts the keywords <code>prev</code> or <code>next</code>, which alters the slide position relative to its current position. Alternatively, use <code>data-slide-to</code> to pass a raw slide index to the carousel <code>data-slide-to="2"</code>, which shifts the slide position to a particular index beginning with <code>0</code>.</p>
-- 
cgit v1.2.3


From 3a62811bbde4e428df1882bddf940f40381a8d41 Mon Sep 17 00:00:00 2001
From: Julian Thilo <bigj95t@gmail.com>
Date: Tue, 28 Jan 2014 00:01:10 +0100
Subject: Update javascript.html

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

(limited to 'docs/javascript.html')

diff --git a/docs/javascript.html b/docs/javascript.html
index e9b4879dd..b0e1287ba 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -1924,7 +1924,7 @@ $('#myCollapsible').on('hidden.bs.collapse', function () {
   <h2 id="carousel-usage">Usage</h2>
 
   <h3>Multiple carousels</h3>
-  <p>Carousels require the use of an <code>id</code> on the outermost container, <code>.carousel</code>, for carousel controls to properly function. When adding multiple carousels, or when changing a carousel's <code>id</code>, be sure to update the relevant controls.</p>
+  <p>Carousels require the use of an <code>id</code> on the outermost container, <code>.carousel</code>, for carousel controls to function properly. When adding multiple carousels, or when changing a carousel's <code>id</code>, be sure to update the relevant controls.</p>
 
   <h3>Via data attributes</h3>
   <p>Use data attributes to easily control the position of the carousel. <code>data-slide</code> accepts the keywords <code>prev</code> or <code>next</code>, which alters the slide position relative to its current position. Alternatively, use <code>data-slide-to</code> to pass a raw slide index to the carousel <code>data-slide-to="2"</code>, which shifts the slide position to a particular index beginning with <code>0</code>.</p>
-- 
cgit v1.2.3