Final corrections and adaptations in the copy

9 files changed, 32 insertions, 129 deletions

diff --git a/src/doc/_includes/accessibility/background.html b/src/doc/_includes/accessibility/background.html
index da97e4762..ac26a4a05 100644
--- a/src/doc/_includes/accessibility/background.html
+++ b/src/doc/_includes/accessibility/background.html
@@ -1,7 +1,7 @@
 <div id="accessibility-background">
   <h4 class="margin-top-none">About Icon Fonts &amp; Accessibility</h4>
   <p>
-    Modern versions of assistive technology, like screen readers, will read CSS generated content (how Font Awesome icons are rendered), as well as specific Unicode characters. When reading our default markup for rendering icons, assisistive technology may have the following problems.
+    Modern versions of assistive technology, like screen readers, will read CSS generated content (how {{ site.forkawesome.name }} icons are rendered), as well as specific Unicode characters. When reading our default markup for rendering icons, assisistive technology may have the following problems.
   </p>
 
   <ul>
diff --git a/src/doc/_includes/community/getting-support.html b/src/doc/_includes/community/getting-support.html
index f7a490b7d..c51cfcf47 100644
--- a/src/doc/_includes/community/getting-support.html
+++ b/src/doc/_includes/community/getting-support.html
@@ -6,12 +6,10 @@
   <ol>
     <li>
       Make sure you've read the latest version of how to <a href="{{ page.relative_path }}get-started/">get started</a>.
-      It's been updated recently to make {{ site.forkawesome.name }} even easier to use.
     </li>
     <li>
-      Check out the <a href="http://stackoverflow.com/questions/tagged/font-awesome">existing questions tagged as
-      Font Awesome</a> over on Stack Overflow. Other folks might have had the same question you've had. And since
-      {{ site.forkawesome.name }} is based on Font Awesome, the answers might help you.
+      Since {{ site.forkawesome.name }} is based on {{ site.fontawesome.name }}, check out the <a href="http://stackoverflow.com/questions/tagged/font-awesome">existing questions tagged as
+      Font Awesome</a> over on Stack Overflow. Other folks might have had the same question you've had.
     </li>
     <li>
       Can't find the answer to your question on Stack Overflow?
diff --git a/src/doc/_includes/footer.html b/src/doc/_includes/footer.html
index 48e4a499a..74982a388 100644
--- a/src/doc/_includes/footer.html
+++ b/src/doc/_includes/footer.html
@@ -6,11 +6,11 @@
       A fork of {{ site.fontawesome.name }}, originally created by <a href="https://twitter.com/{{ site.fontawesome.author.twitter }}">{{ site.fontawesome.author.name }}</a>
     </div>
     <div>
-      {{ site.forkawesome.name }} licensed under <a href="{{ site.forkawesome.license.font.url }}">{{ site.forkawesome.license.font.version }}</a>
+      {{ site.forkawesome.name }} is licensed under <a href="{{ site.forkawesome.license.font.url }}">{{ site.forkawesome.license.font.version }}</a>
       <span class="hide-xs">&middot;</span><br class="hide-sm hide-md hide-lg">
-      Code licensed under <a href="{{ site.forkawesome.license.code.url }}">{{ site.forkawesome.license.code.version }}</a>
+      Code is licensed under <a href="{{ site.forkawesome.license.code.url }}">{{ site.forkawesome.license.code.version }}</a>
       <span class="hide-xs hide-sm">&middot;</span><br class="hide-md hide-lg">
-      Documentation licensed under <a href="{{ site.forkawesome.license.documentation.url }}">{{ site.forkawesome.license.documentation.version }}</a>
+      Documentation is licensed under <a href="{{ site.forkawesome.license.documentation.url }}">{{ site.forkawesome.license.documentation.version }}</a>
     </div>
     <div class="project">
       <a href="{{ site.forkawesome.github.url }}">GitHub Project</a> &middot;
diff --git a/src/doc/_includes/new-features.html b/src/doc/_includes/new-features.html
index e8d46f1c1..7f1899974 100644
--- a/src/doc/_includes/new-features.html
+++ b/src/doc/_includes/new-features.html
@@ -15,15 +15,15 @@
     </div>
     <div class="col-md-4 col-sm-6">
       <h4><i class="fa fa-thumbs-o-up" aria-hidden="true"></i> Bootstrap 3</h4>
