aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-02-11 17:28:07 -0800
committerMark Otto <[email protected]>2012-02-11 17:28:07 -0800
commit343012a9af04102dac033737db7999376bf5db59 (patch)
treed633d4f11f66f1f6f04bdeade70fdf145086cfd6
parent5b22cf5cc3f06d4f63dfbd7579cfec32eb2c2c79 (diff)
parent98cffdbf4684a85565d6ca7cf1173319863d03fd (diff)
downloadbootstrap-343012a9af04102dac033737db7999376bf5db59.tar.xz
bootstrap-343012a9af04102dac033737db7999376bf5db59.zip
Merge branch 'patch-1' of https://github.com/cvrebert/bootstrap into cvrebert-patch-1
-rw-r--r--docs/base-css.html2
-rw-r--r--docs/templates/pages/base-css.mustache2
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/base-css.html b/docs/base-css.html
index 46cf982c6..88d98851c 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -375,7 +375,7 @@ For example, &lt;code&gt;section&lt;/code&gt; 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>
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index e56f45ca0..97c2255e6 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -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>