[SCM] The rsync repository. - branch master updated

[Rsync CVS commit messages]

The branch, master has been updated
       via  d52aeae Improve the &merge/&include example explanation.
      from  f7c3a25 Change rsyncd.conf &merge directive to match *.inc. This allows the same rsyncd.d directory to be used for a set of merge files (*.inc) and a set of include files (*.conf).

;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit d52aeae4e9af689aed4ae6af2b7602552c1383e7
Author: Wayne Davison <wayned at samba.org>
Date:   Fri Mar 11 17:38:47 2011 -0800

    Improve the &merge/&include example explanation.

-----------------------------------------------------------------------

Summary of changes:
 rsyncd.conf.yo |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/rsyncd.conf.yo b/rsyncd.conf.yo
index 2771041..49d2522 100644
--- a/rsyncd.conf.yo
+++ b/rsyncd.conf.yo
@@ -790,9 +790,9 @@ verb(    port = 873
     &merge /etc/rsyncd.d
     &include /etc/rsyncd.d )
 
-This file merges any /etc/rsyncd.d/*.inc files, and then includes any
-/etc/rsyncd.d/*.conf files, which each include file being isolated from
-the reset (so that each include's globals don't affect any others).
+This would merge any /etc/rsyncd.d/*.inc files (for global values that should
+stay in effect), and then include any /etc/rsyncd.d/*.conf files (defining
+modules without any global-value cross-talk).
 
 manpagesection(AUTHENTICATION STRENGTH)
 


-- 
The rsync repository.