-      Font Awesome {{ site.fontawesome.minor_version }} is fully tested and compatible with Bootstrap 3.
+      {{ site.forkawesome.name }} {{ site.forkawesome.minor_version }} is fully tested and compatible with Bootstrap 3.
     </div>
     <div class="col-md-4 col-sm-6">
       <h4><i class="fa fa-code" aria-hidden="true"></i> Better Compatibility</h4>
-      Font Awesome is now more compatible with all web frameworks, including Foundation.
+      {{ site.forkawesome.name }}is now more compatible with all web frameworks, including Foundation.
     </div>
     <div class="col-md-4 col-sm-6">
-      <h4><i class="fa fa-rub" aria-hidden="true"></i> {{ icons | version:site.fontawesome.minor_version | size }} New Icons in {{ site.fontawesome.minor_version }}</h4>
-      Requested by the active community on the <a href="{{ site.fontawesome.github.url }}">Font Awesome GitHub project</a>.
+      <h4><i class="fa fa-rub" aria-hidden="true"></i> {{ icons | version:site.forkawesome.minor_version | size }} New Icons in {{ site.fontawesome.minor_version }}</h4>
+      Requested by the active community on the <a href="{{ site.forkawesome.github.url }}">{{ site.forkawesome.name }} GitHub project</a>.
     </div>
   </div>
 </section>
diff --git a/src/doc/_includes/new-upgrading.html b/src/doc/_includes/new-upgrading.html
index 8f985590a..a2c051a13 100644
--- a/src/doc/_includes/new-upgrading.html
+++ b/src/doc/_includes/new-upgrading.html
@@ -1,8 +1,13 @@
 <section id="new-upgrading">
-  <h2 class="page-header">Switching from Font Awesome 4.7?</h2>
+  <h2 class="page-header">Switching from {{ site.fontawesome.name }} {{ site.fontawesome.minor_version }}?</h2>
   <p>
-    We are not there yet. This is still an early project. But we aim to make
-    process as easy and painless as possible. You are welcome to give us a hand
-    and get involved in the <a href="{{ page.relative_path }}community">community</a>.  
+    If you were using {{ site.fontawesome.name }} {{ site.fontawesome.minor_version }}, you should be able to just switch to {{ site.forkawesome.name }} {{ site.forkawesome.minor_version }} and get all the benefits from it.
+    If you were using npm or composer packages, replace the ones you were using by this {{ site.forkawesome.name }} ones. Or if you downloaded a static copy of {{ site.fontawesome.name }}, download the latest version of {{ site.forkawesome.name }} and
+    replace CSS and font files in your project and you should be good to go.
+  </p>
+  <p>
+    We paid special attention not to change unicode codepoints for the existing icons, nor changed the CSS class names or icon names from {{ site.fontawesome.name }} {{ site.fontawesome.minor_version }}.
+    Though we added a few more acions and made the process of contributing to this project much easier.
+    Though, if you see a mistake, please don't hesitate to <a href="{{ page.relative_path }}community/#reporting-bugs">file a bug</a>.
   </p>
 </section>
diff --git a/src/doc/_includes/why.html b/src/doc/_includes/why.html
index a463ce944..e95b5148d 100644
--- a/src/doc/_includes/why.html
+++ b/src/doc/_includes/why.html
@@ -1,7 +1,7 @@
 <section id="why" class="feature-list">
   <div class="row">
     <div class="col-md-4 col-sm-6">
-      <h4><i class="fa fa-flag" aria-hidden="true"></i> One Font, {{ icons | size }} Icons</h4>
+      <h4><i class="fa fa-fork-awesome" aria-hidden="true"></i> One Font, {{ icons | size }} Icons</h4>
       In a single collection, {{ site.forkawesome.name }} is a pictographic language of web-related actions.
     </div>
     <div class="col-md-4 col-sm-6">
diff --git a/src/doc/get-started.html b/src/doc/get-started.html
index 1a48083b1..05e33044c 100644
--- a/src/doc/get-started.html
+++ b/src/doc/get-started.html
@@ -21,14 +21,13 @@ relative_path: ../
     <div class="row">
       <div class="col-md-9">
         <p class="text-lg">
-          Want to manage and host Font Awesome assets yourself? You can
-          <a href="#modal-download" data-toggle="modal" onClick="_gaq.push(['_trackEvent', 'Launch Modal', 'Launch Download Modal']);">download</a>,
+          Want to manage and host {{ site.forkawesome.name }} assets yourself? You can
+          <a href="#modal-download" data-toggle="modal">download</a>,
           customize, and use the icons and default styling manually. Both CSS and CSS Preprocessor (Sass and Less) formats are included.</p>
       </div>
 
       <div class="col-md-3">
