aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-01-26 19:10:32 -0800
committerMark Otto <[email protected]>2012-01-26 19:10:32 -0800
commit576ae2f5611a2b9a40c8feac1835bd6c8c2735ff (patch)
treee5b4407e6faa05a8c84aacf39213a35b5aba3e77 /docs
parent7a3d04d5bed9b9ddf5a3c78466b7115a0260b75e (diff)
parent824eaff1d810c012b7d86d36b677cd6194120024 (diff)
downloadbootstrap-576ae2f5611a2b9a40c8feac1835bd6c8c2735ff.tar.xz
bootstrap-576ae2f5611a2b9a40c8feac1835bd6c8c2735ff.zip
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Diffstat (limited to 'docs')
-rw-r--r--docs/scaffolding.html2
-rw-r--r--docs/templates/pages/scaffolding.mustache4
2 files changed, 3 insertions, 3 deletions
diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index 11f3b4486..df6ea9f00 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -357,7 +357,7 @@
<div class="span5">
<p>Bootstrap doesn't automatically include these media queries, but understanding and adding them is very easy and requires minimal setup. You have a few options for including the responsive features of Bootstrap:</p>
<ol>
- <li>Use the compiled responsive version, bootstrap-reponsive.css</li>
+ <li>Use the compiled responsive version, bootstrap-responsive.css</li>
<li>Add @import "responsive.less" and recompile Bootstrap</li>
<li>Modify and recompile responsive.less as a separate</li>
</ol>
diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache
index bc924e3ef..7781e86f6 100644
--- a/docs/templates/pages/scaffolding.mustache
+++ b/docs/templates/pages/scaffolding.mustache
@@ -292,7 +292,7 @@
<div class="span5">
<p>{{_i}}Bootstrap doesn't automatically include these media queries, but understanding and adding them is very easy and requires minimal setup. You have a few options for including the responsive features of Bootstrap:{{/i}}</p>
<ol>
- <li>{{_i}}Use the compiled responsive version, bootstrap-reponsive.css{{/i}}</li>
+ <li>{{_i}}Use the compiled responsive version, bootstrap-responsive.css{{/i}}</li>
<li>{{_i}}Add @import "responsive.less" and recompile Bootstrap{{/i}}</li>
<li>{{_i}}Modify and recompile responsive.less as a separate{{/i}}</li>
</ol>
@@ -314,4 +314,4 @@
</pre>
</div>
</div>
-</section> \ No newline at end of file
+</section>