diff options
| author | Jim Shaver <dcypherd@gmail.com> | 2015-05-31 01:21:44 -0400 |
|---|---|---|
| committer | Jim Shaver <dcypherd@gmail.com> | 2015-05-31 01:21:44 -0400 |
| commit | b51363b3ca43f6572acb673186e6ae78a1f48434 (patch) | |
| tree | a7488b32871c142141a813dc6ff2ede172672c31 /doc-src/scripting | |
| parent | 4fe2c069cca07aadf983f54e18dac4de492d5d69 (diff) | |
| parent | 06fba18106a8f759ec6f08453e86772a170c653b (diff) | |
| download | mitmproxy-b51363b3ca43f6572acb673186e6ae78a1f48434.tar.gz mitmproxy-b51363b3ca43f6572acb673186e6ae78a1f48434.tar.bz2 mitmproxy-b51363b3ca43f6572acb673186e6ae78a1f48434.zip | |
Merge remote-tracking branch 'upstream/master' into print-bracket-fix
Conflicts:
examples/har_extractor.py
examples/nonblocking.py
examples/read_dumpfile
libmproxy/web/app.py
Diffstat (limited to 'doc-src/scripting')
| -rw-r--r-- | doc-src/scripting/inlinescripts.html | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/doc-src/scripting/inlinescripts.html b/doc-src/scripting/inlinescripts.html index 7f05eedf..f5de7482 100644 --- a/doc-src/scripting/inlinescripts.html +++ b/doc-src/scripting/inlinescripts.html @@ -122,12 +122,11 @@ The main classes you will deal with in writing mitmproxy scripts are: <td> A handle for interacting with mitmproxy's from within scripts.</td> </tr> <tr> - <th>libmproxy.flow.ODict</th> + <th>netlib.odict.ODict</th> <td>A dictionary-like object for managing sets of key/value data. There - is also a variant called CaselessODict that ignores key case for some - calls (used mainly for headers). - </td> + is also a variant called ODictCaseless that ignores key case for some + calls (used mainly for headers).</td> </tr> <tr> <th>netlib.certutils.SSLCert</th> |