Revise site copy to keep up with ToS changes

CONTRIBUTING.md

@@ -1,28 +1,23 @@
 #Contributing to Gratipay
 
-##What is "open work"?
-At http://gratipay.com/about, we have a definition:
-
-> “Open work” means that your company or organization makes it easy for any individual to do your work for you without asking you first, and as a result to share in any revenue you generate. 
-
-Do work first, ask permission later. Fun, isn't it? If you are opening a new issue or submitting a pull request, **go for it!** Don't be afraid that it's a dumb idea or a duplicate of another issue or an unwanted change or whatever. Maybe it is! We're still glad to have you! :^)
+If you are opening a new issue or submitting a pull request, **go for it!** Don't be afraid that it's a dumb idea or a duplicate of another issue or an unwanted change or whatever. Maybe it is! We're still glad to have you! 💃
 
 ##How you can contribute
-Whether you are a programmer or not, you can contribute to Gratipay. Below are some ideas we've modified from [this great blog post](http://blog.smartbear.com/programming/14-ways-to-contribute-to-open-source-without-being-a-programming-genius-or-a-rock-star/) (more details at the link). You can check out a similar list [here](http://24pullrequests.com/contributing). If you see anything below that doesn't make sense, _relax_--find something you understand and start from there.
+Whether you are a programmer or not, you can contribute to Gratipay. Below are some ideas we've modified from [this great blog post](http://blog.smartbear.com/programming/14-ways-to-contribute-to-open-source-without-being-a-programming-genius-or-a-rock-star/) (more details at the link). You can check out a similar list [here](http://24pullrequests.com/contributing). If you see anything below that doesn't make sense, _relax_—find something you understand and start from there.
 
 1. Follow along on GitHub. Looks like you're in the right place already! See all project repositories at http://github.com/gratipay.
