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/dev | |
| 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/dev')
| -rw-r--r-- | doc-src/dev/architecture.html | 8 | ||||
| -rw-r--r-- | doc-src/dev/index.py | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/doc-src/dev/architecture.html b/doc-src/dev/architecture.html index 8ab8821f..ae81b6c6 100644 --- a/doc-src/dev/architecture.html +++ b/doc-src/dev/architecture.html @@ -1,8 +1,8 @@ -To give you a better understanding of how mitmproxy works, mitmproxy's high-level architecture is detailed -in the following graphic: +To give you a better understanding of how mitmproxy works, mitmproxy's +high-level architecture is detailed in the following graphic: -<img src="@!urlTo('schematics/architecture.png')!@"> +<img class="img-responsive" src="@!urlTo('schematics/architecture.png')!@"> <a href="@!urlTo('schematics/architecture.pdf')!@">(architecture.pdf)</a> <p>Please don't refrain from asking any further -questions on the mailing list, the IRC channel or the GitHub issue tracker.</p>
\ No newline at end of file +questions on the mailing list, the IRC channel or the GitHub issue tracker.</p> diff --git a/doc-src/dev/index.py b/doc-src/dev/index.py index 0f2a6494..ddf100d0 100644 --- a/doc-src/dev/index.py +++ b/doc-src/dev/index.py @@ -1,8 +1,8 @@ from countershape import Page pages = [ - Page("testing.html", "Testing"), - Page("architecture.html", "Architecture"), - Page("sslkeylogfile.html", "TLS Master Secrets"), -# Page("addingviews.html", "Writing Content Views"), + Page("testing.html", "Testing"), + Page("architecture.html", "Architecture"), + Page("sslkeylogfile.html", "TLS Master Secrets"), + # Page("addingviews.html", "Writing Content Views"), ] |