Merge branch 'master' into 4.7.0

FortAwesome · Oct 24, 2016 · 9fe5852 · 9fe5852
2 parents 12c3110 + 69fa1b7
commit 9fe5852
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/_includes/examples/bordered-pulled.html b/src/_includes/examples/bordered-pulled.html
@@ -10,7 +10,7 @@ <h2 class="page-header">
     <div class="col-md-3 col-sm-4">
       <p>
         <i class="fa fa-quote-left fa-3x fa-pull-left fa-border" aria-hidden="true"></i>
-        &hellip;tomorrow we will run faster, stretch out our arms farther&hellip; And then one fine morning—
+        &hellip;tomorrow we will run faster, stretch out our arms farther&hellip; And then one fine morning&mdash;
         So we beat on, boats against the current, borne back ceaselessly into the past.
       </p>
     </div>
@@ -22,7 +22,7 @@ <h2 class="page-header">
 {% highlight html %}
 <i class="fa fa-quote-left fa-3x fa-pull-left fa-border" aria-hidden="true"></i>
 ...tomorrow we will run faster, stretch out our arms farther...
-And then one fine morning— So we beat on, boats against the
+And then one fine morning&mdash; So we beat on, boats against the
 current, borne back ceaselessly into the past.
 {% endhighlight %}
     </div>

diff --git a/src/whats-new.html b/src/whats-new.html
@@ -23,7 +23,7 @@
   <div class="row feature-list">
     <div class="col-md-4 col-sm-6">
       <h4><i class="fa fa-universal-access" aria-hidden="true"></i> <a href="{{ page.relative_path }}accessibility">Accessibility Docs</a></h4>
-      Details on how to mark up your icons depending on how you’re using them.
+      Details on how to mark up your icons depending on how you're using them.
       Make your site icons usable by the most people, and start here.
     </div>
     <div class="col-md-4 col-sm-6">