richard: server/kolabd/kolabd/doc README.amavisd.in, 1.1, 1.2 README.webgui.in, 1.1, 1.2

cvs at intevation.de cvs at intevation.de
Sat Dec 10 22:57:13 CET 2005


Author: richard

Update of /kolabrepository/server/kolabd/kolabd/doc
In directory doto:/tmp/cvs-serv13859/doc

Modified Files:
	README.amavisd.in README.webgui.in 
Log Message:
https://intevation.de/roundup/kolab/issue1021

* Makefile.am: fixed a typo: templtes should be templates
  - kolabdocdir was not using the dist_conf file.  It is now, and the
    documentation directory can be defined with: pkgdocdir
  - kolabrcdir was not using the dist_conf file.  It is now, and the
    rc directory can be defined with: kolab_rcdir
  - Added ChangeLog, NEWS, COPYING and AUTHORS to the document files
    to be distributed.
  - INSTALL will be included in the tarbal
  - Changed the document path to $(pkgdocdir)/kolabd (that is
    ../share/kolab/doc, to .../share/doc/kolabd.  To prevent classes
    with files named the same (e.g. ChangeLog) from other modules.
* dist-conf/kolab: added pkgdocdir to reflect the change in Makefile.am
  - Added perllib
* kolab_bootstrap.in: use the '[x]' trick to prevent grep to show
  in the process list...
* kolabquotawarn.in: removed unnecessary prefix assignment
* doc/README.amavisd.in: replace @l_prefix@/var by the autotools prefix
  variable @localstatedir@
* doc/README.webgui.in: replace @l_prefix@/etc by the autotools prefix
  variable @sysconfdir@
* namespace/libexec/showlog.in: removed commented out prefix
  assignment.  It is really not needed anymore
* kolab_bootstrap.in: removed redundant kolab_prefix assigment
  replaced $kolab_prefix/bin by @bindir@
* rc.kolabd.in: @prefix@/lib/openpkg/bash replaced by @BASH@
* NEWS: added
* AUTHORS: added
* bootstrap: removed touching of the files: NEWS, ChangeLog and
  AUTHORS, as they are now in CVS



Index: README.amavisd.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/doc/README.amavisd.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- README.amavisd.in	13 Sep 2005 14:38:22 -0000	1.1
+++ README.amavisd.in	10 Dec 2005 21:57:11 -0000	1.2
@@ -26,7 +26,7 @@
 containing the virus if it had not been infected.
 
 Any infected email that is blocked from reaching it's recipient is
-archived to @l_prefix@/var/amavisd/virusmails on the server.
+archived to @localstatedir@/amavisd/virusmails on the server.
 
 Spam-handling is different: Spam is not blocked by the filter, but
 instead email potentially is spam is marked with the
@@ -50,7 +50,7 @@
 @viruses_that_fake_sender_maps = ();
 $warnvirusrecip = 1;    # (defaults to false (undef))
 $warnbannedrecip = 1;   # (defaults to false (undef))
-$QUARANTINEDIR = '@l_prefix@/var/amavisd/virusmails';
+$QUARANTINEDIR = '@localstatedir@/amavisd/virusmails';
 $virus_quarantine_to  = 'virus-quarantine';
 @mynetworks = qw( @@@postfix-mynetworks@@@ );
 
@@ -90,4 +90,4 @@
 [3] http://spamassassin.apache.org/
 [4] See http://www.kolab.org/
 [5] A "local user" is a user with an email-account on the kolab
-server, a "non-local user" is everyone else.
\ No newline at end of file
+server, a "non-local user" is everyone else.

Index: README.webgui.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/doc/README.webgui.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- README.webgui.in	13 Sep 2005 14:38:22 -0000	1.1
+++ README.webgui.in	10 Dec 2005 21:57:11 -0000	1.2
@@ -25,7 +25,7 @@
         user. The right are the same as "admin".
 
 By default all classes can use the webgui. By changing
- at l_prefix@/etc/kolab/templates/session_vars.php this can be
+ at sysconfdir@/kolab/templates/session_vars.php this can be
 configured. The user-classes that shold have access to the webgui
 are listed in the $params['allow_user_classes'] array:
 
@@ -37,7 +37,7 @@
 user's account object. If it possible to change which LDAP attributes
 are shown to users on the user page. For each attribute in the user
 form, an entry in the array $params['attribute_access'] in
- at l_prefix@/etc/kolab/templates/session_vars.php can be made. The key
+ at sysconfdir@/kolab/templates/session_vars.php can be made. The key
 of the entry is the attribute's name and the value is one of 
 
   "ro": Readonly.
@@ -57,4 +57,4 @@
 
 $param['attribute_access'] = array( 'title' => 'ro',
                                     'telephoneNumber' => 'ro',
-                                    'c' => 'hidden' );
\ No newline at end of file
+                                    'c' => 'hidden' );





More information about the commits mailing list