diff --git a/doc-src/certinstall/ios.html b/doc-src/certinstall/ios.html index e69de29bb..b3315e567 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": + + + +### 4: Accept the warning by clicking "Install" again: + + + +### 5: The certificate should now be trusted: + + diff --git a/doc-src/certinstall/osx.html b/doc-src/certinstall/osx.html index f0f34d247..0fc5afb27 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 f4eaf62df..2da2c0e39 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 index 2ccfc490d..47fcd672f 100644 Binary files a/doc-src/screenshots/firefox3-import.jpg and b/doc-src/screenshots/firefox3-import.jpg differ diff --git a/doc-src/screenshots/firefox3-trust.jpg b/doc-src/screenshots/firefox3-trust.jpg index ec780dc33..50a2f3413 100644 Binary files a/doc-src/screenshots/firefox3-trust.jpg and b/doc-src/screenshots/firefox3-trust.jpg differ diff --git a/doc-src/screenshots/firefox3.jpg b/doc-src/screenshots/firefox3.jpg index 439fb9ad0..6c4613b62 100644 Binary files a/doc-src/screenshots/firefox3.jpg and b/doc-src/screenshots/firefox3.jpg differ diff --git a/doc-src/screenshots/ios-installed.png b/doc-src/screenshots/ios-installed.png new file mode 100644 index 000000000..2071e441a Binary files /dev/null and b/doc-src/screenshots/ios-installed.png differ diff --git a/doc-src/screenshots/ios-profile.png b/doc-src/screenshots/ios-profile.png new file mode 100644 index 000000000..5bcd5a0d4 Binary files /dev/null and b/doc-src/screenshots/ios-profile.png differ diff --git a/doc-src/screenshots/ios-warning.png b/doc-src/screenshots/ios-warning.png new file mode 100644 index 000000000..d882c514a Binary files /dev/null and b/doc-src/screenshots/ios-warning.png differ diff --git a/doc-src/screenshots/osx-addcert-alwaystrust.png b/doc-src/screenshots/osx-addcert-alwaystrust.png index ef0155e8d..4c5cc704e 100644 Binary files a/doc-src/screenshots/osx-addcert-alwaystrust.png and b/doc-src/screenshots/osx-addcert-alwaystrust.png differ diff --git a/doc-src/screenshots/win7-certstore-trustedroot.png b/doc-src/screenshots/win7-certstore-trustedroot.png index 31073f0b1..e15a87f5a 100644 Binary files a/doc-src/screenshots/win7-certstore-trustedroot.png and b/doc-src/screenshots/win7-certstore-trustedroot.png differ diff --git a/doc-src/screenshots/win7-certstore.png b/doc-src/screenshots/win7-certstore.png index 11bd4540a..f8ce54bd5 100644 Binary files a/doc-src/screenshots/win7-certstore.png and b/doc-src/screenshots/win7-certstore.png differ diff --git a/doc-src/screenshots/win7-wizard.png b/doc-src/screenshots/win7-wizard.png index 5017f2c56..eff6ad096 100644 Binary files a/doc-src/screenshots/win7-wizard.png and b/doc-src/screenshots/win7-wizard.png differ