From 74691b7e27b1015085427e024ff31d2b6b24de0a Mon Sep 17 00:00:00 2001
From: Chris Rebert <code@rebertia.com>
Date: Mon, 14 Jul 2014 17:16:11 -0700
Subject: add docs note about browsers w/ JS disabled; fixes #14134

[skip sauce]
---
 docs/_includes/js/overview.html | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'docs/_includes/js/overview.html')

diff --git a/docs/_includes/js/overview.html b/docs/_includes/js/overview.html
index 2ef8fe850..3aaba0980 100644
--- a/docs/_includes/js/overview.html
+++ b/docs/_includes/js/overview.html
@@ -64,6 +64,9 @@ $('#myModal').on('show.bs.modal', function (e) {
 })
 {% endhighlight %}
 
+  <h3 id="js-disabled">No special fallbacks when JavaScript is disabled</h3>
+  <p>Bootstrap's plugins don't fall back particularly gracefully when JavaScript is disabled. If you care about the user experience in this case, use <a href="https://developer.mozilla.org/en-US/docs/Web/HTML/Element/noscript"><code>&lt;noscript&gt;</code></a> to explain the situation (and how to re-enable JavaScript) to your users, and/or add your own custom fallbacks.</p>
+
   <div class="bs-callout bs-callout-warning" id="callout-third-party-libs">
     <h4>Third-party libraries</h4>
     <p><strong>Bootstrap does not officially support third-party JavaScript libraries</strong> like Prototype or jQuery UI. Despite <code>.noConflict</code> and namespaced events, there may be compatibility problems that you need to fix on your own.</p>
-- 
cgit v1.2.3


From 333af7d371ee56db24030786c3036f3198fd3016 Mon Sep 17 00:00:00 2001
From: Kyle <kylemit@gmail.com>
Date: Sat, 26 Jul 2014 17:55:18 -0400
Subject: Add docs for how to change default JS plugin settings

Closes #14250.
---
 docs/_includes/js/overview.html | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'docs/_includes/js/overview.html')

diff --git a/docs/_includes/js/overview.html b/docs/_includes/js/overview.html
index 3aaba0980..2a3c41a8b 100644
--- a/docs/_includes/js/overview.html
+++ b/docs/_includes/js/overview.html
@@ -47,6 +47,12 @@ $('#myModal').modal('show')                // initializes and invokes show immed
 
   <p>Each plugin also exposes its raw constructor on a <code>Constructor</code> property: <code>$.fn.popover.Constructor</code>. If you'd like to get a particular plugin instance, retrieve it directly from an element: <code>$('[rel="popover"]').data('popover')</code>.</p>
 
+  <h4>Default settings</h4>
+  <p>You can change the default settings for a plugin by modifying the plugin's <code>Constructor.DEFAULTS</code> object:<p>
+{% highlight js %}
+$.fn.modal.Constructor.DEFAULTS.keyboard = false // changes default for the modal plugin's `keyboard` option to false
+{% endhighlight %}
+
   <h3 id="js-noconflict">No conflict</h3>
   <p>Sometimes it is necessary to use Bootstrap plugins with other UI frameworks. In these circumstances, namespace collisions can occasionally occur. If this happens, you may call <code>.noConflict</code> on the plugin you wish to revert the value of.</p>
 {% highlight js %}
-- 
cgit v1.2.3