aboutsummaryrefslogtreecommitdiffstats
path: root/doc-src/certinstall
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2011-03-19 11:57:14 +1300
committerAldo Cortesi <aldo@nullcube.com>2011-03-19 11:57:14 +1300
commit3120b5ce151668e34a83b60c8c7575c252c7ee28 (patch)
tree9aeba211ad4357619588d2c7a90e0a95bfec5a58 /doc-src/certinstall
parent872b7881f2793bec8b2596e2a65bc4891387a1d5 (diff)
downloadmitmproxy-3120b5ce151668e34a83b60c8c7575c252c7ee28.tar.gz
mitmproxy-3120b5ce151668e34a83b60c8c7575c252c7ee28.tar.bz2
mitmproxy-3120b5ce151668e34a83b60c8c7575c252c7ee28.zip
Docs.
- Add IOS screenshots. - Add drop-shadows to screenshots that need them. - Optimise PNGs for size.
Diffstat (limited to 'doc-src/certinstall')
-rw-r--r--doc-src/certinstall/ios.html16
-rw-r--r--doc-src/certinstall/osx.html2
-rw-r--r--doc-src/certinstall/windows7.html2
3 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: