From 7a765d1f8b45dd10d40e6c9ac5ad144ff95a9b0d Mon Sep 17 00:00:00 2001
From: XhmikosR <xhmikosr@users.sourceforge.net>
Date: Tue, 13 May 2014 08:33:23 +0300
Subject: Update jQuery to v1.11.1.

---
 docs/_includes/footer.html                   | 2 +-
 docs/_includes/getting-started/template.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'docs/_includes')

diff --git a/docs/_includes/footer.html b/docs/_includes/footer.html
index 6d626a198..0bb3eafd3 100644
--- a/docs/_includes/footer.html
+++ b/docs/_includes/footer.html
@@ -32,7 +32,7 @@
 <!-- Bootstrap core JavaScript
 ================================================== -->
 <!-- Placed at the end of the document so the pages load faster -->
-<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
 <script src="../dist/js/bootstrap.min.js"></script>
 <script src="../assets/js/docs.min.js"></script>
 {% if page.slug == "customize" %}
diff --git a/docs/_includes/getting-started/template.html b/docs/_includes/getting-started/template.html
index c3b1560aa..3952621a6 100644
--- a/docs/_includes/getting-started/template.html
+++ b/docs/_includes/getting-started/template.html
@@ -27,7 +27,7 @@
     <h1>Hello, world!</h1>
 
     <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
     <!-- Include all compiled plugins (below), or include individual files as needed -->
     <script src="js/bootstrap.min.js"></script>
   </body>
-- 
cgit v1.2.3


From d0fca8aaad4999d3389ebdada36102c89063e0f2 Mon Sep 17 00:00:00 2001
From: XhmikosR <xhmikosr@users.sourceforge.net>
Date: Tue, 13 May 2014 09:26:24 +0300
Subject: Remove RTL leftovers.

---
 docs/_includes/getting-started/download.html       | 3 ---
 docs/_includes/getting-started/whats-included.html | 2 --
 2 files changed, 5 deletions(-)

(limited to 'docs/_includes')

diff --git a/docs/_includes/getting-started/download.html b/docs/_includes/getting-started/download.html
index b457d038e..c89c8b9e4 100644
--- a/docs/_includes/getting-started/download.html
+++ b/docs/_includes/getting-started/download.html
@@ -33,9 +33,6 @@
 <!-- Latest compiled and minified CSS -->
 <link rel="stylesheet" href="{{ site.cdn.css }}">
 
-<!-- RTL (right-to-left) version of CSS -->
-<link rel="stylesheet" href="{{ site.cdn.css_rtl }}">
-
 <!-- Optional theme -->
 <link rel="stylesheet" href="{{ site.cdn.css_theme }}">
 
diff --git a/docs/_includes/getting-started/whats-included.html b/docs/_includes/getting-started/whats-included.html
index 278ebac60..8500e573c 100644
--- a/docs/_includes/getting-started/whats-included.html
+++ b/docs/_includes/getting-started/whats-included.html
@@ -17,8 +17,6 @@ bootstrap/
 ├── css/
 │   ├── bootstrap.css
 │   ├── bootstrap.min.css
-│   ├── bootstrap-rtl.css
-│   ├── bootstrap-rtl.min.css
 │   ├── bootstrap-theme.css
 │   └── bootstrap-theme.min.css
 ├── js/
-- 
cgit v1.2.3


From 239d5e0e3905c4463651fc94a9ed175bdc2e827c Mon Sep 17 00:00:00 2001
From: Chris Rebert <github@rebertia.com>
Date: Tue, 13 May 2014 04:19:51 -0700
Subject: add link to StackOverflow question regarding Android <select> bug

---
 docs/_includes/getting-started/browser-device-support.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/_includes')

