Merge remote-tracking branch 'upstream/master'

alexcchan · alexcchan · commit 2410adfab5df · 2012-06-02T21:41:38.000-05:00
diff --git a/docs/usage/accounts.rst b/docs/usage/accounts.rst
@@ -23,8 +23,8 @@ Use the :meth:`Account.update` to modify one of your accounts. Right now the onl
     AUTH_TOKEN = "YYYYYYYYYYYYYYYYYY"
 
     client = TwilioRestClient(ACCOUNT_SID, AUTH_TOKEN)
-    account = client.accounts.get()
-    account.update(name="My Awesome Account")
+    account = client.accounts.get(ACCOUNT_SID)
+    account.update(friendly_name="My Awesome Account")
 
 Creating Subaccounts
 ----------------------
diff --git a/twilio/twiml.py b/twilio/twiml.py
@@ -81,7 +81,6 @@ def xml(self):
         return el
 
     def append(self, verb):
-        print self.nestables
         if not self.nestables or verb.name not in self.nestables:
             raise TwimlException("%s is not nestable inside %s" % \
                 (verb.name, self.name))
