commit d7b2d245e3e38b44d11d14b621d35ad8ee933249 Merge: b42f2f6 58c46c5 Author: Isis Lovecruft isis@torproject.org Date: Sat Dec 7 04:49:25 2013 +0000

Merge branch 'feature/sphinx-docs' into develop

doc/sphinx/Makefile | 153 +++++++++ doc/sphinx/ext/apilinks_sphinxext.py | 54 +++ doc/sphinx/source/_static/fonts/lato-black.woff | Bin 0 -> 48564 bytes doc/sphinx/source/_static/fonts/lato-bold.woff | Bin 0 -> 50472 bytes doc/sphinx/source/_static/fonts/lato-italic.woff | Bin 0 -> 51076 bytes doc/sphinx/source/_static/fonts/lato-regular.woff | Bin 0 -> 50112 bytes doc/sphinx/source/_static/no-google-fonts.css | 24 ++ doc/sphinx/source/bridgedb.Bridges.rst | 8 + doc/sphinx/source/bridgedb.Bucket.rst | 8 + doc/sphinx/source/bridgedb.Dist.rst | 8 + doc/sphinx/source/bridgedb.EmailServer.rst | 8 + doc/sphinx/source/bridgedb.Filters.rst | 8 + doc/sphinx/source/bridgedb.HTTPServer.rst | 8 + doc/sphinx/source/bridgedb.I18n.rst | 8 + doc/sphinx/source/bridgedb.Main.rst | 8 + doc/sphinx/source/bridgedb.Raptcha.rst | 8 + doc/sphinx/source/bridgedb.Stability.rst | 8 + doc/sphinx/source/bridgedb.Storage.rst | 10 + doc/sphinx/source/bridgedb.Tests.rst | 8 + doc/sphinx/source/bridgedb.Util.rst | 9 + doc/sphinx/source/bridgedb.crypto.rst | 8 + doc/sphinx/source/bridgedb.parse.rst | 13 + doc/sphinx/source/bridgedb.persistent.rst | 7 + doc/sphinx/source/bridgedb.rst | 25 ++ doc/sphinx/source/bridgedb.runner.rst | 8 + doc/sphinx/source/conf.py | 380 +++++++++++++++++++++ doc/sphinx/source/gen_bridge_descriptors.rst | 7 + doc/sphinx/source/index.rst | 27 ++ lib/bridgedb/HTTPServer.py | 2 +- lib/bridgedb/Main.py | 2 +- lib/bridgedb/__init__.py | 3 +- lib/bridgedb/parse/headers.py | 2 +- lib/bridgedb/parse/options.py | 2 +- lib/bridgedb/test/util.py | 2 +- scripts/gen_bridge_descriptors | 106 +++--- 35 files changed, 871 insertions(+), 61 deletions(-)