commit 9a9b229b8106418ffb8ff41f5b3ea8ad3e7d713a Author: aagbsn aagbsn@extc.org Date: Fri Nov 30 15:15:30 2012 +0000

Update reference to module txscapy in ooni documentation

* txscapy was moved to ooni/utils from ooni/lib --- docs/source/api/ooni.lib.rst | 8 -------- docs/source/api/ooni.utils.rst | 7 +++++++ 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/docs/source/api/ooni.lib.rst b/docs/source/api/ooni.lib.rst index 79b65be..2fdb61f 100644 --- a/docs/source/api/ooni.lib.rst +++ b/docs/source/api/ooni.lib.rst @@ -9,14 +9,6 @@ lib Package :undoc-members: :show-inheritance:

-:mod:`txscapy` Module ---------------------- - -.. automodule:: ooni.lib.txscapy - :members: - :undoc-members: - :show-inheritance: - :mod:`txtraceroute` Module --------------------------

diff --git a/docs/source/api/ooni.utils.rst b/docs/source/api/ooni.utils.rst index 4478eaa..9f8b374 100644 --- a/docs/source/api/ooni.utils.rst +++ b/docs/source/api/ooni.utils.rst @@ -105,6 +105,13 @@ utils Package :undoc-members: :show-inheritance:

+:mod:`txscapy` Module +--------------------- + +.. automodule:: ooni.utils.txscapy + :members: + :undoc-members: + :show-inheritance: .. XXX this is commented out because it triggers this error gcooni/utils/onion.py:docstring of