Merge branch 'master' of github.com:opencomparison/opencomparison

wwitzel3 · Oct 3, 2011 · 1cec6f5 · 1cec6f5
2 parents 606abcf + 53f91ac
commit 1cec6f5
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/docs/faq.rst b/docs/faq.rst
@@ -37,6 +37,9 @@ How hard is it to add support for a new repo?
 
 We've done a lot of work to make it as straightforward as possible. At PyCon 2011 we launched our formal `Repo Handler API`_.
 
+Installation
+============
+
 How come you don't support buildout?
 ------------------------------------
 
@@ -53,7 +56,7 @@ If you are using something else besides Ubuntu, Mac OS X 10.6, or Windows 7, you
 What happened to the fixtures?
 ------------------------------
 
-The effort to support databases besides PostGreSQL was hampered for long time, all caused by a third party package I'm not going to identify that caused grief in the use of fixtures. This was a significant issue in Open Comparison, and used up a lot of development cycles. 
+The effort to support databases besides PostGreSQL was hampered for long time, all caused by a third party package we're not going to identify that caused grief in the use of fixtures. This was a significant issue in Open Comparison, and used up a lot of development cycles. 
 
 So we use a **Mock** system of creating sample data in our tests and for running a development version of the site. To create some development data, just run::
 

diff --git a/templates/base.html b/templates/base.html
@@ -89,12 +89,13 @@
             &copy; 2010 <a href="http://pydanny.com">Daniel Greenfeld</a> & <a href="http://twitter.com/audreyr">Audrey Roy</a>
             - <a href="{% url about %}">{% trans "About" %}</a>
             - <a href="{% url faq %}">{% trans "FAQ" %}</a>    
-            - <a href="{% url terms %}">{% trans "Terms of Service" %}</a>
+            - <a href="{% url terms %}">{% trans "Terms" %}</a>
             - <a href="{% url contribute %}">{% trans "Contribute" %}</a>            
-            - <a href="http://opencomparison.readthedocs.org/en/latest/contributors.html">{% trans "Team" %}</a>
             - <a href="http://readthedocs.org/docs/opencomparison/en/latest/api_docs.html">{% trans "API" %}</a>
-            - <a href="{% url syndication %}">{% trans "RSS / Atom" %}</a> - 
+            - <a href="{% url syndication %}">{% trans "RSS / Atom" %}</a>  
-            <a href="http://www.cartwheelweb.com/">Cartwheel Web</a>: Giving back to the Python and {{ FRAMEWORK_TITLE }} community.
+            - <a href="http://www.cartwheelweb.com/">Cartwheel Web</a>: Giving back to the Python and {{ FRAMEWORK_TITLE }} community.
+            - Support our efforts through <a href="https://whitespacejobs.org">Whitespace Jobs</a>
+
         </div>
     </div>
 

diff --git a/templates/pages/contribute.html b/templates/pages/contribute.html
@@ -13,8 +13,8 @@ <h1>How can you contribute?</h1>
 
 <h2>Contributing code</h2>
 
-<p>This project has had over 30 contributors whose work has seen this project move forward in leaps and bounds. If you want help out, please read the <a href="http://opencomparison.readthedocs.org/en/latest/contributing.html">contributing instructions</a>. You
+<p>This project has had over <a href="http://opencomparison.readthedocs.org/en/latest/contributors.html">30 contributors</a> whose work has seen this project move forward in leaps and bounds. If you want help out, please read the <a href="http://opencomparison.readthedocs.org/en/latest/contributing.html">contributing instructions</a>. You
-should also read the <a href="http://opencomparison.readthedocs.org/en/latest/faq.html#general">General Section of the Open Comparison FAQ</a>.
+should also read the <a href="http://opencomparison.readthedocs.org/en/latest/faq.html#installation">Installation Section of the Open Comparison FAQ</a>.
 </p>
 
 <h2>Contributing financially</h2>
@@ -24,7 +24,7 @@ <h2>Contributing financially</h2>
 
 <h3>Post jobs on <a href="https://whitespacejobs.org">Whitespace Jobs</a></h3>
 
-<p>The team behind this site and <a href="http://opencomparison.org">Open Comparison</a> have launched a job listing site for developers called <a href="https://whitespacejobs.org">Whitespace Jobs</a></p>. Out of every paid listing, $100 will go towards work on <a href="http://opencomparison.org">Open Comparison</a> or to diversity advocacy groups such <a href="http://pyladies.com">PyLadies</a>.
+<p>The team behind this site and <a href="http://opencomparison.org">Open Comparison</a> have launched a job listing site for developers called <a href="https://whitespacejobs.org">Whitespace Jobs</a>.</p> Out of every paid listing, $100 will go towards work on <a href="http://opencomparison.org">Open Comparison</a> or to diversity advocacy groups such <a href="http://pyladies.com">PyLadies</a>.
 
 <h3>Direct Open Comparison Consulting</h3>