Merge branch 'modernization' of github.com:aoberoi/Opentok-Python-SDK into v2.2-docs

Conflicts:
	README.rst

Author: jeffswartz

LICENSE.txt

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2014 TokBox, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

README.rst

@@ -2,8 +2,8 @@
 OpenTok Python SDK
 ==================
 
-.. image:: https://travis-ci.org/aoberoi/Opentok-Python-SDK.svg?branch=modernization
-   :target: https://travis-ci.org/aoberoi/Opentok-Python-SDK
+.. image:: https://travis-ci.org/opentok/Opentok-Python-SDK.svg?branch=modernization
+   :target: https://travis-ci.org/opentok/Opentok-Python-SDK
 
 The OpenTok Python SDK lets you generate
 `sessions <http://tokbox.com/opentok/tutorials/create-session/>`_ and
@@ -149,6 +149,15 @@ instance of the ``ArchiveList`` class.
   # Get the total number of Archives for this API Key
   total = archive_list.total
 
+Samples
+-------
+
+There are two sample applications included in this repository. To get going as fast as possible, clone the whole
+repository and follow the Walkthroughs:
+
+- `HelloWorld <sample/HelloWorld/README.md>`_
+- `Archiving <sample/Archiving/README.md>`_
+
 Documentation
 -------------
 

sample/Archiving/templates/participant.html

@@ -49,8 +49,8 @@ <h3 class="panel-title">Instructions</h3>
   </div>
 
     <script>
-        var sessionId = "{{ sessionId }}";
-        var apiKey = "{{ apiKey }}";
+        var sessionId = "{{ session_id }}";
+        var apiKey = "{{ api_key }}";
         var token = "{{ token }}";
     </script>
     <script src="{{ url_for('static', filename='js/participant.js') }}"></script>

setup.py

@@ -36,7 +36,7 @@ def find_version(*file_paths):
 
     author='TokBox, Inc.',
     author_email='[email protected]',
-    license='MIT',
+    license='LICENSE.txt',
 
     classifiers = [
         'Development Status :: 5 - Production/Stable',