Merge branch 'master' into docs_derp

Conflicts:
	docs/components.html

1 files changed, 1 insertions, 2 deletions

diff --git a/docs/components.html b/docs/components.html
index 503b612f64..b81b749373 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -14,8 +14,7 @@ lead: "Over a dozen reusable components built to provide iconography, dropdowns,
     </div>
 
     <h2 id="glyphicons-glyphs">Available glyphs</h2>
-    <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>
-
+    <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 include a link back to <a href="http://glyphicons.com/">Glyphicons</a> whenever possible.</p>
     <div class="bs-glyphicons">
       <ul class="bs-glyphicons-list">
         {% for iconClassName in site.data.glyphicons %}