changing contributing to community, adding guide for getting support

6 files changed, 57 insertions, 30 deletions

diff --git a/build/_includes/contribute.html b/build/_includes/community.html
index 5c51777ee..498f14d7c 100644
--- a/build/_includes/contribute.html
+++ b/build/_includes/community.html
@@ -1,40 +1,39 @@
 {% capture stripe_ad_content %}
 <p class="lead">
-  Font Awesome has a vibrant community centered around the <a href="{{ site.font_awesome.github.url }}">GitHub project</a>.
-  You can request new icons, report bugs, submit pull requests, and check upcoming milestones.
+  Font Awesome has a vibrant community of folks helping each other out. You can
+  <a href="#getting-support">get support</a>,
+  <a href="#reporting-bugs">report bugs</a>,
+  <a href="#requesting-new-icons">request new icons</a>,
+  <a href="#submitting-pull-requests">submit pull requests</a>, and
+  <a href="#project-milestones">check upcoming milestones</a>.
 </p>
 {% endcapture %}
 {% include stripe-ad.html %}
 
-<div id="requesting-new-icons">
-  <h2 class="page-header">Requesting New Icons</h2>
+<div id="getting-support">
+  <h2 class="page-header">Getting Support</h2>
   <p>
-    New icons mostly start as requests by the
-    <a href="{{ site.font_awesome.github.url }}/issues">Font Awesome community on GitHub</a>. Want to request a new
-    icon? Here are some things to keep in mind:
+    Having trouble getting Font Awesome up and running? Something not working the way you think it should? I hate that
+    I don't have time to answer Font Awesome support emails anymore. So here are some things you might wanna do:
   </p>
   <ol>
-    <li>Please be nice. Font Awesome is a happy place.</li>
-    <li>Please <a href="{{ site.font_awesome.github.url }}/search?type=Issues">search</a> to see if your icon request already exists.</li>
     <li>
-      Please and thank you if you include the following:
-      <ul>
-        <li>
-          Title your <a href="{{ site.font_awesome.github.url }}/issues/new?title=Icon%20Request:%20icon-name">new issue</a>
-          <code>Icon request: icon-name</code>.
-        </li>
-        <li>Include a few use cases for your requested icon. How do you plan on using it?</li>
-        <li>Attach a single color image or two that represent the idea you're going for.</li>
-      </ul>
+      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 Font Awesome even easier to use.
     </li>
     <li>
-      Concrete objects make good icons, since abstract concepts are, well, abstract. It's harder to make an icon
-      to represent happiness. It's easier to make a smiley face. <i class="icon-smile"></i>
+      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?
+      <a href="http://stackoverflow.com/questions/ask?tags=font-awesome">Ask a new question</a>, then
+      <a href="mailto:{{ site.font_awesome.author.email }}">send me an email</a> and I might be able to take a look.
     </li>
   </ol>
 </div>
 
-<section id="bugs">
+<section id="reporting-bugs">
   <h2 class="page-header">Reporting Bugs</h2>
   <p>
     Found a problem with Font Awesome? Feel free to submit an issue on the GitHub project. But please keep the following in mind:
@@ -53,7 +52,35 @@
   </ol>
 </section>
 
-<section id="pull-requests">
+<section id="requesting-new-icons">
+  <h2 class="page-header">Requesting New Icons</h2>
+  <p>
+    New icons mostly start as requests by the
+    <a href="{{ site.font_awesome.github.url }}/issues">Font Awesome community on GitHub</a>. Want to request a new
+    icon? Here are some things to keep in mind:
+  </p>
+  <ol>
+    <li>Please be nice. Font Awesome is a happy place.</li>
+    <li>Please <a href="{{ site.font_awesome.github.url }}/search?type=Issues">search</a> to see if your icon request already exists.</li>
+    <li>
+      Please and thank you if you include the following:
+      <ul>
+        <li>
+          Title your <a href="{{ site.font_awesome.github.url }}/issues/new?title=Icon%20Request:%20icon-name">new issue</a>
+          <code>Icon request: icon-name</code>.
+        </li>
+        <li>Include a few use cases for your requested icon. How do you plan on using it?</li>
+        <li>Attach a single color image or two that represent the idea you're going for.</li>
+      </ul>
+    </li>
+    <li>
+      Concrete objects make good icons, since abstract concepts are, well, abstract. It's harder to make an icon
+      to represent happiness. It's easier to make a smiley face. <i class="icon-smile"></i>
+    </li>
+  </ol>
+</section>
+
+<section id="submitting-pull-requests">
   <h2 class="page-header">Submitting Pull Requests</h2>
   Found a way to solve a bug in Font Awesome? Want to contribute new features? Here are a few things to remember:
   <ol>
