diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2015-08-30 03:24:05 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2015-08-30 03:24:05 +0200 |
| commit | 08655cb9567f502ec79799499968c57125d9a205 (patch) | |
| tree | 6a993b5299ca7d4ce06372c674efdac635c4d2cd /doc-src | |
| parent | 21e7f420d2870d89ebc05181c1fca674d80e4e7c (diff) | |
| parent | 9389c186ba6e76ba87e238c0e6b86749da6a67c7 (diff) | |
| download | mitmproxy-08655cb9567f502ec79799499968c57125d9a205.tar.gz mitmproxy-08655cb9567f502ec79799499968c57125d9a205.tar.bz2 mitmproxy-08655cb9567f502ec79799499968c57125d9a205.zip | |
Merge remote-tracking branch 'origin/master' into proxy-refactor-cb
Diffstat (limited to 'doc-src')
| -rw-r--r-- | doc-src/certinstall.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc-src/certinstall.html b/doc-src/certinstall.html index fb3cfd42..594049d9 100644 --- a/doc-src/certinstall.html +++ b/doc-src/certinstall.html @@ -31,8 +31,8 @@ you're on, and you are good to go. ## <a id="docManual"></a>Installing the mitmproxy CA certificate manually -Sometimes using the quick install app is not an option - Java or the IOS -similator spring to mind - or you just need to do it manually for some other +Sometimes using the quick install app is not an option - Java or the iOS +Simulator spring to mind - or you just need to do it manually for some other reason. Below is a list of pointers to manual certificate installation documentation for some common platforms: |