Skip to content

Commit

Permalink
Typo fixes and additional links
Browse files Browse the repository at this point in the history
  • Loading branch information
Kevin Burke committed Oct 16, 2012
1 parent 5916137 commit b9a208e
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 11 deletions.
14 changes: 8 additions & 6 deletions docs/browser.rst
Expand Up @@ -6,7 +6,7 @@ Into the Browser
Using Twilio Client
-------------------

Using Twilio Client, we can be hooked into the full power of the Twilio API
Using Twilio Client, we can hook in to the full power of the Twilio API
from your Web Browser. This includes the ability to make and receive phone
calls, opening up the world of telephony to your dynamic web applications.

Expand All @@ -19,17 +19,17 @@ How Client Works

This is what an outbound Client call looks like:

1. Your server creates a Capability Token with the Application Sid you would
1. Your server creates a `Capability Token`_ with the Application Sid you would
like to use to handle outbound calls.
2. User triggers a ``connect()`` action in the ``twilio.js`` Javascript library.
2. A user triggers a ``connect()`` action in the ``twilio.js`` Javascript library.
3. Twilio looks up the Application Sid for the Client, and retrieves the Voice
URL for that application.
4. Twilio makes an HTTP request to the Voice URL and plays the TwiML it
retrieves back to the user's browser.

To connect an inbound call to your Client browser, generate a Capability Token
that allows incoming connections. Then return this TwiML in response to an
inbound call:
To connect an inbound call to your Client browser, generate a `Capability
Token`_ that allows incoming connections. Then return this TwiML in response to
an inbound call:

.. code-block:: xml
Expand All @@ -39,6 +39,8 @@ inbound call:
</Dial>
</Response>
.. _Capability Token: http://www.twilio.com/docs/client/capability-tokens

Creating an Application
-----------------------

Expand Down
10 changes: 5 additions & 5 deletions docs/callin.rst
Expand Up @@ -265,15 +265,15 @@ Parameter Description
QueuePosition The current queue position for the enqueued call.
QueueSid The SID of the Queue that the caller is in.
QueueTime The time in seconds that the caller has been in the queue.
AvgQueueTime An average of how long time the current enqueued callers has been in the queue.
AvgQueueTime The average amount of time the currently enqueued callers have been in the queue.
CurrentQueueSize The current number of enqueued calls in this queue.
================ ===========

Utilizing this information, we can inform our users what position they are in
the queue and how long they can expect to wait before an answer.
Using this information, we can inform our users what position they are in the
queue and how long they can expect to wait before an answer.

Remember to change the ``waitUrlMethod`` from ``GET`` to ``POST`` now that we are using
``POST`` data for the ``waitUrl``
Remember to change the ``waitUrlMethod`` from ``GET`` to ``POST`` now that we
are using ``POST`` data for the ``waitUrl``.

.. code-block:: python
:emphasize-lines: 12, 15-22
Expand Down

0 comments on commit b9a208e

Please sign in to comment.