commit 38adeda918ffc1367ec8eb8dc0002bd737ad95c6 Merge: 2a21ec5 8badba1 Author: Damian Johnson atagar@torproject.org Date: Tue Jun 5 21:28:53 2012 -0700

Merging changes for sphinx documentation

.gitignore | 3 + docs/Makefile | 133 +++++++++ docs/conf.py | 223 +++++++++++++++ docs/index.rst | 62 ++++ stem/__init__.py | 6 + stem/connection.py | 475 +++++++++++++++---------------- stem/control.py | 144 ++++------ stem/descriptor/__init__.py | 74 +++--- stem/descriptor/extrainfo_descriptor.py | 275 +++++++++--------- stem/descriptor/reader.py | 110 ++++---- stem/descriptor/server_descriptor.py | 212 +++++++-------- stem/process.py | 87 +++--- stem/response/__init__.py | 206 +++++++------- stem/response/getinfo.py | 3 +- stem/response/protocolinfo.py | 47 ++-- stem/socket.py | 209 ++++++-------- stem/util/conf.py | 304 ++++++++++---------- stem/util/connection.py | 26 +-- stem/util/enum.py | 113 ++++---- stem/util/log.py | 86 +++--- stem/util/proc.py | 140 ++++------ stem/util/system.py | 124 ++++----- stem/util/term.py | 27 +-- stem/util/tor_tools.py | 14 +- stem/version.py | 69 +++--- 25 files changed, 1714 insertions(+), 1458 deletions(-)