Clean up wording on support page.

media/css/core.css

@@ -873,6 +873,13 @@ div.gold-subscription > form button {
     margin: 1em .3em 1.5em 0em;
 }
 
+/* Support Page */
+
+#support_page li {
+    margin-left: 1em;
+    list-style: inside;
+}
+
 /* Form Wizards */
 div.actions.wizard-actions button.action-primary,
 div.actions.wizard-actions input.action-primary {

readthedocs/templates/core/header.html

@@ -16,11 +16,6 @@
 
     <!-- BEGIN header nav -->
     {% if request.user.is_authenticated %}
-    <div class="rtfd-header-nav" style="margin-right: 20%">
-      <ul>
-            <!-- <li><a href="{% url 'gold_detail' %}">{% trans "Support Us" %}</a></li> -->
-      </ul>
-    </div>
     <div class="menu menu-user" id="subnav-user-menu">
       <div class="menu-button">
         <a href="{% url 'projects_dashboard' %}">

readthedocs/templates/projects/project_dashboard.html

@@ -8,7 +8,9 @@
 
         <p>
             Read the Docs depends on users like you to help us keep the site sustainable.
-            We are adding the concept of <a href="{% url "gold_detail" %}">Read the Docs Gold</a> to allow folks to support us.
+        </p>
+        <p>
+            We now have the concept of <a href="{% url "gold_detail" %}">Read the Docs Gold</a> to allow folks to support us. You can pay us a set amount every month, and we'll keep the site running, and improving all the time.
         </p>
 
         <form method="get" action="{% url "gold_detail" %}">
@@ -19,9 +21,7 @@
       <div class="module onboard onboard-accounts">
         <h3>Thanks!</h3>
         <p>
-          Your support of Read the Docs helps make the site better each and every month.
+          Your <a href="{% url "gold_detail" %}">support</a> of Read the Docs helps make the site better each and every month.
-          It also allows us to provide enhanced support to you,
-          so <a href="{% url "support" %}">let us know</a> if you ever need help.
         </p>
 
     {% endif %}

readthedocs/templates/support.html

@@ -1,47 +1,75 @@
 {% extends "base.html" %}
 
 {% load i18n %}
+{% load core_tags %}
+
 
 {% block title %}Support{% endblock %}
 
 {% block content %}
-{% if request.user.gold.count %}
+<div id="support_page">
-<h3>Priority Support</h3>
+{% filter restructuredtext %}
-<p>
-Gold users have access to priority support for Read the Docs.
-You can contact us at <a href="mailto:{{ support_email }}">{{ support_email }}</a>.
-</p>
-{% else %}
-<h3>Community Support Support</h3>
-<p>
-Since Read the Docs is a community site,
-we aren't able to offer any guarentees in support response time.
-</p>
 
-<p>
+Usage Questions
-You can file a bug on our <a href="https://github.com/rtfd/readthedocs.org/issues">GitHub Issue Tracker</a>,
+~~~~~~~~~~~~~~~~
+
+If you have questions about how to use Read the Docs well,
+`Stack Overflow`_ is the best place to ask. Tag questions with ``read-the-docs`` so other folks can find them easily.
+
+{% if not request.user.gold.count %}
+
+Priority Support
+~~~~~~~~~~~~~~~~
+
+Gold users have access to priority support for Read the Docs.
+You can contact us at {{ support_email }}.
+
+**Thanks for supporting the site.**
+
+{% else %}
+
+Community Support
+~~~~~~~~~~~~~~~~
+
+Read the Docs is a community supported site.
+Currently nobody is paid to handle readthedocs.org support.
+We are hoping to bring in enough money with our `Gold`_ program to change that,
+so please sign up if you are able.
+
+**All people answering your questions are doing it with their own time,
+so please be kind and provide as much infromation as possible.**
+
+Bugs & Support Issues
+~~~~~~~~~~~~~~~~~~~~~
+
+You can file a bug on our `GitHub Issue Tracker`_,
 and it will be taken care of as soon as possible.
-We do offer <strong>priority support</strong> to Gold users.
+We do offer priority support to Gold users.
-You can <a href="{% url "gold_detail" %}">sign up</a> for Gold for access to priority support.
+You can `sign up`_ for Gold for access to priority support.
-</p>
 
 {% endif %}
-<p>
+
+Reporting Issues
+~~~~~~~~~~~~~~~~
+
 When reporting a bug,
 please include as much information as possible that will help us solve this issue.
 This includes:
-</p>
 
-<ul>
+* Project Name
-	<li>Project Name</li>
+* URL
-	<li>URL</li>
+* Action taken
-	<li>Action taken</li>
+* Expected Result
-	<li>Expected Result</li>
+* Actual Result
-	<li>Actual Result</li>
-</ul>
 
-<p>
 Thanks for using Read the Docs!
-</p>
 
+.. _Stack Overflow: http://stackoverflow.com/questions/tagged/read-the-docs
+.. _Github Issue Tracker: https://github.com/rtfd/readthedocs.org/issues
+.. _sign up: {% url "gold_detail" %}
+.. _Gold: {% url "gold_detail" %}
+
+
+{% endfilter %}
+</div>
 {% endblock %}