Merge branch 'dev' of github.com:twitter/bootstrap into dev

Conflicts:
	bootstrap.css

1 files changed, 3 insertions, 3 deletions

diff --git a/docs/index.html b/docs/index.html
index 18c72fe31..e07446494 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -611,7 +611,7 @@
         <tbody>
           <tr>
             <td><code>&lt;code&gt;</code></td>
-            <td>In a line of text like this, your wrapped code will look like this <code>&gt;html&lt;</code> element.</td>
+            <td>In a line of text like this, your wrapped code will look like this <code>&lt;html&gt;</code> element.</td>
           </tr>
           <tr>
             <td><code>&lt;pre&gt;</code></td>
@@ -620,7 +620,7 @@
   &lt;h1&gt;Heading&lt;/h1&gt;
   &lt;p&gt;Something right here...&lt;/p&gt;
 &lt;/div&gt;</pre>
-              <p><strong>Note:</strong> Be sure to keep code within <code>pre</code> tags as close to the left as possible; it will render all tabs.</p>
+              <p><strong>Note:</strong> Be sure to keep code within <code>&lt;pre&gt;</code> tags as close to the left as possible; it will render all tabs.</p>
             </td>
           </tr>
           <tr>
@@ -2030,4 +2030,4 @@ Lorem ipsum dolar sit amet illo error <a href="#" title="below">ipsum</a> verita
     <script src="assets/js/application.js"></script>
 
   </body>
-</html>
\ No newline at end of file
+</html>