aboutsummaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2018-03-20 16:00:02 +0100
committerMaximilian Hils <git@maximilianhils.com>2018-03-20 16:00:02 +0100
commit252684e14e824fb1c45271158f78f599c66b6db0 (patch)
tree49e16576c0c03999820fc89be0778f8166682f6b /docs
parent885d3d5da4b7bd115bc06d9fc73a5199c0b827fc (diff)
downloadmitmproxy-252684e14e824fb1c45271158f78f599c66b6db0.tar.gz
mitmproxy-252684e14e824fb1c45271158f78f599c66b6db0.tar.bz2
mitmproxy-252684e14e824fb1c45271158f78f599c66b6db0.zip
minor docs fixes
Diffstat (limited to 'docs')
-rw-r--r--docs/src/content/concepts-certificates.md16
-rw-r--r--docs/src/themes/mitmproxydocs/static/css/style.css3
-rw-r--r--docs/style/style.scss60
3 files changed, 43 insertions, 36 deletions
diff --git a/docs/src/content/concepts-certificates.md b/docs/src/content/concepts-certificates.md
index 6956ff3f..e6586576 100644
--- a/docs/src/content/concepts-certificates.md
+++ b/docs/src/content/concepts-certificates.md
@@ -19,7 +19,7 @@ configure your target device with the correct proxy settings. Now start a
browser on the device, and visit the magic domain **mitm.it**. You should see
something like this:
-{{< figure src="/certinstall-webapp.png" >}}
+{{< figure src="/certinstall-webapp.png" class="has-border" >}}
Click on the relevant icon, follow the setup instructions for the platform
you're on and you are good to go.
@@ -32,8 +32,8 @@ reason. Below is a list of pointers to manual certificate installation
documentation for some common platforms. The mitmproxy CA cert is located in
`~/.mitmproxy` after it has been generated at the first start of mitmproxy.
-- [IOS](http://jasdev.me/intercepting-ios-traffic) On
- iOS 10.3 and onwards, you also need to enable full trust for the mitmproxy
+- [IOS](http://jasdev.me/intercepting-ios-traffic)
+ On iOS 10.3 and onwards, you also need to enable full trust for the mitmproxy
root certificate:
1. Go to Settings > General > About > Certificate Trust Settings.
2. Under "Enable full trust for root certificates", turn on trust for
@@ -42,13 +42,13 @@ documentation for some common platforms. The mitmproxy CA cert is located in
- [Java](https://docs.oracle.com/cd/E19906-01/820-4916/geygn/index.html)
- [Android/Android Simulator](http://wiki.cacert.org/FAQ/ImportRootCert#Android_Phones_.26_Tablets)
- [Windows](https://web.archive.org/web/20160612045445/http://windows.microsoft.com/en-ca/windows/import-export-certificates-private-keys#1TC=windows-7)
-- [Windows (automated)](https://technet.microsoft.com/en-us/library/cc732443.aspx)
+- [Windows (automated)](https://technet.microsoft.com/en-us/library/cc732443.aspx)
{{< highlight bash >}}
certutil.exe -importpfx Root mitmproxy-ca-cert.p12
{{< / highlight >}}
-
-- [Mac OS X](https://support.apple.com/kb/PH7297?locale=en_US)
+
+- [Mac OS X](https://support.apple.com/kb/PH20129)
- [Ubuntu/Debian]( https://askubuntu.com/questions/73287/how-do-i-install-a-root-certificate/94861#94861)
- [Mozilla Firefox](https://wiki.mozilla.org/MozillaRootCertificate#Mozilla_Firefox)
- [Chrome on Linux](https://stackoverflow.com/a/15076602/198996)
@@ -90,7 +90,7 @@ The files created by mitmproxy in the .mitmproxy directory are as follows:
| mitmproxy-ca-cert.p12 | The certificate in PKCS12 format. For use on Windows. |
| mitmproxy-ca-cert.cer | Same file as .pem, but with an extension expected by some Android devices. |
-## Using a custom certificate
+## Using a custom server certificate
You can use your own (leaf) certificate by passing the `--cert
[domain=]path_to_certificate` option to mitmproxy. Mitmproxy then uses the
@@ -156,7 +156,7 @@ hostname, while using a filename allows a single specific certificate to be used
for all SSL connections. Certificate files must be in the PEM format and should
contain both the unencrypted private key and the certificate.
-### Multiple certs by Hostname
+### Multiple client certificates
You can specify a directory to `--client-certs`, in which case the matching
certificate is looked up by filename. So, if you visit example.org, mitmproxy
diff --git a/docs/src/themes/mitmproxydocs/static/css/style.css b/docs/src/themes/mitmproxydocs/static/css/style.css
index 868c7d0a..ccd0e3ff 100644
--- a/docs/src/themes/mitmproxydocs/static/css/style.css
+++ b/docs/src/themes/mitmproxydocs/static/css/style.css
@@ -6753,3 +6753,6 @@ code {
.content h2 {
padding-top: 1em;
border-top: 1px solid #c0c0c0; }
+
+figure.has-border img {
+ box-shadow: 0 0 20px 0 rgba(0, 0, 0, 0.25); }
diff --git a/docs/style/style.scss b/docs/style/style.scss
index bc146fd5..2db14100 100644
--- a/docs/style/style.scss
+++ b/docs/style/style.scss
@@ -11,36 +11,36 @@ $family-sans-serif: BlinkMacSystemFont, -apple-system, "Segoe UI", "Roboto", "Ox
@import "../node_modules/bulma/sass/layout/_all";
.sidebody {
- overflow-x: hidden;
- overflow-y: scroll;
+ overflow-x: hidden;
+ overflow-y: scroll;
}
.example {
- .highlight {
- margin: 0;
- }
- .path {
- font-style: italic;
- width: 100%;
- text-align: right;
- }
- margin-bottom: 1em;
+ .highlight {
+ margin: 0;
+ }
+ .path {
+ font-style: italic;
+ width: 100%;
+ text-align: right;
+ }
+ margin-bottom: 1em;
}
.sidebar {
- background-color: #F1F1F1;
- .version {
- padding: 1em;
- }
- .brand {
- background-color: #303030;
- color: #c0c0c0;
- padding: 1em;
- top: 0;
- }
- .menu {
- padding: 1em;
- }
+ background-color: #F1F1F1;
+ .version {
+ padding: 1em;
+ }
+ .brand {
+ background-color: #303030;
+ color: #c0c0c0;
+ padding: 1em;
+ top: 0;
+ }
+ .menu {
+ padding: 1em;
+ }
}
.mainbody {
@@ -54,8 +54,12 @@ code {
}
.content {
- h2 {
- padding-top: 1em;
- border-top: 1px solid #c0c0c0;
- }
+ h2 {
+ padding-top: 1em;
+ border-top: 1px solid #c0c0c0;
+ }
+}
+
+figure.has-border img {
+ box-shadow: 0 0 20px 0 rgba(0,0,0,0.25);
}