Skip to content

Commit 30ff92a

Browse files
committed
New generated reference docs.
1 parent 2af30ab commit 30ff92a

File tree

5 files changed

+43
-25
lines changed

5 files changed

+43
-25
lines changed

docs/README.html

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -51,15 +51,14 @@ <h1>OpenTok Python SDK<a class="headerlink" href="#opentok-python-sdk" title="Pe
5151
<a class="reference external" href="http://tokbox.com/opentok/tutorials/create-session/">sessions</a> and
5252
<a class="reference external" href="http://tokbox.com/opentok/tutorials/create-token/">tokens</a> for <a class="reference external" href="http://www.tokbox.com/">OpenTok</a>
5353
applications, and <a class="reference external" href="http://www.tokbox.com/platform/archiving">archive</a> Opentok 2.0 sessions.</p>
54-
<p>If you are updating from a previous version of this SDK, see
55-
<a class="reference external" href="#important-changes-in-v22">Important changes in v2.2</a>.</p>
54+
<p>If you are updating from a previous version of this SDK, see &#8220;Important changes since v2.2.0&#8221; below.</p>
5655
<div class="section" id="installation-using-pip-recommended">
5756
<h2>Installation using Pip (recommended):<a class="headerlink" href="#installation-using-pip-recommended" title="Permalink to this headline"></a></h2>
5857
<p>Pip helps manage dependencies for Python projects using the PyPI index. Find more info here:
5958
<a class="reference external" href="http://www.pip-installer.org/en/latest/">http://www.pip-installer.org/en/latest/</a></p>
6059
<p>Add the <tt class="docutils literal"><span class="pre">opentok</span></tt> package as a dependency in your project. The most common way is to add it to your
6160
<tt class="docutils literal"><span class="pre">requirements.txt</span></tt> file:</p>
62-
<div class="highlight-python"><div class="highlight"><pre>opentok&gt;=2.2.0
61+
<div class="highlight-python"><div class="highlight"><pre>opentok&gt;=2.2.1
6362
</pre></div>
6463
</div>
6564
<p>Next, install the dependencies:</p>
@@ -86,12 +85,12 @@ <h3>Creating Sessions<a class="headerlink" href="#creating-sessions" title="Perm
8685
address, and <tt class="docutils literal"><span class="pre">media_mode</span></tt> which is a String (defined by the MediaModes class). This method returns
8786
a <tt class="docutils literal"><span class="pre">Session</span></tt> object. Its <tt class="docutils literal"><span class="pre">session_id</span></tt> attribute is useful when saving to a persistent store (such
8887
as a database).</p>
89-
<div class="code python highlight-python"><div class="highlight"><pre><span class="c"># Just a plain Session:</span>
90-
<span class="n">session</span> <span class="o">=</span> <span class="n">opentok</span><span class="o">.</span><span class="n">create_session</span><span class="p">()</span>
91-
<span class="c"># A Session that attempts to send streams directly between clients (falling back</span>
88+
<div class="code python highlight-python"><div class="highlight"><pre><span class="c"># Create a session that attempts to send streams directly between clients (falling back</span>
9289
<span class="c"># to use the OpenTok TURN server to relay streams if the clients cannot connect):</span>
93-
<span class="n">session</span> <span class="o">=</span> <span class="n">opentok</span><span class="o">.</span><span class="n">create_session</span><span class="p">(</span><span class="n">media_mode</span><span class="o">=</span><span class="n">MediaModes</span><span class="o">.</span><span class="n">relayed</span><span class="p">)</span>
94-
<span class="c"># A Session with a location hint</span>
90+
<span class="n">session</span> <span class="o">=</span> <span class="n">opentok</span><span class="o">.</span><span class="n">create_session</span><span class="p">()</span>
91+
<span class="c"># A session that uses the OpenTok Media Router:</span>
92+
<span class="n">session</span> <span class="o">=</span> <span class="n">opentok</span><span class="o">.</span><span class="n">create_session</span><span class="p">(</span><span class="n">media_mode</span><span class="o">=</span><span class="n">MediaModes</span><span class="o">.</span><span class="n">routed</span><span class="p">)</span>
93+
<span class="c"># A session with a location hint</span>
9594
<span class="n">session</span> <span class="o">=</span> <span class="n">opentok</span><span class="o">.</span><span class="n">create_session</span><span class="p">(</span><span class="n">location</span><span class="o">=</span><span class="s">u&#39;12.34.56.78&#39;</span><span class="p">)</span>
9695

9796
<span class="c"># Store this session ID in the database</span>
@@ -195,8 +194,15 @@ <h2>Release Notes<a class="headerlink" href="#release-notes" title="Permalink to
195194
<p>See the <a class="reference external" href="https://github.com/opentok/Opentok-Python-SDK/releases">Releases</a> page for details about
196195
each release.</p>
197196
</div>
198-
<div class="section" id="id1">
199-
<h2>Important changes in v2.2<a class="headerlink" href="#id1" title="Permalink to this headline"></a></h2>
197+
<div class="section" id="important-changes-since-v2-2">
198+
<h2>Important changes since v2.2<a class="headerlink" href="#important-changes-since-v2-2" title="Permalink to this headline"></a></h2>
199+
<p><strong>Changes in v2.2.1:</strong></p>
200+
<p>The default setting for the create_session() method is to create a session with the media mode set
201+
to relayed. In previous versions of the SDK, the default setting was to use the OpenTok Media Router
202+
(media mode set to routed). In a relayed session, clients will attempt to send streams directly
203+
between each other (peer-to-peer); if clients cannot connect due to firewall restrictions, the
204+
session uses the OpenTok TURN server to relay audio-video streams.</p>
205+
<p><strong>Changes in v2.2.0:</strong></p>
200206
<p>This version of the SDK includes support for working with OpenTok 2.0 archives. (This API does not
201207
work with OpenTok 1.0 archives.)</p>
202208
<p>The OpenTok.create_session() method now includes a media_mode parameter, instead of a p2p parameter.</p>
@@ -237,7 +243,7 @@ <h3><a href="index.html">Table Of Contents</a></h3>
237243
<li><a class="reference internal" href="#documentation">Documentation</a></li>
238244
<li><a class="reference internal" href="#requirements">Requirements</a></li>
239245
<li><a class="reference internal" href="#release-notes">Release Notes</a></li>
240-
<li><a class="reference internal" href="#id1">Important changes in v2.2</a></li>
246+
<li><a class="reference internal" href="#important-changes-since-v2-2">Important changes since v2.2</a></li>
241247
<li><a class="reference internal" href="#development-and-contributing">Development and Contributing</a></li>
242248
<li><a class="reference internal" href="#support">Support</a></li>
243249
</ul>

docs/_sources/README.txt

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ The OpenTok Python SDK lets you generate
1010
`tokens <http://tokbox.com/opentok/tutorials/create-token/>`_ for `OpenTok <http://www.tokbox.com/>`_
1111
applications, and `archive <http://www.tokbox.com/platform/archiving>`_ Opentok 2.0 sessions.
1212

13-
If you are updating from a previous version of this SDK, see
14-
`Important changes in v2.2 <#important-changes-in-v22>`_.
13+
If you are updating from a previous version of this SDK, see "Important changes since v2.2.0" below.
1514

1615
Installation using Pip (recommended):
1716
-------------------------------------
@@ -22,7 +21,7 @@ http://www.pip-installer.org/en/latest/
2221
Add the ``opentok`` package as a dependency in your project. The most common way is to add it to your
2322
``requirements.txt`` file::
2423

25-
opentok>=2.2.0
24+
opentok>=2.2.1
2625

2726
Next, install the dependencies::
2827

@@ -55,12 +54,12 @@ as a database).
5554

