From e85ff654d319812d2a992763d71b44e612cd69c3 Mon Sep 17 00:00:00 2001
From: Guillaume Ayoub <guillaume.ayoub@kozea.fr>
Date: Sun, 10 Apr 2011 19:41:36 +0200
Subject: [PATCH] Update user documentation with latest code changes

---
 pages/user_documentation.rst | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/pages/user_documentation.rst b/pages/user_documentation.rst
index 09f3e002..40b91198 100644
--- a/pages/user_documentation.rst
+++ b/pages/user_documentation.rst
@@ -141,13 +141,21 @@ Configuring Server
 Configuration File
 ~~~~~~~~~~~~~~~~~~
 
+.. note::
+   This section is following the latest git master changes. Please look at the
+   default configuration file included in your package if you have an older
+   version of Radicale.
+
 The server configuration can be modified in ``/etc/radicale/config`` or in
 ``~/.config/radicale/config``. Here is the default configuration file, with the
 main parameters::
 
   [server]
-  # CalDAV server hostname, empty for all hostnames
-  host = 
+  # CalDAV server hostnames separated by a comma
+  # IPv4 syntax: address:port
+  # IPv6 syntax: [address]:port
+  # IPv6 adresses are configured to only allow IPv6 connections
+  hosts = 0.0.0.0:5232
   # CalDAV server port
   port = 5232
   # Daemon flag
@@ -167,8 +175,8 @@ main parameters::
 
   [acl]
   # Access method
-  # Value: fake | htpasswd
-  type = fake
+  # Value: None | htpasswd
+  type = None
   # Personal calendars only available for logged in users (if needed)
   personal = False
   # Htpasswd filename (if needed)
@@ -182,6 +190,15 @@ main parameters::
   # created if not present
   folder = ~/.config/radicale/calendars
 
+  [logging]
+  # Logging configuration file
+  # If no config is given, simple information is printed on the standard output
+  # For more information about the syntax of the configuration file, see:
+  # http://docs.python.org/library/logging.config.html
+  config = /etc/radicale/logging
+  # Set the default logging level to debug
+  debug = False
+
 This configuration file is read each time the server is launched. If some
 values are not given, the default ones are used. If no configuration file is
 available, all the default values are used.