aboutsummaryrefslogtreecommitdiffstats
path: root/docs/scripting
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@corte.si>2016-10-19 15:03:50 +1300
committerGitHub <noreply@github.com>2016-10-19 15:03:50 +1300
commit49346c5248b8aa33acef26f0d55f51dcd2493a59 (patch)
treee92c9ac66a83fed5cf964691e5b0e81b90fc1eea /docs/scripting
parent83dbefb224c0b0d77b226f80e37b5b3d6bebb703 (diff)
parent7c32d4ea2a435484e83aa459831f74ca483d8e3c (diff)
downloadmitmproxy-49346c5248b8aa33acef26f0d55f51dcd2493a59.tar.gz
mitmproxy-49346c5248b8aa33acef26f0d55f51dcd2493a59.tar.bz2
mitmproxy-49346c5248b8aa33acef26f0d55f51dcd2493a59.zip
Merge pull request #1632 from cortesi/refactor
Start rationalising our module structure bit by bit
Diffstat (limited to 'docs/scripting')
-rw-r--r--docs/scripting/api.rst8
-rw-r--r--docs/scripting/overview.rst2
2 files changed, 6 insertions, 4 deletions
diff --git a/docs/scripting/api.rst b/docs/scripting/api.rst
index abc9ff3e..59ef8d95 100644
--- a/docs/scripting/api.rst
+++ b/docs/scripting/api.rst
@@ -11,8 +11,8 @@ API
- `mitmproxy.models.http.HTTPResponse <#mitmproxy.models.http.HTTPResponse>`_
- `mitmproxy.models.http.HTTPFlow <#mitmproxy.models.http.HTTPFlow>`_
- Logging
- - `mitmproxy.controller.Log <#mitmproxy.controller.Log>`_
- - `mitmproxy.controller.LogEntry <#mitmproxy.controller.LogEntry>`_
+ - `mitmproxy.log.Log <#mitmproxy.controller.Log>`_
+ - `mitmproxy.log.LogEntry <#mitmproxy.controller.LogEntry>`_
Errors
@@ -36,5 +36,7 @@ HTTP
Logging
--------
-.. autoclass:: mitmproxy.controller.Log
+.. autoclass:: mitmproxy.log.Log
+ :inherited-members:
+.. autoclass:: mitmproxy.log.LogEntry
:inherited-members:
diff --git a/docs/scripting/overview.rst b/docs/scripting/overview.rst
index 5966eb1d..b820538e 100644
--- a/docs/scripting/overview.rst
+++ b/docs/scripting/overview.rst
@@ -6,7 +6,7 @@ Overview
Mitmproxy has a powerful scripting API that allows you to control almost any
aspect of traffic being proxied. In fact, much of mitmproxy's own core
functionality is implemented using the exact same API exposed to scripters (see
-:src:`mitmproxy/builtins`).
+:src:`mitmproxy/addons`).
A simple example