diff options
| -rw-r--r-- | doc-src/certinstall/ios.html | 16 | ||||
| -rw-r--r-- | doc-src/certinstall/osx.html | 2 | ||||
| -rw-r--r-- | doc-src/certinstall/windows7.html | 2 | ||||
| -rw-r--r-- | doc-src/screenshots/firefox3-import.jpg | bin | 79780 -> 55496 bytes | |||
| -rw-r--r-- | doc-src/screenshots/firefox3-trust.jpg | bin | 46279 -> 31495 bytes | |||
| -rw-r--r-- | doc-src/screenshots/firefox3.jpg | bin | 81573 -> 57366 bytes | |||
| -rw-r--r-- | doc-src/screenshots/ios-installed.png | bin | 0 -> 80251 bytes | |||
| -rw-r--r-- | doc-src/screenshots/ios-profile.png | bin | 0 -> 83364 bytes | |||
| -rw-r--r-- | doc-src/screenshots/ios-warning.png | bin | 0 -> 75604 bytes | |||
| -rw-r--r-- | doc-src/screenshots/osx-addcert-alwaystrust.png | bin | 65883 -> 47146 bytes | |||
| -rw-r--r-- | doc-src/screenshots/win7-certstore-trustedroot.png | bin | 54298 -> 39236 bytes | |||
| -rw-r--r-- | doc-src/screenshots/win7-certstore.png | bin | 53142 -> 37453 bytes | |||
| -rw-r--r-- | doc-src/screenshots/win7-wizard.png | bin | 85691 -> 66456 bytes |
13 files changed, 17 insertions, 3 deletions
diff --git a/doc-src/certinstall/ios.html b/doc-src/certinstall/ios.html index e69de29b..b3315e56 100644 --- a/doc-src/certinstall/ios.html +++ b/doc-src/certinstall/ios.html @@ -0,0 +1,16 @@ + +### 1: Set up the Mail app on the device to receive email. + +### 2: Mail the mitmproxy-ca-cert.pem file to the device, and tap on the attachment. + +### 3: You will be prompted to install a profile. Click "Install": + +<img src="@!urlTo('ios-profile.png')!@"/> + +### 4: Accept the warning by clicking "Install" again: + +<img src="@!urlTo('ios-warning.png')!@"/> + +### 5: The certificate should now be trusted: + +<img src="@!urlTo('ios-installed.png')!@"/> diff --git a/doc-src/certinstall/osx.html b/doc-src/certinstall/osx.html index f0f34d24..0fc5afb2 100644 --- a/doc-src/certinstall/osx.html +++ b/doc-src/certinstall/osx.html @@ -1,5 +1,5 @@ -### 1: Open Finder, and double-click on the mitmproxy ca.pem file. +### 1: Open Finder, and double-click on the mitmproxy-ca-cert.pem file. ### 2: You will be prompted to add the certificate. Click "Always Trust": diff --git a/doc-src/certinstall/windows7.html b/doc-src/certinstall/windows7.html index f4eaf62d..2da2c0e3 100644 --- a/doc-src/certinstall/windows7.html +++ b/doc-src/certinstall/windows7.html @@ -1,6 +1,4 @@ -These instructions were tested on Windows 7. - ### 1: Copy the ~/.mitmproxy/mitmproxy-ca-cert.p12 file to the target system. ### 2: Double-click the certificate file. You should see a certificate import wizard: diff --git a/doc-src/screenshots/firefox3-import.jpg b/doc-src/screenshots/firefox3-import.jpg Binary files differindex 2ccfc490..47fcd672 100644 --- a/doc-src/screenshots/firefox3-import.jpg +++ b/doc-src/screenshots/firefox3-import.jpg diff --git a/doc-src/screenshots/firefox3-trust.jpg b/doc-src/screenshots/firefox3-trust.jpg Binary files differindex ec780dc3..50a2f341 100644 --- a/doc-src/screenshots/firefox3-trust.jpg +++ b/doc-src/screenshots/firefox3-trust.jpg diff --git a/doc-src/screenshots/firefox3.jpg b/doc-src/screenshots/firefox3.jpg Binary files differindex 439fb9ad..6c4613b6 100644 --- a/doc-src/screenshots/firefox3.jpg +++ b/doc-src/screenshots/firefox3.jpg diff --git a/doc-src/screenshots/ios-installed.png b/doc-src/screenshots/ios-installed.png Binary files differnew file mode 100644 index 00000000..2071e441 --- /dev/null +++ b/doc-src/screenshots/ios-installed.png diff --git a/doc-src/screenshots/ios-profile.png b/doc-src/screenshots/ios-profile.png Binary files differnew file mode 100644 index 00000000..5bcd5a0d --- /dev/null +++ b/doc-src/screenshots/ios-profile.png diff --git a/doc-src/screenshots/ios-warning.png b/doc-src/screenshots/ios-warning.png Binary files differnew file mode 100644 index 00000000..d882c514 --- /dev/null +++ b/doc-src/screenshots/ios-warning.png diff --git a/doc-src/screenshots/osx-addcert-alwaystrust.png b/doc-src/screenshots/osx-addcert-alwaystrust.png Binary files differindex ef0155e8..4c5cc704 100644 --- a/doc-src/screenshots/osx-addcert-alwaystrust.png +++ b/doc-src/screenshots/osx-addcert-alwaystrust.png diff --git a/doc-src/screenshots/win7-certstore-trustedroot.png b/doc-src/screenshots/win7-certstore-trustedroot.png Binary files differindex 31073f0b..e15a87f5 100644 --- a/doc-src/screenshots/win7-certstore-trustedroot.png +++ b/doc-src/screenshots/win7-certstore-trustedroot.png diff --git a/doc-src/screenshots/win7-certstore.png b/doc-src/screenshots/win7-certstore.png Binary files differindex 11bd4540..f8ce54bd 100644 --- a/doc-src/screenshots/win7-certstore.png +++ b/doc-src/screenshots/win7-certstore.png diff --git a/doc-src/screenshots/win7-wizard.png b/doc-src/screenshots/win7-wizard.png Binary files differindex 5017f2c5..eff6ad09 100644 --- a/doc-src/screenshots/win7-wizard.png +++ b/doc-src/screenshots/win7-wizard.png |
