MC6
diff --git a/‎docs/usage/token-generation.rst
Lines changed: 18 additions & 6 deletions b/‎docs/usage/token-generation.rst
Lines changed: 18 additions & 6 deletions
diff --git a/‎twilio/rest/resources.py
Lines changed: 18 additions & 10 deletions b/‎twilio/rest/resources.py
Lines changed: 18 additions & 10 deletions
@@ -4,16 +4,26 @@
 Generate Capability Tokens
 ===========================
 
-`Twilio Client <http://www.twilio.com/api/client>`_ allows you to make and recieve connections in the browser. You can place a call to a phone on the PSTN network, all without leaving your browser. See the `Twilio Client Quickstart <http:/www.twilio.com/docs/quickstart/client>`_ to get up and running with Twilio Client.
+`Twilio Client <http://www.twilio.com/api/client>`_ allows you to make and
+recieve connections in the browser. You can place a call to a phone on the PSTN
+network, all without leaving your browser. See the `Twilio Client Quickstart
+<http:/www.twilio.com/docs/quickstart/client>`_ to get up and running with
+Twilio Client.
 
-Capability tokens are used by `Twilio Client <http://www.twilio.com/api/client>`_ to provide connection security and authorization. The `Capability Token documentation <http://www.twilio.con/docs/tokens>`_ explains indepth the purpose and features of these tokens.
+Capability tokens are used by `Twilio Client
+<http://www.twilio.com/api/client>`_ to provide connection
+security and authorization. The `Capability Token documentation
+of these tokens.
 
-:class:`TwilioCapability` is responsible for the creation of these capability tokens. You'll need your Twilio AccountSid and AuthToken.
+:class:`TwilioCapability` is responsible for the creation of these capability
+tokens. You'll need your Twilio AccountSid and AuthToken.
 
 .. code-block:: python
 
     from twilio.util import TwilioCapability
 
+    # Find these values at twilio.com/user/account
     account_sid = "AC123123"
     auth_token = "secret"
 
@@ -37,7 +47,7 @@ To make an outgoing connection from a `Twilio Client <http://www.twilio.com/api/
 
 .. code-block:: python
 
-    application_sid = "AP123123" # Twilio Application Sid
+    application_sid = "APabe7650f654fc34655fc81ae71caa3ff" # Twilio Application Sid
     capability.allow_client_outgoing(application_sid)
 
 Generate a Token
@@ -47,10 +57,12 @@ Generate a Token
 
     token = capability.generate()
 
-By default, this token will expire in one hour. If you'd like to change the token expiration, :meth:`generate` takes an optional :attr:`expires` argument.
+By default, this token will expire in one hour. If you'd like to change the
+token expiration, :meth:`generate` takes an optional :attr:`expires` argument.
 
 .. code-block:: python
 
     token = capability.generate(expires=600)
 
-This token will now expire in 10 minutes. If you haven't guessed already, :attr:`expires` is expressed in seconds.
+This token will now expire in 10 minutes. If you haven't guessed already,
+:attr:`expires` is expressed in seconds.
@@ -133,7 +133,7 @@ def make_request(method, url,
             url = '%s&%s' % (url, enc_params)
         else:
             url = '%s?%s' % (url, enc_params)
-    
+
     resp, content = http.request(url, method, headers=headers, body=data)
 
     # Format httplib2 reqeusts as reqeusts objects
@@ -269,7 +269,16 @@ def get_instance(self, sid):
 
     def get_instances(self, params=None, page=None, page_size=None):
         """
-        Query the list resource for a list of InstanceResources
+        Query the list resource for a list of InstanceResources.
+
+        Raises a TwilioRestException if requesting a page of results that does
+        not exist.
+
+        :param dict params: List of URL parameters to be included in request
+        :param int page: The page of results to retrieve (most recent at 0)
+        :param int page_size: The number of results to be returned.
+
+        :returns: -- the list of resources
         """
         params = params or {}
 
@@ -290,7 +299,7 @@ def create_instance(self, body):
         """
         Create an InstanceResource via a POST to the List Resource
 
-        :param dict body: Dictoionary of POST data
+        :param dict body: Dictionary of POST data
         """
         resp, instance = self.request("POST", self.uri, data=body)
 
@@ -350,7 +359,6 @@ def load_instance(self, data):
         instance.load_subresources()
         return instance
 
-
 class AvailablePhoneNumber(InstanceResource):
     """ An available phone number resource """
 
@@ -729,7 +737,7 @@ def list(self, phone_number=None, friendly_name=None, **kwargs):
             "PhoneNumber": phone_number,
             "FrienldyName": friendly_name,
             })
-        return self.get_instances(params=params, **kwargs) 
+        return self.get_instances(params=params, **kwargs)
 
     def update(self, sid, friendly_name=None):
         """
@@ -782,7 +790,7 @@ def load(self, entries):
 
         # Only check if entries has a uri
         if "account_sid" in entries:
-        
+
             # Parse the parent's uri to get the scheme and base
             uri = re.sub(r'AC(.*)', entries["account_sid"],
                 self.parent.base_uri)
@@ -912,7 +920,7 @@ def transfer(self, sid, account_sid):
         Transfer the phone number with sid from the current account to another
         identified by account_sid
         """
-        return self.update(sid, account_sid=account_sid) 
+        return self.update(sid, account_sid=account_sid)
 
     def update(self, sid, api_version=None, voice_url=None, voice_method=None,
                voice_fallback_url=None, voice_fallback_method=None,
@@ -968,7 +976,7 @@ def update(self, voice_url=None, voice_method=None, sms_url=None,
         """
         Update your Twilio Sandbox
         """
-        data = transform_params({
+        body = transform_params({
                 "VoiceUrl": voice_url,
                 "VoiceMethod": voice_method,
                 "SmsUrl": sms_url,
@@ -1028,9 +1036,9 @@ def list(self, to=None, from_=None, before=None, after=None, **kwargs):
         paging informtion see :class:`ListResource`.
 
         :param to: Only show SMS messages to this phone number.
-        :param from_: Onlye show SMS message from this phone number.
+        :param from_: Only show SMS messages from this phone number.
         :param date after: Only list recordings logged after this datetime
-        :param date before: Only list recordings logger before this datetime
+        :param date before: Only list recordings logged before this datetime
         """
         params = transform_params({
             "To": to,