From ecae8b0288d74ffe16466a47c7f4f1dddf36d0b4 Mon Sep 17 00:00:00 2001
From: Roy Hyunjin Han <starsareblueandfaraway@gmail.com>
Date: Mon, 7 Jan 2013 16:46:12 -0500
Subject: [PATCH] Updated TODO

---
 README.rst | 17 +++++++++++------
 TODO.rst   |  7 +++++++
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/README.rst b/README.rst
index bba2b1d..5ed4179 100644
--- a/README.rst
+++ b/README.rst
@@ -38,7 +38,7 @@ Emit. ::
 
     socketIO = SocketIO('localhost', 8000)
     socketIO.emit('aaa', {'bbb': 'ccc'})
-    socketIO.wait(seconds=1)
+    socketIO.wait(seconds=1)  # Exit after one second
 
 Emit with callback. ::
 
@@ -49,7 +49,7 @@ Emit with callback. ::
 
     socketIO = SocketIO('localhost', 8000)
     socketIO.emit('aaa', {'bbb': 'ccc'}, on_response)
-    socketIO.wait(forCallbacks=True)
+    socketIO.wait(forCallbacks=True)  # Exit after callbacks run
 
 Define events. ::
 
@@ -60,7 +60,7 @@ Define events. ::
 
     socketIO = SocketIO('localhost', 8000)
     socketIO.on('ddd', on_ddd)
-    socketIO.wait()
+    socketIO.wait()  # Loop until CTRL-C
 
 Define events in a namespace. ::
 
@@ -72,7 +72,7 @@ Define events in a namespace. ::
             self.socketIO.emit('eee', {'fff': 'ggg'})
 
     socketIO = SocketIO('localhost', 8000, Namespace)
-    socketIO.wait()
+    socketIO.wait()  # Loop until CTRL-C
 
 Define standard events. ::
 
@@ -93,7 +93,7 @@ Define standard events. ::
             print '[Message] %s: %s' % (id, message)
 
     socketIO = SocketIO('localhost', 8000, Namespace)
-    socketIO.wait()
+    socketIO.wait()  # Loop until CTRL-C
 
 Define different behavior for different channels on a single socket. ::
 
@@ -117,8 +117,13 @@ Define different behavior for different channels on a single socket. ::
     mainSocket = SocketIO('localhost', 8000, MainNamespace)
     chatSocket = mainSocket.connect('/chat', ChatNamespace)
     newsSocket = mainSocket.connect('/news', NewsNamespace)
-    mainSocket.wait()
+    mainSocket.wait()  # Loop until CTRL-C
 
+Open secure websockets (HTTPS / WSS) behind a proxy. ::
+
+    SocketIO('localhost', 8000, 
+        secure=True,
+        proxies={'http': 'http://proxy.example.com:8080'})
 
 License
 -------
diff --git a/TODO.rst b/TODO.rst
index e69de29..e3e5408 100644
--- a/TODO.rst
+++ b/TODO.rst
@@ -0,0 +1,7 @@
+Let user define a proxy #5
+Let user emit without arguments #5
+Review forks
+    Integrate Zac's fork #6
+    Integrate Sajal's fork #7
+    Integrate Francis's fork #10
+    Investigate #8