-2. Follow the [Gratipay blog](https://medium.com/gratipay-blog).
-3. Diagnose a bug by creating an issue.
-3. Suggest an improvement by creating an issue.
-4. Close resolved issues ([here's the big list](https://github.com/issues?q=is%3Aopen+user%3Agratipay+sort%3Aupdated-desc)).
-5. [Test the code](https://github.com/gratipay/gratipay.com/blob/master/README.md).
-6. Fix a bug/resolve an issue.
-7. Write a test.
-8. Add a comment to the code.
-11. Create an example.
-12. Answer a question.
-13. Write a blog post.
-14. Improve the website (either [gratipay.com](http://gratipay.com) or [inside.gratipay.com](http://inside.gratipay.com)).
+1. Follow the [Gratipay blog](https://medium.com/gratipay-blog).
+1. Diagnose a bug by creating an issue.
+1. Suggest an improvement by creating an issue.
+1. Close resolved issues ([here's the big list](https://github.com/issues?q=is%3Aopen+user%3Agratipay+sort%3Aupdated-desc)).
+1. [Test the code](https://github.com/gratipay/gratipay.com/blob/master/README.md).
+1. Fix a bug/resolve an issue.
+1. Write a test.
+1. Add a comment to the code.
+1. Create an example.
+1. Answer a question.
+1. Write a blog post.
+1. Improve the website (either [gratipay.com](http://gratipay.com) or [inside.gratipay.com](http://inside.gratipay.com)).
 
 ###More info
 If you want to really get involved, then check out our [full documentation for contributors](http://inside.gratipay.com/).

README.md

@@ -3,7 +3,7 @@
 [![Build Status](http://img.shields.io/travis/gratipay/gratipay.com/master.svg)](https://travis-ci.org/gratipay/gratipay.com)
 [![Open Bounties](https://api.bountysource.com/badge/team?team_id=423&style=bounties_received)](https://www.bountysource.com/teams/gratipay/issues)
 
-[Gratipay](http://gratipay.com) provides payments and payouts for open work,
+[Gratipay](http://gratipay.com) helps companies fund open source,
 in order to cultivate an economy of gratitude, generosity, and love.
 
 

templates/about-features.html

@@ -2,9 +2,7 @@
 {% block subnav %}
     {% set current_page = request.path.raw.split('/')[3] %}
     {% set nav_base = '/about/features' %}
-    {% set pages = [ ('/', _('Overview'))
-                   , ('/payments', _('Payments'))
-                   , ('/payroll', _('Payroll'))
+    {% set pages = [ ('/', _('Payments'))
                    , ('/dnt', _('Do Not Track'))
                     ] %}
     {% include "templates/nav.html" %}

tests/py/test_pages.py

@@ -112,7 +112,7 @@ def test_twitter_associate(self):
         assert self.client.GxT('/on/twitter/associate').code == 400
 
     def test_about(self):
-        expected = "We provide voluntary"
+        expected = "We help companies pay"
         actual = self.client.GET('/about/').body
         assert expected in actual
 
@@ -134,10 +134,7 @@ def test_about_teams_redirect(self):
         assert self.client.GxT('/about/features/teams/').code == 302
 
     def test_about_payments(self):
-        assert "Payments" in self.client.GET('/about/features/payments').body.decode('utf8')
-
-    def test_about_payroll(self):
-        assert "Payroll" in self.client.GET('/about/features/payroll').body.decode('utf8')
+        assert "Payments" in self.client.GET('/about/features/').body.decode('utf8')
 
     def test_404(self):
         response = self.client.GET('/about/four-oh-four.html', raise_immediately=False)

tests/ttw/test_homepage.py

@@ -7,14 +7,14 @@
 class Tests(BrowserHarness):
 
     def test_homepage_renders_copy_correctly_for_anon(self):
-        assert self.css('#content h1').html == 'Teams'
+        assert self.css('#content h1').html == 'Projects'
         assert self.css('#header .sign-in button').html.strip()[:7] == 'Sign in'
 
     def test_homepage_renders_copy_correctly_for_authed(self):
         self.make_participant('alice', claimed_time='now')
         self.sign_in('alice')
         self.reload()
-        assert self.css('#content h1').html == 'Teams'
+        assert self.css('#content h1').html == 'Projects'
         assert self.css('.you-are a').html.strip()[:6] == '~alice'
 
     def test_homepage_pops_the_welcome_modal_for_first_time_visitors(self):

www/about/features/index.spt

@@ -5,31 +5,152 @@ title = _("Features")
 {% extends "templates/about-features.html" %}
 {% block content %}
 
-<p>Gratipay provides voluntary <a
-    href="/about/features/payments">payments</a> and (eventually) <a
-href="/about/features/payroll">payroll</a> for open work. Read our <a
-href="/about/">site overview</a> for basic definitions.</p>
+<p>Gratipay offers a <a
+    href="https://en.wikipedia.org/wiki/Pay_what_you_want">voluntary</a> <a
+href="https://en.wikipedia.org/wiki/Subscription_business_model">subscription</a>
+<a href="https://en.wikipedia.org/wiki/Revenue_model">revenue model</a>,
+wherein projects receive weekly payments from companies, organizations, and
+individuals.</p>
 
 
-<h2>How do Payments Work?</h2>
+<h2 id="receiving">How do I use Gratipay to receive money?
+    <a class="permalink" title="permalink" href="#receiving">&#182;</a>
+</h2>
+
+<p><a href="/new">Apply for your project</a> to join Gratipay.</p>
+
+
+<h2 id="giving">How do I give money?
+    <a class="permalink" title="permalink" href="#giving">&#182;</a>
+</h2>
+
+<p><a href="/explore/teams/">Browse</a> or <a href="/search">search</a> for a
+project you want to give to, and then look for the prompt. Here's <a
+href="/introtopython/">introtopython</a>, for example:</p>
+
+<div><a href="/introtopython/"><img src="giving-prompt-anon.png"></a></div>
+
+<p>Then once you sign in:</p>
+
+<div><a href="/introtopython/"><img src="giving-prompt-auth.png"></a></div>
+
+
+<h2 id="when">When are payments run?
+    <a class="permalink" title="permalink" href="#when">&#182;</a>
+</h2>
+
+<p>We process payments once a week, on Thursdays. You can <a
+href="https://github.com/gratipay/inside.gratipay.com/issues?q=label%3APayday">follow
+along</a> each week.</p>
+
+
+<h2 id="currencies">What currencies do you support?
+    <a class="permalink" title="permalink" href="#currencies">&#182;</a>
+</h2>
+
+<p>We charge and pay out in USD.</p>
+
+
+<h2 id="methods">What payment methods do you support?
+    <a class="permalink" title="permalink" href="#methods">&#182;</a>
+</h2>
+
+<p>We are able to charge these brands of credit and debit card: Visa,
+MasterCard, Discover, JCB, and American Express.</p>
+
+<p>We pay out via PayPal.</p>
+
+
+<h2 id="fees">What are the payment fees?
+    <a class="permalink" title="permalink" href="#fees">&#182;</a>
+</h2>
+
+See <a href="/about/pricing">pricing</a>.
+
+
+<h2 id="limits">What are the payment limits?
+    <a class="permalink" title="permalink" href="#limits">&#182;</a>
+</h2>
+
+<p>The minimum you can give any one project is 1&#162; per week. The maximum is
+$1,000 per week, and is intended to reduce income volatility by reducing how
+dependent a project is on a few sources of income.</p>
+
+<p>Our minimum credit/debit card charge is $10. We <a
+    href="https://medium.com/gratipay-blog/charging-in-arrears-18cacf779bee#.z92kxeqt6">charge
+in arrears</a>. For example, we'll charge $10 (+ fees) at the end of ten weeks
+for a $1/wk subscription. This may cause your project's income to <a
+href="#receiving-less">fluctuate</a>.</p>
+
+
+<h2 id="promoting">What can I do to promote my project?
+    <a class="permalink" title="permalink" href="#promoting">&#182;</a>
+</h2>
+
+<p>Check out <a href="http://tractionbook.com/"><i>Traction</i></a>!</p>
+
+
+<h2 id="who">How do I see who is giving to my project?
+    <a class="permalink" title="permalink" href="#who">&#182;</a>
+</h2>
+
+<p>You can't. Payments are anonymous, to avoid the problem where people feel
+overly entitled to special treatment because they've given your project a
+little money.</p>
+
+<p>You <em>can</em> see overall statistics for your project under
+&ldquo;Receiving&rdquo; on your project page, including:</p>
+
+<ul>
+    <li>Funded Dues: incoming payments from givers who have not reached the <a href="#limits">charge threshold</a>, backed by working credit cards.</li>
+    <li>Unfunded Dues: incoming payments that are not backed by working credit cards.</li>
+    <li>Estimated payment for next week: payments that the project will receive next <a href="#when">payday</a>.</li>
+</ul>
+
+<h2 id="receiving-less">Why is my project receiving less now than it was before?
+    <a class="permalink" title="permalink" href="#receiving-less">&#182;</a>
+</h2>
+
+<p>If your project's income on Gratipay decreased, one of the following
+happened (most likely first):</p>
+
+<ol>
+    <li>Due to the way we handle <a href="#limits">minimum charges</a>, it's
+    possible that (for example) you might see a $10 payment every 10
+    weeks.</li>
+
+    <li>Someone decreased or entirely removed their payment to your project, or
+    their Gratipay account was closed. As Gratipay payments are anonymous, we
+    cannot tell you who.</li>
+
+    <li>Someone's credit card failed when we tried to charge it.</li>
+
+    <li>You have violated our <a href="https://gratipay.com/about/terms/">terms
+        of service</a>. We will have contacted you before terminating your
+    account.</li>
+
+    <li>We received a legal document ordering Gratipay to cease processing
+    payments for you. We will contact you unless prohibited by court
+    order.</li>
+
+</ol>
 
-<p>Gratipay implements a <a
-    href="https://en.wikipedia.org/wiki/Pay_what_you_want">voluntary</a> <a
-href="https://en.wikipedia.org/wiki/Subscription_business_model">subscription</a>
-<a href="https://en.wikipedia.org/wiki/Revenue_model">revenue model</a>.
-Payments are pay-what-you-want, and recurring.</p>
 
-<p><a href="./payments">Read more about payments</a>.</p>
+<h2 id="taxes">Is money I give through Gratipay tax-deductible?
+    <a class="permalink" title="permalink" href="#taxes">&#182;</a>
+</h2>
 
+<p>No.</p>
 
-<h2>How does Payroll Work?</h2>
 
-<p>To be honest ... it doesn't right now. But when we bring it back again,
-it will be based on the idea that everyone sets their own salary. Our
-payments are pay-what-you-want, and our payroll is
-&ldquo;take-what-you-want.&rdquo;</p>
+<h2 id="right-project">How do I know I am giving to the right project?
+    <a class="permalink" title="permalink" href="#right-project">&#182;</a>
+</h2>
 
-<p><a href="./payroll">Read more about payroll</a>.</p>
+<p>You can follow links to Gratipay from a trusted source like a company or
+organization's website. Also, Twitter verifies accounts in instances where this
+is particularly relevant, so check their Twitter account carefully if it's
+linked.</p>
 
 
 <h2>Other Features</h2>