thomas: server/kolabd/kolabd/templates freebusy.conf.template.in, 1.13, 1.14 resmgr.conf.template.in, 1.20, 1.21
cvs at kolab.org
cvs at kolab.org
Fri Dec 7 16:44:22 CET 2007
Author: thomas
Update of /kolabrepository/server/kolabd/kolabd/templates
In directory doto:/tmp/cvs-serv28289
Modified Files:
freebusy.conf.template.in resmgr.conf.template.in
Log Message:
Reverted "Update instructions" in template files.
These should not be in the template files, because those are intended to
be edited by users. So these instructions should only be in CVS or at most
in the source tarball, not in the installed "binary" package.
Index: freebusy.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/freebusy.conf.template.in,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- freebusy.conf.template.in 7 Dec 2007 15:04:19 -0000 1.13
+++ freebusy.conf.template.in 7 Dec 2007 15:44:20 -0000 1.14
@@ -2,19 +2,6 @@
TARGET=@freebusy_confdir@/config.php
PERMISSIONS=0640
OWNERSHIP=@freebusy_usr@:@freebusy_grp@
-
-# Update instructions:
-# --------------------
-# If this file is being modified, please do the following:
-# - execute the command: convert_template2config_php.pl
-# - move the file freebusy.conf_config.php to server/kolab-freebusy/freebusy/config.php
-#
-# The file server/kolab-freebusy/freebusy/config.php is a configuration example
-# file that is distributed with the kolab-freebusy module/package.
-# The purpose of the server/kolab-freebusy/freebusy/config.php file is to be
-# an example configuration file, in case the kolab-freebusy module/package
-# is distributed on it's own.
-
KOLAB_META_END
<?php
Index: resmgr.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/resmgr.conf.template.in,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- resmgr.conf.template.in 7 Dec 2007 13:19:22 -0000 1.20
+++ resmgr.conf.template.in 7 Dec 2007 15:44:20 -0000 1.21
@@ -2,19 +2,6 @@
TARGET=@resmgr_confdir@/config.php
PERMISSIONS=0640
OWNERSHIP=@resmgr_conffile_usr@:@resmgr_conffile_grp@
-
-# Update instructions:
-# --------------------
-# If this file is being modified, please do the following:
-# - execute the command: convert_template2config_php.pl
-# - move the file resmgs.conf_config.php to server/kolab-filter/filter/config.php
-#
-# The file server/kolab-filter/filter/config.php is a configuration example
-# file that is distributed with the kolab-filter module/package.
-# The purpose of the server/kolab-filter/filter/config.php file is to be
-# an example configuration file, in case the kolab-filter module/package
-# is distributed on it's own.
-
KOLAB_META_END
<?php
More information about the commits
mailing list