5655
.. code:: python
5756

58-
# Just a plain Session:
59-
session = opentok.create_session()
60-
# A Session that attempts to send streams directly between clients (falling back
57+
# Create a session that attempts to send streams directly between clients (falling back
6158
# to use the OpenTok TURN server to relay streams if the clients cannot connect):
62-
session = opentok.create_session(media_mode=MediaModes.relayed)
63-
# A Session with a location hint
59+
session = opentok.create_session()
60+
# A session that uses the OpenTok Media Router:
61+
session = opentok.create_session(media_mode=MediaModes.routed)
62+
# A session with a location hint
6463
session = opentok.create_session(location=u'12.34.56.78')
6564

6665
# Store this session ID in the database
@@ -177,8 +176,18 @@ Release Notes
177176
See the `Releases <https://github.com/opentok/Opentok-Python-SDK/releases>`_ page for details about
178177
each release.
179178

180-
Important changes in v2.2
181-
-------------------------
179+
Important changes since v2.2
180+
----------------------------
181+
182+
**Changes in v2.2.1:**
183+
184+
The default setting for the create_session() method is to create a session with the media mode set
185+
to relayed. In previous versions of the SDK, the default setting was to use the OpenTok Media Router
186+
(media mode set to routed). In a relayed session, clients will attempt to send streams directly
187+
between each other (peer-to-peer); if clients cannot connect due to firewall restrictions, the
188+
session uses the OpenTok TURN server to relay audio-video streams.
189+
190+
**Changes in v2.2.0:**
182191

