diff --git a/conf/config b/conf/config
index 1bdbef7..6afaa97 100644
--- a/conf/config
+++ b/conf/config
@@ -1,7 +1,19 @@
+# -*- mode: conf -*-
+# vim:ft=cfg
+
+# Config file for Radicale - A simple calendar server
+#
+# Place it into /etc/radicale/config (global)
+# or ~/.config/radicale/config (user)
+#
+# The current values are the default ones
+
+
 [server]
 # CalDAV server hostnames separated by a comma
 # IPv4 syntax: address:port
 # IPv6 syntax: [address]:port
+# For example: 0.0.0.0:9999, [::]:9999
 # IPv6 adresses are configured to only allow IPv6 connections
 hosts = 127.0.0.1:5232
 # Daemon flag
@@ -14,10 +26,16 @@ ssl = False
 certificate = /etc/apache2/ssl/server.crt
 # SSL private key
 key = /etc/apache2/ssl/server.key
+# SSL Protocol used. See python's ssl module for available values
+protocol = PROTOCOL_SSLv23
+# Ciphers available. See python's ssl module for available ciphers
+ciphers =
 # Reverse DNS to resolve client address in logs
 dns_lookup = True
 # Root URL of Radicale (starting and ending with a slash)
 base_prefix = CHANGEPATH
+# Possibility to allow URLs cleaned by a HTTP server, without the base_prefix
+can_skip_base_prefix = False
 # Message displayed in the client when a password is needed
 realm = Radicale - Password Required
 
@@ -31,13 +49,12 @@ stock = utf-8
 
 [auth]
 # Authentication method
-# Value: None | htpasswd | IMAP | LDAP | PAM | courier | http
+# Value: None | htpasswd | IMAP | LDAP | PAM | courier | http | remote_user | custom
 type = LDAP
 
-# Usernames used for public collections, separated by a comma
-public_users = public
-# Usernames used for private collections, separated by a comma
-private_users = private
+# Custom authentication handler
+custom_handler =
+
 # Htpasswd filename
 htpasswd_filename = /etc/radicale/users
 # Htpasswd encryption method
@@ -54,7 +71,7 @@ ldap_attribute = uid
 # placed as X in a query of the form (&(...)X)
 # example: (objectCategory=Person)(objectClass=User)(memberOf=cn=calenderusers,ou=users,dc=example,dc=org)
 # leave empty if no additional filter is needed
-ldap_filter = 
+ldap_filter = (objectClass=inetOrgPerson)
 # LDAP dn for initial login, used if LDAP server does not allow anonymous searches
 # Leave empty if searches are anonymous
 ldap_binddn =
@@ -82,10 +99,18 @@ http_user_parameter =
 http_password_parameter =
 
 
+[git]
+# Git default options
+committer = Radicale <radicale@example.com>
+
+
 [rights]
-# Rights management method
-# Value: None | owner_only | owner_write | from_file
-type = None
+# Rights backend
+# Value: None | authenticated | owner_only | owner_write | from_file | custom
+type = authenticated
+
+# Custom rights handler
+custom_handler =
 
 # File for rights management from_file
 file = ~/.config/radicale/rights
@@ -93,11 +118,14 @@ file = ~/.config/radicale/rights
 
 [storage]
 # Storage backend
-# Value: filesystem | database
+# Value: filesystem | multifilesystem | database | custom
 type = filesystem
 
+# Custom storage handler
+custom_handler =
+
 # Folder for storing local collections, created if not present
-filesystem_folder = /var/www/radicale/collections
+filesystem_folder = ~/.config/radicale/collections
 
 # Database URL for SQLAlchemy
 # dialect+driver://user:password@host/dbname[?key=value..]
@@ -121,4 +149,3 @@ full_environment = False
 # Additional HTTP headers
 #[headers]
 #Access-Control-Allow-Origin = *
-