Adapting Community guidelines.

6 files changed, 29 insertions, 35 deletions

diff --git a/src/_includes/community/getting-support.html b/src/_includes/community/getting-support.html
index 8ae311adc..f7a490b7d 100644
--- a/src/_includes/community/getting-support.html
+++ b/src/_includes/community/getting-support.html
@@ -1,22 +1,21 @@
 <div id="getting-support">
   <h2 class="page-header">Getting Support</h2>
   <p>
-    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:
+    Having trouble getting {{ site.forkawesome.name }} up and running? Something not working the way you think it should?
   </p>
   <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 Font Awesome even easier to use.
+      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.
+      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.
     </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.fontawesome.author.email }}">send me an email</a> and I might be able to take a look.
+      <a href="http://stackoverflow.com/questions/ask?tags=fork-awesome">Ask a new question</a>, then. 
     </li>
   </ol>
 </div>
diff --git a/src/_includes/community/project-milestones.html b/src/_includes/community/project-milestones.html
index 598569981..62a7b8c46 100644
--- a/src/_includes/community/project-milestones.html
+++ b/src/_includes/community/project-milestones.html
@@ -1,7 +1,8 @@
 <section id="project-milestones">
-  <h2 class="page-header">Project Milestones</h2>
+  <h2 class="page-header">Projects</h2>
   <p>
-    Want to keep up with what's planned for Font Awesome? Check out our
-    <a href="{{ site.fontawesome.github.url }}/milestones">milestones</a> on the GitHub project.
+    Want to keep up with what's planned for {{ site.forkawesome.name }}? Check out our
+    <a href="{{ site.forkawesome.github.url }}/projects">projects</a> on the GitHub repo.
+    And come help us achieve those goals.
   </p>
 </section>
diff --git a/src/_includes/community/reporting-bugs.html b/src/_includes/community/reporting-bugs.html
index b8fb61e49..1ad5994de 100644
--- a/src/_includes/community/reporting-bugs.html
+++ b/src/_includes/community/reporting-bugs.html
@@ -1,18 +1,18 @@
 <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:
+    Found a problem with {{ site.forkawesome.name }}? Feel free to submit an issue on the GitHub project. But please keep the following in mind:
   </p>
   <ol>
-    <li>Please be nice. Font Awesome is a happy place.</li>
-    <li>Please <a href="{{ site.fontawesome.github.url }}/search?type=Issues">search</a> to see if your bug was already reported.</li>
+    <li>Please be nice. {{ site.forkawesome.name }} is a happy place.</li>
+    <li>Please <a href="{{ site.forkawesome.github.url }}/search?type=Issues">search</a> to see if your bug was already reported.</li>
     <li>
       Before opening any issue, please read the generic <a href="https://github.com/necolas/issue-guidelines">issue
       guidelines</a>, by <a href="https://github.com/necolas/">Nicolas Gallagher</a>.
     </li>
     <li>
       After doing everything above, feel free to
-      <a href="{{ site.fontawesome.github.url }}/issues/new">submit an issue</a>.
+      <a href="{{ site.forkawesome.github.url }}/issues/new">submit an issue</a>.
     </li>
   </ol>
 </section>
diff --git a/src/_includes/community/requesting-new-icons.html b/src/_includes/community/requesting-new-icons.html
index d08aa16ff..6865e9528 100644
--- a/src/_includes/community/requesting-new-icons.html
+++ b/src/_includes/community/requesting-new-icons.html
@@ -2,12 +2,12 @@
   <h2 class="page-header">Requesting New Icons</h2>
   <p>
     New icons mostly start as requests by the
-    <a href="{{ site.fontawesome.github.url }}/issues">Font Awesome community on GitHub</a>. Want to request a new
+    <a href="{{ site.forkawesome.github.url }}/issues">{{ site.forkawesome.name }} 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.fontawesome.github.url }}/search?type=Issues">search</a> to see if your icon request already exists. If a request is found, please add a &#x1F44D; reaction to that one.</li>
+    <li>Please be nice. {{ site.forkawesome.name }} is a happy place.</li>
+    <li>Please <a href="{{ site.forkawesome.github.url }}/search?type=Issues">search</a> to see if your icon request already exists. If a request is found, please add a &#x1F44D; reaction to that one.</li>
     <li>
       Please make requests for single icons, unless you are requesting a couple of strictly related icons (e.g., thumbs-up/thumbs-down).
     </li>
@@ -15,7 +15,7 @@
       Please and thank you if you include the following:
       <ul>
         <li>
-          Title your <a href="{{ site.fontawesome.github.url }}/issues/new?title=Icon%20Request:%20fa-">new issue</a>
+          Title your <a href="{{ site.forkawesome.github.url }}/issues/new?title=Icon%20Request:%20fa-">new issue</a>
           <code>Icon request: icon-name</code> (e.g., <code>Icon request: icon-car</code>).
         </li>
         <li>Include a few use cases for your requested icon. How do you plan on using it?</li>
diff --git a/src/_includes/community/submitting-pull-requests.html b/src/_includes/community/submitting-pull-requests.html
index 1a55aba7b..83f331347 100644
--- a/src/_includes/community/submitting-pull-requests.html
+++ b/src/_includes/community/submitting-pull-requests.html
@@ -1,13 +1,18 @@
 <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:
+  Found a way to solve a bug in {{ site.forkawesome.name }}? Want to contribute new features or a new icon?
   <ol>
-    <li>Please do not submit new icons.</li>
-    <li>Please submit all pull requests against *-wip branches.</li>
-    <li>All pull requests submitted against master will be summarily closed and this guide referenced.</li>
     <li>
-      After doing everything above, feel free to
-      <a href="{{ site.fontawesome.github.url }}/issues/new">submit a pull request</a>.
+      Clone the repository and work on your proposal.
+    </li>
+    <li>
+      Then, when you think it's ready or when you want feedback,
+      <a href="{{ site.forkawesome.github.url }}/issues/new">submit a pull
+      request</a>.
+    </li>
+    <li>
+      Discuss with rest of the community and follow up on conversations until
+      your pull request is merged.
     </li>
   </ol>
 </section>
diff --git a/src/community.html b/src/community.html
index 31b96af62..702ca133d 100644
--- a/src/community.html
+++ b/src/community.html
@@ -5,23 +5,12 @@ navbar_active: community
 relative_path: ../
 ---
 {% capture jumbotron_h1 %}<i class="fa fa-thumbs-o-up" aria-hidden="true"></i>&nbsp; Community{% endcapture %}
-{% capture jumbotron_p %}Lots of ways to get involved with Font Awesome{% endcapture %}
+{% capture jumbotron_p %}Lots of ways to get involved with {{ site.forkawesome.name }}{% endcapture %}
 
 {% include jumbotron.html %}
 {% include stripe-social.html %}
 
 <div class="container">
-  {% capture stripe_ad_content %}
-  <p class="lead">
-    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 community/getting-support.html %}
   {% include community/requesting-new-icons.html %}
   {% include community/reporting-bugs.html %}