X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/9585b27678ee8b94f2f260e8d8d61ff4381f2fa3..ec8637f3679b891041c798400774141024e24a4e:/rsyncd.conf.yo

diff --git a/rsyncd.conf.yo b/rsyncd.conf.yo
index 052ccc7e..b914570d 100644
--- a/rsyncd.conf.yo
+++ b/rsyncd.conf.yo
@@ -1,5 +1,5 @@
 mailto(rsync-bugs@samba.org)
-manpage(rsyncd.conf)(5)(8 Nov 2007)()()
+manpage(rsyncd.conf)(5)(16 Dec 2007)()()
 manpagename(rsyncd.conf)(configuration file for rsync in daemon mode)
 manpagesynopsis()
 
@@ -113,6 +113,10 @@ After the global options you should define a number of modules, each
 module exports a directory tree as a symbolic name. Modules are
 exported by specifying a module name in square brackets [module]
 followed by the options for that module.
+The module name cannot contain a slash or a closing square bracket.  If the
+name contains whitespace, each internal sequence of whitespace will be
+changed into a single space, while leading or trailing whitespace will be
+discarded.
 
 startdit()
 
@@ -180,7 +184,7 @@ as long as that directory does not exist.  When this option is enabled,
 rsync will refuse to run if that path is a directory or a symlink to
 a directory.  When using the "munge symlinks" option in a chroot area,
 you should add this path to the exclude setting for the module so that
-the user can't try to create it.
+a user can't try to create it.
 
 Note:  rsync makes no attempt to verify that any pre-existing symlinks in
 the hierarchy are as safe as you want them to be.  If you setup an rsync
@@ -190,6 +194,12 @@ every symlink's value.  There is a perl script in the support directory
 of the source code named "munge-symlinks" that can be used to add or remove
 this prefix from your symlinks.
 
+When this option is disabled on a writable module and "use chroot" is off,
+incoming symlinks will be modified to drop a leading slash and to remove ".."
+path elements that rsync believes will allow a symlink to escape the module's
+hierarchy.  There are tricky ways to work around this, though, so you had
+better trust your users if you choose this combination of options.
+
 dit(bf(max connections)) The "max connections" option allows you to
 specify the maximum number of simultaneous connections you will allow.
 Any clients connecting when the maximum has been reached will receive a
@@ -645,7 +655,7 @@ url(http://rsync.samba.org/)(http://rsync.samba.org/)
 
 manpagesection(VERSION)
 
-This man page is current for version 3.0.0pre5 of rsync.
+This man page is current for version 3.0.0pre7 of rsync.
 
 manpagesection(CREDITS)