Skip to content

Commit df5364a

Browse files
aoberoiaoberoi
committed
Merge branch 'aoberoi-issue-52'
2 parents ea2d9ea + f7d0e35 commit df5364a

File tree

52 files changed

+525
-501
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+525
-501
lines changed

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,11 @@ The `getSessionId()` method of the `OpenTok\Session` instance returns the sessio
6565
which you use to identify the session in the OpenTok client libraries.
6666

6767
```php
68-
// Just a plain Session
68+
// Create a session that attempts to use peer-to-peer streaming:
6969
$session = $openTok->createSession();
70-
// A Session that attempts to use peer-to-peer streaming
71-
$session = $openTok->createSession(array( 'mediaMode' => MediaMode::RELAYED ));
72-
// A Session with a location hint
70+
// A session that uses the OpenTok Media Router:
71+
$session = $openTok->createSession(array( 'mediaMode' => MediaMode::ROUTED ));
72+
// A session with a location hint:
7373
$session = $openTok->createSession(array( 'location' => '12.34.56.78' ));
7474

7575
// Store this sessionId in the database for later use

‎docs/classes/OpenTok.Archive.html‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@
114114
<ul class="dropdown-menu">
115115
<li>
116116
<a href="../reports/errors.html">
117-
<i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">22</span>
117+
<i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">24</span>
118118
</a>
119119
</li>
120120
<li>
@@ -144,28 +144,28 @@
144144
<div class="accordion" style="margin-bottom: 0">
145145
<div class="accordion-group">
146146
<div class="accordion-heading">
147-
<a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1762844904"></a>
147+
<a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-720410790"></a>
148148
<a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
149149
</div>
150-
<div id="namespace-1762844904" class="accordion-body collapse in">
150+
<div id="namespace-720410790" class="accordion-body collapse in">
151151
<div class="accordion-inner">
152152

153153
<div class="accordion" style="margin-bottom: 0">
154154
<div class="accordion-group">
155155
<div class="accordion-heading">
156-
<a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-769592831"></a>
156+
<a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1772829201"></a>
157157
<a href="../namespaces/OpenTok.html" style="margin-left: 30px; padding-left: 0">OpenTok</a>
158158
</div>
159-
<div id="namespace-769592831" class="accordion-body collapse ">
159+
<div id="namespace-1772829201" class="accordion-body collapse ">
160160
<div class="accordion-inner">
161161

162162
<div class="accordion" style="margin-bottom: 0">
163163
<div class="accordion-group">
164164
<div class="accordion-heading">
165-
<a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1213787515"></a>
165+
<a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1510364022"></a>
166166
<a href="../namespaces/OpenTok.Exception.html" style="margin-left: 30px; padding-left: 0">Exception</a>
167167
</div>
168-
<div id="namespace-1213787515" class="accordion-body collapse ">
168+
<div id="namespace-1510364022" class="accordion-body collapse ">
169169
<div class="accordion-inner">
170170

171171

@@ -742,7 +742,7 @@ <h1><i class="icon-pushpin"></i></h1>
742742
<section class="span10 offset1">
743743
<hr />
744744
Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
745-
on May 21st, 2014 at 12:59.
745+
on June 16th, 2014 at 23:01.
746746
</section>
747747
</section>
748748
</section>

‎docs/classes/OpenTok.ArchiveList.html‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@
114114
<ul class="dropdown-menu">
115115
<li>
116116
<a href="../reports/errors.html">
117-
<i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">22</span>
117+
<i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">24</span>
118118
</a>
119119
</li>
120120
<li>
@@ -144,28 +144,28 @@
144144
<div class="accordion" style="margin-bottom: 0">
145145
<div class="accordion-group">
146146
<div class="accordion-heading">
147-
<a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1483251242"></a>
147+
<a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1188009187"></a>
148148
<a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
149149
</div>
150-
<div id="namespace-1483251242" class="accordion-body collapse in">
150+
<div id="namespace-1188009187" class="accordion-body collapse in">
151151
<div class="accordion-inner">
152152

153153
<div class="accordion" style="margin-bottom: 0">
154154
<div class="accordion-group">
155155
<div class="accordion-heading">
156-
<a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-892184544"></a>
156+
<a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1888721302"></a>
157157
<a href="../namespaces/OpenTok.html" style="margin-left: 30px; padding-left: 0">OpenTok</a>
158158
</div>
159-
<div id="namespace-892184544" class="accordion-body collapse ">
159+
<div id="namespace-1888721302" class="accordion-body collapse ">
160160
<div class="accordion-inner">
161161

162162
<div class="accordion" style="margin-bottom: 0">
163163
<div class="accordion-group">
164164
<div class="accordion-heading">
165-
<a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1119331677"></a>
165+
<a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1041245286"></a>
166166
<a href="../namespaces/OpenTok.Exception.html" style="margin-left: 30px; padding-left: 0">Exception</a>
167167
</div>
168-
<div id="namespace-1119331677" class="accordion-body collapse ">
168+
<div id="namespace-1041245286" class="accordion-body collapse ">
169169
<div class="accordion-inner">
170170

171171

@@ -422,7 +422,7 @@ <h1><i class="icon-pushpin"></i></h1>
422422
<section class="span10 offset1">
423423
<hr />
424424
Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
425-
on May 21st, 2014 at 12:59.
425+
on June 16th, 2014 at 23:01.
426426
</section>
427427
</section>
428428
</section>

‎docs/classes/OpenTok.Exception.ArchiveAuthenticationException.html‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@
114114
<ul class="dropdown-menu">
115115
<li>
116116
<a href="../reports/errors.html">
117-
<i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">22</span>
117+
<i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">24</span>
118118
</a>
119119
</li>
120120
<li>
@@ -144,28 +144,28 @@
144144
<div class="accordion" style="margin-bottom: 0">
145145
<div class="accordion-group">
146146
<div class="accordion-heading">
147-
<a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-4250790"></a>
147+
<a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1996388462"></a>
148148
<a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
149149
</div>
150-
<div id="namespace-4250790" class="accordion-body collapse in">
150+
<div id="namespace-1996388462" class="accordion-body collapse in">
151151
<div class="accordion-inner">
152152

153153
<div class="accordion" style="margin-bottom: 0">
154154
<div class="accordion-group">
155155
<div class="accordion-heading">
156-
<a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1827173021"></a>
156+
<a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1257714281"></a>
157157
<a href="../namespaces/OpenTok.html" style="margin-left: 30px; padding-left: 0">OpenTok</a>
158158
</div>
159-
<div id="namespace-1827173021" class="accordion-body collapse ">
159+
<div id="namespace-1257714281" class="accordion-body collapse ">
160160
<div class="accordion-inner">
161161

162162
<div class="accordion" style="margin-bottom: 0">
163163
<div class="accordion-group">
164164
<div class="accordion-heading">
165-
<a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-375955245"></a>
165+
<a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-282406681"></a>
166166
<a href="../namespaces/OpenTok.Exception.html" style="margin-left: 30px; padding-left: 0">Exception</a>
167167
</div>
168-
<div id="namespace-375955245" class="accordion-body collapse ">
168+
<div id="namespace-282406681" class="accordion-body collapse ">
169169
<div class="accordion-inner">
170170

171171

@@ -421,7 +421,7 @@ <h1><i class="icon-pushpin"></i></h1>
421421
<section class="span10 offset1">
422422
<hr />
423423
Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
424-
on May 21st, 2014 at 12:59.
424+
on June 16th, 2014 at 23:01.
425425
</section>
426426
</section>
427427
</section>

0 commit comments

Comments
 (0)