--- rsync-3.0.8/rsyncd.conf.5.~1~	Sat Mar 26 14:37:52 2011

+++ rsync-3.0.8/rsyncd.conf.5	Mon Jun 13 22:07:54 2011

@@ -1,4 +1,4 @@

-.TH "rsyncd.conf" "5" "26 Mar 2011" "" ""

+.TH "rsyncd.conf" "5" "8 May 2009" "" ""

 .SH "NAME"

 rsyncd.conf \(em configuration file for rsync in daemon mode

 .SH "SYNOPSIS"

@@ -20,9 +20,9 @@

 .PP 

 The file consists of modules and parameters. A module begins with the

 name of the module in square brackets and continues until the next

-module begins. Modules contain parameters of the form \(dq\&name = value\(dq\&.

+module begins. Modules contain parameters of the form \(lqname = value\(rq.

 .PP 

-The file is line\-based \-\- that is, each newline\-terminated line represents

+The file is line-based \(em that is, each newline-terminated line represents

 either a comment, a module name or a parameter.

 .PP 

 Only the first equals sign in a parameter is significant. Whitespace before

@@ -34,7 +34,7 @@

 Any line beginning with a hash (#) is ignored, as are lines containing

 only whitespace.

 .PP 

-Any line ending in a \e is \(dq\&continued\(dq\& on the next line in the

+Any line ending in a \e is \(lqcontinued\(rq on the next line in the

 customary UNIX fashion.

 .PP 

 The values following the equals sign in parameters are all either a string

@@ -53,9 +53,9 @@

 file ownership.  Otherwise, it must just have permission to read and

 write the appropriate data, log, and lock files.

 .PP 

-You can launch it either via inetd, as a stand\-alone daemon, or from

-an rsync client via a remote shell.  If run as a stand\-alone daemon then

-just run the command \(dq\&\fBrsync \-\-daemon\fP\(dq\& from a suitable startup script.

+You can launch it either via inetd, as a stand-alone daemon, or from

+an rsync client via a remote shell.  If run as a stand-alone daemon then

+just run the command \(lq\fBrsync \-\-daemon\fP\(rq from a suitable startup script.

 .PP 

 When run via inetd you should add a line like this to /etc/services:

 .PP 

@@ -71,12 +71,12 @@

 .fi 

 .PP 

-Replace \(dq\&/usr/bin/rsync\(dq\& with the path to where you have rsync installed on

+Replace \(lq/usr/bin/rsync\(rq with the path to where you have rsync installed on

 your system.  You will then need to send inetd a HUP signal to tell it to

 reread its config file.

 .PP 

 Note that you should \fBnot\fP send the rsync daemon a HUP signal to force

-it to reread the \f(CWrsyncd.conf\fP file. The file is re\-read on each client

+it to reread the \f(CWrsyncd.conf\fP file. The file is re-read on each client

 connection.

 .PP 

 .SH "GLOBAL PARAMETERS"

@@ -91,7 +91,7 @@

 .PP 

 .IP "\fBmotd file\fP"

 This parameter allows you to specify a

-\(dq\&message of the day\(dq\& to display to clients on each connect. This

+\(lqmessage of the day\(rq to display to clients on each connect. This

 usually contains site information and any legal notices. The default

 is no motd file.

 .IP 

@@ -103,12 +103,12 @@

 .IP "\fBport\fP"

 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 \fB\-\-port\fP command\-line option.

+is being run by inetd, and is superseded by the \fB\-\-port\fP command-line option.

 .IP 

 .IP "\fBaddress\fP"

 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 \fB\-\-address\fP command\-line option.

+being run by inetd, and is superseded by the \fB\-\-address\fP command-line option.

 .IP 

 .IP "\fBsocket options\fP"

 This parameter can provide endless fun for people

@@ -119,7 +119,7 @@

 system call for

 details on some of the options you may be able to set. By default no

 special socket options are set.  These settings can also be specified

-via the \fB\-\-sockopts\fP command\-line option.

+via the \fB\-\-sockopts\fP command-line option.

 .IP 

 .SH "MODULE PARAMETERS"

@@ -139,44 +139,44 @@

 of available modules. The default is no comment.

 .IP 

 .IP "\fBpath\fP"

-This parameter specifies the directory in the daemon\(cq\&s

+This parameter specifies the directory in the daemon's

 filesystem to make available in this module.  You must specify this parameter

 for each module in \f(CWrsyncd.conf\fP.

 .IP 

 .IP "\fBuse chroot\fP"

-If \(dq\&use chroot\(dq\& is true, the rsync daemon will chroot

-to the \(dq\&path\(dq\& before starting the file transfer with the client.  This has

+If \(lquse chroot\(rq is true, the rsync daemon will chroot

+to the \(lqpath\(rq before starting the file transfer with the client.  This has

 the advantage of extra protection against possible implementation security

-holes, but it has the disadvantages of requiring super\-user privileges,

+holes, but it has the disadvantages of requiring super-user privileges,

 of not being able to follow symbolic links that are either absolute or outside

 of the new root path, and of complicating the preservation of users and groups

 by name (see below).

 .IP 

-As an additional safety feature, you can specify a dot\-dir in the module\(cq\&s

-\(dq\&path\(dq\& to indicate the point where the chroot should occur.  This allows rsync

-to run in a chroot with a non\-\(dq\&/\(dq\& path for the top of the transfer hierarchy.

+As an additional safety feature, you can specify a dot-dir in the module's

+\(lqpath\(rq to indicate the point where the chroot should occur.  This allows rsync

+to run in a chroot with a non\-"/\(rq path for the top of the transfer hierarchy.

 Doing this guards against unintended library loading (since those absolute

 paths will not be inside the transfer hierarchy unless you have used an unwise

 pathname), and lets you setup libraries for the chroot that are outside of the

-transfer.  For example, specifying \(dq\&/var/rsync/./module1\(dq\& will chroot to the

-\(dq\&/var/rsync\(dq\& directory and set the inside\-chroot path to \(dq\&/module1\(dq\&.  If you

-had omitted the dot\-dir, the chroot would have used the whole path, and the

-inside\-chroot path would have been \(dq\&/\(dq\&.

+transfer.  For example, specifying \(lq/var/rsync/./module1\(rq will chroot to the

+\(lq/var/rsync\(rq directory and set the inside-chroot path to \(lq/module1\(rq.  If you

+had omitted the dot-dir, the chroot would have used the whole path, and the

+inside-chroot path would have been \(lq/\(rq.

 .IP 

-When \(dq\&use chroot\(dq\& is false or the inside\-chroot path is not \(dq\&/\(dq\&, rsync will:

+When \(lquse chroot\(rq is false or the inside-chroot path is not \(lq/\(rq, rsync will:

 (1) munge symlinks by

-default for security reasons (see \(dq\&munge symlinks\(dq\& for a way to turn this

+default for security reasons (see \(lqmunge symlinks\(rq for a way to turn this

 off, but only if you trust your users), (2) substitute leading slashes in

-absolute paths with the module\(cq\&s path (so that options such as

+absolute paths with the module's path (so that options such as

 \fB\-\-backup\-dir\fP, \fB\-\-compare\-dest\fP, etc. interpret an absolute path as

-rooted in the module\(cq\&s \(dq\&path\(dq\& dir), and (3) trim \(dq\&..\(dq\& path elements from

+rooted in the module's \(lqpath\(rq dir), and (3) trim \(lq..\(rq path elements from

 args if rsync believes they would escape the module hierarchy.

-The default for \(dq\&use chroot\(dq\& is true, and is the safer choice (especially

-if the module is not read\-only).

+The default for \(lquse chroot\(rq is true, and is the safer choice (especially

+if the module is not read-only).

 .IP 

 When this parameter is enabled, rsync will not attempt to map users and groups

 by name (by default), but instead copy IDs as though \fB\-\-numeric\-ids\fP had

-been specified.  In order to enable name\-mapping, rsync needs to be able to

+been specified.  In order to enable name-mapping, rsync needs to be able to

 use the standard library functions for looking up names and IDs (i.e.

 \f(CWgetpwuid()\fP

 , 

@@ -191,12 +191,12 @@

 used by these library functions (traditionally /etc/passwd and

 /etc/group, but perhaps additional dynamic libraries as well).

 .IP 

-If you copy the necessary resources into the module\(cq\&s chroot area, you

-should protect them through your OS\(cq\&s normal user/group or ACL settings (to

-prevent the rsync module\(cq\&s user from being able to change them), and then

-hide them from the user\(cq\&s view via \(dq\&exclude\(dq\& (see how in the discussion of

+If you copy the necessary resources into the module's chroot area, you

+should protect them through your OS's normal user/group or ACL settings (to

+prevent the rsync module's user from being able to change them), and then

+hide them from the user's view via \(lqexclude\(rq (see how in the discussion of

 that parameter).  At that point it will be safe to enable the mapping of users

-and groups by name using the \(dq\&numeric ids\(dq\& daemon parameter (see below).

+and groups by name using the \(lqnumeric ids\(rq daemon parameter (see below).

 .IP 

 Note also that you are free to setup custom user/group information in the

 chroot area that is different from your normal system.  For example, you

@@ -205,12 +205,12 @@

 .IP "\fBnumeric ids\fP"

 Enabling this parameter disables the mapping

 of users and groups by name for the current daemon module.  This prevents

-the daemon from trying to load any user/group\-related files or libraries.

+the daemon from trying to load any user/group-related files or libraries.

 This enabling makes the transfer behave as if the client had passed

-the \fB\-\-numeric\-ids\fP command\-line option.  By default, this parameter is

-enabled for chroot modules and disabled for non\-chroot modules.

+the \fB\-\-numeric\-ids\fP command-line option.  By default, this parameter is

+enabled for chroot modules and disabled for non-chroot modules.

 .IP 

-A chroot\-enabled module should not have this parameter enabled unless you\(cq\&ve

+A chroot-enabled module should not have this parameter enabled unless you've

 taken steps to ensure that the module has the necessary resources it needs

 to translate names, and that it is not possible for a user to change those

 resources.

@@ -219,52 +219,52 @@

 This parameter tells rsync to modify

 all incoming symlinks in a way that makes them unusable but recoverable

 (see below).  This should help protect your files from user trickery when

-your daemon module is writable.  The default is disabled when \(dq\&use chroot\(dq\&

-is on and the inside\-chroot path is \(dq\&/\(dq\&, otherwise it is enabled.

+your daemon module is writable.  The default is disabled when \(lquse chroot\(rq

+is on and the inside-chroot path is \(lq/\(rq, otherwise it is enabled.

 .IP 

-If you disable this parameter on a daemon that is not read\-only, there

+If you disable this parameter on a daemon that is not read-only, there

 are tricks that a user can play with uploaded symlinks to access

-daemon\-excluded items (if your module has any), and, if \(dq\&use chroot\(dq\&

+daemon-excluded items (if your module has any), and, if \(lquse chroot\(rq

 is off, rsync can even be tricked into showing or changing data that

-is outside the module\(cq\&s path (as access\-permissions allow).

+is outside the module's path (as access-permissions allow).

 .IP 

 The way rsync disables the use of symlinks is to prefix each one with

-the string \(dq\&/rsyncd\-munged/\(dq\&.  This prevents the links from being used

+the string \(lq/rsyncd-munged/\(rq.  This prevents the links from being used

 as long as that directory does not exist.  When this parameter is enabled,

 rsync will refuse to run if that path is a directory or a symlink to

-a directory.  When using the \(dq\&munge symlinks\(dq\& parameter in a chroot area

-that has an inside\-chroot path of \(dq\&/\(dq\&, you should add \(dq\&/rsyncd\-munged/\(dq\&

+a directory.  When using the \(lqmunge symlinks\(rq parameter in a chroot area

+that has an inside-chroot path of \(lq/\(rq, you should add \(lq/rsyncd-munged/\(rq

 to the exclude setting for the module so that

-a user can\(cq\&t try to create it.

+a user can't try to create it.

 .IP 

-Note:  rsync makes no attempt to verify that any pre\-existing symlinks in

-the module\(cq\&s hierarchy are as safe as you want them to be (unless, of

+Note:  rsync makes no attempt to verify that any pre-existing symlinks in

+the module's hierarchy are as safe as you want them to be (unless, of

 course, it just copied in the whole hierarchy).  If you setup an rsync

 daemon on a new area or locally add symlinks, you can manually protect your

-symlinks from being abused by prefixing \(dq\&/rsyncd\-munged/\(dq\& to the start of

-every symlink\(cq\&s value.  There is a perl script in the support directory

-of the source code named \(dq\&munge\-symlinks\(dq\& that can be used to add or remove

+symlinks from being abused by prefixing \(lq/rsyncd-munged/\(rq to the start of

+every symlink's value.  There is a perl script in the support directory

+of the source code named \(lqmunge-symlinks\(rq that can be used to add or remove

 this prefix from your symlinks.

 .IP 

-When this parameter is disabled on a writable module and \(dq\&use chroot\(dq\& is off

-(or the inside\-chroot path is not \(dq\&/\(dq\&),

-incoming symlinks will be modified to drop a leading slash and to remove \(dq\&..\(dq\&

-path elements that rsync believes will allow a symlink to escape the module\(cq\&s

+When this parameter is disabled on a writable module and \(lquse chroot\(rq is off

+(or the inside-chroot path is not \(lq/\(rq),

+incoming symlinks will be modified to drop a leading slash and to remove \(lq..\(rq

+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 parameters.

 .IP 

 .IP "\fBcharset\fP"

 This specifies the name of the character set in which the

-module\(cq\&s filenames are stored.  If the client uses an \fB\-\-iconv\fP option,

-the daemon will use the value of the \(dq\&charset\(dq\& parameter regardless of the

+module's filenames are stored.  If the client uses an \fB\-\-iconv\fP option,

+the daemon will use the value of the \(lqcharset\(rq parameter regardless of the

 character set the client actually passed.  This allows the daemon to

 support charset conversion in a chroot module without extra files in the

-chroot area, and also ensures that name\-translation is done in a consistent

-manner.  If the \(dq\&charset\(dq\& parameter is not set, the \fB\-\-iconv\fP option is

-refused, just as if \(dq\&iconv\(dq\& had been specified via \(dq\&refuse options\(dq\&.

+chroot area, and also ensures that name-translation is done in a consistent

+manner.  If the \(lqcharset\(rq parameter is not set, the \fB\-\-iconv\fP option is

+refused, just as if \(lqiconv\(rq had been specified via \(lqrefuse options\(rq.

 .IP 

 If you wish to force users to always use \fB\-\-iconv\fP for a particular

-module, add \(dq\&no\-iconv\(dq\& to the \(dq\&refuse options\(dq\& parameter.  Keep in mind

+module, add \(lqno-iconv\(rq to the \(lqrefuse options\(rq parameter.  Keep in mind

 that this will restrict access to your module to very new rsync clients.

 .IP 

 .IP "\fBmax connections\fP"

@@ -273,21 +273,21 @@

 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.

 A negative value disables the module.

-See also the \(dq\&lock file\(dq\& parameter.

+See also the \(lqlock file\(rq parameter.

 .IP 

 .IP "\fBlog file\fP"

-When the \(dq\&log file\(dq\& parameter is set to a non\-empty

+When the \(lqlog file\(rq parameter is set to a non-empty

 string, the rsync daemon will log messages to the indicated file rather

 than using syslog. This is particularly useful on systems (such as AIX)

 where 

 \f(CWsyslog()\fP

-doesn\(cq\&t work for chrooted programs.  The file is

+doesn't work for chrooted programs.  The file is

 opened before 

 \f(CWchroot()\fP

 is called, allowing it to be placed outside

-the transfer.  If this value is set on a per\-module basis instead of

+the transfer.  If this value is set on a per-module basis instead of

 globally, the global log will still contain any authorization failures

-or config\-file error messages.

+or config-file error messages.

 .IP 

 If the daemon fails to open the specified file, it will fall back to

 using syslog and output an error about the failure.  (Note that the

@@ -300,19 +300,19 @@

 defined on your system. Common names are auth, authpriv, cron, daemon,

 ftp, kern, lpr, mail, news, security, syslog, user, uucp, local0,

 local1, local2, local3, local4, local5, local6 and local7. The default

-is daemon.  This setting has no effect if the \(dq\&log file\(dq\& setting is a

-non\-empty string (either set in the per\-modules settings, or inherited

+is daemon.  This setting has no effect if the \(lqlog file\(rq setting is a

+non-empty string (either set in the per-modules settings, or inherited

 from the global settings).

 .IP 

 .IP "\fBmax verbosity\fP"

 This parameter allows you to control

-the maximum amount of verbose information that you\(cq\&ll allow the daemon to

+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.

 .IP 

 .IP "\fBlock file\fP"

 This parameter specifies the file to use to

-support the \(dq\&max connections\(dq\& parameter. The rsync daemon uses record

+support the \(lqmax connections\(rq parameter. The rsync daemon uses record

 locking on this file to ensure that the max connections limit is not

 exceeded for the modules sharing the lock file.

 The default is \f(CW/var/run/rsyncd.lock\fP.

@@ -319,15 +319,15 @@

 .IP 

 .IP "\fBread only\fP"

 This parameter determines whether clients

-will be able to upload files or not. If \(dq\&read only\(dq\& is true then any

-attempted uploads will fail. If \(dq\&read only\(dq\& is false then uploads will

+will be able to upload files or not. If \(lqread only\(rq is true then any

+attempted uploads will fail. If \(lqread only\(rq is false then uploads will

 be possible if file permissions on the daemon side allow them. The default

 is for all modules to be read only.

 .IP 

 .IP "\fBwrite only\fP"

 This parameter determines whether clients

-will be able to download files or not. If \(dq\&write only\(dq\& is true then any

-attempted downloads will fail. If \(dq\&write only\(dq\& is false then downloads

+will be able to download files or not. If \(lqwrite only\(rq is true then any

+attempted downloads will fail. If \(lqwrite only\(rq is false then downloads

 will be possible if file permissions on the daemon side allow them.  The

 default is for this parameter to be disabled.

 .IP 

@@ -340,19 +340,19 @@

 .IP "\fBuid\fP"

 This parameter specifies the user name or user ID that

 file transfers to and from that module should take place as when the daemon

-was run as root. In combination with the \(dq\&gid\(dq\& parameter this determines what

+was run as root. In combination with the \(lqgid\(rq parameter this determines what

 file permissions are available. The default is uid \-2, which is normally

-the user \(dq\&nobody\(dq\&.

+the user \(lqnobody\(rq.

 .IP 

 .IP "\fBgid\fP"

 This parameter specifies the group name or group ID that

 file transfers to and from that module should take place as when the daemon

-was run as root. This complements the \(dq\&uid\(dq\& parameter. The default is gid \-2,

-which is normally the group \(dq\&nobody\(dq\&.

+was run as root. This complements the \(lquid\(rq parameter. The default is gid \-2,

+which is normally the group \(lqnobody\(rq.

 .IP 

 .IP "\fBfake super\fP"

-Setting \(dq\&fake super = yes\(dq\& for a module causes the

-daemon side to behave as if the \fB\-\-fake\-super\fP command\-line option had

+Setting \(lqfake super = yes\(rq for a module causes the

+daemon side to behave as if the \fB\-\-fake\-user\fP command-line option had

 been specified.  This allows the full attributes of a file to be stored

 without having to have the daemon actually running as root.

 .IP 

@@ -360,7 +360,7 @@

 The daemon has its own filter chain that determines what files

 it will let the client access.  This chain is not sent to the client and is

 independent of any filters the client may have specified.  Files excluded by

-the daemon filter chain (\fBdaemon\-excluded\fP files) are treated as non\-existent

+the daemon filter chain (\fBdaemon-excluded\fP files) are treated as non-existent

 if the client tries to pull them, are skipped with an error message if the

 client tries to push them (triggering exit code 23), and are never deleted from

 the module.  You can use daemon filters to prevent clients from downloading or

@@ -367,55 +367,55 @@

 tampering with private administrative files, such as files you may add to

 support uid/gid name translations.

 .IP 

-The daemon filter chain is built from the \(dq\&filter\(dq\&, \(dq\&include from\(dq\&, \(dq\&include\(dq\&,

-\(dq\&exclude from\(dq\&, and \(dq\&exclude\(dq\& parameters, in that order of priority.  Anchored

+The daemon filter chain is built from the \(lqfilter\(rq, \(lqinclude from\(rq, \(lqinclude\(rq,

+\(lqexclude from\(rq, and \(lqexclude\(rq parameters, in that order of priority.  Anchored

 patterns are anchored at the root of the module.  To prevent access to an

-entire subtree, for example, \(dq\&/secret\(dq\&, you \fImust\fP exclude everything in the

-subtree; the easiest way to do this is with a triple\-star pattern like

-\(dq\&/secret/***\(dq\&.

+entire subtree, for example, \(lq/secret\(rq, you \fImust\fP exclude everything in the

+subtree; the easiest way to do this is with a triple-star pattern like

+\(lq/secret/***\(rq.

 .IP 

-The \(dq\&filter\(dq\& parameter takes a space\-separated list of daemon filter rules,

+The \(lqfilter\(rq parameter takes a space-separated list of daemon filter rules,

 though it is smart enough to know not to split a token at an internal space in

-a rule (e.g. \(dq\&\- /foo  \(em /bar\(dq\& is parsed as two rules).  You may specify one or

-more merge\-file rules using the normal syntax.  Only one \(dq\&filter\(dq\& parameter can

+a rule (e.g. \(lq\- /foo  \(em /bar\(rq is parsed as two rules).  You may specify one or

+more merge-file rules using the normal syntax.  Only one \(lqfilter\(rq parameter can

 apply to a given module in the config file, so put all the rules you want in a

-single parameter.  Note that per\-directory merge\-file rules do not provide as

+single parameter.  Note that per-directory merge-file rules do not provide as

 much protection as global rules, but they can be used to make \fB\-\-delete\fP work

-better during a client download operation if the per\-dir merge files are

+better during a client download operation if the per-dir merge files are

 included in the transfer and the client requests that they be used.

 .IP 

 .IP "\fBexclude\fP"

-This parameter takes a space\-separated list of daemon

+This parameter takes a space-separated list of daemon

 exclude patterns.  As with the client \fB\-\-exclude\fP option, patterns can be

-qualified with \(dq\&\- \(dq\& or \(dq\&+ \(dq\& to explicitly indicate exclude/include.  Only one

-\(dq\&exclude\(dq\& parameter can apply to a given module.  See the \(dq\&filter\(dq\& parameter

+qualified with \(lq\- \(rq or \(lq+ \(rq to explicitly indicate exclude/include.  Only one

+\(lqexclude\(rq parameter can apply to a given module.  See the \(lqfilter\(rq parameter

 for a description of how excluded files affect the daemon.

 .IP 

 .IP "\fBinclude\fP"

-Use an \(dq\&include\(dq\& to override the effects of the \(dq\&exclude\(dq\&

-parameter.  Only one \(dq\&include\(dq\& parameter can apply to a given module.  See the

-\(dq\&filter\(dq\& parameter for a description of how excluded files affect the daemon.

+Use an \(lqinclude\(rq to override the effects of the \(lqexclude\(rq

+parameter.  Only one \(lqinclude\(rq parameter can apply to a given module.  See the

+\(lqfilter\(rq parameter for a description of how excluded files affect the daemon.

 .IP 

 .IP "\fBexclude from\fP"

 This parameter specifies the name of a file

 on the daemon that contains daemon exclude patterns, one per line.  Only one

-\(dq\&exclude from\(dq\& parameter can apply to a given module; if you have multiple

-exclude\-from files, you can specify them as a merge file in the \(dq\&filter\(dq\&

-parameter.  See the \(dq\&filter\(dq\& parameter for a description of how excluded files

+\(lqexclude from\(rq parameter can apply to a given module; if you have multiple

+exclude-from files, you can specify them as a merge file in the \(lqfilter\(rq

+parameter.  See the \(lqfilter\(rq parameter for a description of how excluded files

 affect the daemon.

 .IP 

 .IP "\fBinclude from\fP"

-Analogue of \(dq\&exclude from\(dq\& for a file of daemon include

-patterns.  Only one \(dq\&include from\(dq\& parameter can apply to a given module.  See

-the \(dq\&filter\(dq\& parameter for a description of how excluded files affect the

+Analogue of \(lqexclude from\(rq for a file of daemon include

+patterns.  Only one \(lqinclude from\(rq parameter can apply to a given module.  See

+the \(lqfilter\(rq parameter for a description of how excluded files affect the

 daemon.

 .IP 

 .IP "\fBincoming chmod\fP"

 This parameter allows you to specify a set of

-comma\-separated chmod strings that will affect the permissions of all

+comma-separated chmod strings that will affect the permissions of all

 incoming files (files that are being received by the daemon).  These

 changes happen after all other permission calculations, and this will

-even override destination\-default and/or existing permissions when the

+even override destination-default and/or existing permissions when the

 client does not specify \fB\-\-perms\fP.

 See the description of the \fB\-\-chmod\fP rsync option and the \fBchmod\fP(1)

 manpage for information on the format of this string.

@@ -422,7 +422,7 @@

 .IP 

 .IP "\fBoutgoing chmod\fP"

 This parameter allows you to specify a set of

-comma\-separated chmod strings that will affect the permissions of all

+comma-separated chmod strings that will affect the permissions of all

 outgoing files (files that are being sent out from the daemon).  These

 changes happen first, making the sent permissions appear to be different

 than those stored in the filesystem itself.  For instance, you could

@@ -433,41 +433,41 @@

 .IP 

 .IP "\fBauth users\fP"

 This parameter specifies a comma and

-space\-separated list of usernames that will be allowed to connect to

+space-separated list of usernames that will be allowed to connect to

 this module. The usernames do not need to exist on the local

 system. The usernames may also contain shell wildcard characters. If

-\(dq\&auth users\(dq\& is set then the client will be challenged to supply a

+\(lqauth users\(rq is set then the client will be challenged to supply a

 username and password to connect to the module. A challenge response

 authentication protocol is used for this exchange. The plain text

 usernames and passwords are stored in the file specified by the

-\(dq\&secrets file\(dq\& parameter. The default is for all users to be able to

-connect without a password (this is called \(dq\&anonymous rsync\(dq\&).

+\(lqsecrets file\(rq parameter. The default is for all users to be able to

+connect without a password (this is called \(lqanonymous rsync\(rq).

 .IP 

-See also the section entitled \(dq\&USING RSYNC\-DAEMON FEATURES VIA A REMOTE

-SHELL CONNECTION\(dq\& in \fBrsync\fP(1) for information on how handle an

-rsyncd.conf\-level username that differs from the remote\-shell\-level

+See also the \(lqCONNECTING TO AN RSYNC DAEMON OVER A REMOTE SHELL

+PROGRAM\(rq section in \fBrsync\fP(1) for information on how handle an

+rsyncd.conf\-level username that differs from the remote-shell-level

 username when using a remote shell to connect to an rsync daemon.

 .IP 

 .IP "\fBsecrets file\fP"

 This parameter specifies the name of

 a file that contains the username:password pairs used for

-authenticating this module. This file is only consulted if the \(dq\&auth

-users\(dq\& parameter is specified. The file is line based and contains

+authenticating this module. This file is only consulted if the \(lqauth

+users\(rq parameter is specified. The file is line based and contains

 username:password pairs separated by a single colon. Any line starting

 with a hash (#) is considered a comment and is skipped. The passwords