aboutsummaryrefslogtreecommitdiff
path: root/docs/templates
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-09-07 11:06:08 -0700
committerMark Otto <[email protected]>2012-09-07 11:06:08 -0700
commit6c5c3c81ecf6f329e950ca4e8970bbcaa7597043 (patch)
tree19029f7c4d46fa59c15809980a0f4a918ce25f91 /docs/templates
parent7a0f5c6c00ab7f70346e59503f850c5b5623f908 (diff)
parent138b5a8c0569e548ec93803aaa88ea7033363680 (diff)
downloadbootstrap-6c5c3c81ecf6f329e950ca4e8970bbcaa7597043.tar.xz
bootstrap-6c5c3c81ecf6f329e950ca4e8970bbcaa7597043.zip
Merge branch 'tiny-typos' of https://github.com/ramiro/bootstrap into ramiro-tiny-typos
Diffstat (limited to 'docs/templates')
-rw-r--r--docs/templates/pages/getting-started.mustache2
-rw-r--r--docs/templates/pages/scaffolding.mustache8
2 files changed, 5 insertions, 5 deletions
diff --git a/docs/templates/pages/getting-started.mustache b/docs/templates/pages/getting-started.mustache
index 513124c27..e9f86dc98 100644
--- a/docs/templates/pages/getting-started.mustache
+++ b/docs/templates/pages/getting-started.mustache
@@ -128,7 +128,7 @@
<div class="page-header">
<h1>{{_i}}4. Basic HTML template{{/i}}</h1>
</div>
- <p class="lead">{{_i}}With a brief intro into the contents out of the way, we can focus putting Bootstrap to use. To do that, we'll utilize a basic HTML template that includes everything we mentioned in the <a href="#file-structure">File structure</a>.{{/i}}</p>
+ <p class="lead">{{_i}}With a brief intro into the contents out of the way, we can focus on putting Bootstrap to use. To do that, we'll utilize a basic HTML template that includes everything we mentioned in the <a href="#file-structure">File structure</a>.{{/i}}</p>
<p>{{_i}}Now, here's a look at a <strong>typical HTML file</strong>:{{/i}}</p>
<pre class="prettyprint linenums">
&lt;!DOCTYPE html&gt;
diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache
index 0d9c191e3..f87af3c90 100644
--- a/docs/templates/pages/scaffolding.mustache
+++ b/docs/templates/pages/scaffolding.mustache
@@ -130,7 +130,7 @@
<p>{{_i}}To nest your content with the default grid, add a new <code>.row</code> and set of <code>.span*</code> columns within an existing <code>.span*</code> column. Nested rows should include a set of columns that add up to the number of columns of its parent.{{/i}}</p>
<div class="row show-grid">
<div class="span9">
- {{_i}}Level 1 of column{{/i}}
+ {{_i}}Level 1 column{{/i}}
<div class="row show-grid">
<div class="span6">
{{_i}}Level 2{{/i}}
@@ -247,10 +247,10 @@
<pre class="prettyprint linenums">
&lt;div class="row-fluid"&gt;
&lt;div class="span12"&gt;
- {{_i}}Level 1 of column{{/i}}
+ {{_i}}Fluid 12{{/i}}
&lt;div class="row-fluid"&gt;
- &lt;div class="span6"&gt;{{_i}}Level 2{{/i}}&lt;/div&gt;
- &lt;div class="span6"&gt;{{_i}}Level 2{{/i}}&lt;/div&gt;
+ &lt;div class="span6"&gt;{{_i}}Fluid 6{{/i}}&lt;/div&gt;
+ &lt;div class="span6"&gt;{{_i}}Fluid 6{{/i}}&lt;/div&gt;
&lt;/div&gt;
&lt;/div&gt;
&lt;/div&gt;