aboutsummaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2015-10-22 02:38:14 +0200
committerMaximilian Hils <git@maximilianhils.com>2015-10-22 02:38:14 +0200
commited56eadd28e4ab4f450a500948847008fd9a1985 (patch)
tree1d2c63829fc5fdf8296f9e96183fff73359689f6 /docs
parent726b70ccdc13a6f1ce7bb815d1624c2ac7b1ed6c (diff)
parent4d772d7ce0a2785f05fb7f5c5916932a64b16d37 (diff)
downloadmitmproxy-ed56eadd28e4ab4f450a500948847008fd9a1985.tar.gz
mitmproxy-ed56eadd28e4ab4f450a500948847008fd9a1985.tar.bz2
mitmproxy-ed56eadd28e4ab4f450a500948847008fd9a1985.zip
Merge branch 'master' of https://github.com/mitmproxy/mitmproxy
Diffstat (limited to 'docs')
-rw-r--r--docs/certinstall.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/certinstall.rst b/docs/certinstall.rst
index 96227217..542c6dd2 100644
--- a/docs/certinstall.rst
+++ b/docs/certinstall.rst
@@ -159,7 +159,7 @@ Using a custom certificate authority
By default, mitmproxy will use ``~/.mitmproxy/mitmproxy-ca.pem`` as
the certificate authority to generate certificates for all domains for which no
custom certificate is provided (see above). You can use your own certificate
-authority by passing the ``--confdir`` option to mitmproxy. Mitmproxy
+authority by passing the ``--cadir DIRECTORY`` option to mitmproxy. Mitmproxy
will then look for ``mitmproxy-ca.pem`` in the specified directory. If
no such file exists, it will be generated automatically.