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/certinstall/windows7.html | |
| 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/certinstall/windows7.html')
| -rw-r--r-- | doc-src/certinstall/windows7.html | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/doc-src/certinstall/windows7.html b/doc-src/certinstall/windows7.html deleted file mode 100644 index 7a4cc3d2..00000000 --- a/doc-src/certinstall/windows7.html +++ /dev/null @@ -1,35 +0,0 @@ - -How to install the __mitmproxy__ certificate authority in Windows 7: - -<ol class="tlist"> - - <li> The easiest way to get the certificate to the device is to use <a - href="@!urlTo("webapp.html")!@">the web app</a>. If this fails for some - reason, simply copy the ~/.mitmproxy/mitmproxy-ca-cert.p12 file to the - target system and double-click it. </li> - - <li> - You should see a certificate import wizard: - - <img src="@!urlTo('win7-wizard.png')!@"/> - </li> - - <li> - Click "Next" until you're prompted for the certificate store: - - <img src="@!urlTo('win7-certstore.png')!@"/> - - </li> - - - <li> - <p>Select "Place all certificates in the following store", and select "Trusted Root Certification Authorities":</p> - - <img src="@!urlTo('win7-certstore-trustedroot.png')!@"/> - - </li> - - <li> Click "Next" and "Finish". </li> - -</ol> - |