diff options
| author | Mark Otto <[email protected]> | 2013-09-02 19:53:20 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-09-02 19:53:20 -0700 |
| commit | 54b75ffae314f43e5502a81df252246c3fd8056b (patch) | |
| tree | fd8f285f50ab9c747dfd426e5fc1eb0eca70393a | |
| parent | e521ee83094f5a70978cc9d879f400c3ac95369c (diff) | |
| parent | c6d51be2d8ae25f4a78902ca3391b1bc800116ae (diff) | |
| download | bootstrap-54b75ffae314f43e5502a81df252246c3fd8056b.tar.xz bootstrap-54b75ffae314f43e5502a81df252246c3fd8056b.zip | |
Merge branch 'master' of github.com:twbs/bootstrap
| -rw-r--r-- | components.html | 2 | ||||
| -rw-r--r-- | examples/theme/index.html | 2 | ||||
| -rw-r--r-- | javascript.html | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/components.html b/components.html index edc6e5216..63dfacb9d 100644 --- a/components.html +++ b/components.html @@ -15,7 +15,7 @@ base_url: "../" </div> <h2 id="glyphicons-glyphs">Available glyphs</h2> - <p>Includes 180 glyphs in font format from the Glyphicon Halflings set. <a href="http://glyphicons.com/">Glyphicons</a> Halflings are normally not available for free, but their creator has made them available for Bootstrap free of cost. As a thank you, we only ask that you to include a link back to <a href="http://glyphicons.com/">Glyphicons</a> whenever possible.</p> + <p>Includes 200 glyphs in font format from the Glyphicon Halflings set. <a href="http://glyphicons.com/">Glyphicons</a> Halflings are normally not available for free, but their creator has made them available for Bootstrap free of cost. As a thank you, we only ask that you to include a link back to <a href="http://glyphicons.com/">Glyphicons</a> whenever possible.</p> <ul class="bs-glyphicons"> <li><span class="glyphicon glyphicon-adjust"></span> .glyphicon .glyphicon-adjust</li> <li><span class="glyphicon glyphicon-align-center"></span> .glyphicon .glyphicon-align-center</li> diff --git a/examples/theme/index.html b/examples/theme/index.html index 2d8925a16..a0f3128bf 100644 --- a/examples/theme/index.html +++ b/examples/theme/index.html @@ -64,7 +64,7 @@ <!-- Main jumbotron for a primary marketing message or call to action --> <div class="jumbotron"> <h1>Hello, world!</h1> - <p>This is a template for a simple marketing or informational website. It includes a large callout called the hero unit and three supporting pieces of content. Use it as a starting point to create something more unique.</p> + <p>This is a template for a simple marketing or informational website. It includes a large callout called a jumbotron and three supporting pieces of content. Use it as a starting point to create something more unique.</p> <p><a href="#" class="btn btn-primary btn-lg" role="button">Learn more »</a></p> </div> diff --git a/javascript.html b/javascript.html index 496480085..b317f6b03 100644 --- a/javascript.html +++ b/javascript.html @@ -573,7 +573,7 @@ $('#myDropdown').on('show.bs.dropdown', function () { <h2 id="scrollspy-usage">Usage</h2> <h3>Via data attributes</h3> - <p>To easily add scrollspy behavior to your topbar navigation, add <code>data-spy="scroll"</code> to the element you want to spy on (most typically this would be the <code><body></code>. Then add the <code>data-target</code> attribute with the ID or class of the parent element of any Bootstrap <code>.nav</code> component.</p> + <p>To easily add scrollspy behavior to your topbar navigation, add <code>data-spy="scroll"</code> to the element you want to spy on (most typically this would be the <code><body></code>). Then add the <code>data-target</code> attribute with the ID or class of the parent element of any Bootstrap <code>.nav</code> component.</p> {% highlight html %} <body data-spy="scroll" data-target="#navbar-example"> ... |