diff options
| author | Mark Otto <[email protected]> | 2012-01-24 10:45:51 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-01-24 10:45:51 -0800 |
| commit | 72861dfbf2759d6ea51ee557def37f85fb5f647d (patch) | |
| tree | f9d3e38deed8995cbacd83088008499548ef4228 | |
| parent | b0bd1d82035c22031e75627df0d3853c9d1e285c (diff) | |
| parent | 04efc8d0a85f76402527e5e8658df43a8e4deb6c (diff) | |
| download | bootstrap-72861dfbf2759d6ea51ee557def37f85fb5f647d.tar.xz bootstrap-72861dfbf2759d6ea51ee557def37f85fb5f647d.zip | |
Merge branch 'apostrophe-grammar' of https://github.com/phopkins/bootstrap into phopkins-apostrophe-grammar
| -rw-r--r-- | docs/base-css.html | 4 | ||||
| -rw-r--r-- | docs/components.html | 2 | ||||
| -rw-r--r-- | docs/javascript.html | 2 | ||||
| -rw-r--r-- | docs/less.html | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/docs/base-css.html b/docs/base-css.html index 6485d76a2..f21f25f6b 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -366,7 +366,7 @@ <tr> <td><code><pre class="prettyprint"></code></td> <td> - <p>Using the google-code-prettify library, you're blocks of code get a slightly different visual style and automatic syntax highlighting. You can also add an additional class to add line numbers.</p> + <p>Using the google-code-prettify library, your blocks of code get a slightly different visual style and automatic syntax highlighting. You can also add an additional class to add line numbers.</p> <pre class="prettyprint"><div> <h1>Heading</h1> <p>Something right here...</p> @@ -1105,7 +1105,7 @@ <div class="span4"> <div class="form-docs"> <h3>Redesigned browser states</h3> - <p>Bootstrap features styles for browser-supported focused and <code>disabled</code> states. We remove the default Webkit <code>outline</code> and apply a <code>box-shadow</code> in it's place for <code>:focus</code>.</p> + <p>Bootstrap features styles for browser-supported focused and <code>disabled</code> states. We remove the default Webkit <code>outline</code> and apply a <code>box-shadow</code> in its place for <code>:focus</code>.</p> <hr> <h3>Form validation</h3> <p>It also includes validation styles for errors, warnings, and success. To use, add the a class to the surrounding <code>.control-group</code>.</p> diff --git a/docs/components.html b/docs/components.html index 9d28b9e06..3a15541c4 100644 --- a/docs/components.html +++ b/docs/components.html @@ -1088,7 +1088,7 @@ <div class="row"> <div class="span4"> <h3>Rewritten base class</h3> - <p>With Bootstrap 2, we've simplified the base class: <code>.alert</code> instead of <code>.alert-message</code>. We've also reduced the minimum required markup—no <code><p></code> is required by default, just the outter <code><div></code>.</p> + <p>With Bootstrap 2, we've simplified the base class: <code>.alert</code> instead of <code>.alert-message</code>. We've also reduced the minimum required markup—no <code><p></code> is required by default, just the outer <code><div></code>.</p> <h3>Single alert message</h3> <p>For a more durable component with less code, we've removed the differentiating look for block alerts, messages that come with more padding and typically more text. The class also has changed to <code>.alert-block</code>.</p> <hr> diff --git a/docs/javascript.html b/docs/javascript.html index cc641ed49..5a7c46b01 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -856,7 +856,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) { <p><span class="label notice">Notice</span> Individual popover instance options can alternatively be specified through the use of data attributes.</code></p> <h3>Markup</h3> <p> - For performance reasons, the Tooltip and Popover data-apis are opt in. If you would like to use them just specify a the selector option. + For performance reasons, the Tooltip and Popover data-apis are opt in. If you would like to use them just specify a selector option. </p> <h3>Methods</h3> <h4>$().popover(options)</h4> diff --git a/docs/less.html b/docs/less.html index cd486ac98..cc8197118 100644 --- a/docs/less.html +++ b/docs/less.html @@ -75,7 +75,7 @@ <div class="row"> <div class="span4"> <h3>Why LESS?</h3> - <p>Bootstrap is made with LESS at it's core, a dynamic stylesheet language created by <a href="http://cloudhead.io">Alexis Sellier</a>. It makes developing systems-based CSS faster, easier, and more fun.</p> + <p>Bootstrap is made with LESS at its core, a dynamic stylesheet language created by <a href="http://cloudhead.io">Alexis Sellier</a>. It makes developing systems-based CSS faster, easier, and more fun.</p> </div> <div class="span4"> <h3>What's included?</h3> |