From f47d89ff4e710f6d2df755fe526e91a5cf236cfa Mon Sep 17 00:00:00 2001
From: Aldo Cortesi <aldo@nullcube.com>
Date: Mon, 27 Jan 2014 14:16:23 +1300
Subject: Revert "Move the doc tree out into its own repo."

This reverts commit 8f88fcedd601c0033b4469b66626a83011879baf.
---
 doc-src/certinstall/ios.html | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 doc-src/certinstall/ios.html

(limited to 'doc-src/certinstall/ios.html')

diff --git a/doc-src/certinstall/ios.html b/doc-src/certinstall/ios.html
new file mode 100644
index 00000000..fd14e65a
--- /dev/null
+++ b/doc-src/certinstall/ios.html
@@ -0,0 +1,21 @@
+
+How to install the __mitmproxy__ certificate authority on IOS devices:
+
+<ol class="tlist">
+    <li>Set up the Mail app on the device to receive email.</li>
+
+    <li>Mail the mitmproxy-ca-cert.pem file to the device, and tap on the attachment.</li>
+
+    <li>You will be prompted to install a profile. Click "Install":
+
+    <img src="@!urlTo('ios-profile.png')!@"/></li>
+
+    <li>Accept the warning by clicking "Install" again:
+
+    <img src="@!urlTo('ios-warning.png')!@"/></li>
+
+    <li>The certificate should now be trusted:
+
+    <img src="@!urlTo('ios-installed.png')!@"/></li>
+
+</ol>
-- 
cgit v1.2.3


From f3369529abd601d7f10fcdb45ec280e8f6a7ad19 Mon Sep 17 00:00:00 2001
From: Aldo Cortesi <aldo@nullcube.com>
Date: Tue, 28 Jan 2014 13:24:11 +1300
Subject: Adjust docs for web app certificate installation.

---
 doc-src/certinstall/ios.html | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'doc-src/certinstall/ios.html')

diff --git a/doc-src/certinstall/ios.html b/doc-src/certinstall/ios.html
index fd14e65a..c12d65f6 100644
--- a/doc-src/certinstall/ios.html
+++ b/doc-src/certinstall/ios.html
@@ -1,11 +1,17 @@
 
-How to install the __mitmproxy__ certificate authority on IOS devices:
+## Getting the certificate onto the device
+
+The easiest way to get the certificate to the device is to use [the web
+app](@!urlTo("webapp.html")!@). In the rare cases where the web app doesn't
+work, you will need to get the __mitmproxy-ca-cert.pem__ file to the device to
+install it. The easiest way to accomplish this is to set up the Mail app on the
+device, and to email it over as an attachment. Open the email, tap on the
+attachment, then proceed with the install.
 
-<ol class="tlist">
-    <li>Set up the Mail app on the device to receive email.</li>
 
-    <li>Mail the mitmproxy-ca-cert.pem file to the device, and tap on the attachment.</li>
+## Installing the certificate
 
+<ol class="tlist">
     <li>You will be prompted to install a profile. Click "Install":
 
     <img src="@!urlTo('ios-profile.png')!@"/></li>
-- 
cgit v1.2.3