Merge branch '0.16-maintenance'

This commit is contained in:
Markus Unterwaditzer 2018-06-13 18:50:01 +02:00
commit 6e0e674fe3

View file

@ -223,6 +223,7 @@ CalDAV and CardDAV
CardDAV.
::
[storage example_for_carddav]
type = "carddav"
url = "..."
@ -238,18 +239,19 @@ CalDAV and CardDAV
:param username: Username for authentication.
:param password: Password for authentication.
:param verify: Verify SSL certificate, default True. This can also be a
local path to a self-signed SSL certificate. See :ref:`ssl-tutorial`
for more information.
:param verify_fingerprint: Optional. SHA1 or MD5 fingerprint of the
expected server certificate. See :ref:`ssl-tutorial` for more
information.
local path to a self-signed SSL certificate. See
:ref:`ssl-tutorial` for more information.
:param verify_fingerprint: Optional. SHA1 or MD5 fingerprint of the expected
server certificate. See :ref:`ssl-tutorial` for
more information.
:param auth: Optional. Either ``basic``, ``digest`` or ``guess``. The
default is preemptive Basic auth, sending credentials even if server
didn't request them. This saves from an additional roundtrip per
request. Consider setting ``guess`` if this causes issues with your
server.
default is preemptive Basic auth, sending credentials even if
server didn't request them. This saves from an additional
roundtrip per request. Consider setting ``guess`` if this
causes issues with your server.
:param auth_cert: Optional. Either a path to a certificate with a client
certificate and the key or a list of paths to the files with them.
certificate and the key or a list of paths to the files
with them.
:param useragent: Default ``vdirsyncer``.
Google