Merge branch 'master' into 2.0.4-wip

diff --cc docs/javascript.html
index 0208af819db133986667e8d9477810a941eb7698,3a1f151cde78aaf995499beb99adefed2403971a..07e95f28408ff09ccd43252da1c5fb3c93c0054e
--- 1/docs/javascript.html
--- 2/docs/javascript.html
+++ b/docs/javascript.html
@@@ -199,10 -223,11 +199,11 @@@
  
            <h2>Live demo</h2>
            <p>Toggle a modal via javascript by clicking the button below. It will slide down and fade in from the top of the page.</p>
+ 
            <!-- sample modal content -->
-           <div id="myModal" class="modal hide fade">
+           <div id="myModal" class="modal hide fade" tabindex=0>
              <div class="modal-header">
 -              <button class="close" data-dismiss="modal">&times;</button>
 +              <button type="button" class="close" data-dismiss="modal">&times;</button>
                <h3>Modal Heading</h3>
              </div>
              <div class="modal-body">

diff --cc docs/templates/pages/javascript.mustache
index f5c6ce9107aebf733661dc341c772e2164dd4335,3fec56d3078f1632e16209d1d05dc58d67b2cfd6..ffc19a98f51a2e96474453719549351edba1a4cc
--- 1/docs/templates/pages/javascript.mustache
--- 2/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@@ -122,10 -146,11 +122,11 @@@
  
            <h2>{{_i}}Live demo{{/i}}</h2>
            <p>{{_i}}Toggle a modal via javascript by clicking the button below. It will slide down and fade in from the top of the page.{{/i}}</p>
+ 
            <!-- sample modal content -->
-           <div id="myModal" class="modal hide fade">
+           <div id="myModal" class="modal hide fade" tabindex="0">
              <div class="modal-header">
 -              <button class="close" data-dismiss="modal">&times;</button>
 +              <button type="button" class="close" data-dismiss="modal">&times;</button>
                <h3>{{_i}}Modal Heading{{/i}}</h3>
              </div>
              <div class="modal-body">