diff --git a/docs/_includes/getting-started/browser-device-support.html b/docs/_includes/getting-started/browser-device-support.html
index a799bbb96..1a1236440 100644
--- a/docs/_includes/getting-started/browser-device-support.html
+++ b/docs/_includes/getting-started/browser-device-support.html
@@ -173,7 +173,7 @@ if (navigator.userAgent.match(/IEMobile\/10\.0/)) {
   <h3 id="support-android-stock-browser">Android stock browser</h3>
   <p>Out of the box, Android 4.1 (and even some newer releases apparently) ship with the Browser app as the default web browser of choice (as opposed to Chrome). Unfortunately, the Browser app has lots of bugs and inconsistencies with CSS in general.</p>
   <h4>Select menus</h4>
-  <p>On <code>&lt;select&gt;</code> elements, the Android stock browser will not display the side controls if there is a <code>border-radius</code> and/or <code>border</code> applied. Use the snippet of code below to remove the offending CSS and render the <code>&lt;select&gt;</code> as an unstyled element on the Android stock browser. The user agent sniffing avoids interference with Chrome, Safari, and Mozilla browsers.</p>
+  <p>On <code>&lt;select&gt;</code> elements, the Android stock browser will not display the side controls if there is a <code>border-radius</code> and/or <code>border</code> applied. (See <a href="http://stackoverflow.com/questions/14744437/html-select-box-not-showing-drop-down-arrow-on-android-version-4-0-when-set-with">this StackOverflow question</a> for details.) Use the snippet of code below to remove the offending CSS and render the <code>&lt;select&gt;</code> as an unstyled element on the Android stock browser. The user agent sniffing avoids interference with Chrome, Safari, and Mozilla browsers.</p>
 {% highlight html %}
 <script>
 $(function () {
-- 
cgit v1.2.3


From ceda9483723fedb04ad6221a32be028cc81c5d4d Mon Sep 17 00:00:00 2001
From: XhmikosR <xhmikosr@users.sourceforge.net>
Date: Tue, 13 May 2014 17:14:10 +0300
Subject: Remove unneeded spaces from `pre`.

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

(limited to 'docs/_includes')

diff --git a/docs/_includes/css/code.html b/docs/_includes/css/code.html
index 0d1396145..6e15b4c56 100644
--- a/docs/_includes/css/code.html
+++ b/docs/_includes/css/code.html
@@ -16,7 +16,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
   To switch directories, type <kbd>cd</kbd> followed by the name of the directory.
 </div>
 {% highlight html %}
-  To switch directories, type <kbd>cd</kbd> followed by the name of the directory.
+To switch directories, type <kbd>cd</kbd> followed by the name of the directory.
 {% endhighlight %}
 
   <h2 id="code-block">Basic block</h2>
-- 
cgit v1.2.3


From 99f6f700f47154c8126bfbdceadcd3a45627801a Mon Sep 17 00:00:00 2001
From: Chris Rebert <code@rebertia.com>
Date: Wed, 14 May 2014 18:12:18 -0700
Subject: docs: sort tooltip & container options for sanity

---
 docs/_includes/js/popovers.html | 66 ++++++++++++++++++++---------------------
 docs/_includes/js/tooltips.html | 36 +++++++++++-----------
 2 files changed, 51 insertions(+), 51 deletions(-)

(limited to 'docs/_includes')

diff --git a/docs/_includes/js/popovers.html b/docs/_includes/js/popovers.html
index b2f58fbc4..a3e5f81cd 100644
--- a/docs/_includes/js/popovers.html
+++ b/docs/_includes/js/popovers.html
@@ -151,6 +151,33 @@ $('.popover-dismiss').popover({
           <td>true</td>
           <td>Apply a CSS fade transition to the popover</td>
         </tr>
+        <tr>
+          <td>container</td>
+          <td>string | false</td>
+          <td>false</td>
+          <td>
+           <p>Appends the popover to a specific element. Example: <code>container: 'body'</code>. This option is particularly useful in that it allows you to position the popover in the flow of the document near the triggering element - which will prevent the popover from floating away from the triggering element during a window resize.</p>
+          </td>
+        </tr>
+        <tr>
+          <td>content</td>
+          <td>string | function</td>
+          <td>''</td>
+          <td>
+            <p>Default content value if <code>data-content</code> attribute isn't present.</p>
+            <p>If a function is given, it will be called with 1 argument, which is the element that the popover is attached to.</p>
+          </td>
+        </tr>
+        <tr>
+          <td>delay</td>
+          <td>number | object</td>
+          <td>0</td>
+          <td>
+           <p>Delay showing and hiding the popover (ms) - does not apply to manual trigger type</p>
+           <p>If a number is supplied, delay is applied to both hide/show</p>
+           <p>Object structure is: <code>delay: { show: 500, hide: 100 }</code></p>
+          </td>
+        </tr>
         <tr>
           <td>html</td>
           <td>boolean</td>
@@ -169,18 +196,6 @@ $('.popover-dismiss').popover({
           <td>false</td>
           <td>If a selector is provided, popover objects will be delegated to the specified targets. In practice, this is used to enable dynamic HTML content to have popovers added. See <a href="https://github.com/twbs/bootstrap/issues/4215">this</a> and <a href="http://jsfiddle.net/fScua/">an informative example</a>.</td>
         </tr>
-        <tr>
-          <td>trigger</td>
-          <td>string</td>
-          <td>'click'</td>
-          <td>How popover is triggered - click | hover | focus | manual</td>
-        </tr>
-        <tr>
-          <td>title</td>
-          <td>string | function</td>
-          <td>''</td>
-          <td>Default title value if <code>title</code> attribute isn't present</td>
-        </tr>
         <tr>
           <td>template</td>
           <td>string</td>
@@ -194,31 +209,16 @@ $('.popover-dismiss').popover({
           </td>
         </tr>
         <tr>
-          <td>content</td>
+          <td>title</td>
           <td>string | function</td>
           <td>''</td>
-          <td>
-            <p>Default content value if <code>data-content</code> attribute isn't present.</p>
-            <p>If a function is given, it will be called with 1 argument, which is the element that the popover is attached to.</p>
-          </td>
-        </tr>
-        <tr>
-          <td>delay</td>
-          <td>number | object</td>
-          <td>0</td>
-          <td>
-           <p>Delay showing and hiding the popover (ms) - does not apply to manual trigger type</p>
-           <p>If a number is supplied, delay is applied to both hide/show</p>
-           <p>Object structure is: <code>delay: { show: 500, hide: 100 }</code></p>
-          </td>
+          <td>Default title value if <code>title</code> attribute isn't present</td>
         </tr>
         <tr>
-          <td>container</td>
-          <td>string | false</td>
-          <td>false</td>
-          <td>
-           <p>Appends the popover to a specific element. Example: <code>container: 'body'</code>. This option is particularly useful in that it allows you to position the popover in the flow of the document near the triggering element - which will prevent the popover from floating away from the triggering element during a window resize.</p>
-          </td>
+          <td>trigger</td>
+          <td>string</td>
+          <td>'click'</td>
+          <td>How popover is triggered - click | hover | focus | manual</td>
         </tr>
       </tbody>
     </table>
diff --git a/docs/_includes/js/tooltips.html b/docs/_includes/js/tooltips.html
index 64ea06e85..4d91da640 100644
--- a/docs/_includes/js/tooltips.html
+++ b/docs/_includes/js/tooltips.html
@@ -90,6 +90,24 @@ $('#example').tooltip(options)
          <td>true</td>
          <td>Apply a CSS fade transition to the tooltip</td>
        </tr>
+       <tr>
+         <td>container</td>
+         <td>string | false</td>
+         <td>false</td>
+         <td>
+          <p>Appends the tooltip to a specific element. Example: <code>container: 'body'</code></p>
+         </td>
+       </tr>
+       <tr>
+         <td>delay</td>
+         <td>number | object</td>
+         <td>0</td>
+         <td>
+          <p>Delay showing and hiding the tooltip (ms) - does not apply to manual trigger type</p>
+          <p>If a number is supplied, delay is applied to both hide/show</p>
+          <p>Object structure is: <code>delay: { show: 500, hide: 100 }</code></p>
+         </td>
+       </tr>
        <tr>
          <td>html</td>
          <td>boolean</td>
@@ -131,24 +149,6 @@ $('#example').tooltip(options)
          <td>'hover focus'</td>
          <td>How tooltip is triggered - click | hover | focus | manual. You may pass multiple triggers; separate them with a space.</td>
        </tr>
-       <tr>
-         <td>delay</td>
-         <td>number | object</td>
-         <td>0</td>
-         <td>
-          <p>Delay showing and hiding the tooltip (ms) - does not apply to manual trigger type</p>
-          <p>If a number is supplied, delay is applied to both hide/show</p>
-          <p>Object structure is: <code>delay: { show: 500, hide: 100 }</code></p>
-         </td>
-       </tr>
-       <tr>
-         <td>container</td>
-         <td>string | false</td>
-         <td>false</td>
-         <td>
-          <p>Appends the tooltip to a specific element. Example: <code>container: 'body'</code></p>
-         </td>
-       </tr>
        <tr>
          <td>viewport</td>
          <td>string | object</td>
-- 
cgit v1.2.3


From 90cfa1a44de353d1b0a8aef080e267bd765159e3 Mon Sep 17 00:00:00 2001
From: Chris Rebert <code@rebertia.com>
Date: Wed, 14 May 2014 18:17:24 -0700
Subject: add 'viewport' option to popover docs; #12328 erratum

---
 docs/_includes/js/popovers.html | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'docs/_includes')

diff --git a/docs/_includes/js/popovers.html b/docs/_includes/js/popovers.html
index a3e5f81cd..174e9969a 100644
--- a/docs/_includes/js/popovers.html
+++ b/docs/_includes/js/popovers.html
@@ -220,6 +220,14 @@ $('.popover-dismiss').popover({
           <td>'click'</td>
           <td>How popover is triggered - click | hover | focus | manual</td>
         </tr>
+        <tr>
+         <td>viewport</td>
+         <td>string | object</td>
+         <td>{ selector: 'body', padding: 0 }</td>
+         <td>
+          <p>Keeps the popover within the bounds of this element. Example: <code>viewport: '#viewport'</code> or <code>{ selector: '#viewport', padding: 0 }</code></p>
+         </td>
+       </tr>
       </tbody>
     </table>
   </div><!-- /.table-responsive -->
-- 
cgit v1.2.3


From e839a4999559eeea4a74dfeebb16428a48b44728 Mon Sep 17 00:00:00 2001
From: Chris Rebert <code@rebertia.com>
Date: Wed, 14 May 2014 18:18:33 -0700
Subject: add multiple triggers info to popover docs

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

(limited to 'docs/_includes')

diff --git a/docs/_includes/js/popovers.html b/docs/_includes/js/popovers.html
index 174e9969a..05778bc97 100644
--- a/docs/_includes/js/popovers.html
+++ b/docs/_includes/js/popovers.html
@@ -218,7 +218,7 @@ $('.popover-dismiss').popover({
           <td>trigger</td>
           <td>string</td>
           <td>'click'</td>
-          <td>How popover is triggered - click | hover | focus | manual</td>
+          <td>How popover is triggered - click | hover | focus | manual. You may pass multiple triggers; separate them with a space.</td>
         </tr>
         <tr>
          <td>viewport</td>
-- 
cgit v1.2.3


From 6fdbd8e3cf90d1beaccc60396d30303287b4b1b8 Mon Sep 17 00:00:00 2001
From: Chris Rebert <code@rebertia.com>
Date: Wed, 14 May 2014 18:19:50 -0700
Subject: add 'selector' option motivation to tooltip docs

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

(limited to 'docs/_includes')

diff --git a/docs/_includes/js/tooltips.html b/docs/_includes/js/tooltips.html
index 4d91da640..72096b368 100644
--- a/docs/_includes/js/tooltips.html
+++ b/docs/_includes/js/tooltips.html
@@ -124,7 +124,7 @@ $('#example').tooltip(options)
          <td>selector</td>
          <td>string</td>
          <td>false</td>
-         <td>If a selector is provided, tooltip objects will be delegated to the specified targets.</td>
+         <td>If a selector is provided, tooltip objects will be delegated to the specified targets. In practice, this is used to enable dynamic HTML content to have tooltips added. See <a href="https://github.com/twbs/bootstrap/issues/4215">this</a> and <a href="http://jsfiddle.net/fScua/">an informative example</a>.</td>
        </tr>
        <tr>
          <td>template</td>
-- 
cgit v1.2.3


From 3465d984fb934b1616b8d4ecf394b997cd1f0fab Mon Sep 17 00:00:00 2001
From: Chris Rebert <code@rebertia.com>
Date: Wed, 14 May 2014 18:23:58 -0700
Subject: add 'container' option motivation to tooltip docs

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

(limited to 'docs/_includes')

diff --git a/docs/_includes/js/tooltips.html b/docs/_includes/js/tooltips.html
index 72096b368..e967878f8 100644
--- a/docs/_includes/js/tooltips.html
+++ b/docs/_includes/js/tooltips.html
@@ -95,7 +95,7 @@ $('#example').tooltip(options)
          <td>string | false</td>
          <td>false</td>
          <td>
-          <p>Appends the tooltip to a specific element. Example: <code>container: 'body'</code></p>
+          <p>Appends the tooltip to a specific element. Example: <code>container: 'body'</code>. This option is particularly useful in that it allows you to position the tooltip in the flow of the document near the triggering element - which will prevent the tooltip from floating away from the triggering element during a window resize.</p>
          </td>
        </tr>
        <tr>
-- 
cgit v1.2.3


From 00fcf072c6955b1e5ba51298db1026c91783eef6 Mon Sep 17 00:00:00 2001
From: Chris Rebert <code@rebertia.com>
Date: Wed, 14 May 2014 18:43:14 -0700
Subject: update default 'template' value in popover docs

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

(limited to 'docs/_includes')

diff --git a/docs/_includes/js/popovers.html b/docs/_includes/js/popovers.html
index 05778bc97..2ee670741 100644
--- a/docs/_includes/js/popovers.html
+++ b/docs/_includes/js/popovers.html
@@ -199,7 +199,7 @@ $('.popover-dismiss').popover({
         <tr>
           <td>template</td>
           <td>string</td>
-          <td><code>'&lt;div class="popover"&gt;&lt;div class="arrow"&gt;&lt;/div&gt;&lt;h3 class="popover-title"&gt;&lt;/h3&gt;&lt;div class="popover-content"&gt;&lt;/div&gt;&lt;/div&gt;'</code></td>
+          <td><code>'&lt;div class="popover" role="tooltip"&gt;&lt;div class="arrow"&gt;&lt;/div&gt;&lt;h3 class="popover-title"&gt;&lt;/h3&gt;&lt;div class="popover-content"&gt;&lt;/div&gt;&lt;/div&gt;'</code></td>
           <td>
            <p>Base HTML to use when creating the popover.</p>
            <p>The popover's <code>title</code> will be injected into the <code>.popover-title</code>.</p>
-- 
cgit v1.2.3


From f47ad79538458c4fe787335a5873c00073c5c2c9 Mon Sep 17 00:00:00 2001
From: Attila Dobi <dobiattila@gmail.com>
Date: Tue, 15 Apr 2014 10:46:58 +0300
Subject: add `target` option to Affix plugin

---
 docs/_includes/js/affix.html | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'docs/_includes')

diff --git a/docs/_includes/js/affix.html b/docs/_includes/js/affix.html
index cfd32ec35..5b6fec0bb 100644
--- a/docs/_includes/js/affix.html
+++ b/docs/_includes/js/affix.html
@@ -62,6 +62,13 @@
          <td>10</td>
          <td>Pixels to offset from screen when calculating position of scroll. If a single number is provided, the offset will be applied in both top and bottom directions. To provide a unique, bottom and top offset just provide an object <code>offset: { top: 10 }</code> or <code>offset: { top: 10, bottom: 5 }</code>. Use a function when you need to dynamically calculate an offset.</td>
        </tr>
+       <tr>
+         <td>target</td>
+         <td>selector | node | jQuery element</td>
+         <td>the <code>window</code> object</td>
+         <td>Specifies the target element of the affix.</td>
+       </tr>
+
       </tbody>
     </table>
   </div><!-- /.table-responsive -->
-- 
cgit v1.2.3


From 511240b37751f10fc5043c8155f9f097c8bdcb09 Mon Sep 17 00:00:00 2001
From: Chris Rebert <github@rebertia.com>
Date: Sat, 17 May 2014 22:55:29 -0700
Subject: update link to Grunt setup & info

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

(limited to 'docs/_includes')

diff --git a/docs/_includes/getting-started/download.html b/docs/_includes/getting-started/download.html
index c89c8b9e4..bb0537796 100644
--- a/docs/_includes/getting-started/download.html
+++ b/docs/_includes/getting-started/download.html
@@ -13,7 +13,7 @@
     </div>
     <div class="col-sm-4">
       <h3 id="download-source">Source code</h3>
-      <p>Source Less, JavaScript, and font files, along with our docs. <strong>Requires a Less compiler and <a href="{{ site.repo }}#compiling-css-and-javascript">some setup.</a></strong></p>
+      <p>Source Less, JavaScript, and font files, along with our docs. <strong>Requires a Less compiler and <a href="#grunt">some setup.</a></strong></p>
       <p>
         <a href="{{ site.download.source }}" class="btn btn-lg btn-outline" role="button" onclick="ga('send', 'event', 'Getting started', 'Download', 'Download source');">Download source</a>
       </p>
-- 
cgit v1.2.3