bernhard: server/kolabd/kolabd/doc README.webgui.in,1.4,1.5

[cvs at kolab.org]

Author: bernhard

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

Modified Files:
	README.webgui.in 
Log Message:
* templates/master.cf.template.in: added envelope_recipient
	to masquerade_classes. According to Postfix' documention it was
	missing to allow for delivery to local machines, which we do
	not want to do in a standard Kolab Server setup. 
	Removed the masquerade_exceptions = root line, as we can get
	the information where an email to root at machine came from also
	from the connection itself and it is good to be closer to the default.
* Resolved conflict in doc/README.webgui.in.


Index: README.webgui.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/doc/README.webgui.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- README.webgui.in	25 Jan 2006 21:55:22 -0000	1.4
+++ README.webgui.in	28 Aug 2006 11:15:10 -0000	1.5
@@ -34,7 +34,7 @@
 
 
 2) Controlling access for regular users to the LDAP attributes of the
-user's account object. It it possible to change which LDAP attributes
+user's account object. It is 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
 @sysconfdir@/kolab/templates/session_vars.php can be made. The key