-        <a class="btn btn-default btn-lg btn-block" href="#modal-download" data-toggle="modal"
-           onClick="_gaq.push(['_trackEvent', 'Launch Modal', 'Launch Download Modal']);">
+        <a class="btn btn-default btn-lg btn-block" href="#modal-download" data-toggle="modal">
           <i class="fa fa-download fa-lg margin-right-sm"></i>
           Download
         </a>
@@ -43,7 +42,7 @@ relative_path: ../
         <li>
           In the <code>&lt;head&gt;</code> of your html, reference the location to your font-awesome.min.css.
 {% highlight html %}
-<link rel="stylesheet" href="path/to/font-awesome/css/font-awesome.min.css">
+<link rel="stylesheet" href="path/to/fork-awesome/css/fork-awesome.min.css">
 {% endhighlight %}
         </li>
         <li>Check out the <a href="{{ page.relative_path }}examples/">examples</a> to start using Font Awesome!</li>
@@ -53,11 +52,11 @@ relative_path: ../
     <div class="download-preprocessors" id="download-preprocessors">
       <h3>Using Sass or Less</h3>
 
-      <p>Use this method to customize Font Awesome {{ site.fontawesome.version }} using Less or Sass.</p>
+      <p>Use this method to customize Font Awesome {{ site.forkawesome.version }} using Less or Sass.</p>
       <ol>
-        <li>Copy the <code>font-awesome/</code> directory into your project.</li>
+        <li>Copy the <code>fork-awesome/</code> directory into your project.</li>
         <li>
-          Open your project's <code>font-awesome/less/variables.less</code> or <code>font-awesome/scss/_variables.scss</code> and edit the <code>@fa-font-path</code> or <code>$fa-font-path</code>
+          Open your project's <code>fork-awesome/less/variables.less</code> or <code>fork-awesome/scss/_variables.scss</code> and edit the <code>@fa-font-path</code> or <code>$fa-font-path</code>
           variable to point to your font directory.
 {% highlight scss %}
 @fa-font-path:   "../font";
@@ -70,85 +69,6 @@ relative_path: ../
     </div>
   </section>
 
-  <div class="hr margin-top-lg">
-    <span class="hr-text text-xl text-muted">or</span>
-  </div>
-
-  <section class="get-started-advanced" id="get-started-advanced">
-    <h2 class="page-header clearfix">
-      Advanced &amp; Packages
-      <span class="label label-default text-base pull-right">Pro</span>
-    </h2>
-
-    <div class="ruby-gem-less margin-bottom-xl" id="ruby-gem-less">
-      <h3><a href="https://github.com/FortAwesome/font-awesome-less">Less Ruby Gem</a></h3>
-      <p>
-        Use the <a href="https://github.com/FortAwesome/font-awesome-less">Official Font Awesome Less Ruby Gem</a> to easily get Font
-        Awesome Less into a Rails project. Generously maintained by <a href="https://twitter.com/supercodepoet/">@supercodepoet</a>.
-      </p>
-      <ol>
-        <li>
-          Add this line to your application's Gemfile:
-{% highlight bash %}
-gem 'font-awesome-less'
-{% endhighlight %}
-        </li>
-        <li>
-          And then execute:
-{% highlight bash %}
-$ bundle
-{% endhighlight %}
-        </li>
-        <li>Or install it yourself as:
-{% highlight bash %}
-$ gem install font-awesome-less
-{% endhighlight %}
-        </li>
-      </ol>
-      <p>
-      If you use Rails, add this to your e.g. <code>application.less</code>:
-      </p>
-{% highlight css %}
-@import "font-awesome-sprockets";
-@import "font-awesome";
-{% endhighlight %}
-    </div>
-
-    <div class="ruby-gem-sass" id="ruby-gem-sass">
-      <h3><a href="https://github.com/FortAwesome/font-awesome-sass">Sass Ruby Gem</a></h3>
-      <p>
-        Use the <a href="https://github.com/FortAwesome/font-awesome-sass">Official Font Awesome Sass Ruby Gem</a> to easily get Font
-        Awesome Sass into a Rails or Compass project. Generously maintained by <a href="https://twitter.com/supercodepoet/">@supercodepoet</a>.
-      </p>
-      <ol>
-        <li>
-          Add this line to your application's Gemfile:
-{% highlight bash %}
-gem 'font-awesome-sass'
-{% endhighlight %}
-        </li>
-        <li>
-          And then execute:
-{% highlight bash %}
-$ bundle
-{% endhighlight %}
-        </li>
-        <li>Or install it yourself as:
-{% highlight bash %}
-$ gem install font-awesome-sass
-{% endhighlight %}
-        </li>
-      </ol>
-      <p>
-      If you use Rails, add this to your e.g. <code>application.scss</code>:
-      </p>
-{% highlight css %}
-@import "font-awesome-sprockets";
-@import "font-awesome";
-{% endhighlight %}
-    </div>
-  </section>
-
   <section class="get-started-more margin-top-lg" id="get-started-more">
     <h2 class="page-header">More Information</h2>
   </section>
