X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/42afed9c1ac7e54a0dd233ba1b22faaafccb683b..4ccfd96cfee813f3855be5a902acc3d5cd0545a4:/rsyncd.conf.yo

diff --git a/rsyncd.conf.yo b/rsyncd.conf.yo
index 6d134c62..f81e3e97 100644
--- a/rsyncd.conf.yo
+++ b/rsyncd.conf.yo
@@ -1,5 +1,5 @@
 mailto(rsync-bugs@samba.org)
-manpage(rsyncd.conf)(5)(21 Sep 2004)()()
+manpage(rsyncd.conf)(5)(30 Sep 2004)()()
 manpagename(rsyncd.conf)(configuration file for rsync server)
 manpagesynopsis()
 
@@ -160,12 +160,25 @@ being downloaded/uploaded by adding an exclude rule to the rsync.conf file
 is a relatively new feature in rsync, so make sure your server is running
 at least 2.6.3 to effect this.
 
+dit(bf(port)) You can override the default port the daemon will listen on
+by specifying this value (defaults to 873).  This is ignored if the daemon
+is being run by inetd, and is superseded by the --port command-line option.
+
+dit(bf(address)) You can override the default IP address the daemon
+will listen on by specifying this value.  This is ignored if the daemon is
+being run by inetd, and is superseded by the --address command-line option.
+
 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
 message telling them to try later.  The default is 0 which means no limit.
 See also the "lock file" option.
 
+dit(bf(max verbosity)) The "max verbosity" option allows you to control
+the maximum amount of verbose information that you'll allow the daemon to
+generate (since the information goes into the log file). The default is 1,
+which allows the client to request one level of verbosity.
+
 dit(bf(lock file)) The "lock file" option specifies the file to use to
 support the "max connections" option. The rsync server uses record
 locking on this file to ensure that the max connections limit is not
@@ -200,6 +213,16 @@ file transfers to and from that module should take place as when the daemon
 was run as root. This complements the "uid" option. The default is gid -2,
 which is normally the group "nobody".
 
+dit(bf(filter)) The "filter" option allows you to specify a space-separated
+list of filter rules that the server will not allow to be read or written.
+This is only superficially equivalent to the client specifying these
+patterns with the --filter option.  Only one "filter" option may be
+specified, but it may contain as many rules as you like, including
+merge-file rules.  Note that per-directory merge-file rules do not provide
+as much protection as global rules, but they can be used to make --delete
+work better when a client downloads the server's files (if the per-dir
+merge files are included in the transfer).
+
 dit(bf(exclude)) The "exclude" option allows you to specify a
 space-separated list of patterns that the server will not allow to be read
 or written.  This is only superficially equivalent to the client
@@ -327,10 +350,10 @@ The default is no "hosts deny" option, which means all hosts can connect.
 dit(bf(ignore errors)) The "ignore errors" option tells rsyncd to
 ignore I/O errors on the server when deciding whether to run the delete
 phase of the transfer. Normally rsync skips the --delete step if any
-I/O errors have occurred in order to prevent disasterous deletion due
+I/O errors have occurred in order to prevent disastrous deletion due
 to a temporary resource shortage or other I/O error. In some cases this
 test is counter productive so you can use this option to turn off this
-behaviour. 
+behavior. 
 
 dit(bf(ignore nonreadable)) This tells the rsync server to completely
 ignore files that are not readable by the user. This is useful for
@@ -393,6 +416,10 @@ To prevent all compression, you can use "dont compress = *" (see below)
 instead of "refuse options = compress" to avoid returning an error to a
 client that requests compression.
 
+Note that rsync's --del option is implemented as a popt alias, so there
+is no need (an indeed, no way) to refuse "del" by name -- just matching
+the --delete-during option (e.g. "delete*") will refuse --del as well.
+
 dit(bf(dont compress)) The "dont compress" option allows you to select
 filenames based on wildcard patterns that should not be compressed
 during transfer. Compression is expensive in terms of CPU usage so it
@@ -545,7 +572,8 @@ documentation!
 
 manpageauthor()
 
-rsync was written by Andrew Tridgell and Paul Mackerras.  They may be
-contacted via email at tridge@samba.org and
-Paul.Mackerras@cs.anu.edu.au
+rsync was written by Andrew Tridgell and Paul Mackerras.
+Many people have later contributed to it.
 
+Mailing lists for support and development are available at
+url(http://lists.samba.org)(lists.samba.org)