Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f7c3a25
)
Improve the &merge/&include example explanation.
author
Wayne Davison
<wayned@samba.org>
Sat, 12 Mar 2011 01:38:47 +0000
(17:38 -0800)
committer
Wayne Davison
<wayned@samba.org>
Sat, 12 Mar 2011 01:39:33 +0000
(17:39 -0800)
rsyncd.conf.yo
patch
|
blob
|
blame
|
history
diff --git
a/rsyncd.conf.yo
b/rsyncd.conf.yo
index
2771041
..
49d2522
100644
(file)
--- a/
rsyncd.conf.yo
+++ b/
rsyncd.conf.yo
@@
-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)