X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/fddf529df98dcc8c92394d4eef690fdeed02e374..17af842d2d9ba71b4b6a436ee75102bf941b643a:/rsyncd.conf.yo

diff --git a/rsyncd.conf.yo b/rsyncd.conf.yo
index 8f8f1526..a5152fd5 100644
--- a/rsyncd.conf.yo
+++ b/rsyncd.conf.yo
@@ -116,7 +116,8 @@ who like to tune their systems to the utmost degree. You can set all
 sorts of socket options which may make transfers faster (or
 slower!). Read the man page for the setsockopt() system call for
 details on some of the options you may be able to set. By default no
-special socket options are set.
+special socket options are set.  These settings are superseded by the
+bf(--sockopts) command-line option.
 
 enddit()
 
@@ -262,6 +263,13 @@ only superficially equivalent to the client specifying the
 bf(--include-from) option with a equivalent file.
 See the "exclude" option above.
 
+dit(bf(incoming chmod)) This option allows you to specify a chmod string
+that will affect the permissions of all incoming files (files that are
+being copied to the daemon).  These changes happen last, giving you the
+final word on what the permissions should look like in the repository.  See
+the description of the bf(--chmod) rsync option and the bf(chmod) manpage
+for information on the format of this string.
+
 dit(bf(auth users)) The "auth users" option specifies a comma and
 space-separated list of usernames that will be allowed to connect to
 this module. The usernames do not need to exist on the local
@@ -470,7 +478,7 @@ quote(itemize(
   it() bf(RSYNC_REQUEST): (pre-xfer only) The module/path info specified
   by the user (note that the user can specify multiple source files,
   so the request can be something like "mod/path1 mod/path2", etc.).
-  it() bf(RSYNC_ARGn): (pre-xfer only) The pre-request arguments are set
+  it() bf(RSYNC_ARG#): (pre-xfer only) The pre-request arguments are set
   in these numbered values. RSYNC_ARG0 is always "rsyncd", and the last
   value contains a single period.
   it() bf(RSYNC_EXIT_STATUS): (post-xfer only) rsync's exit value.  This will be 0 for a