0
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-18 15:54:26 +01:00

Merge branch 'patch-1' of https://github.com/cvrebert/bootstrap into cvrebert-patch-1

This commit is contained in:
Mark Otto 2012-02-11 17:28:07 -08:00
commit 343012a9af
2 changed files with 2 additions and 2 deletions

View File

@ -375,7 +375,7 @@ For example, <code>section</code> should be wrapped as inline.
</div><!--/span-->
<div class="span4">
<h2>Basic block</h2>
<p>Use <code>&lt;pre&gt;</code> for multiple lines of code. Be sure to turn any angle brackets into unicode characters for proper rendering.</p>
<p>Use <code>&lt;pre&gt;</code> for multiple lines of code. Be sure to escape any angle brackets in the code for proper rendering.</p>
<pre>
&lt;p&gt;Sample text here...&lt;/p&gt;
</pre>

View File

@ -299,7 +299,7 @@
</div><!--/span-->
<div class="span4">
<h2>Basic block</h2>
<p>{{_i}}Use <code>&lt;pre&gt;</code> for multiple lines of code. Be sure to turn any angle brackets into unicode characters for proper rendering.{{/i}}</p>
<p>{{_i}}Use <code>&lt;pre&gt;</code> for multiple lines of code. Be sure to escape any angle brackets in the code for proper rendering.{{/i}}</p>
<pre>
&lt;p&gt;{{_i}}Sample text here...{{/i}}&lt;/p&gt;
</pre>