From d52aeae4e9af689aed4ae6af2b7602552c1383e7 Mon Sep 17 00:00:00 2001
From: Wayne Davison <wayned@samba.org>
Date: Fri, 11 Mar 2011 17:38:47 -0800
Subject: [PATCH] Improve the &merge/&include example explanation.

---
 rsyncd.conf.yo | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/rsyncd.conf.yo b/rsyncd.conf.yo
index 2771041b..49d25226 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)
 
-- 
2.34.1