Update docs for TwiML message generation

skimbrel · skimbrel · commit f60e4b7980e6 · 2013-11-04T17:14:42.000-08:00
diff --git a/docs/api/twiml.rst b/docs/api/twiml.rst
@@ -42,7 +42,7 @@ Secondary Verbs
 .. autoclass:: twilio.twiml.Pause
    :members:
 
-.. autoclass:: twilio.twiml.Sms
+.. autoclass:: twilio.twiml.Message
    :members:
 
 .. autoclass:: twilio.twiml.Enqueue
diff --git a/docs/usage/twiml.rst b/docs/usage/twiml.rst
@@ -45,6 +45,25 @@ All attributes are keyword arguments.
         <Play loop="3">https://api.twilio.com/cowbell.mp3</Play>
     <Response>
 
+The Message and Sms verbs are slightly special: because :const:`from` is a
+Python keyword, use the :const:`sender` parameter to specify the number
+the message should come from:
+
+.. code-block:: python
+
+    from twilio import twiml
+
+    r = twiml.Response()
+    m = r.message("Hello MMS Monkey!", sender="+14155551234")
+    print str(r)
+
+.. code-block:: xml
+
+    <?xml version="1.0" encoding="utf-8"?>
+    <Response>
+        <Message from="+14155551234">Hello MMS Monkey!</Message>
+    <Response>
+
 Python 2.6+ added the :const:`with` statement for context management.
 Using :const:`with`, the module can *almost* emulate Ruby blocks.
 