@@ -66,7 +93,7 @@
   </ol>
 </section>
 
-<section id="milestones">
+<section id="project-milestones">
   <h2 class="page-header">Project Milestones</h2>
   <p>
     Want to keep up with what's planned for Font Awesome? Check out our
diff --git a/build/_includes/icons/new.html b/build/_includes/icons/new.html
index 9984ee2d6..0108304ab 100644
--- a/build/_includes/icons/new.html
+++ b/build/_includes/icons/new.html
@@ -6,7 +6,7 @@
       <h2 class="page-header">New Icons in {{ site.font_awesome.version }}</h2>
       <p>
         You asked, Font Awesome delivers with {{ site.font_awesome.new_icon_count }} shiny new icons in version {{ site.font_awesome.version }}.
-        Want to request new icons? Here's how to <a href="{{ page.relative_path }}contribute/#requesting-new-icons">request new icons</a>.
+        Want to request new icons? Here's how to <a href="{{ page.relative_path }}community/#requesting-new-icons">request new icons</a>.
       </p>
   {% if page.navbar_active == "icons" %}
     </div>
diff --git a/build/_includes/navbar.html b/build/_includes/navbar.html
index ed661845e..83583a80e 100644
--- a/build/_includes/navbar.html
+++ b/build/_includes/navbar.html
@@ -30,7 +30,7 @@
           </ul>
         </li>
         <li{% if page.navbar_active == "whats-new" %} class="active"{% endif %}><a href="{{ page.relative_path }}whats-new/">What's New</a></li>
-        <li{% if page.navbar_active == "contribute" %} class="active"{% endif %}><a href="{{ page.relative_path }}contribute/">Contribute</a></li>
+        <li{% if page.navbar_active == "community" %} class="active"{% endif %}><a href="{{ page.relative_path }}community/">Community</a></li>
         <li{% if page.navbar_active == "license" %} class="active"{% endif %}><a href="{{ page.relative_path }}license/">License</a></li>
       </ul>
       <ul class="nav pull-right">
diff --git a/build/_includes/whats-new.html b/build/_includes/whats-new.html
index 529097381..7c5fe2a67 100644
--- a/build/_includes/whats-new.html
+++ b/build/_includes/whats-new.html
@@ -2,7 +2,7 @@
 <p class="lead">
   Font Awesome is always getting a little awesome-er. So here's what's new in the latest version, Font Awesome
   {{ site.font_awesome.version }}. Have some ideas for new features?
-  <a href="{{ page.relative_path }}contribute/">Help contribute</a>.
+  <a href="{{ page.relative_path }}community/">Help contribute</a>.
 </p>
 {% endcapture %}
 {% include stripe-ad.html %}
diff --git a/build/assets/font-awesome/font/FontAwesome.otf b/build/assets/font-awesome/font/FontAwesome.otf
index 5460623e5..5c9505f65 100644
--- a/build/assets/font-awesome/font/FontAwesome.otf
+++ b/build/assets/font-awesome/font/FontAwesome.otf
diff --git a/build/contribute/index.html b/build/community/index.html
index 78f90a602..6132b7a10 100644
--- a/build/contribute/index.html
+++ b/build/community/index.html
@@ -1,15 +1,15 @@
 ---
 layout: base
-title: How to Contribute to Font Awesome
-navbar_active: contribute
+title: The Font Awesome Community
+navbar_active: community
 relative_path: ../
 ---
-{% capture jumbotron_h1 %}<i class="icon-thumbs-up icon-large"></i>&nbsp; Contribute{% endcapture %}
+{% capture jumbotron_h1 %}<i class="icon-thumbs-up icon-large"></i>&nbsp; Community{% endcapture %}
 {% capture jumbotron_p %}Lots of ways to get involved with Font Awesome{% endcapture %}
 
 {% include jumbotron.html %}
 {% include stripe-social.html %}
 
 <div class="container">
-  {% include contribute.html %}
+  {% include community.html %}
 </div>