183192
This version of the SDK includes support for working with OpenTok 2.0 archives. (This API does not
184193
work with OpenTok 1.0 archives.)

docs/docs/opentok.html

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,13 @@ <h2>Submodules<a class="headerlink" href="#submodules" title="Permalink to this
7575
<li><strong>status</strong> &#8211; <p>The status of the archive, which can be one of the following:</p>
7676
<ul>
7777
<li>&#8220;available&#8221; &#8211; The archive is available for download from the OpenTok cloud.</li>
78+
<li>&#8220;expired&#8221; &#8211; The archive is no longer available for download from the OpenTok cloud.</li>
7879
<li>&#8220;failed&#8221; &#8211; The archive recording failed.</li>
7980
<li>&#8220;started&#8221; &#8211; The archive started and is in the process of being recorded.</li>
8081
<li>&#8220;stopped&#8221; &#8211; The archive stopped recording.</li>
8182
<li>&#8220;uploaded&#8221; &#8211; The archive is available for download from the the upload target
82-
S3 bucket.</li>
83+
Amazon S3 bucket or Windows Azure container that you set at the
84+
<a class="reference external" href="https://dashboard.tokbox.com">OpenTok dashboard</a>.</li>
8385
</ul>
8486
</li>
8587
<li><strong>url</strong> &#8211; The download URL of the available MP4 file. This is only set for an archive with the status set to
@@ -235,7 +237,7 @@ <h2>Submodules<a class="headerlink" href="#submodules" title="Permalink to this
235237

236238
<dl class="method">
237239
<dt id="opentok.opentok.OpenTok.create_session">
238-
<tt class="descname">create_session</tt><big>(</big><em>location=None</em>, <em>media_mode=u'disabled'</em><big>)</big><a class="headerlink" href="#opentok.opentok.OpenTok.create_session" title="Permalink to this definition"></a></dt>
240+
<tt class="descname">create_session</tt><big>(</big><em>location=None</em>, <em>media_mode=u'enabled'</em><big>)</big><a class="headerlink" href="#opentok.opentok.OpenTok.create_session" title="Permalink to this definition"></a></dt>
239241
<dd><p>Creates a new OpenTok session and returns the session ID, which uniquely identifies
240242
the session.</p>
241243
<p>For example, when using the OpenTok JavaScript library, use the session ID when calling the
@@ -414,7 +416,8 @@ <h2>Submodules<a class="headerlink" href="#submodules" title="Permalink to this
414416
<p>Clients must be actively connected to the OpenTok session for you to successfully start
415417
recording an archive.</p>
416418
<p>You can only record one archive at a time for a given session. You can only record archives
417-
of OpenTok server-enabled sessions; you cannot archive peer-to-peer sessions.</p>
419+
of sessions that use the OpenTok Media Router (sessions witht the media mode set to routed);
420+
you cannot archive sessions witht the media mode set to relayed.</p>
418421
<table class="docutils field-list" frame="void" rules="none">
419422
<col class="field-name" />
420423
<col class="field-body" />

docs/objects.inv

0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)