stop talking about payroll

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 payroll for open work,
+[Gratipay](http://gratipay.com) provides payments for open work,
 in order to cultivate an economy of gratitude, generosity, and love.
 If you'd like to learn more, check out <https://gratipay.com/about>.
 If you'd like to contribute to Gratipay, check out <http://inside.gratipay.com>.

gratipay/billing/exchanges.py

@@ -203,7 +203,7 @@ def get_ready_payout_routes_by_network(db, network):
                 p.status_of_1_0_payout='pending-payout'
 
 
-                ----- TODO: Include members on payroll once process_payroll is implemented
+                ----- TODO: Include takes once process_takes is implemented
 
                )
     """, (network,))

gratipay/billing/payday.py

@@ -288,7 +288,7 @@ def transfer_takes(cursor, ts_start):
 
     @staticmethod
     def process_draws(cursor):
-        """Send whatever remains after payroll to the team owner.
+        """Send whatever remains after takes to the team owner.
         """
         log("Processing draws.")
         cursor.run("UPDATE payday_teams SET is_drained=true;")

gratipay/models/participant/__init__.py

@@ -1,4 +1,4 @@
-"""Participants on Gratipay give payments and take payroll.
+"""Participants on Gratipay give and take payments.
 """
 from __future__ import print_function, unicode_literals
 
@@ -1590,7 +1590,7 @@ def to_dict(self, details=False, inquirer=None):
 
         # Key: taking
         # Values:
-        #   3.00 - user takes this amount in payroll
+        #   3.00 - user takes this amount
         output['taking'] = str(self.taking)
         output['ntaking_from'] = self.ntaking_from
 

gratipay/models/team.py

@@ -1,4 +1,4 @@
-"""Teams on Gratipay receive payments and distribute payroll.
+"""Teams on Gratipay receive and distribute payments.
 """
 import re
 from decimal import Decimal
@@ -271,7 +271,7 @@ def update_receiving(self, cursor=None):
         """, dict(slug=self.slug))
 
 
-        # This next step is easy for now since we don't have payroll.
+        # This next step is easy for now since we don't have takes.
         from gratipay.models.participant import Participant
         Participant.from_username(self.owner).update_taking(cursor or self.db)
 

www/~/%username/settings/close.spt

@@ -79,8 +79,8 @@ elif nteams == 1:
                 href="https://github.com/gratipay/gratipay.com/issues/397">data
                 retention policy</a>).</p>
 
-        <p>Things we clear immediately include your profile statement, 
-        the payroll you're taking, and the payments you're giving.</p>
+        <p>Things we clear immediately include your profile statement, and the
+        payments you're giving and taking.</p>
 
         <p>We specifically <i>don't</i> delete your past giving and 
         taking history on the site, because that information also belongs