aboutsummaryrefslogtreecommitdiffstats
path: root/doc-src
diff options
context:
space:
mode:
authorJim Shaver <dcypherd@gmail.com>2015-04-10 02:20:43 -0400
committerJim Shaver <dcypherd@gmail.com>2015-04-10 02:20:43 -0400
commit5ca85bc5f4accf701dc07b09744e51b2af4334a7 (patch)
tree68ee6255076fd78ff5a0153dfea57918cee48cad /doc-src
parent6c6639a78aed12a7c19e692c873606ee9bc46852 (diff)
downloadmitmproxy-5ca85bc5f4accf701dc07b09744e51b2af4334a7.tar.gz
mitmproxy-5ca85bc5f4accf701dc07b09744e51b2af4334a7.tar.bz2
mitmproxy-5ca85bc5f4accf701dc07b09744e51b2af4334a7.zip
Minor reorg and add link for Chrome on Linux
Diffstat (limited to 'doc-src')
-rw-r--r--doc-src/certinstall/ssl.html9
1 files changed, 7 insertions, 2 deletions
diff --git a/doc-src/certinstall/ssl.html b/doc-src/certinstall/ssl.html
index 8d27f0ef..e9b7df72 100644
--- a/doc-src/certinstall/ssl.html
+++ b/doc-src/certinstall/ssl.html
@@ -22,6 +22,11 @@ Most of the time you can easily install mitmproxy's CA certificate through the w
<td><a href="http://docs.oracle.com/cd/E19906-01/820-4916/geygn/index.html">Java</a></td>
</tr>
<tr>
+ <td><a href="http://kb.mit.edu/confluence/pages/viewpage.action?pageId=152600377">iOS</a></td>
+ <td><a href="http://wiki.cacert.org/FAQ/ImportRootCert#Android_Phones_.26_Tablets">Android/Android Simulator</a></td>
+ </tr>
+
+ <tr>
<td><a href="http://windows.microsoft.com/en-ca/windows/import-export-certificates-private-keys#1TC=windows-7">Windows</a></td>
<td><a href="https://support.apple.com/kb/PH7297?locale=en_US">Mac OS X</a></td>
</tr>
@@ -30,9 +35,9 @@ Most of the time you can easily install mitmproxy's CA certificate through the w
<td><a href="https://wiki.mozilla.org/MozillaRootCertificate#Mozilla_Firefox">Firefox</a></td>
</tr>
<tr>
- <td><a href="http://kb.mit.edu/confluence/pages/viewpage.action?pageId=152600377">iOS</a></td>
- <td><a href="http://wiki.cacert.org/FAQ/ImportRootCert#Android_Phones_.26_Tablets">Android/Android Simulator</a></td>
+ <td><a href="https://code.google.com/p/chromium/wiki/LinuxCertManagement">Chrome on Linux</a></td>
</tr>
+
</table>
More On mitmproxy Certificates