Merge branch 'master' into sipout-twiml

Kevin Burke · Kevin Burke · commit 39a366962b86 · 2013-03-06T21:26:47.000-08:00
diff --git a/docs/usage/conferences.rst b/docs/usage/conferences.rst
@@ -26,7 +26,7 @@ Listing Conferences
 Filtering Conferences
 -----------------------
 
-The :meth:`Conferences.list` method supports filtering on :attr:`status`, :attr:`date_updated`, :attr:`date_created` and :attr:`friendly_name`. The following code will return a list of all active conferences and print their friendly name.
+The :meth:`Conferences.list` method supports filtering on :attr:`status`, :attr:`date_updated`, :attr:`date_created` and :attr:`friendly_name`. The following code will return a list of all in-progress conferences and print their friendly name.
 
 .. code-block:: python
 
@@ -37,7 +37,7 @@ The :meth:`Conferences.list` method supports filtering on :attr:`status`, :attr:
     AUTH_TOKEN = "YYYYYYYYYYYYYYYYYY"
 
     client = TwilioRestClient(ACCOUNT_SID, AUTH_TOKEN)
-    conferences = client.conferences.list(status="active")
+    conferences = client.conferences.list(status="in-progress")
 
     for conference in conferences:
         print conference.friendly_name
diff --git a/docs/usage/phone-numbers.rst b/docs/usage/phone-numbers.rst
@@ -95,7 +95,7 @@ If you've found a phone number you want, you can purchase the number.
     AUTH_TOKEN = "YYYYYYYYYYYYYYYYYY"
 
     client = TwilioRestClient(ACCOUNT_SID, AUTH_TOKEN)
-    number = client.phone_numbers.purchase("+15305431234")
+    number = client.phone_numbers.purchase(phone_number="+15305431234")
 
 However, it's easier to purchase numbers after finding them using search (as
 shown in the first example).