@@ -164,31 +84,18 @@ $ gem install font-awesome-sass
     <div class="col-md-6" id="ie8-font-face">
       <h4>Internet Explorer 8 and @font-face</h4>
       <p>IE8 has some issues with <code>@font-face</code> when combined with <code>:before</code>.
-        Font Awesome uses that combination. If a page is cached, and loaded without the mouse over the window
+        {{ site.forkawesome.name }} uses that combination. If a page is cached, and loaded without the mouse over the window
         (i.e. hit the refresh button or load something in an iframe) then the page gets rendered before the font loads.
         Hovering over the page (body) will show some of the icons and hovering over the remaining icons will show those as well.
         <a href="https://github.com/FortAwesome/Font-Awesome/issues/954">See issue #954</a> for details.</p>
       <p><a href="http://getbootstrap.com/getting-started/#support-ie8-font-face">Getting started - Internet Explorer 8 and @font-face</a> by <a href="http://getbootstrap.com/about/#team">Bootstrap Team</a> is licensed under <a href="https://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a></p>
-    </div>
-  </div>
 
-  <div class="row">
-    <div class="col-md-6" id="need-ie7">
       <h4>Need IE7 Support?</h4>
       <p>
-        If you need IE7 support, you have my condolences. Really. Font Awesome {{ site.fontawesome.version }}
-        doesn't support IE7, but an older version does. You'll need to check out the
-        <a href="{{ page.relative_path }}3.2.1/get-started/#need-ie7">3.2.1 instructions for using IE7</a>. Then go complain to
-        whoever decided your project needs IE7 support.
+        Sorry, {{ site.forkawesome.name }} {{ site.forkawesome.version }}
+        doesn't support IE7, but an older version of {{ site.fontawesome.name }} does (v3.2.1, if you can still find it).
       </p>
     </div>
-
-    <div class="col-md-6" id="troubleshooting">
-      <h4>Troubleshooting</h4>
-      <p>If you're having trouble with Font Awesome, make sure to check out the
-        <a href="{{ site.fontawesome.github.url }}/wiki/Troubleshooting">troubleshooting wiki page</a>.
-        Generously maintained by <a href="https://twitter.com/gtagliala">@gtagliala</a>.</p>
-    </div>
   </div>
 
 {% include modals/download.html %}
diff --git a/src/doc/index.html b/src/doc/index.html
index c16d49796..dc4499578 100644
--- a/src/doc/index.html
+++ b/src/doc/index.html
@@ -9,13 +9,6 @@ relative_path: ./
 {% include stripe-social.html %}
 
 <div class="container">
-  {% capture stripe_ad_content %}
-  <p class="lead">
-    Font Awesome gives you scalable vector icons that can instantly be customized &mdash; size, color, drop shadow,
-    and anything that can be done with the power of CSS.
-  </p>
-  {% endcapture %}
-
   {% include why.html %}
   {% include thanks-to.html %}
 </div>
diff --git a/src/doc/whats-new.html b/src/doc/whats-new.html
index 6bf450c9b..3b6999e2d 100644
--- a/src/doc/whats-new.html
+++ b/src/doc/whats-new.html
@@ -12,7 +12,7 @@ relative_path: ../
 
 <div class="container">
   <p class="lead">
-    {{ site.forkawesome.name }} is community effort based on
+    {{ site.forkawesome.name }} is now a community effort based on
     {{ site.fontawesome.name }} {{ site.fontawesome.version }} by
     {{ site.fontawesome.author.name }}.<br />
     We <i class="fa fa-heart" aria-hidden="true"></i>
@@ -36,7 +36,7 @@ relative_path: ../
     </div>
     <div class="col-md-4 col-sm-6">
       <h4><i class="fa fa-users" aria-hidden="true"></i> Distributed community</h4>
-      We'd like to turn this into a distributed open source design project,
+      We believe in distributed open source design projects,
       where all contributions are included and credited. So
       <a href="{{ page.relative_path }}community">join our community</a>.
     </div>