Improve the &merge/&include example explanation.
authorWayne Davison <wayned@samba.org>
Sat, 12 Mar 2011 01:38:47 +0000 (17:38 -0800)
committerWayne Davison <wayned@samba.org>
Sat, 12 Mar 2011 01:39:33 +0000 (17:39 -0800)
rsyncd.conf.yo

index 2771041..49d2522 100644 (file)
@@ -790,9 +790,9 @@ verb(    port = 873
     &merge /etc/rsyncd.d
     &include /etc/rsyncd.d )
 
     &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)
 
 
 manpagesection(AUTHENTICATION STRENGTH)