Merge branch '2.1.2-wip' into exploratory

Conflicts:
	docs/getting-started.html
	docs/templates/pages/getting-started.mustache

1 files changed, 2 insertions, 2 deletions

diff --git a/docs/javascript.html b/docs/javascript.html
index 75901bc06..03d670132 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -247,10 +247,10 @@ $('#myModal').on('show', function (e) {
             <a data-toggle="modal" href="#myModal" class="btn btn-primary btn-large">Launch demo modal</a>
           </div>
 <pre class="prettyprint linenums">
-&lt;-- Button to trigger modal --&gt;
+&lt!-- Button to trigger modal --&gt;
 &lt;a href="#myModal" role="button" class="btn" data-toggle="modal"&gt;Launch demo modal&lt;/a&gt;
 
-&lt;-- Modal --&gt;
+&lt!-- Modal --&gt;
 &lt;div id="myModal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"&gt;
   &lt;div class="modal-header"&gt;
     &lt;button type="button" class="close" data-dismiss="modal" aria-hidden="true"&gt;&times;&lt;/button&gt;