aboutsummaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2016-10-19 14:25:11 +1300
committerAldo Cortesi <aldo@nullcube.com>2016-10-19 14:39:39 +1300
commit22eebfd574c95bbaf600aa67f14e52a44345e678 (patch)
treeccf157bf3d452c32e5142ee77fc1c1f99c428306 /docs
parent966418725b204491d2c40358c08bf56564307412 (diff)
downloadmitmproxy-22eebfd574c95bbaf600aa67f14e52a44345e678.tar.gz
mitmproxy-22eebfd574c95bbaf600aa67f14e52a44345e678.tar.bz2
mitmproxy-22eebfd574c95bbaf600aa67f14e52a44345e678.zip
addons.Addons -> addonmanager, builtins -> addons
Diffstat (limited to 'docs')
-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