Merge branch 'master' of github.com:mozilla-services/pywebpush into bug/03

Author: jrconlin

README.md

@@ -37,7 +37,8 @@ JSON, etc), but be sure that your receiving application is able to
 parse and understand it. (e.g. `data = "Mary had a little lamb."`)
 
 gcm_key is the API key obtained from the Google Developer Console.
-It is only needed if endpoint is https://android.googleapis.com/gcm/send
+It is only needed if endpoint is
+https://android.googleapis.com/gcm/send
 
 `headers` is a `dict`ionary of additional HTTP header values (e.g.
 [VAPID](https://github.com/mozilla-services/vapid/tree/master/python)

pywebpush/__init__.py

@@ -156,6 +156,10 @@ def send(self, data, headers={}, ttl=0, gcm_key=None, reg_id=None):
         """Encode and send the data to the Push Service.
 
         :param data: A serialized block of data (see encode() ).
+        :param gcm_key: API key obtained from the Google Developer Console.
+            Needed if endpoint is https://android.googleapis.com/gcm/send
+        :param reg_id: registration id of the recipient. If not provided,
+            it will be extracted from the endpoint.
         :param headers: A dictionary containing any additional HTTP headers.
         :param ttl: The Time To Live in seconds for this message if the
             recipient is not online. (Defaults to "0", which discards the