Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

README.md

@@ -35,7 +35,7 @@ Have a bug or a feature request? [Please open a new issue](https://github.com/tw
 
 ## Documentation
 
-Bootstrap's docs are built using [Jekyll](http://jekyllrb.com) and hosted on GitHub Pages at [http://getbootstrap.com](http://getbootstrap.com). To view our docs locally, you'll need to [install Jekyll](https://github.com/mojombo/jekyll/wiki/install) to run a local server.
+Bootstrap's docs are built using [Jekyll](http://jekyllrb.com) and hosted on GitHub Pages at [http://getbootstrap.com](http://getbootstrap.com). To view our docs locally, you'll need to [install Jekyll](http://jekyllrb.com/docs/installation) to run a local server.
 
 Documentation for [previous versions](https://github.com/twitter/bootstrap/tags) is also available via tags.
 

docs/docs.html

@@ -5119,11 +5119,11 @@ $('#myModal').on('show', function (e) {
       <a data-toggle="modal" href="#myModal" class="btn btn-primary btn-large">Launch demo modal</a>
     </div><!-- /example -->
 {% highlight html %}
-<div class="modal">
   <!-- Button trigger modal -->
   <a data-toggle="modal" href="#myModal" class="btn btn-primary btn-large">Launch demo modal</a>
 
   <!-- Modal -->
+  <div class="modal" id="myModal">
     <div class="modal-dialog">
       <div class="modal-content">
         <div class="modal-header">
@@ -5139,7 +5139,7 @@ $('#myModal').on('show', function (e) {
         </div>
       </div><!-- /.modal-content -->
     </div><!-- /.modal-dalog -->
-</div><!-- /.modal -->
+  </div><!-- /.modal -->
 {% endhighlight %}