aboutsummaryrefslogtreecommitdiff
path: root/docs/templates
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-11-15 09:15:37 -0800
committerMark Otto <[email protected]>2012-11-15 09:15:37 -0800
commita43bf14ea5fa7118cfdbed0469d227976fb92a79 (patch)
tree95041ab233cf7a9543347539e4e3e8c9dad35e72 /docs/templates
parent1a4ce9ba1872c06fe3107fd1330070d08706ec1c (diff)
parent05655ff4ff3b44f5c773dcc6079d03af498733d5 (diff)
downloadbootstrap-a43bf14ea5fa7118cfdbed0469d227976fb92a79.tar.xz
bootstrap-a43bf14ea5fa7118cfdbed0469d227976fb92a79.zip
Merge branch '2.2.2-wip' into exploratory
Diffstat (limited to 'docs/templates')
-rw-r--r--docs/templates/pages/scaffolding.mustache2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache
index 0382b0ee3..7a5bfaed7 100644
--- a/docs/templates/pages/scaffolding.mustache
+++ b/docs/templates/pages/scaffolding.mustache
@@ -51,7 +51,7 @@
<p>{{_i}}These styles can be found within <strong>scaffolding.less</strong>.{{/i}}</p>
<h3>{{_i}}Reset via Normalize{{/i}}</h3>
- <p>{{_i}}With Bootstrap 2, the old reset block has been dropped in favor of <a href="http://necolas.github.com/normalize.css/" target="_blank">Normalize.css</a>, a project by <a href="http://twitter.com/necolas" target="_blank">Nicolas Gallagher</a> that also powers the <a href="http://html5boilerplate.com" target="_blank">HTML5 Boilerplate</a>. While we use much of Normalize within our <strong>reset.less</strong>, we have removed some elements specifically for Bootstrap.{{/i}}</p>
+ <p>{{_i}}With Bootstrap 2, the old reset block has been dropped in favor of <a href="http://necolas.github.com/normalize.css/" target="_blank">Normalize.css</a>, a project by <a href="http://twitter.com/necolas" target="_blank">Nicolas Gallagher</a> and <a href="http://twitter.com/jon_neal" target="_blank">Jonathan Neal</a> that also powers the <a href="http://html5boilerplate.com" target="_blank">HTML5 Boilerplate</a>. While we use much of Normalize within our <strong>reset.less</strong>, we have removed some elements specifically for Bootstrap.{{/i}}</p>
</section>