certificate docs: reorg, wording, tweaks

2 files changed, 26 insertions, 29 deletions

diff --git a/doc-src/tutorials/gamecenter.html b/doc-src/tutorials/gamecenter.html
index 8d2e9bc5..15380c20 100644
--- a/doc-src/tutorials/gamecenter.html
+++ b/doc-src/tutorials/gamecenter.html
@@ -2,10 +2,9 @@
 ## The setup
 
 In this tutorial, I'm going to show you how simple it is to creatively
-interfere with Apple Game Center traffic using mitmproxy. To set things up, 
-you must install the [mitmproxy root certificate](@!urlTo("certinstall/ssl.html")!@). I then
-started mitmproxy on my desktop, and configured the iPhone to use it as a
-proxy. 
+interfere with Apple Game Center traffic using mitmproxy. To set things up,
+install the [mitmproxy root certificate](@!urlTo("certinstall.html")!@). Then
+start mitmproxy on your desktop, and confige the iPhone to use it as a proxy.
 
 
 ## Taking a look at the Game Center traffic
@@ -13,7 +12,7 @@ proxy.
 Lets take a first look at the Game Center traffic. The game I'll use in this
 tutorial is [Super Mega
 Worm](http://itunes.apple.com/us/app/super-mega-worm/id388541990?mt=8) - a
-great little retro-apocalyptic sidescroller for the iPhone: 
+great little retro-apocalyptic sidescroller for the iPhone:
 
 <center>
     <img src="@!urlTo('tutorials/supermega.png')!@"/>
@@ -90,7 +89,7 @@ now fire up. Lets bump the score up to something a bit more ambitious:
 </plist>
 <!--(end)-->
 
-Save the file and exit your editor. 
+Save the file and exit your editor.
 
 The final step is to replay this modified request. Simply press __r__ for
 replay.
@@ -102,7 +101,7 @@ replay.
 </center>
 
 And that's it - according to the records, I am the greatest Super Mega Worm
-player of all time. 
+player of all time.
 
 There's a curious addendum to this tale. When I first wrote this tutorial, all
 the top competitors' scores were the same: 2,147,483,647 (this is no longer the
@@ -118,4 +117,3 @@ phone, then 2^31-1 might well be the maximum score you could get. Then again,
 if the game itself stores its score in a signed 32-bit int, you could get the
 same score through perfect play, effectively beating the game. So, which is it
 in this case? I'll leave that for you to decide.
-
diff --git a/doc-src/tutorials/transparent-dhcp.html b/doc-src/tutorials/transparent-dhcp.html
index ce8a10fd..c34dd700 100644
--- a/doc-src/tutorials/transparent-dhcp.html
+++ b/doc-src/tutorials/transparent-dhcp.html
@@ -1,27 +1,27 @@
 This walkthrough illustrates how to set up transparent proxying with mitmproxy. We use VirtualBox VMs with an Ubuntu proxy machine in this example, but the general principle can be applied to other setups.
 
-1.  **Configure VirtualBox Network Adapters for the proxy machine**  
-    The network setup is simple:  `internet <--> proxy vm <--> (virtual) internal network`.  
-    For the proxy machine, *eth0* represents the outgoing network. *eth1* is connected to the internal network that will be proxified, using a static ip (192.168.3.1).  
+1.  **Configure VirtualBox Network Adapters for the proxy machine**
+    The network setup is simple:  `internet <--> proxy vm <--> (virtual) internal network`.
+    For the proxy machine, *eth0* represents the outgoing network. *eth1* is connected to the internal network that will be proxified, using a static ip (192.168.3.1).
     <hr>VirtualBox configuration:
     <img src="@!urlTo('tutorials/transparent-dhcp/step1_vbox_eth0.png')!@"/><br><br>
-    <img src="@!urlTo('tutorials/transparent-dhcp/step1_vbox_eth1.png')!@"/>  
+    <img src="@!urlTo('tutorials/transparent-dhcp/step1_vbox_eth1.png')!@"/>
     <br>Proxy VM:
-    <img src="@!urlTo('tutorials/transparent-dhcp/step1_proxy.png')!@"/>  
+    <img src="@!urlTo('tutorials/transparent-dhcp/step1_proxy.png')!@"/>
     <hr>
-2.  **Configure DHCP and DNS**  
-    We use dnsmasq to provide DHCP and DNS in our internal network. 
-    Dnsmasq is a lightweight server designed to provide DNS (and optionally DHCP and TFTP) services to a small-scale 
-    network.  
+2.  **Configure DHCP and DNS**
+    We use dnsmasq to provide DHCP and DNS in our internal network.
+    Dnsmasq is a lightweight server designed to provide DNS (and optionally DHCP and TFTP) services to a small-scale
+    network.
 
-    -   Before we get to that, we need to fix some Ubuntu quirks: 
-        **Ubuntu >12.04** runs an internal dnsmasq instance (listening on loopback only) by default 
+    -   Before we get to that, we need to fix some Ubuntu quirks:
+        **Ubuntu >12.04** runs an internal dnsmasq instance (listening on loopback only) by default
         <a href="https://www.stgraber.org/2012/02/24/dns-in-ubuntu-12-04/">[1]</a>. For our use case, this needs to be
-        disabled by changing <br>`dns=dnsmasq` to `#dns=dnsmasq` in */etc/NetworkManager/NetworkManager.conf*  
+        disabled by changing <br>`dns=dnsmasq` to `#dns=dnsmasq` in */etc/NetworkManager/NetworkManager.conf*
         and running `sudo restart network-manager` afterwards.
-    -   Now, dnsmasq can be be installed and configured:  
-        `sudo apt-get install dnsmasq`  
-        Replace */etc/dnsmasq.conf* with the following configuration:  
+    -   Now, dnsmasq can be be installed and configured:
+        `sudo apt-get install dnsmasq`
+        Replace */etc/dnsmasq.conf* with the following configuration:
         <pre>\# Listen for DNS requests on the internal network
         interface=eth1
         \# Act as a DHCP server, assign IP addresses to clients
@@ -30,15 +30,15 @@ This walkthrough illustrates how to set up transparent proxying with mitmproxy.
         dhcp-option=option:router,192.168.3.1
         dhcp-option=option:dns-server,192.168.3.1
         </pre>
-        Apply changes:  
+        Apply changes:
         `sudo service dnsmasq restart`
         <hr>
         Your proxied machine's network settings should now look similar to this:
         <img src="@!urlTo('tutorials/transparent-dhcp/step2_proxied_vm.png')!@"/>
         <hr>
 
-3.  **Set up traffic redirection to mitmproxy**  
-    To redirect traffic to mitmproxy, we need to add two iptables rules:  
+3.  **Set up traffic redirection to mitmproxy**
+    To redirect traffic to mitmproxy, we need to add two iptables rules:
     <pre class="terminal">
     iptables -t nat -A PREROUTING -i eth1 -p tcp --dport 80 \
         -j REDIRECT --to-port 8080
@@ -46,9 +46,8 @@ This walkthrough illustrates how to set up transparent proxying with mitmproxy.
         -j REDIRECT --to-port 8080
     </pre>
 
-4.  If required, <a href="@!urlTo('ssl.html')!@">install the mitmproxy
+4.  If required, <a href="@!urlTo('certinstall.html')!@">install the mitmproxy
     certificates on the test device</a>.
 
-5.  Finally, we can run <code>mitmproxy -T</code>.  
+5.  Finally, we can run <code>mitmproxy -T</code>.
     The proxied machine cannot to leak any data outside of HTTP or DNS requests.
-