From 42993487760ec1f8512d6b18d0e9f7b7ee5b8f6e Mon Sep 17 00:00:00 2001
From: Guillaume Ayoub <guillaume.ayoub@kozea.fr>
Date: Wed, 25 Jan 2012 14:53:46 +0100
Subject: [PATCH] Change "calendar" into "collection" when needed.

WARNING: the default folders storing calendars/addressbooks have been changed
---
 config               | 14 +++++++-------
 radicale/__main__.py |  2 +-
 radicale/config.py   |  4 ++--
 setup.py             |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/config b/config
index c6445ea..3bbd063 100644
--- a/config
+++ b/config
@@ -30,7 +30,7 @@ key = /etc/apache2/ssl/server.key
 [encoding]
 # Encoding for responding requests
 request = utf-8
-# Encoding for storing local calendars
+# Encoding for storing local collections
 stock = utf-8
 
 
@@ -39,9 +39,9 @@ stock = utf-8
 # Value: None | htpasswd | LDAP | PAM | courier
 type = None
 
-# Usernames used for public calendars, separated by a comma
+# Usernames used for public collections, separated by a comma
 public_users = public
-# Usernames used for private calendars, separated by a comma
+# Usernames used for private collections, separated by a comma
 private_users = private
 
 # Htpasswd filename
@@ -75,11 +75,11 @@ courier_socket =
 # Storage backend
 type = filesystem
 
-# Folder for storing local calendars, created if not present
-filesystem_folder = ~/.config/radicale/calendars
+# Folder for storing local collections, created if not present
+filesystem_folder = ~/.config/radicale/collections
 
-# Git repository for storing local calendars, created if not present
-filesystem_folder = ~/.config/radicale/calendars
+# Git repository for storing local collections, created if not present
+filesystem_folder = ~/.config/radicale/collections
 
 
 [logging]
diff --git a/radicale/__main__.py b/radicale/__main__.py
index 539a8cc..a789864 100644
--- a/radicale/__main__.py
+++ b/radicale/__main__.py
@@ -111,7 +111,7 @@ def run():
     atexit.register(cleanup)
     radicale.log.LOGGER.info("Starting Radicale")
 
-    # Create calendar servers
+    # Create collection servers
     servers = []
     server_class = radicale.HTTPSServer if options.ssl else radicale.HTTPServer
     shutdown_program = threading.Event()
diff --git a/radicale/config.py b/radicale/config.py
index 28bde0d..31b0d53 100644
--- a/radicale/config.py
+++ b/radicale/config.py
@@ -65,9 +65,9 @@ INITIAL_CONFIG = {
     "storage": {
         "type": "filesystem",
         "filesystem_folder":
-            os.path.expanduser("~/.config/radicale/calendars"),
+            os.path.expanduser("~/.config/radicale/collections"),
         "git_folder":
-            os.path.expanduser("~/.config/radicale/calendars")},
+            os.path.expanduser("~/.config/radicale/collections")},
     "logging": {
         "config": "/etc/radicale/logging",
         "debug": "False",
diff --git a/setup.py b/setup.py
index 9aeedac..c41d720 100755
--- a/setup.py
+++ b/setup.py
@@ -58,7 +58,7 @@ setup(
     packages=["radicale", "radicale.acl", "radicale.storage"],
     provides=["radicale"],
     scripts=["bin/radicale"],
-    keywords=["calendar", "CalDAV"],
+    keywords=["calendar", "addressbook", "CalDAV", "CardDAV"],
     classifiers=[
         "Development Status :: 4 - Beta",
         "Environment :: Console",