upstream/oracle/userland-gate: comparison components/rsync/patches/rsync.1.patch

equal deleted inserted replaced

-:f4d6496d9297
+:5c589218fa09
---- rsync-3.0.8/rsync.1.~1~	Sat Mar 26 14:37:52 2011
+--- rsync-3.0.9/rsync.1.orig	2011-09-23 09:42:26.000000000 -0700
-+++ rsync-3.0.8/rsync.1	Mon Jun 13 22:07:51 2011
++++ rsync-3.0.9/rsync.1	2013-04-19 14:14:00.348176963 -0700
 @@ -1,6 +1,6 @@
--.TH "rsync" "1" "26 Mar 2011" "" ""
+.TH "rsync" "1" "23 Sep 2011" "" ""
-+.TH "rsync" "1" "8 May 2009" "" ""
 .SH "NAME"
--rsync \(em a fast, versatile, remote (and local) file\-copying tool
+-rsync \- a fast, versatile, remote (and local) file\-copying tool
 +rsync \(em a fast, versatile, remote (and local) file-copying tool
 .SH "SYNOPSIS"
 .PP
-@@ -29,17 +29,17 @@
+@@ -29,30 +29,30 @@
 copy locally, to/from another host over any remote shell, or to/from a
 remote rsync daemon.  It offers a large number of options that control
 every aspect of its behavior and permit very flexible specification of the
 -set of files to be copied.  It is famous for its delta\-transfer algorithm,
 +set of files to be copied.  It is famous for its delta-transfer algorithm,
 -quick check indicates that the file\(cq\&s data does not need to be updated.
 +quick check indicates that the file's data does not need to be updated.
 .PP
 Some of the additional features of rsync are:
 .PP
-@@ -46,13 +46,13 @@
 .IP o
 support for copying links, devices, owners, groups, and permissions
 .IP o
 -exclude and exclude\-from options similar to GNU tar
 +exclude and exclude-from options similar to GNU tar
 -does not require super\-user privileges
 +does not require super-user privileges
 .IP o
 pipelining of file transfers to minimize latency costs
 .IP o
-@@ -67,24 +67,24 @@
+@@ -67,24 +67,25 @@
 current host (it does not support copying files between two remote hosts).
 .PP
 There are two different ways for rsync to contact a remote system: using a
 -remote\-shell program as the transport (such as ssh or rsh) or contacting an
 -rsync daemon directly via TCP.  The remote\-shell transport is used whenever
 a host specification.  Contacting an rsync daemon directly happens when the
 source or destination path contains a double colon (::) separator after a
 host specification, OR when an rsync:// URL is specified (see also the
 -\(dq\&USING RSYNC\-DAEMON FEATURES VIA A REMOTE\-SHELL CONNECTION\(dq\& section for
 +\(lqUSING RSYNC-DAEMON FEATURES VIA A REMOTE-SHELL CONNECTION\(rq section for
++\(lqUSING RSYNC-DAEMON FEATURES VIA A REMOTE-SHELL CONNECTION\(rq section for
 an exception to this latter rule).
 .PP
 As a special case, if a single source arg is specified without a
 -destination, the files are listed in an output format similar to \(dq\&ls \-l\(dq\&.
 +destination, the files are listed in an output format similar to \(lqls \-l\(rq.
 +\(lqserver\(rq.  Don't confuse \(lqserver\(rq with an rsync daemon \(em a daemon is always a
 +server, but a server can be either a daemon or a remote-shell spawned process.
 .PP
 .SH "SETUP"
-@@ -93,7 +93,7 @@
+@@ -93,7 +94,7 @@
 .PP
 Once installed, you can use rsync to any machine that you can access via
 a remote shell (as well as some that you can access using the rsync
 -daemon\-mode protocol).  For remote transfers, a modern rsync uses ssh
 +daemon-mode protocol).  For remote transfers, a modern rsync uses ssh
 for its communications, but it may have been configured to use a
 different remote shell by default, such as rsh or remsh.
 .PP
-@@ -119,7 +119,7 @@
+@@ -119,7 +120,7 @@
 This would transfer all files matching the pattern *.c from the
 current directory to the directory src on the machine foo. If any of
 the files already exist on the remote system then the rsync
 -remote\-update protocol is used to update the file by sending only the
 +remote-update protocol is used to update the file by sending only the
 differences. See the tech report for details.
 .PP
 .RS
-@@ -129,7 +129,7 @@
+@@ -129,7 +130,7 @@
 .PP
 This would recursively transfer all files from the directory src/bar on the
 machine foo into the /data/tmp/bar directory on the local machine. The
 -files are transferred in \(dq\&archive\(dq\& mode, which ensures that symbolic
 +files are transferred in \(lqarchive\(rq mode, which ensures that symbolic
 links, devices, attributes, permissions, ownerships, etc. are preserved
 in the transfer.  Additionally, compression will be used to reduce the
 size of data portions of the transfer.
-@@ -141,8 +141,8 @@
+@@ -141,8 +142,8 @@
 .PP
 A trailing slash on the source changes this behavior to avoid creating an
 additional directory level at the destination.  You can think of a trailing
 -/ on a source as meaning \(dq\&copy the contents of this directory\(dq\& as opposed
 -to \(dq\&copy the directory by name\(dq\&, but in both cases the attributes of the
 +/ on a source as meaning \(lqcopy the contents of this directory\(rq as opposed
 +to \(lqcopy the directory by name\(rq, but in both cases the attributes of the
 containing directory are transferred to the containing directory on the
 destination.  In other words, each of the following commands copies the
 files in the same way, including their setting of the attributes of
-@@ -156,9 +156,9 @@
+@@ -156,9 +157,9 @@
 .RE
 .PP
 -Note also that host and module references don\(cq\&t require a trailing slash to
 +Note also that host and module references don't require a trailing slash to
 -copy the remote directory\(cq\&s contents into \(dq\&/dest\(dq\&:
 +copy the remote directory's contents into \(lq/dest\(rq:
 .PP
 .RS
 \f(CWrsync \-av host: /dest\fP
-@@ -168,8 +168,8 @@
+@@ -168,8 +169,8 @@
 .RE
 .PP
 -You can also use rsync in local\-only mode, where both the source and
 -destination don\(cq\&t have a \(cq\&:\(cq\& in the name. In this case it behaves like
 +You can also use rsync in local-only mode, where both the source and
 +destination don't have a \(oq:\(cq in the name. In this case it behaves like
 an improved copy command.
 .PP
 Finally, you can list all the (listable) modules available from a
-@@ -186,7 +186,7 @@
+@@ -186,7 +187,7 @@
 .PP
 The syntax for requesting multiple files from a remote host is done by
 -specifying additional remote\-host args in the same style as the first,
 +specifying additional remote-host args in the same style as the first,
 or with the hostname omitted.  For instance, all these work:
 .PP
 .RS
-@@ -202,22 +202,22 @@
+@@ -202,22 +203,22 @@
 examples:
 .PP
 .RS
 -\f(CWrsync \-av host:'\&dir1/file1 dir2/file2'\& /dest\fP
 +\f(CWrsync \-av host:'dir1/file1 dir2/file2' /dest\fP
 -\f(CWrsync \-av host:'\&file\e name\e with\e spaces'\& /dest\fP
 +\f(CWrsync \-av host:'file\e name\e with\e spaces' /dest\fP
 .RE
 .PP
-@@ -237,7 +237,7 @@
+@@ -237,7 +238,7 @@
 you either use a double colon :: instead of a single colon to
 separate the hostname from the path, or you use an rsync:// URL.
 .IP o
 -the first word of the \(dq\&path\(dq\& is actually a module name.
 +the first word of the \(lqpath\(rq is actually a module name.
 .IP o
 the remote daemon may print a message of the day when you
 connect.
-@@ -251,7 +251,7 @@
+@@ -251,7 +252,7 @@
 you must not specify the \fB\-\-rsh\fP (\fB\-e\fP) option.
 .PP
 -An example that copies all the files in a remote module named \(dq\&src\(dq\&:
 +An example that copies all the files in a remote module named \(lqsrc\(rq:
 .PP
 .nf
 rsync \-av host::src /dest
-@@ -269,18 +269,18 @@
+@@ -269,18 +270,18 @@
 .PP
 You may establish the connection via a web proxy by setting the
 environment variable RSYNC_PROXY to a hostname:port pair pointing to
 -your web proxy.  Note that your web proxy\(cq\&s configuration must support
 +your web proxy.  Note that your web proxy's configuration must support
 -  export RSYNC_CONNECT_PROG='\&ssh proxyhost nc %H 873'\&
 +  export RSYNC_CONNECT_PROG='ssh proxyhost nc %H 873'
 rsync \-av targethost1::module/src/ /dest/
 rsync \-av rsync:://targethost2/module/src/ /dest/
 .fi
-@@ -290,26 +290,26 @@
+@@ -290,26 +291,26 @@
 which forwards all data to port 873 (the rsync daemon) on the targethost
 (%H).
 .PP
 -.SH "USING RSYNC\-DAEMON FEATURES VIA A REMOTE\-SHELL CONNECTION"
 +.SH "USING RSYNC-DAEMON FEATURES VIA A REMOTE-SHELL CONNECTION"
 +rsync-daemon transfer, with the only exception being that you must
 +explicitly set the remote shell program on the command-line with the
 \fB\-\-rsh=COMMAND\fP option.  (Setting the RSYNC_RSH in the environment
 will not turn on this functionality.)  For example:
 .PP
-@@ -318,19 +318,19 @@
+@@ -318,32 +319,36 @@
 .fi
 .PP
 -If you need to specify a different remote\-shell user, keep in mind that the
 -user@ prefix in front of the host is specifying the rsync\-user value (for a
 +The \(lqssh-user\(rq will be used at the ssh level; the \(lqrsync-user\(rq will be
 +used to log-in to the \(lqmodule\(rq.
 .PP
 .SH "STARTING AN RSYNC DAEMON TO ACCEPT CONNECTIONS"
-@@ -339,11 +339,11 @@
+.PP
++WARNING: Daemon mode does not participate in the core Solaris security
++policies, including Authentication, limit of privileges, Audit and Audit
++of any subprocessing.
++.PP
+In order to connect to an rsync daemon, the remote system needs to have a
 daemon already running (or it needs to have configured something like inetd
 to spawn an rsync daemon for incoming connections on a particular port).
 For full information on how to start a daemon that will handling incoming
 -socket connections, see the \fBrsyncd.conf\fP(5) man page \-\- that is the config
 +socket connections, see the \fBrsyncd.conf\fP(5) man page \(em that is the config
 .PP
 -If you\(cq\&re using one of the remote\-shell transports for the transfer, there is
 +If you're using one of the remote-shell transports for the transfer, there is
 no need to manually start an rsync daemon.
 .PP
+.SH "SORTED TRANSFER ORDER"
+@@ -353,19 +358,19 @@
+This handles the merging together of the contents of identically named
+directories, makes it easy to remove duplicate filenames, and may confuse
+someone when the files are transferred in a different order than what was
+-given on the command\-line.
++given on the command-line.
+.PP
+If you need a particular file to be transferred prior to another, either
+separate the files into different rsync calls, or consider using
+-\fB\-\-delay\-updates\fP (which doesn\(cq\&t affect the sorted transfer order, but
+-does make the final file\-updating phase happen much more rapidly).
++\fB\-\-delay-updates\fP (which doesn't affect the sorted transfer order, but
++does make the final file-updating phase happen much more rapidly).
+.PP
 .SH "EXAMPLES"
-@@ -351,7 +351,7 @@
 .PP
 Here are some examples of how I use rsync.
 .PP
 -To backup my wife\(cq\&s home directory, which consists of large MS Word
 +To backup my wife's home directory, which consists of large MS Word
 files and mail folders, I use a cron job that runs
 .PP
 .RS
-@@ -360,7 +360,7 @@
+@@ -374,14 +379,14 @@
 .PP
 each night over a PPP connection to a duplicate directory on my machine
 -\(dq\&arvidsjaur\(dq\&.
 +\(lqarvidsjaur\(rq.
 .PP
 To synchronize my samba source trees I use the following Makefile
 targets:
-@@ -367,7 +367,7 @@
 .PP
 .nf
 get:
 -            rsync \-avuzb \-\-exclude '\&*~'\& samba:samba/ .
 +            rsync \-avuzb \-\-exclude '*~' samba:samba/ .
 put:
 rsync \-Cavuzb . samba:samba/
 sync: get put
-@@ -376,12 +376,12 @@
+@@ -390,12 +395,12 @@
 .PP
 this allows me to sync with a CVS directory at the other end of the
 connection. I then do CVS operations on the remote machine, which saves a
 -lot of time as the remote CVS protocol isn\(cq\&t very efficient.
 +lot of time as the remote CVS protocol isn't very efficient.
 -\f(CWrsync \-az \-e ssh \-\-delete ~ftp/pub/samba nimbus:\(dq\&~ftp/pub/tridge\(dq\&\fP
 +\f(CWrsync \-az \-e ssh \-\-delete ~ftp/pub/samba nimbus:"~ftp/pub/tridge"\fP
 .PP
 This is launched from cron every few hours.
 .PP
-@@ -393,25 +393,25 @@
+@@ -407,25 +412,25 @@
 .nf
 \-v, \-\-verbose               increase verbosity
 - \-q, \-\-quiet                 suppress non\-error messages
 -     \-\-no\-motd               suppress daemon\-mode MOTD (see caveat)
 -     \-\-copy\-unsafe\-links     only \(dq\&unsafe\(dq\& symlinks are transformed
 +     \-\-copy\-unsafe\-links     only "unsafe" symlinks are transformed
 \-\-safe\-links            ignore symlinks that point outside the tree
 \-k, \-\-copy\-dirlinks         transform symlink to dir into referent dir
 \-K, \-\-keep\-dirlinks         treat symlinked dir on receiver as dir
-@@ -421,25 +421,25 @@
+@@ -435,25 +440,25 @@
 \-\-chmod=CHMOD           affect file and/or directory permissions
 \-A, \-\-acls                  preserve ACLs (implies \-p)
 \-X, \-\-xattrs                preserve extended attributes
 - \-o, \-\-owner                 preserve owner (super\-user only)
 + \-o, \-\-owner                 preserve owner (super-user only)
 \-\-ignore\-existing       skip updating files that exist on receiver
 -     \-\-remove\-source\-files   sender removes synchronized files (non\-dir)
 +     \-\-remove\-source\-files   sender removes synchronized files (non-dir)
 \-\-del                   an alias for \-\-delete\-during
 \-\-delete                delete extraneous files from dest dirs
-\-\-delete\-before         receiver deletes before transfer (default)
+\-\-delete\-before         receiver deletes before xfer, not during
-@@ -449,19 +449,19 @@
+@@ -463,19 +468,19 @@
 \-\-delete\-excluded       also delete excluded files from dest dirs
 \-\-ignore\-errors         delete even if there are I/O errors
 \-\-force                 force deletion of dirs even if not empty
 -     \-\-max\-delete=NUM        don'\&t delete more than NUM files
 -     \-\-max\-size=SIZE         don'\&t transfer any file larger than SIZE
 -     \-\-modify\-window=NUM     compare mod\-times with reduced accuracy
 +     \-\-modify\-window=NUM     compare mod-times with reduced accuracy
 \-T, \-\-temp\-dir=DIR          create temporary files in directory DIR
 \-y, \-\-fuzzy                 find similar file for basis if no dest file
 \-\-compare\-dest=DIR      also compare received files relative to DIR
-@@ -470,31 +470,31 @@
+@@ -484,29 +489,29 @@
 \-z, \-\-compress              compress file data during the transfer
 \-\-compress\-level=NUM    explicitly set compression level
 \-\-skip\-compress=LIST    skip compressing files with suffix in LIST
 - \-C, \-\-cvs\-exclude           auto\-ignore files in the same way CVS does
 - \-f, \-\-filter=RULE           add a file\-filtering RULE
 - \-F                          same as \-\-filter='\&dir\-merge /.rsync\-filter'\&
 -                             repeated: \-\-filter='\&\- .rsync\-filter'\&
 + \-C, \-\-cvs\-exclude           auto-ignore files in the same way CVS does
 + \-f, \-\-filter=RULE           add a file-filtering RULE
 + \-F                          same as \-\-filter='dir-merge /.rsync\-filter'
-+                             repeated: \-\-filter='\- .rsync\-filter'
++                             repeated: \-\-filter='\- .rsync-filter
 \-\-exclude=PATTERN       exclude files matching PATTERN
 \-\-exclude\-from=FILE     read exclude patterns from FILE
 -     \-\-include=PATTERN       don'\&t exclude files matching PATTERN
 +     \-\-include=PATTERN       don't exclude files matching PATTERN
 \-\-include\-from=FILE     read include patterns from FILE
 + \-i, \-\-itemize\-changes       output a change-summary for all updates
 \-\-out\-format=FORMAT     output updates using the specified FORMAT
 -     \-\-log\-file=FILE         log what we'\&re doing to the specified FILE
 +     \-\-log\-file=FILE         log what we're doing to the specified FILE
 \-\-log\-file\-format=FMT   log updates using the specified FMT
--     \-\-password\-file=FILE    read daemon\-access password from FILE
+\-\-password\-file=FILE    read daemon\-access password from FILE
-+     \-\-password\-file=FILE    read daemon-access password from FILE
 \-\-list\-only             list the files instead of copying them
-\-\-bwlimit=KBPS          limit I/O bandwidth; KBytes per second
+@@ -534,8 +539,8 @@
-\-\-write\-batch=FILE      write a batched update to FILE
-@@ -520,8 +520,8 @@
 \-\-config=FILE           specify alternate rsyncd.conf file
 \-\-no\-detach             do not detach from the parent
 \-\-port=PORT             listen on alternate port number
 -     \-\-log\-file=FILE         override the \(dq\&log file\(dq\& setting
 -     \-\-log\-file\-format=FMT   override the \(dq\&log format\(dq\& setting
 +     \-\-log\-file=FILE         override the "log file" setting
 +     \-\-log\-file\-format=FMT   override the "log format" setting
 \-\-sockopts=OPTIONS      specify custom TCP options
 \-v, \-\-verbose               increase verbosity
 \-4, \-\-ipv4                  prefer IPv4
-@@ -536,12 +536,12 @@
+@@ -547,21 +552,21 @@
-rsync uses the GNU long options package. Many of the command line
+.SH "OPTIONS"
-options have two variants, one short and one long.  These are shown
-below, separated by commas. Some options only have a long variant.
+.PP
--The \(cq\&=\(cq\& for options that take a parameter is optional; whitespace
+-Rsync accepts both long (double\-dash + word) and short (single\-dash + letter)
-+The \(oq=\(cq for options that take a parameter is optional; whitespace
++Rsync accepts both long (double-dash + word) and short (single\-dash + letter)
-can be used instead.
+options.  The full list of the available options are described below.  If an
+option can be specified in more than one way, the choices are comma\-separated.
+Some options only have a long variant, not a short.  If the option takes a
+parameter, the parameter is only listed after the long variant, even though it
+must also be specified for the short.  When specifying a parameter, you can
+-either use the form \-\-option=param or replace the \(cq\&=\(cq\& with whitespace.  The
+-parameter may need to be quoted in some manner for it to survive the shell\(cq\&s
++either use the form \-\-option=param or replace the '=' with whitespace.  The
++parameter may need to be quoted in some manner for it to survive the shell's
+command\-line parsing.  Keep in mind that a leading tilde (~) in a filename is
+substituted by your shell, so \-\-option=~/foo will not change the tilde into
+-your home directory (remove the \(cq\&=\(cq\& for that).
++your home directory (remove the '=' for that).
 .PP
 .IP "\fB\-\-help\fP"
 Print a short help page describing the options
 -available in rsync and exit.  For backward\-compatibility with older
 +available in rsync and exit.  For backward-compatibility with older
 versions of rsync, the help will also be output if you use the \fB\-h\fP
 option without any other args.
 .IP
-@@ -558,11 +558,11 @@
+@@ -578,11 +583,11 @@
 you are debugging rsync.
 .IP
 Note that the names of the transferred files that are output are done using
 -a default \fB\-\-out\-format\fP of \(dq\&%n%L\(dq\&, which tells you just the name of the
 +a default \fB\-\-out\-format\fP of \(lq%n%L\(rq, which tells you just the name of the
 -\fB\-\-itemize\-changes\fP or adding \(dq\&%i\(dq\& to the \fB\-\-out\-format\fP setting), the
 +\fB\-\-itemize\-changes\fP or adding \(lq%i\(rq to the \fB\-\-out\-format\fP setting), the
 output (on the client) increases to mention all items that are changed in
 any way.  See the \fB\-\-out\-format\fP option for more details.
 .IP
-@@ -575,8 +575,8 @@
+@@ -595,56 +600,56 @@
 .IP "\fB\-\-no\-motd\fP"
 This option affects the information that is output
 by the client at the start of a daemon transfer.  This suppresses the
 -message\-of\-the\-day (MOTD) text, but it also affects the list of modules
 -that the daemon sends in response to the \(dq\&rsync host::\(dq\& request (due to
 +message-of-the-day (MOTD) text, but it also affects the list of modules
 +that the daemon sends in response to the \(lqrsync host::\(rq request (due to
 a limitation in the rsync protocol), so omit this option if you want to
 request the list of modules from the daemon.
 .IP
-@@ -583,13 +583,13 @@
 .IP "\fB\-I, \-\-ignore\-times\fP"
 Normally rsync will skip any files that are
 already the same size and have the same modification timestamp.
 -This option turns off this \(dq\&quick check\(dq\& behavior, causing all files to
 +This option turns off this \(lqquick check\(rq behavior, causing all files to
 -transferring files with either a changed size or a changed last\-modified
 +transferring files with either a changed size or a changed last-modified
 time to just looking for files that have changed in size.  This is useful
 when starting to use rsync after using another mirroring system which may
 not preserve timestamps exactly.
-@@ -596,35 +596,35 @@
 .IP
 .IP "\fB\-\-modify\-window\fP"
 When comparing two timestamps, rsync treats the
 -timestamps as being equal if they differ by no more than the modify\-window
 +timestamps as being equal if they differ by no more than the modify-window
 +automatic after-the-transfer verification has nothing to do with this
 +option's before-the-transfer \(lqDoes this file need to be updated?\(rq check.
 .IP
 For protocol 30 and beyond (first supported in 3.0.0), the checksum used is
 MD5.  For older protocols, the checksum used is MD4.
-@@ -637,25 +637,25 @@
+@@ -657,25 +662,25 @@
 specified, in which case \fB\-r\fP is not implied.
 .IP
 Note that \fB\-a\fP \fBdoes not preserve hardlinks\fP, because
 -finding multiply\-linked files is expensive.  You must separately
 +finding multiply-linked files is expensive.  You must separately
 -Note also that the side\-effects of the \fB\-\-files\-from\fP option are NOT
 +Note also that the side-effects of the \fB\-\-files\-from\fP option are NOT
 positional, as it affects the default state of several options and slightly
 changes the meaning of \fB\-a\fP (see the \fB\-\-files\-from\fP option for more
 details).
-@@ -668,7 +668,7 @@
+@@ -688,7 +693,7 @@
 incremental scan that uses much less memory than before and begins the
 transfer after the scanning of the first few directories have been
 completed.  This incremental scan only affects our recursion algorithm, and
 -does not change a non\-recursive transfer.  It is also only possible when
 +does not change a non-recursive transfer.  It is also only possible when
 both ends of the transfer are at least version 3.0.0.
 .IP
 Some options require rsync to know the full file list, so these options
-@@ -705,16 +705,16 @@
+@@ -725,16 +730,16 @@
 .IP
 then a file named /tmp/foo/bar/baz.c would be created on the remote
 machine, preserving its full path.  These extra path elements are called
 -\(dq\&implied directories\(dq\& (i.e. the \(dq\&foo\(dq\& and the \(dq\&foo/bar\(dq\& directories in the
 +\(lqimplied directories\(rq (i.e. the \(lqfoo\(rq and the \(lqfoo/bar\(rq directories in the
 -path.  If you\(cq\&re dealing with an older rsync on the sending side, you may
 +path.  If you're dealing with an older rsync on the sending side, you may
 need to use the \fB\-\-no\-implied\-dirs\fP option.
 .IP
 It is also possible to limit the amount of path information that is sent as
-@@ -728,8 +728,8 @@
+@@ -748,7 +753,7 @@
 .IP
 That would create /tmp/bar/baz.c on the remote machine.  (Note that the
 -dot must be followed by a slash, so \(dq\&/foo/.\(dq\& would not be abbreviated.)
--For older rsync versions, you would need to use a chdir to limit the
 +dot must be followed by a slash, so \(lq/foo/.\(rq would not be abbreviated.)
-+(2) For older rsync versions, you would need to use a chdir to limit the
+For older rsync versions, you would need to use a chdir to limit the
 source path.  For example, when pushing files:
 .IP
-.RS
+@@ -757,13 +762,13 @@
-@@ -737,13 +737,13 @@
 .RE
 .IP
 -(Note that the parens put the two commands into a sub\-shell, so that the
 -\(dq\&cd\(dq\& command doesn\(cq\&t remain in effect for future commands.)
 -\f(CW   rsync \-avR \-\-rsync\-path=\(dq\&cd /foo; rsync\(dq\& \e \fP
 +\f(CW   rsync \-avR \-\-rsync\-path="cd /foo; rsync" \e \fP
 .br
 \f(CW       remote:bar/baz.c /tmp/\fP
 .RE
-@@ -759,14 +759,14 @@
+@@ -779,14 +784,14 @@
 elements to have big differences, such as being a symlink to a directory on
 the receiving side.
 .IP
 -For instance, if a command\-line arg or a files\-from entry told rsync to
 -transfer the file \(dq\&path/foo/file\(dq\&, the directories \(dq\&path\(dq\& and \(dq\&path/foo\(dq\&
 +\(lqpath/foo/file\(rq using the existing path elements, which means that the file
 +ends up being created in \(lqpath/bar\(rq.  Another way to accomplish this link
 preservation is to use the \fB\-\-keep\-dirlinks\fP option (which will also
 affect symlinks to directories in the rest of the transfer).
 .IP
-@@ -780,15 +780,15 @@
+@@ -800,15 +805,15 @@
 backup file goes and what (if any) suffix gets appended using the
 \fB\-\-backup\-dir\fP and \fB\-\-suffix\fP options.
 .IP
 -Note that if you don\(cq\&t specify \fB\-\-backup\-dir\fP, (1) the
 +Note that if you don't specify \fB\-\-backup\-dir\fP, (1) the
 -your rules specify a trailing inclusion/exclusion of \(cq\&*\(cq\&, the auto\-added
 +your rules specify a trailing inclusion/exclusion of \(oq*\(cq, the auto-added
 rule would never be reached).
 .IP
 .IP "\fB\-\-backup\-dir=DIR\fP"
-@@ -799,22 +799,16 @@
+@@ -821,20 +826,20 @@
-(otherwise the files backed up in the specified directory
+.IP
-will keep their original filenames).
+Note that if you specify a relative path, the backup directory will be
-.IP
+relative to the destination directory, so you probably want to specify
--Note that if you specify a relative path, the backup directory will be
--relative to the destination directory, so you probably want to specify
 -either an absolute path or a path that starts with \(dq\&../\(dq\&.  If an rsync
 -daemon is the receiver, the backup dir cannot go outside the module\(cq\&s path
--hierarchy, so take extra care not to delete it or copy into it.
++either an absolute path or a path that starts with \(lq../\(rq.  If an rsync
--.IP
++daemon is the receiver, the backup dir cannot go outside the module's path
+hierarchy, so take extra care not to delete it or copy into it.
+.IP
 .IP "\fB\-\-suffix=SUFFIX\fP"
 This option allows you to override the default
 backup suffix used with the \fB\-\-backup\fP (\fB\-b\fP) option. The default suffix is a ~
 -if no \-\fB\-backup\-dir\fP was specified, otherwise it is an empty string.
 +if no \-\fB\-backup-dir\fP was specified, otherwise it is an empty string.
 -source file\(cq\&s, it will be updated if the sizes are different.)
 +source file's, it will be updated if the sizes are different.)
 .IP
 Note that this does not affect the copying of symlinks or other special
 files.  Also, a difference of file format between the sender and receiver
-@@ -823,52 +817,34 @@
+@@ -843,8 +848,8 @@
 where the destination has a file, the transfer would occur regardless of
 the timestamps.
 .IP
 -This option is a transfer rule, not an exclude, so it doesn\(cq\&t affect the
 -data that goes into the file\-lists, and thus it doesn\(cq\&t affect deletions.
 +This option is a transfer rule, not an exclude, so it doesn't affect the
 +data that goes into the file-lists, and thus it doesn't affect deletions.
 It just limits the files that the receiver requests to be transferred.
 .IP
 .IP "\fB\-\-inplace\fP"
--This option changes how rsync transfers a file when
+@@ -859,14 +864,14 @@
--its data needs to be updated: instead of the default method of creating
+.IP o
-+This option changes how rsync transfers a file when the
+Hard links are not broken.  This means the new data will be visible
-+file's data needs to be updated: instead of the default method of creating
+through other hard links to the destination file.  Moreover, attempts to
-a new copy of the file and moving it into place when it is complete, rsync
-instead writes the updated data directly to the destination file.
-.IP
--This has several effects:
-+This has several effects: (1) in-use binaries cannot be updated (either the
-+OS will prevent this from happening, or binaries that attempt to swap-in
-+their data will misbehave or crash), (2) the file's data will be in an
-+inconsistent state during the transfer, (3) a file's data may be left in an
-+inconsistent state after the transfer if the transfer is interrupted or if
-+an update fails, (4) a file that does not have write permissions can not be
-+updated, and (5) the efficiency of rsync's delta-transfer algorithm may be
-+reduced if some data in the destination file is overwritten before it can
-+be copied to a position later in the file (one exception to this is if you
-+combine this option with \fB\-\-backup\fP, since rsync is smart enough to use
-+the backup file as the basis file for the transfer).
-.IP
--.RS
--.IP o
--Hard links are not broken.  This means the new data will be visible
--through other hard links to the destination file.  Moreover, attempts to
 -copy differing source files onto a multiply\-linked destination file will
 -result in a \(dq\&tug of war\(dq\& with the destination data changing back and forth.
--.IP o
++copy differing source files onto a multiply-linked destination file will
--In\-use binaries cannot be updated (either the OS will prevent this from
++result in a \(lqtug of war\(rq with the destination data changing back and forth.
+.IP o
+In\-use binaries cannot be updated (either the OS will prevent this from
 -happening, or binaries that attempt to swap\-in their data will misbehave or
--crash).
++happening, or binaries that attempt to swap-in their data will misbehave or
--.IP o
+crash).
+.IP o
 -The file\(cq\&s data will be in an inconsistent state during the transfer
--and will be left that way if the transfer is interrupted or if an update
++The file's data will be in an inconsistent state during the transfer
--fails.
+and will be left that way if the transfer is interrupted or if an update
--.IP o
+fails.
--A file that rsync cannot write to cannot be updated. While a super user
+.IP o
--can update any file, a normal user needs to be granted write permission for
+@@ -874,7 +879,7 @@
--the open of the file for writing to be successful.
+can update any file, a normal user needs to be granted write permission for
--.IP o
+the open of the file for writing to be successful.
+.IP o
 -The efficiency of rsync\(cq\&s delta\-transfer algorithm may be reduced if
--some data in the destination file is overwritten before it can be copied to
++The efficiency of rsync's delta-transfer algorithm may be reduced if
--a position later in the file.  This does not apply if you use \fB\-\-backup\fP,
+some data in the destination file is overwritten before it can be copied to
--since rsync is smart enough to use the backup file as the basis file for the
+a position later in the file.  This does not apply if you use \fB\-\-backup\fP,
--transfer.
+since rsync is smart enough to use the backup file as the basis file for the
--.RE
+@@ -885,9 +890,9 @@
--
--.IP
 WARNING: you should not use this option to update files that are being
 accessed by others, so be careful when choosing to use this for a copy.
 .IP
 -This option is useful for transferring large files with block\-based changes
-+This option is useful for transfer of large files with block-based changes
++This option is useful for transferring large files with block-based changes
 or appended data, and also on systems that are disk bound, not network
 -bound.  It can also help keep a copy\-on\-write filesystem snapshot from
--diverging the entire contents of a file that only has minor changes.
++bound.  It can also help keep a copy-on-write filesystem snapshot from
-+bound.
+diverging the entire contents of a file that only has minor changes.
 .IP
 The option implies \fB\-\-partial\fP (since an interrupted transfer does not delete
-the file), but conflicts with \fB\-\-partial\-dir\fP and \fB\-\-delay\-updates\fP.
+@@ -901,18 +906,18 @@
-@@ -881,18 +857,18 @@
 the receiving side is identical with the start of the file on the sending
 side.  If a file needs to be transferred and its size on the receiver is
 the same or longer than the size on the sender, the file is skipped.  This
 -does not interfere with the updating of a file\(cq\&s non\-content attributes
 +does not interfere with the updating of a file's non-content attributes
 -final verification step fails (rsync uses a normal, non\-appending
 +final verification step fails (rsync uses a normal, non-appending
 \fB\-\-inplace\fP transfer for the resend).
 .IP
 Note: prior to rsync 3.0.0, the \fB\-\-append\fP option worked like
-@@ -902,9 +878,9 @@
+@@ -922,21 +927,21 @@
 .IP
 .IP "\fB\-d, \-\-dirs\fP"
 Tell the sending side to include any directories that
 -are encountered.  Unlike \fB\-\-recursive\fP, a directory\(cq\&s contents are not copied
 -unless the directory name specified is \(dq\&.\(dq\& or ends with a trailing slash
 +unless the directory name specified is \(lq.\(rq or ends with a trailing slash
 +(e.g. \(lq.\(rq, \(lqdir/.\(rq, \(lqdir/\(rq, etc.).  Without this option or the
 \fB\-\-recursive\fP option, rsync will skip all directories it encounters (and
 output a message to that effect for each one).  If you specify both
 \fB\-\-dirs\fP and \fB\-\-recursive\fP, \fB\-\-recursive\fP takes precedence.
-@@ -911,12 +887,12 @@
 .IP
 The \fB\-\-dirs\fP option is implied by the \fB\-\-files\-from\fP option
 or the \fB\-\-list\-only\fP option (including an implied
 -\fB\-\-list\-only\fP usage) if \fB\-\-recursive\fP wasn\(cq\&t specified (so that
 +\fB\-\-list\-only\fP usage) if \fB\-\-recursive\fP wasn't specified (so that
 +There is also a backward-compatibility helper option, \fB\-\-old\-dirs\fP (or
 +\fB\-\-old\-d\fP) that tells rsync to use a hack of \(lq\-r \-\-exclude='/*/*'\(rq to get
 an older rsync to list a single directory without recursing.
 .IP
 .IP "\fB\-l, \-\-links\fP"
-@@ -926,12 +902,12 @@
+@@ -946,12 +951,12 @@
 .IP "\fB\-L, \-\-copy\-links\fP"
 When symlinks are encountered, the item that
 they point to (the referent) is copied, rather than the symlink.  In older
 -versions of rsync, this option also had the side\-effect of telling the
 +versions of rsync, this option also had the side-effect of telling the
 +an rsync that is too old to understand \fB\-K\fP \(em in that case, the \fB\-L\fP option
 +will still have the side-effect of \fB\-K\fP on that older receiving rsync.
 .IP
 .IP "\fB\-\-copy\-unsafe\-links\fP"
 This tells rsync to copy the referent of
-@@ -949,7 +925,7 @@
+@@ -969,7 +974,7 @@
 .IP "\fB\-k, \-\-copy\-dirlinks\fP"
 This option causes the sending side to treat
 a symlink to a directory as though it were a real directory.  This is
 -useful if you don\(cq\&t want symlinks to non\-directories to be affected, as
 +useful if you don't want symlinks to non-directories to be affected, as
 they would be using \fB\-\-copy\-links\fP.
 .IP
 Without this option, if the sending side has replaced a directory with a
-@@ -960,32 +936,18 @@
+@@ -986,26 +991,26 @@
-See also \fB\-\-keep\-dirlinks\fP for an analogous option for the receiving
+to make the paths match up right.  For example:
-side.
+.IP
-.IP
+.RS
--\fB\-\-copy\-dirlinks\fP applies to all symlinks to directories in the source.  If
--you want to follow only a few specified symlinks, a trick you can use is to
--pass them as additional source args with a trailing slash, using \fB\-\-relative\fP
--to make the paths match up right.  For example:
--.IP
--.RS
 -\f(CWrsync \-r \-\-relative src/./ src/./follow\-me/ dest/\fP
--.RE
++\f(CWrsync \-r \-\-relative src/./ src/./follo-me/ dest/\fP
--
+.RE
--.IP
--This works because rsync calls \fBlstat\fP(2) on the source arg as given, and the
+.IP
--trailing slash makes \fBlstat\fP(2) follow the symlink, giving rise to a directory
+This works because rsync calls \fBlstat\fP(2) on the source arg as given, and the
+trailing slash makes \fBlstat\fP(2) follow the symlink, giving rise to a directory
 -in the file\-list which overrides the symlink found during the scan of \(dq\&src/./\(dq\&.
--.IP
++in the file-list which overrides the symlink found during the scan of \(lqsrc/./\(rq.
+.IP
 .IP "\fB\-K, \-\-keep\-dirlinks\fP"
 This option causes the receiving side to treat
 a symlink to a directory as though it were a real directory, but only if it
 matches a real directory from the sender.  Without this option, the
 -receiver\(cq\&s symlink would be deleted and replaced with a real directory.
 +\fB\-\-keep\-dirlinks\fP, the receiver keeps the symlink and \(lqfile\(rq ends up in
 +\(lqbar\(rq.
 .IP
 One note of caution:  if you use \fB\-\-keep\-dirlinks\fP, you must trust all
 the symlinks in the copy!  If it is possible for an untrusted user to
-@@ -998,32 +960,21 @@
+@@ -1018,7 +1023,7 @@
 See also \fB\-\-copy\-dirlinks\fP for an analogous option for the sending side.
 .IP
 .IP "\fB\-H, \-\-hard\-links\fP"
 -This tells rsync to look for hard\-linked files in
--the source and link together the corresponding files on the destination.
--Without this option, hard\-linked files in the source are treated
 +This tells rsync to look for hard-linked files in
-+the transfer and link together the corresponding files on the receiving
+the source and link together the corresponding files on the destination.
-+side.  Without this option, hard-linked files in the transfer are treated
+Without this option, hard\-linked files in the source are treated
 as though they were separate files.
-.IP
+@@ -1029,10 +1034,10 @@
--This option does NOT necessarily ensure that the pattern of hard links on the
+.IP
--destination exactly matches that on the source.  Cases in which the
+.RS
--destination may end up with extra hard links include the following:
+.IP o
-+When you are updating a non-empty destination, this option only ensures
-+that files that are hard-linked together on the source are hard-linked
-+together on the destination.  It does NOT currently endeavor to break
-+already existing hard links on the destination that do not exist between
-+the source files.  Note, however, that if one or more extra-linked files
-+have content changes, they will become unlinked when updated (assuming you
-+are not using the \fB\-\-inplace\fP option).
-.IP
--.RS
--.IP o
 -If the destination contains extraneous hard\-links (more linking than
--what is present in the source file list), the copying algorithm will not
++If the destination contains extraneous hard-links (more linking than
--break them explicitly.  However, if one or more of the paths have content
+what is present in the source file list), the copying algorithm will not
+break them explicitly.  However, if one or more of the paths have content
 -differences, the normal file\-update process will break those extra links
--(unless you are using the \fB\-\-inplace\fP option).
++differences, the normal file-update process will break those extra links
--.IP o
+(unless you are using the \fB\-\-inplace\fP option).
--If you specify a \fB\-\-link\-dest\fP directory that contains hard links,
+.IP o
--the linking of the destination files against the \fB\-\-link\-dest\fP files can
+If you specify a \fB\-\-link\-dest\fP directory that contains hard links,
--cause some paths in the destination to become linked together due to the
+@@ -1043,7 +1048,7 @@
--\fB\-\-link\-dest\fP associations.
--.RE
+.IP
--
--.IP
 Note that rsync can only detect hard links between files that are inside
 -the transfer set.  If rsync updates a file that has extra hard\-link
 +the transfer set.  If rsync updates a file that has extra hard-link
 connections to files outside the transfer, that linkage will be broken.  If
 you are tempted to use the \fB\-\-inplace\fP option to avoid this breakage, be
 very careful that you know how your files are being updated so that you are
-@@ -1031,12 +982,9 @@
+@@ -1051,11 +1056,11 @@
 see the \fB\-\-inplace\fP option for more caveats).
 .IP
 If incremental recursion is active (see \fB\-\-recursive\fP), rsync may transfer
 -a missing hard\-linked file before it finds that another link for that contents
 +a missing hard-linked file before it finds that another link for that contents
 exists elsewhere in the hierarchy.  This does not affect the accuracy of
 -the transfer (i.e. which files are hard\-linked together), just its efficiency
 -(i.e. copying the data for a new, early copy of a hard\-linked file that could
 -have been found later in the transfer in another member of the hard\-linked
--set of files).  One way to avoid this inefficiency is to disable
++the transfer (i.e. which files are hard-linked together), just its efficiency
-+the transfer, just its efficiency.  One way to avoid this is to disable
++(i.e. copying the data for a new, early copy of a hard-linked file that could
++have been found later in the transfer in another member of the hard-linked
+set of files).  One way to avoid this inefficiency is to disable
 incremental recursion using the \fB\-\-no\-inc\-recursive\fP option.
 .IP
-.IP "\fB\-p, \-\-perms\fP"
+@@ -1073,24 +1078,24 @@
-@@ -1053,10 +1001,10 @@
 permissions, though the \fB\-\-executability\fP option might change just
 the execute permission for the file.
 .IP o
 -New files get their \(dq\&normal\(dq\& permission bits set to the source
 -file\(cq\&s permissions masked with the receiving directory\(cq\&s default
 +permissions (either the receiving process's umask, or the permissions
 +specified via the destination directory's default ACL), and
 their special permission bits disabled except in the case where a new
 directory inherits a setgid bit from its parent directory.
 .RE
-@@ -1063,14 +1011,14 @@
 .IP
 Thus, when \fB\-\-perms\fP and \fB\-\-executability\fP are both disabled,
 -rsync\(cq\&s behavior is the same as that of other file\-copy utilities,
 +rsync's behavior is the same as that of other file-copy utilities,
 -all non\-masked bits get enabled).  If you\(cq\&d care to make this latter
 +all non-masked bits get enabled).  If you'd care to make this latter
 behavior easier to type, you could define a popt alias for it, such as
 putting this line in the file ~/.popt (the following defines the \fB\-Z\fP option,
 and includes \-\-no\-g to use the default group of the destination dir):
-@@ -1087,34 +1035,34 @@
+@@ -1107,34 +1112,34 @@
 .RE
 .IP
 -(Caveat: make sure that \fB\-a\fP does not follow \fB\-Z\fP, or it will re\-enable
 -the two \(dq\&\-\-no\-*\(dq\& options mentioned above.)
 +To make a file executable, rsync turns on each \(oqx\(cq permission that
 +has a corresponding \(oqr\(cq permission enabled.
 .RE
 .IP
-@@ -1130,35 +1078,28 @@
+@@ -1153,32 +1158,32 @@
-and restore ACLs that are not compatible.
+This option causes rsync to update the destination
-.IP
+extended attributes to be the same as the source ones.
-.IP "\fB\-X, \-\-xattrs\fP"
--This option causes rsync to update the destination
--extended attributes to be the same as the source ones.
-+This option causes rsync to update the remote
-+extended attributes to be the same as the local ones.
 .IP
 -For systems that support extended\-attribute namespaces, a copy being done by a
 -super\-user copies all namespaces except system.*.  A normal user only copies
 -the user.* namespace.  To be able to backup and restore non\-user namespaces as
 +For systems that support extended-attribute namespaces, a copy being done by a
 +super-user copies all namespaces except system.*.  A normal user only copies
 +the user.* namespace.  To be able to backup and restore non-user namespaces as
 a normal user, see the \fB\-\-fake\-super\fP option.
 .IP
--Note that this option does not copy rsyncs special xattr values (e.g. those
+Note that this option does not copy rsyncs special xattr values (e.g. those
--used by \fB\-\-fake\-super\fP) unless you repeat the option (e.g. \-XX).  This
+used by \fB\-\-fake\-super\fP) unless you repeat the option (e.g. \-XX).  This
 -\(dq\&copy all xattrs\(dq\& mode cannot be used with \fB\-\-fake\-super\fP.
--.IP
++\(lqcopy all xattrs\(rq mode cannot be used with \fB\-\-fake\-super\fP.
+.IP
 .IP "\fB\-\-chmod\fP"
 This option tells rsync to apply one or more
--comma\-separated \(dq\&chmod\(dq\& strings to the permission of the files in the
+-comma\-separated \(dq\&chmod\(dq\& modes to the permission of the files in the
--transfer.  The resulting value is treated as though it were the permissions
++comma-separated \(lqchmod\(rq modes to the permission of the files in the
-+comma-separated \(lqchmod\(rq strings to the permission of the files in the
+transfer.  The resulting value is treated as though it were the permissions
-+transfer.  The resulting value is treated as though it was the permissions
 that the sending side supplied for the file, which means that this option
 can seem to have no effect on existing files if \fB\-\-perms\fP is not enabled.
 .IP
 In addition to the normal parsing rules specified in the \fBchmod\fP(1)
 manpage, you can specify an item that should only apply to a directory by
 -prefixing it with a \(cq\&D\(cq\&, or specify an item that should only apply to a
 -file by prefixing it with a \(cq\&F\(cq\&.  For example, the following will ensure
 -that all directories get marked set\-gid, that no files are other\-writable,
 -that both are user\-writable and group\-writable, and that both have
--consistent executability across all bits:
++prefixing it with a 'D', or specify an item that should only apply to a
-+prefixing it with a \(oqD\(cq, or specify an item that should only apply to a
++file by prefixing it with a 'F'.  For example, the following will ensure
-+file by prefixing it with a \(oqF\(cq.  For example:
++that all directories get marked set-gid, that no files are other-writable,
++that both are user\-writable and group-writable, and that both have
+consistent executability across all bits:
 .IP
 .RS
 -\-\-chmod=Dg+s,ug+w,Fo\-w,+X
 +\-\-chmod=Dg+s,ug+w,Fo-w,+X
 .RE
 .IP
-@@ -1171,7 +1112,7 @@
+@@ -1191,7 +1196,7 @@
 .IP "\fB\-o, \-\-owner\fP"
 This option causes rsync to set the owner of the
 destination file to be the same as the source file, but only if the
 -receiving rsync is being run as the super\-user (see also the \fB\-\-super\fP
 +receiving rsync is being run as the super-user (see also the \fB\-\-super\fP
 and \fB\-\-fake\-super\fP options).
 Without this option, the owner of new and/or transferred files are set to
 the invoking user on the receiving side.
-@@ -1183,7 +1124,7 @@
+@@ -1203,7 +1208,7 @@
 .IP "\fB\-g, \-\-group\fP"
 This option causes rsync to set the group of the
 destination file to be the same as the source file.  If the receiving
 -program is not running as the super\-user (or if \fB\-\-no\-super\fP was
 +program is not running as the super-user (or if \fB\-\-no\-super\fP was
 specified), only groups that the invoking user on the receiving side
 is a member of will be preserved.
 Without this option, the group is set to the default group of the invoking
-@@ -1197,7 +1138,7 @@
+@@ -1217,7 +1222,7 @@
 This option causes rsync to transfer character and
 block device files to the remote system to recreate these devices.
 This option has no effect if the receiving rsync is not run as the
 -super\-user (see also the \fB\-\-super\fP and \fB\-\-fake\-super\fP options).
 +super-user (see also the \fB\-\-super\fP and \fB\-\-fake\-super\fP options).
 .IP
 .IP "\fB\-\-specials\fP"
 This option causes rsync to transfer special files
-@@ -1212,8 +1153,8 @@
+@@ -1232,8 +1237,8 @@
 option is not used, the optimization that excludes files that have not been
 modified cannot be effective; in other words, a missing \fB\-t\fP or \fB\-a\fP will
 cause the next transfer to behave as if it used \fB\-I\fP, causing all files to be
 -updated (though rsync\(cq\&s delta\-transfer algorithm will make the update fairly efficient
 -if the files haven\(cq\&t actually changed, you\(cq\&re much better off using \fB\-t\fP).
 +updated (though rsync's delta-transfer algorithm will make the update fairly efficient
 +if the files haven't actually changed, you're much better off using \fB\-t\fP).
 .IP
 .IP "\fB\-O, \-\-omit\-dir\-times\fP"
 This tells rsync to omit directories when
-@@ -1222,58 +1163,62 @@
+@@ -1242,58 +1247,58 @@
 This option is inferred if you use \fB\-\-backup\fP without \fB\-\-backup\-dir\fP.
 .IP
 .IP "\fB\-\-super\fP"
 -This tells the receiving side to attempt super\-user
 -activities even if the receiving rsync wasn\(cq\&t run by the super\-user.  These
 Try to handle sparse files efficiently so they take
 -up less space on the destination.  Conflicts with \fB\-\-inplace\fP because it\(cq\&s
 +up less space on the destination.  Conflicts with \fB\-\-inplace\fP because it's
 not possible to overwrite data in a sparse fashion.
 .IP
-+NOTE: Don't use this option when the destination is a Solaris \(lqtmpfs\(rq
-+filesystem. It doesn't seem to handle seeks over null regions
-+correctly and ends up corrupting the files.
-+.IP
 .IP "\fB\-n, \-\-dry\-run\fP"
 -This makes rsync perform a trial run that doesn\(cq\&t
 +This makes rsync perform a trial run that doesn't
 make any changes (and produces mostly the same output as a real run).  It
 is most commonly used in combination with the \fB\-v, \-\-verbose\fP and/or
 \fB\-i, \-\-itemize\-changes\fP options to see what an rsync command is going
-@@ -1281,39 +1226,38 @@
+@@ -1301,50 +1306,50 @@
 .IP
 The output of \fB\-\-itemize\-changes\fP is supposed to be exactly the same on a
 dry run and a subsequent real run (barring intentional trickery and system
 -call failures); if it isn\(cq\&t, that\(cq\&s a bug.  Other output should be mostly
--unchanged, but may differ in some areas.  Notably, a dry run does not
++call failures); if it isn't, that's a bug.  Other output should be mostly
-+call failures); if it isn't, that's a bug.  Other output is the same to the
+unchanged, but may differ in some areas.  Notably, a dry run does not
-+extent practical, but may differ in some areas.  Notably, a dry run does not
 send the actual data for file transfers, so \fB\-\-progress\fP has no effect,
 -the \(dq\&bytes sent\(dq\&, \(dq\&bytes received\(dq\&, \(dq\&literal data\(dq\&, and \(dq\&matched data\(dq\&
 -statistics are too small, and the \(dq\&speedup\(dq\& value is equivalent to a run
--where no file transfers were needed.
 +the \(lqbytes sent\(rq, \(lqbytes received\(rq, \(lqliteral data\(rq, and \(lqmatched data\(rq
 +statistics are too small, and the \(lqspeedup\(rq value is equivalent to a run
-+where no file transfers are needed.
+where no file transfers were needed.
 .IP
 .IP "\fB\-W, \-\-whole\-file\fP"
 -With this option rsync\(cq\&s delta\-transfer algorithm
 -is not used and the whole file is sent as\-is instead.  The transfer may be
 +With this option rsync's delta-transfer algorithm
 +is not used and the whole file is sent as-is instead.  The transfer may be
 faster if this option is used when the bandwidth between the source and
 destination machines is higher than the bandwidth to disk (especially when the
 -\(dq\&disk\(dq\& is actually a networked filesystem).  This is the default when both
--the source and destination are specified as local paths, but only if no
++\(lqdisk\(rq is actually a networked filesystem).  This is the default when both
+the source and destination are specified as local paths, but only if no
 -batch\-writing option is in effect.
-+\(lqdisk\(rq is actually a networked filesystem).  This is the default when both
++batch-writing option is in effect.
-+the source and destination are specified as local paths.
 .IP
 .IP "\fB\-x, \-\-one\-file\-system\fP"
 This tells rsync to avoid crossing a
 -filesystem boundary when recursing.  This does not limit the user\(cq\&s ability
 -to specify items to copy from multiple filesystems, just rsync\(cq\&s recursion
 \fB\-\-copy\-unsafe\-links\fP), a symlink to a directory on another device is
 -treated like a mount\-point.  Symlinks to non\-directories are unaffected
 +treated like a mount-point.  Symlinks to non-directories are unaffected
 by this option.
 .IP
-.IP "\fB\-\-existing, \-\-ignore\-non\-existing\fP"
+-.IP "\fB\-\-existing, \-\-ignore\-non\-existing\fP"
-@@ -1323,8 +1267,8 @@
++.IP "\fB\-\-existing, \-\-ignore-non-existing\fP"
+This tells rsync to skip
+creating files (including directories) that do not exist
+yet on the destination.  If this option is
 combined with the \fB\-\-ignore\-existing\fP option, no files will be updated
 (which can be useful if all you want to do is delete extraneous files).
 .IP
 -This option is a transfer rule, not an exclude, so it doesn\(cq\&t affect the
 -data that goes into the file\-lists, and thus it doesn\(cq\&t affect deletions.
 +This option is a transfer rule, not an exclude, so it doesn't affect the
 +data that goes into the file-lists, and thus it doesn't affect deletions.
 It just limits the files that the receiver requests to be transferred.
 .IP
 .IP "\fB\-\-ignore\-existing\fP"
-@@ -1332,8 +1276,8 @@
+@@ -1352,41 +1357,41 @@
 already exist on the destination (this does \fInot\fP ignore existing
 directories, or nothing would get done).  See also \fB\-\-existing\fP.
 .IP
 -This option is a transfer rule, not an exclude, so it doesn\(cq\&t affect the
 -data that goes into the file\-lists, and thus it doesn\(cq\&t affect deletions.
 +This option is a transfer rule, not an exclude, so it doesn't affect the
 +data that goes into the file-lists, and thus it doesn't affect deletions.
 It just limits the files that the receiver requests to be transferred.
 .IP
 This option can be useful for those doing backups using the \fB\-\-link\-dest\fP
-@@ -1340,23 +1284,23 @@
 option when they need to continue a backup run that got interrupted.  Since
 a \fB\-\-link\-dest\fP run is copied into a new directory hierarchy (when it is
 used properly), using \fB\-\-ignore existing\fP will ensure that the
 -already\-handled files don\(cq\&t get tweaked (which avoids a change in
--permissions on the hard\-linked files).  This does mean that this option
 +already-handled files don't get tweaked (which avoids a change in
-+permissions on the hard-linked files).  This does mean that this option
+permissions on the hard\-linked files).  This does mean that this option
 is only looking at the existing files in the destination hierarchy itself.
 .IP
 .IP "\fB\-\-remove\-source\-files\fP"
 This tells rsync to remove from the sending
 -side the files (meaning non\-directories) that are a part of the transfer
 +side the files (meaning non-directories) that are a part of the transfer
 and have been successfully duplicated on the receiving side.
+.IP
+Note that you should only use this option on source files that are quiescent.
+If you are using this to move files that show up in a particular directory over
+to another host, make sure that the finished files get renamed into the source
+-directory, not directly written into it, so that rsync can\(cq\&t possibly transfer
+-a file that is not yet fully written.  If you can\(cq\&t first write the files into
++directory, not directly written into it, so that rsync can't possibly transfer
++a file that is not yet fully written.  If you can't first write the files into
+a different directory, you should use a naming idiom that lets rsync avoid
+-transferring files that are not yet finished (e.g. name the file \(dq\&foo.new\(dq\& when
+-it is written, rename it to \(dq\&foo\(dq\& when it is done, and then use the option
++transferring files that are not yet finished (e.g. name the file \(lqfoo.new\(rq when
++it is written, rename it to \(lqfoo\(rq when it is done, and then use the option
+\fB\-\-exclude='\&*.new'\&\fP for the rsync transfer).
 .IP
 .IP "\fB\-\-delete\fP"
 This tells rsync to delete extraneous files from the
 -receiving side (ones that aren\(cq\&t on the sending side), but only for the
 +receiving side (ones that aren't on the sending side), but only for the
 -the files\(cq\& parent directory.  Files that are excluded from the transfer are
 +the files' parent directory.  Files that are excluded from the transfer are
 also excluded from being deleted unless you use the \fB\-\-delete\-excluded\fP
 option or mark the rules as only matching on the sending side (see the
 include/exclude modifiers in the FILTER RULES section).
-@@ -1372,7 +1316,7 @@
+@@ -1413,29 +1418,29 @@
-If the sending side detects any I/O errors, then the deletion of any
-files at the destination will be automatically disabled. This is to
-prevent temporary filesystem failures (such as NFS errors) on the
--sending side from causing a massive deletion of files on the
-+sending side causing a massive deletion of files on the
-destination.  You can override this with the \fB\-\-ignore\-errors\fP option.
-.IP
-The \fB\-\-delete\fP option may be combined with one of the \-\-delete\-WHEN options
-@@ -1383,29 +1327,29 @@
 \fB\-\-delete\-delay\fP and \fB\-\-delete\-after\fP.
 .IP
 .IP "\fB\-\-delete\-before\fP"
 -Request that the file\-deletions on the receiving
 +Request that the file-deletions on the receiving
 -Request that the file\-deletions on the receiving
 +Request that the file-deletions on the receiving
 side be computed during the transfer (like \fB\-\-delete\-during\fP), and then
 removed after the transfer completes.  This is useful when combined with
 \fB\-\-delay\-updates\fP and/or \fB\-\-fuzzy\fP, and is more efficient than using
-@@ -1413,21 +1357,21 @@
+@@ -1443,21 +1448,21 @@
 computes the deletions in a separate pass after all updates are done).
 If the number of removed files overflows an internal buffer, a
 temporary file will be created on the receiving side to hold the names (it
 -is removed while open, so you shouldn\(cq\&t see it during the transfer).  If
 +is removed while open, so you shouldn't see it during the transfer).  If
 -See \fB\-\-delete\fP (which is implied) for more details on file\-deletion.
 +See \fB\-\-delete\fP (which is implied) for more details on file-deletion.
 .IP
 .IP "\fB\-\-delete\-excluded\fP"
 In addition to deleting the files on the
-@@ -1436,7 +1380,7 @@
+@@ -1466,19 +1471,19 @@
 See the FILTER RULES section for a way to make individual exclusions behave
 this way on the receiver, and for a way to protect files from
 \fB\-\-delete\-excluded\fP.
 -See \fB\-\-delete\fP (which is implied) for more details on file\-deletion.
 +See \fB\-\-delete\fP (which is implied) for more details on file-deletion.
 .IP
 .IP "\fB\-\-ignore\-errors\fP"
 Tells \fB\-\-delete\fP to go ahead and delete files
-@@ -1443,12 +1387,12 @@
 even when there are I/O errors.
 .IP
 .IP "\fB\-\-force\fP"
 -This option tells rsync to delete a non\-empty directory
 -when it is to be replaced by a non\-directory.  This is only relevant if
 -using \fB\-\-delete\-after\fP, and it used to be non\-functional unless the
 +using \fB\-\-delete\-after\fP, and it used to be non-functional unless the
 \fB\-\-recursive\fP option was also enabled.
 .IP
 .IP "\fB\-\-max\-delete=NUM\fP"
-@@ -1458,27 +1402,27 @@
+@@ -1488,27 +1493,27 @@
 .IP
 Also new for version 3.0.0, you may specify \fB\-\-max\-delete=0\fP to be warned
 about any extraneous files in the destination without removing any of them.
 -Older clients interpreted this as \(dq\&unlimited\(dq\&, so if you don\(cq\&t know what
 +Older clients interpreted this as \(lqunlimited\(rq, so if you don't know what
 +\(lqMB\(rq, or \(lqGB\(rq.  (Note: lower-case is also accepted for all values.)
 +Finally, if the suffix ends in either \(lq+1\(rq or \(lq\-1\(rq, the value will
 be offset by one byte in the indicated direction.
 .IP
 Examples: \-\-max\-size=1.5mb\-1 is 1499999 bytes, and \-\-max\-size=2g+1 is
-@@ -1492,7 +1436,7 @@
+@@ -1522,7 +1527,7 @@
 .IP
 .IP "\fB\-B, \-\-block\-size=BLOCKSIZE\fP"
 This forces the block size used in
 -rsync\(cq\&s delta\-transfer algorithm to a fixed value.  It is normally selected based on
 +rsync's delta-transfer algorithm to a fixed value.  It is normally selected based on
 the size of each file being updated.  See the technical report for details.
 .IP
 .IP "\fB\-e, \-\-rsh=COMMAND\fP"
-@@ -1505,27 +1449,27 @@
+@@ -1535,27 +1540,27 @@
 remote shell \fICOMMAND\fP will be used to run an rsync daemon on the
 remote host, and all data will be transmitted through that remote
 shell connection, rather than through a direct socket connection to a
 -running rsync daemon on the remote host.  See the section \(dq\&USING
 -RSYNC\-DAEMON FEATURES VIA A REMOTE\-SHELL CONNECTION\(dq\& above.
 -argument (but not backslashes).  Note that doubling a single\-quote
 -inside a single\-quoted string gives you a single\-quote; likewise for
 -double\-quotes (though you need to pay attention to which quotes your
 +and you can use single- and/or double-quotes to preserve spaces in an
 +argument (but not backslashes).  Note that doubling a single-quote
-+inside a single-quoted string gives you a single-quote; likewise for
++inside a single\-quoted string gives you a single-quote; likewise for
 +double-quotes (though you need to pay attention to which quotes your
 shell is parsing and which quotes rsync is parsing).  Some examples:
 .IP
 .RS
 -\f(CW    \-e '\&ssh \-p 2234'\&\fP
 -(Note that ssh users can alternately customize site\-specific connect
 +(Note that ssh users can alternately customize site-specific connect
 options in their .ssh/config file.)
 .IP
 You can also choose the remote shell program using the RSYNC_RSH
-@@ -1535,11 +1479,11 @@
+@@ -1565,29 +1570,29 @@
 .IP
 .IP "\fB\-\-rsync\-path=PROGRAM\fP"
 Use this to specify what program is to be run
 -on the remote machine to start\-up rsync.  Often used when rsync is not in
 -the default remote\-shell\(cq\&s path (e.g. \-\-rsync\-path=/usr/local/bin/rsync).
 +program, script, or command sequence you'd care to run, so long as it does
 +not corrupt the standard-in & standard-out that rsync is using to
 communicate.
 .IP
 One tricky example is to set a different default directory on the remote
-@@ -1546,24 +1490,24 @@
 machine for use with the \fB\-\-relative\fP option.  For instance:
 .IP
 .RS
 -\f(CW    rsync \-avR \-\-rsync\-path=\(dq\&cd /a/b && rsync\(dq\& host:c/d /e/\fP
 +\f(CW    rsync \-avR \-\-rsync\-path="cd /a/b && rsync" host:c/d /e/\fP
 -initial items are marked as perishable \-\- see the FILTER RULES section):
 +initial items are marked as perishable \(em see the FILTER RULES section):
 .IP
 .RS
 .RS
-\f(CWRCS SCCS CVS CVS.adm RCSLOG cvslog.* tags TAGS .make.state
+@@ -1604,19 +1609,19 @@
-\&.nse_depinfo *~ #* .#* ,* _$* *$ *.old *.bak *.BAK *.orig *.rej .del\-*
--*.a *.olb *.o *.obj *.so *.exe *.Z *.elc *.ln core .svn/ .git/ .hg/ .bzr/\fP
-+*.a *.olb *.o *.obj *.so *.exe *.Z *.elc *.ln core .svn/ .git/ .bzr/\fP
-.RE
-.RE
-@@ -1574,19 +1518,19 @@
 .IP
 Finally, any file is ignored if it is in the same directory as a
 \&.cvsignore file and matches one of the patterns listed therein.  Unlike
 -rsync\(cq\&s filter/exclude files, these patterns are split on whitespace.
 +rsync's filter/exclude files, these patterns are split on whitespace.
 +The first option turns on the per-directory scanning for the .cvsignore
 +file.  The second option does a one-time import of the CVS excludes
 mentioned above.
 .IP
 .IP "\fB\-f, \-\-filter=RULE\fP"
-@@ -1607,17 +1551,17 @@
+@@ -1637,17 +1642,17 @@
 your command.  The first time it is used is a shorthand for this rule:
 .IP
 .RS
 -\f(CW   \-\-filter='\&dir\-merge /.rsync\-filter'\&\fP
 +\f(CW   \-\-filter='dir\-merge /.rsync\-filter'\fP
 .RE
 .IP
 -This tells rsync to look for per\-directory .rsync\-filter files that have
-+This tells rsync to look for per-directory .rsync\-filter files that have
++This tells rsync to look for per-directory .rsync-filter files that have
 been sprinkled through the hierarchy and use their rules to filter the
 files in the transfer.  If \fB\-F\fP is repeated, it is a shorthand for this
 rule:
 .IP
 .RS
 -\f(CW   \-\-filter='\&exclude .rsync\-filter'\&\fP
 +\f(CW   \-\-filter='exclude .rsync\-filter'\fP
 .RE
 .IP
-@@ -1629,7 +1573,7 @@
+@@ -1659,27 +1664,27 @@
 .IP "\fB\-\-exclude=PATTERN\fP"
 This option is a simplified form of the
 \fB\-\-filter\fP option that defaults to an exclude rule and does not allow
 -the full rule\-parsing syntax of normal filter rules.
 +the full rule-parsing syntax of normal filter rules.
 .IP
 See the FILTER RULES section for detailed information on this option.
 .IP
-@@ -1636,13 +1580,13 @@
 .IP "\fB\-\-exclude\-from=FILE\fP"
 This option is related to the \fB\-\-exclude\fP
 option, but it specifies a FILE that contains exclude patterns (one per line).
 -Blank lines in the file and lines starting with \(cq\&;\(cq\& or \(cq\&#\(cq\& are ignored.
 +Blank lines in the file and lines starting with \(oq;\(cq or \(oq#\(cq are ignored.
 -the full rule\-parsing syntax of normal filter rules.
 +the full rule-parsing syntax of normal filter rules.
 .IP
 See the FILTER RULES section for detailed information on this option.
 .IP
-@@ -1649,7 +1593,7 @@
 .IP "\fB\-\-include\-from=FILE\fP"
 This option is related to the \fB\-\-include\fP
 option, but it specifies a FILE that contains include patterns (one per line).
 -Blank lines in the file and lines starting with \(cq\&;\(cq\& or \(cq\&#\(cq\& are ignored.
 +Blank lines in the file and lines starting with \(oq;\(cq or \(oq#\(cq are ignored.
 If \fIFILE\fP is \fB\-\fP, the list will be read from standard input.
 .IP
 .IP "\fB\-\-files\-from=FILE\fP"
-@@ -1668,11 +1612,11 @@
+@@ -1698,18 +1703,18 @@
 specified in the list on the destination rather than noisily skipping
 them (use \fB\-\-no\-dirs\fP or \fB\-\-no\-d\fP if you want to turn that off).
 .IP o
 -The \fB\-\-archive\fP (\fB\-a\fP) option\(cq\&s behavior does not imply \fB\-\-recursive\fP
 +The \fB\-\-archive\fP (\fB\-a\fP) option's behavior does not imply \fB\-\-recursive\fP
 +These side-effects change the default state of rsync, so the position
 +of the \fB\-\-files\-from\fP option on the command-line has no bearing on how
 other options are parsed (e.g. \fB\-a\fP works the same before or after
 \fB\-\-files\-from\fP, as does \fB\-\-no\-R\fP and all other options).
 .RE
-@@ -1679,7 +1623,7 @@
 .IP
 The filenames that are read from the FILE are all relative to the
 -source dir \-\- any leading slashes are removed and no \(dq\&..\(dq\& references are
 +source dir \(em any leading slashes are removed and no \(lq..\(rq references are
 allowed to go higher than the source dir.  For example, take this
 command:
 .IP
-@@ -1688,24 +1632,24 @@
+@@ -1718,47 +1723,47 @@
 .RE
 .IP
 -If /tmp/foo contains the string \(dq\&bin\(dq\& (or even \(dq\&/bin\(dq\&), the /usr/bin
 +If /tmp/foo contains the string \(lqbin\(rq (or even \(lq/bin\(rq), the /usr/bin
 +(the host must match one end of the transfer).  As a short-cut, you can
 +specify just a prefix of \(lq:\(rq to mean \(lquse the remote end of the
 +transfer\(rq.  For example:
 .IP
 .RS
-\f(CW   rsync \-a \-\-files\-from=:/path/file\-list src:/ /tmp/copy\fP
+-\f(CW   rsync \-a \-\-files\-from=:/path/file\-list src:/ /tmp/copy\fP
-@@ -1712,39 +1656,32 @@
++\f(CW   rsync \-a \-\-files\-from=:/path/file-list src:/ /tmp/copy\fP
 .RE
 .IP
 -This would copy all the files specified in the /path/file\-list file that
 -was located on the remote \(dq\&src\(dq\& host.
 +This would copy all the files specified in the /path/file-list file that
 +was located on the remote \(lqsrc\(rq host.
 .IP
--If the \fB\-\-iconv\fP and \fB\-\-protect\-args\fP options are specified and the
+If the \fB\-\-iconv\fP and \fB\-\-protect\-args\fP options are specified and the
--\fB\-\-files\-from\fP filenames are being sent from one host to another, the
+\fB\-\-files\-from\fP filenames are being sent from one host to another, the
 -filenames will be translated from the sending host\(cq\&s charset to the
 -receiving host\(cq\&s charset.
--.IP
++filenames will be translated from the sending host's charset to the
--NOTE: sorting the list of files in the \-\-files\-from input helps rsync to be
++receiving host's charset.
--more efficient, as it will avoid re\-visiting the path elements that are shared
+.IP
--between adjacent entries.  If the input is not sorted, some path elements
+NOTE: sorting the list of files in the \-\-files\-from input helps rsync to be
--(implied directories) may end up being scanned multiple times, and rsync will
+more efficient, as it will avoid re\-visiting the path elements that are shared
+between adjacent entries.  If the input is not sorted, some path elements
+(implied directories) may end up being scanned multiple times, and rsync will
 -eventually unduplicate them after they get turned into file\-list elements.
--.IP
++eventually unduplicate them after they get turned into file-list elements.
+.IP
 .IP "\fB\-0, \-\-from0\fP"
 This tells rsync that the rules/filenames it reads from a
 -file are terminated by a null (\(cq\&\e0\(cq\&) character, not a NL, CR, or CR+LF.
 +file are terminated by a null ('\e0') character, not a NL, CR, or CR+LF.
 This affects \fB\-\-exclude\-from\fP, \fB\-\-include\-from\fP, \fB\-\-files\-from\fP, and any
 merged files specified in a \fB\-\-filter\fP rule.
 It does not affect \fB\-\-cvs\-exclude\fP (since all names read from a .cvsignore
-file are split on whitespace).
+@@ -1767,14 +1772,14 @@
-.IP
-+If the \fB\-\-iconv\fP and \fB\-\-protect\-args\fP options are specified and the
-+\fB\-\-files\-from\fP filenames are being sent from one host to another, the
-+filenames will be translated from the sending host's charset to the
-+receiving host's charset.
-+.IP
 .IP "\fB\-s, \-\-protect\-args\fP"
--This option sends all filenames and most options to
+This option sends all filenames and most options to
-+This option sends all filenames and some options to
 the remote rsync without allowing the remote shell to interpret them.  This
 -means that spaces are not split in names, and any non\-wildcard special
 +means that spaces are not split in names, and any non-wildcard special
 characters are not translated (such as ~, $, ;, &, etc.).  Wildcards are
 expanded on the remote host by rsync (instead of the shell doing it).
 .IP
--If you use this option with \fB\-\-iconv\fP, the args related to the remote
+If you use this option with \fB\-\-iconv\fP, the args related to the remote
--side will also be translated
+side will also be translated
 -from the local to the remote character\-set.  The translation happens before
 -wild\-cards are expanded.  See also the \fB\-\-files\-from\fP option.
-+If you use this option with \fB\-\-iconv\fP, the args will also be translated
 +from the local to the remote character-set.  The translation happens before
 +wild-cards are expanded.  See also the \fB\-\-files\-from\fP option.
 .IP
 .IP "\fB\-T, \-\-temp\-dir=DIR\fP"
 This option instructs rsync to use DIR as a
-@@ -1769,25 +1706,25 @@
+@@ -1799,25 +1804,25 @@
 If you are using this option for reasons other than a shortage of disk
 space, you may wish to combine it with the \fB\-\-delay\-updates\fP option,
 which will ensure that all copied files get put into subdirectories in the
 -destination hierarchy, awaiting the end of the transfer.  If you don\(cq\&t
 +destination hierarchy, awaiting the end of the transfer.  If you don't
 -fuzzy\-match files, so either use \fB\-\-delete\-after\fP or specify some
 +fuzzy-match files, so either use \fB\-\-delete\-after\fP or specify some
 filename exclusions if you need to prevent this.
 .IP
 .IP "\fB\-\-compare\-dest=DIR\fP"
-@@ -1795,7 +1732,7 @@
+@@ -1825,7 +1830,7 @@
 the destination machine as an additional hierarchy to compare destination
 files against doing transfers (if the files are missing in the destination
 directory).  If a file is found in \fIDIR\fP that is identical to the
 -sender\(cq\&s file, the file will NOT be transferred to the destination
 +sender's file, the file will NOT be transferred to the destination
 directory.  This is useful for creating a sparse backup of just files that
 have changed from an earlier backup.
 .IP
-@@ -1815,7 +1752,7 @@
+@@ -1845,7 +1850,7 @@
 rsync will also copy unchanged files found in \fIDIR\fP to the destination
 directory using a local copy.
 This is useful for doing transfers to a new destination while leaving
 -existing files intact, and then doing a flash\-cutover when all files have
 +existing files intact, and then doing a flash-cutover when all files have
 been successfully transferred.
 .IP
 Multiple \fB\-\-copy\-dest\fP directories may be provided, which will cause
-@@ -1838,10 +1775,10 @@
+@@ -1868,10 +1873,10 @@
 .RE
 .IP
 -If file\(cq\&s aren\(cq\&t linking, double\-check their attributes.  Also check if some
 -attributes are getting forced outside of rsync\(cq\&s control, such a mount option
 -ownership (such as OS X\(cq\&s \(dq\&Ignore ownership on this volume\(dq\& option).
 +ownership (such as OS X's \(lqIgnore ownership on this volume\(rq option).
 .IP
 Beginning in version 2.6.4, multiple \fB\-\-link\-dest\fP directories may be
 provided, which will cause rsync to search the list in the order specified
-@@ -1852,9 +1789,9 @@
+@@ -1882,9 +1887,9 @@
 selected to try to speed up the transfer.
 .IP
 This option works best when copying into an empty destination hierarchy, as
 -rsync treats existing files as definitive (so it never looks in the link\-dest
 +rsync treats existing files as definitive (so it never looks in the link-dest
 -change the attributes of a destination file, which affects all the hard\-linked
 +change the attributes of a destination file, which affects all the hard-linked
 versions).
 .IP
 Note that if you combine this option with \fB\-\-ignore\-times\fP, rsync will not
-@@ -1866,14 +1803,14 @@
+@@ -1896,14 +1901,14 @@
 See also \fB\-\-compare\-dest\fP and \fB\-\-copy\-dest\fP.
 .IP
 Note that rsync versions prior to 2.6.1 had a bug that could prevent
 -\fB\-\-link\-dest\fP from working properly for a non\-super\-user when \fB\-o\fP was
 -specified (or implied by \fB\-a\fP).  You can work\-around this bug by avoiding
 -being transmitted \-\- something that is useful over a slow connection.
 +being transmitted \(em something that is useful over a slow connection.
 .IP
 Note that this option typically achieves better compression ratios than can
 be achieved by using a compressing remote shell or a compressing transport
-@@ -1885,7 +1822,7 @@
+@@ -1915,7 +1920,7 @@
 .IP
 .IP "\fB\-\-compress\-level=NUM\fP"
 Explicitly set the compression level to use
 -(see \fB\-\-compress\fP) instead of letting it default.  If NUM is non\-zero,
 +(see \fB\-\-compress\fP) instead of letting it default.  If NUM is non-zero,
 the \fB\-\-compress\fP option is implied.
 .IP
 .IP "\fB\-\-skip\-compress=LIST\fP"
-@@ -1895,13 +1832,13 @@
+@@ -1925,13 +1930,13 @@
 .IP
 You may specify an empty string to indicate that no file should be skipped.
 .IP
 -Simple character\-class matching is supported: each must consist of a list
 +Simple character-class matching is supported: each must consist of a list
 of letters inside the square brackets (e.g. no special classes, such as
 -\(dq\&[:alpha:]\(dq\&, are supported, and \(cq\&\-\(cq\& has no special meaning).
-+\(lq[:alpha:]\(rq, are supported).
++\(lq[:alpha:]\(rq, are supported, and '\-' has no special meaning).
 .IP
 -The characters asterisk (*) and question\-mark (?) have no special meaning.
 +The characters asterisk (*) and question-mark (?) have no special meaning.
 .IP
 -Here\(cq\&s an example that specifies 6 suffixes to skip (since 1 of the 5 rules
 +Here's an example that specifies 6 suffixes to skip (since 1 of the 5 rules
 matches 2 suffixes):
 .IP
 .nf
-@@ -1909,30 +1846,17 @@
+@@ -1962,7 +1967,7 @@
-.fi
-.IP
--The default list of suffixes that will not be compressed is this (in this
--version of rsync):
-+The default list of suffixes that will not be compressed is this (several
-+of these are newly added for 3.0.0):
-.IP
--\fB7z\fP
--\fBavi\fP
--\fBbz2\fP
--\fBdeb\fP
--\fBgz\fP
--\fBiso\fP
--\fBjpeg\fP
--\fBjpg\fP
--\fBmov\fP
--\fBmp3\fP
--\fBmp4\fP
--\fBogg\fP
--\fBrpm\fP
--\fBtbz\fP
--\fBtgz\fP
--\fBz\fP
--\fBzip\fP
-+.nf
-+    gz/zip/z/rpm/deb/iso/bz2/t[gb]z/7z/mp[34]/mov/avi/ogg/jpg/jpeg
-+.fi
-+
 .IP
 This list will be replaced by your \fB\-\-skip\-compress\fP list in all but one
 situation: a copy from a daemon rsync will add your skipped suffixes to
 -its list of non\-compressing files (and its list may be configured to a
 +its list of non-compressing files (and its list may be configured to a
 different default).
 .IP
 .IP "\fB\-\-numeric\-ids\fP"
-@@ -1948,8 +1872,8 @@
+@@ -1978,8 +1983,8 @@
 If a user or group has no name on the source system or it has no match
 on the destination system, then the numeric ID
 from the source system is used instead.  See also the comments on the
 -\(dq\&use chroot\(dq\& setting in the rsyncd.conf manpage for information on how
 -the chroot setting affects rsync\(cq\&s ability to look up the names of the
 +\(lquse chroot\(rq setting in the rsyncd.conf manpage for information on how
 +the chroot setting affects rsync's ability to look up the names of the
 users and groups and what you can do about it.
 .IP
 .IP "\fB\-\-timeout=TIMEOUT\fP"
-@@ -1971,7 +1895,7 @@
+@@ -2001,7 +2006,7 @@
 .IP "\fB\-\-port=PORT\fP"
 This specifies an alternate TCP port number to use
 rather than the default of 873.  This is only needed if you are using the
 -double\-colon (::) syntax to connect with an rsync daemon (since the URL
 +double-colon (::) syntax to connect with an rsync daemon (since the URL
 syntax has a way to specify the port as a part of the URL).  See also this
 option in the \fB\-\-daemon\fP mode section.
 .IP
-@@ -1991,21 +1915,21 @@
+@@ -2021,21 +2026,21 @@
 This tells rsync to use blocking I/O when launching
 a remote shell transport.  If the remote shell is either rsh or remsh,
 rsync defaults to using
 -blocking I/O, otherwise it defaults to using non\-blocking I/O.  (Note that
 -ssh prefers non\-blocking I/O.)
 -type of update being done, \fBX\fP is replaced by the file\-type, and the
 +type of update being done, \fBX\fP is replaced by the file-type, and the
 other letters represent attributes that may be output if they are being
 modified.
 .IP
-@@ -2028,21 +1952,21 @@
+@@ -2058,21 +2063,21 @@
 A \fB.\fP means that the item is not being updated (though it might
 have attributes that are being modified).
 .IP o
 -A \fB*\fP means that the rest of the itemized\-output area contains
 -a message (e.g. \(dq\&deleting\(dq\&).
 -a \(dq\&?\(dq\& (this can happen when talking to an older rsync).
 +a \(lq?\(rq (this can happen when talking to an older rsync).
 .IP
 The attribute that is associated with each letter is as follows:
 .IP
-@@ -2052,27 +1976,27 @@
+@@ -2082,27 +2087,27 @@
 (requires \fB\-\-checksum\fP) or that a symlink, device, or special file has
 a changed value.
 Note that if you are sending files to an rsync prior to 3.0.1, this
 -change flag will be present only for checksum\-differing regular files.
 +change flag will be present only for checksum-differing regular files.
 -sender\(cq\&s value (requires \fB\-\-group\fP and the authority to set the group).
 +sender's value (requires \fB\-\-group\fP and the authority to set the group).
 .IP o
 The \fBu\fP slot is reserved for future use.
 .IP o
-@@ -2082,50 +2006,50 @@
+@@ -2112,80 +2117,80 @@
 .RE
 .IP
 -One other output is possible:  when deleting files, the \(dq\&%i\(dq\& will output
 -the string \(dq\&*deleting\(dq\& for each item that is being removed (assuming that
 to a file.  This is similar to the logging that a daemon does, but can be
 -requested for the client side and/or the server side of a non\-daemon
 +requested for the client side and/or the server side of a non-daemon
 transfer.  If specified as a client option, transfer logging will be
 -enabled with a default format of \(dq\&%i %n%L\(dq\&.  See the \fB\-\-log\-file\-format\fP
-+enabled with a default format of \(lq%i %n%L\(rq.  See the \fB\-\-log\-file\-format\fP
++enabled with a default format of \(lq%i %n%L\(rq.  See the \fB\-\-log\-file-format\fP
 option if you wish to override this.
 .IP
 -Here\(cq\&s a example command that requests the remote side to log what is
 +Here's a example command that requests the remote side to log what is
 happening:
 -  rsync \-av \-\-rsync\-path=\(dq\&rsync \-\-log\-file=/tmp/rlog\(dq\& src/ dest/
 +  rsync \-av \-\-rsync\-path="rsync \-\-log\-file=/tmp/rlog" src/ dest/
 .fi
 .IP
-@@ -2134,28 +2058,28 @@
+This is very useful if you need to debug why a connection is closing
-.IP
+unexpectedly.
-.IP "\fB\-\-log\-file\-format=FORMAT\fP"
+.IP
+-.IP "\fB\-\-log\-file\-format=FORMAT\fP"
++.IP "\fB\-\-log\-file-format=FORMAT\fP"
 This allows you to specify exactly what
 -per\-update logging is put into the file specified by the \fB\-\-log\-file\fP option
 +per-update logging is put into the file specified by the \fB\-\-log\-file\fP option
 (which must also be specified for this option to have any effect).  If you
 specify an empty string, updated files will not be mentioned in the log file.
 -were updated via rsync\(cq\&s delta\-transfer algorithm, which does not include created
 +were updated via rsync's delta-transfer algorithm, which does not include created
 dirs, symlinks, etc.
 .IP o
 \fBTotal file size\fP is the total sum of all file sizes in the transfer.
-@@ -2165,14 +2089,14 @@
+@@ -2195,14 +2200,14 @@
 \fBTotal transferred file size\fP is the total sum of all files sizes
 for just the transferred files.
 .IP o
 -\fBLiteral data\fP is how much unmatched file\-update data we had to
 +\fBLiteral data\fP is how much unmatched file-update data we had to
 +\fBFile list size\fP is how big the file-list data was when the sender
 +sent it to the receiver.  This is smaller than the in-memory size for the
 file list due to some compressing of duplicated data when rsync sends the
 list.
 .IP o
-@@ -2186,27 +2110,27 @@
+@@ -2216,27 +2221,27 @@
 \fBTotal bytes sent\fP is the count of all the bytes that rsync sent
 from the client side to the server side.
 .IP o
 -\fBTotal bytes received\fP is the count of all non\-message bytes that
 -rsync received by the client side from the server side.  \(dq\&Non\-message\(dq\&
 -Output numbers in a more human\-readable format.
 +Output numbers in a more human-readable format.
 This makes big numbers output using larger units, with a K, M, or G suffix.  If
 this option was specified once, these units are K (1000), M (1000*1000), and
 G (1000*1000*1000); if the option is repeated, the units are powers of 1024
-@@ -2227,39 +2151,39 @@
+@@ -2257,39 +2262,39 @@
 dir as data to speed up the resumption of the transfer and then delete it
 after it has served its purpose.
 .IP
 -Note that if \fB\-\-whole\-file\fP is specified (or implied), any partial\-dir
 +Note that if \fB\-\-whole\-file\fP is specified (or implied), any partial-dir
 -You can also set the partial\-dir value the RSYNC_PARTIAL_DIR environment
 +You can also set the partial-dir value the RSYNC_PARTIAL_DIR environment
 variable.  Setting this in the environment does not force \fB\-\-partial\fP to be
 enabled, but rather it affects where partial files go when \fB\-\-partial\fP is
 specified.  For instance, instead of using \fB\-\-partial\-dir=.rsync\-tmp\fP
-@@ -2270,7 +2194,7 @@
+@@ -2300,7 +2305,7 @@
 specified (since \fB\-\-inplace\fP conflicts with \fB\-\-partial\-dir\fP), and (2) when
 \fB\-\-delay\-updates\fP was specified (see below).
 .IP
 -For the purposes of the daemon\-config\(cq\&s \(dq\&refuse options\(dq\& setting,
 +For the purposes of the daemon-config's \(lqrefuse options\(rq setting,
 \fB\-\-partial\-dir\fP does \fInot\fP imply \fB\-\-partial\fP.  This is so that a
 refusal of the \fB\-\-partial\fP option can be used to disallow the overwriting
 of destination files with a partial transfer, while still allowing the
-@@ -2281,12 +2205,12 @@
+@@ -2311,12 +2316,12 @@
 updated file into a holding directory until the end of the
 transfer, at which time all the files are renamed into place in rapid
 succession.  This attempts to make the updating of the files a little more
 -atomic.  By default the files are placed into a directory named \(dq\&.~tmp~\(dq\& in
 -each file\(cq\&s destination directory, but if you\(cq\&ve specified the
 +\(lq.~tmp~\(rq dir will be excluded from the transfer, and what you can do if
 +you want rsync to cleanup old \(lq.~tmp~\(rq dirs that might be lying around.
 Conflicts with \fB\-\-inplace\fP and \fB\-\-append\fP.
 .IP
 This option uses more memory on the receiving side (one bit per file
-@@ -2298,16 +2222,16 @@
+@@ -2328,16 +2333,16 @@
 the updated files will be put into a single directory if the path is
 absolute)
 and (2) there are no mount points in the hierarchy (since the
 -delayed updates will fail if they can\(cq\&t be renamed into place).
 +delayed updates will fail if they can't be renamed into place).
 +rid of empty directories from the file-list, including nested directories
 +that have no non-directory children.  This is useful for avoiding the
 creation of a bunch of useless directories when the sending rsync is
 recursively scanning a hierarchy of files using include/exclude/filter
 rules.
-@@ -2316,41 +2240,41 @@
+@@ -2346,41 +2351,41 @@
 not affect what goes into the file list, and thus does not leave directories
 empty, even if none of the files in a directory match the transfer rule.
 .IP
 -Because the file\-list is actually being pruned, this option also affects
 +Because the file-list is actually being pruned, this option also affects
 -Implies \fB\-\-verbose\fP if it wasn\(cq\&t already specified.
 +Implies \fB\-\-verbose\fP if it wasn't already specified.
 .IP
 While rsync is transferring a regular file, it updates a progress line that
 looks like this:
-@@ -2361,12 +2285,12 @@
+@@ -2391,12 +2396,12 @@
 .IP
 In this example, the receiver has reconstructed 782448 bytes or 63% of the
 -sender\(cq\&s file, which is being reconstructed at a rate of 110.64 kilobytes
 +sender's file, which is being reconstructed at a rate of 110.64 kilobytes
 +These statistics can be misleading if rsync's delta-transfer algorithm is
 +in use.  For example, if the sender's file consists of the basis file
 followed by additional data, the reported rate will probably drop
 dramatically when the receiver gets to the literal data, and the transfer
 will probably take much longer to finish than the receiver estimated as it
-@@ -2376,7 +2300,7 @@
+@@ -2406,7 +2411,7 @@
 summary line that looks like this:
 .IP
 .nf
 -     1238099 100%  146.38kB/s    0:00:08  (xfer#5, to\-check=169/396)
 +     1238099 100%  146.38kB/s    0:00:08  (xfer#5, to-check=169/396)
 .fi
 .IP
-@@ -2384,8 +2308,8 @@
+@@ -2414,8 +2419,8 @@
 of transfer for the whole file was 146.38 kilobytes per second over the 8
 seconds that it took to complete, it was the 5th transfer of a regular file
 during the current rsync session, and there are 169 more files for the
 -receiver to check (to see if they are up\-to\-date or not) remaining out of
 -the 396 total files in the file\-list.
 +receiver to check (to see if they are up-to-date or not) remaining out of
 +the 396 total files in the file-list.
 .IP
 .IP "\fB\-P\fP"
 The \fB\-P\fP option is equivalent to \fB\-\-partial\fP \fB\-\-progress\fP.  Its
-@@ -2395,14 +2319,13 @@
+@@ -2429,10 +2434,10 @@
-.IP "\fB\-\-password\-file\fP"
+other lines are ignored).
-This option allows you to provide a password in a
-file for accessing an rsync daemon.  The file must not be world readable.
--It should contain just the password as the first line of the file (all
--other lines are ignored).
-+It should contain just the password as a single line.
 .IP
 This option does not supply a password to a remote shell transport such as
 -ssh; to learn how to do that, consult the remote shell\(cq\&s documentation.
 +ssh; to learn how to do that, consult the remote shell's documentation.
 When accessing an rsync daemon using a remote shell as the transport, this
 -authentication (i.e. if you have also specified a password in the daemon\(cq\&s
 +authentication (i.e. if you have also specified a password in the daemon's
 config file).
 .IP
 .IP "\fB\-\-list\-only\fP"
-@@ -2410,9 +2333,9 @@
+@@ -2440,9 +2445,9 @@
 instead of transferred.  This option is inferred if there is a single source
 arg and no destination specified, so its main uses are: (1) to turn a copy
 command that includes a
 -destination arg into a file\-listing command, or (2) to be able to specify
 +destination arg into a file-listing command, or (2) to be able to specify
 -Caution: keep in mind that a source arg with a wild\-card is expanded by the
 +Caution: keep in mind that a source arg with a wild-card is expanded by the
 shell into multiple args, so it is never safe to try to list such an arg
 without using this option.  For example:
 .IP
-@@ -2423,11 +2346,11 @@
+@@ -2453,11 +2458,11 @@
 .IP
 Compatibility note:  when requesting a remote listing of files from an rsync
 that is version 2.6.3 or older, you may encounter an error if you ask for a
 -non\-recursive listing.  This is because a file listing implies the \fB\-\-dirs\fP
 -option w/o \fB\-\-recursive\fP, and older rsyncs don\(cq\&t have that option.  To
 +need to expand a directory's content), or turn on recursion and exclude
 +the content of subdirectories: \fB\-r \-\-exclude='/*/*'\fP.
 .IP
 .IP "\fB\-\-bwlimit=KBPS\fP"
 This option allows you to specify a maximum
-@@ -2440,7 +2363,7 @@
+@@ -2470,7 +2475,7 @@
 .IP
 .IP "\fB\-\-write\-batch=FILE\fP"
 Record a file that can later be applied to
 -another identical destination with \fB\-\-read\-batch\fP. See the \(dq\&BATCH MODE\(dq\&
 +another identical destination with \fB\-\-read\-batch\fP. See the \(lqBATCH MODE\(rq
 section for details, and also the \fB\-\-only\-write\-batch\fP option.
 .IP
 .IP "\fB\-\-only\-write\-batch=FILE\fP"
-@@ -2452,20 +2375,20 @@
+@@ -2482,58 +2487,58 @@
 Note that you can feel free to write the batch directly to some portable
 media: if this media fills to capacity before the end of the transfer, you
 can just apply that partial transfer to the destination and repeat the
 -whole process to get the rest of the changes (as long as you don\(cq\&t mind a
 -partially updated destination system while the multi\-update cycle is
 -See the \(dq\&BATCH MODE\(dq\& section for details.
 +See the \(lqBATCH MODE\(rq section for details.
 .IP
 .IP "\fB\-\-protocol=NUM\fP"
 Force an older protocol version to be used.  This
-@@ -2472,38 +2395,38 @@
 is useful for creating a batch file that is compatible with an older
 version of rsync.  For instance, if rsync 2.6.4 is being used with the
 \fB\-\-write\-batch\fP option, but rsync 2.6.3 is what will be used to run the
 -\fB\-\-read\-batch\fP option, you should use \(dq\&\-\-protocol=28\(dq\& when creating the
 +\fB\-\-read\-batch\fP option, you should use \(lq\-\-protocol=28\(rq when creating the
 -daemon uses the charset specified in its \(dq\&charset\(dq\& configuration parameter
 +daemon uses the charset specified in its \(lqcharset\(rq configuration parameter
 regardless of the remote charset you actually pass.  Thus, you may feel free to
 specify just the local charset for a daemon transfer (e.g. \fB\-\-iconv=utf8\fP).
 .IP
-@@ -2554,7 +2477,7 @@
+@@ -2584,7 +2589,7 @@
 run as a daemon with the \fB\-\-daemon\fP option.  The \fB\-\-address\fP option
 allows you to specify a specific IP address (or hostname) to bind to.  This
 makes virtual hosting possible in conjunction with the \fB\-\-config\fP option.
 -See also the \(dq\&address\(dq\& global option in the rsyncd.conf manpage.
 +See also the \(lqaddress\(rq global option in the rsyncd.conf manpage.
 .IP
 .IP "\fB\-\-bwlimit=KBPS\fP"
 This option allows you to specify a maximum
-@@ -2567,7 +2490,7 @@
+@@ -2597,7 +2602,7 @@
 This specifies an alternate config file than
 the default.  This is only relevant when \fB\-\-daemon\fP is specified.
 The default is /etc/rsyncd.conf unless the daemon is running over
 -a remote shell program and the remote user is not the super\-user; in that case
 +a remote shell program and the remote user is not the super-user; in that case
 the default is rsyncd.conf in the current directory (typically $HOME).
 .IP
 .IP "\fB\-\-no\-detach\fP"
-@@ -2575,7 +2498,7 @@
+@@ -2605,25 +2610,25 @@
 rsync to not detach itself and become a background process.  This
 option is required when running as a service on Cygwin, and may also
 be useful when rsync is supervised by a program such as
 -\fBdaemontools\fP or AIX\(cq\&s \fBSystem Resource Controller\fP.
 +\fBdaemontools\fP or AIX's \fBSystem Resource Controller\fP.
 \fB\-\-no\-detach\fP is also recommended when rsync is run under a
 debugger.  This option has no effect if rsync is run from inetd or
 sshd.
-@@ -2582,18 +2505,18 @@
 .IP
 .IP "\fB\-\-port=PORT\fP"
 This specifies an alternate TCP port number for the
 -daemon to listen on rather than the default of 873.  See also the \(dq\&port\(dq\&
 +daemon to listen on rather than the default of 873.  See also the \(lqport\(rq
 +given FORMAT string instead of using the \(lqlog format\(rq setting in the config
 +file.  It also enables \(lqtransfer logging\(rq unless the string is empty, in which
 case transfer logging is turned off.
 .IP
 .IP "\fB\-\-sockopts\fP"
-@@ -2603,8 +2526,8 @@
+@@ -2633,15 +2638,15 @@
 .IP "\fB\-v, \-\-verbose\fP"
 This option increases the amount of information the
 daemon logs during its startup phase.  After the client connects, the
 -daemon\(cq\&s verbosity level will be controlled by the options that the client
 -used and the \(dq\&max verbosity\(dq\& setting in the module\(cq\&s config section.
 +daemon's verbosity level will be controlled by the options that the client
 +used and the \(lqmax verbosity\(rq setting in the module's config section.
 .IP
 .IP "\fB\-4, \-\-ipv4\fP or \fB\-6, \-\-ipv6\fP"
 Tells rsync to prefer IPv4/IPv6
-@@ -2611,7 +2534,7 @@
 when creating the incoming sockets that the rsync daemon will use to
 listen for connections.  One of these options may be required in older
 versions of Linux to work around an IPv6 bug in the kernel (if you see
 -an \(dq\&address already in use\(dq\& error when nothing else is using the port,
 +an \(lqaddress already in use\(rq error when nothing else is using the port,
 try specifying \fB\-\-ipv6\fP or \fB\-\-ipv4\fP when starting the daemon).
 .IP
 If rsync was complied without support for IPv6, the \fB\-\-ipv6\fP option
-@@ -2639,7 +2562,7 @@
+@@ -2669,7 +2674,7 @@
 filename is not skipped.
 .PP
 Rsync builds an ordered list of filter rules as specified on the
 -command\-line.  Filter rules have the following syntax:
 +command-line.  Filter rules have the following syntax:
 .PP
 .RS
 \f(CWRULE [PATTERN_OR_FILENAME]\fP
-@@ -2650,7 +2573,7 @@
+@@ -2680,7 +2685,7 @@
 .PP
 You have your choice of using either short or long RULE names, as described
 -below.  If you use a short\-named rule, the \(cq\&,\(cq\& separating the RULE from the
 +below.  If you use a short-named rule, the \(oq,\(cq separating the RULE from the
 MODIFIERS is optional.  The PATTERN or FILENAME that follows (when present)
 must come after either a single space or an underscore (_).
 Here are the available rule prefixes:
-@@ -2660,9 +2583,9 @@
+@@ -2690,9 +2695,9 @@
 .br
 \fBinclude, +\fP specifies an include pattern.
 .br
 -\fBmerge, .\fP specifies a merge\-file to read for more rules.
 +\fBmerge, .\fP specifies a merge-file to read for more rules.
 -\fBdir\-merge, :\fP specifies a per\-directory merge\-file.
 +\fBdir-merge, :\fP specifies a per-directory merge-file.
 .br
 \fBhide, H\fP specifies a pattern for hiding files from the transfer.
 .br
-@@ -2678,15 +2601,15 @@
+@@ -2708,29 +2713,29 @@
 .PP
 When rules are being read from a file, empty lines are ignored, as are
 -comment lines that start with a \(dq\&#\(dq\&.
 +comment lines that start with a \(lq#\(rq.
 +does not begin with \(lq\- \(rq (dash, space) or \(lq+ \(rq (plus, space), then the
 +rule will be interpreted as if \(lq+ \(rq (for an include option) or \(lq\- \(rq (for
 an exclude option) were prefixed to the string.  A \fB\-\-filter\fP option, on
 the other hand, must always contain either a short or long rule name at the
 start of the rule.
-@@ -2693,14 +2616,14 @@
 .PP
 Note also that the \fB\-\-filter\fP, \fB\-\-include\fP, and \fB\-\-exclude\fP options take one
 rule/pattern each. To add multiple ones, you can repeat the options on
 -the command\-line, use the merge\-file syntax of the \fB\-\-filter\fP option, or
 +the command-line, use the merge-file syntax of the \fB\-\-filter\fP option, or
 +You can include and exclude files by specifying patterns using the \(lq+\(rq,
 +\(lq\-\(rq, etc. filter rules (as introduced in the FILTER RULES section above).
 The include/exclude rules each specify a pattern that is matched against
 the names of the files that are going to be transferred.  These patterns
 can take several forms:
-@@ -2710,15 +2633,15 @@
+@@ -2740,15 +2745,15 @@
 particular spot in the hierarchy of files, otherwise it is matched
 against the end of the pathname.  This is similar to a leading ^ in
 regular expressions.
 -Thus \(dq\&/foo\(dq\& would match a name of \(dq\&foo\(dq\& at either the \(dq\&root of the
 -transfer\(dq\& (for a global rule) or in the merge\-file\(cq\&s directory (for a
 +any point in the hierarchy where a \(lqfoo\(rq was found within a directory
 +named \(lqsub\(rq.  See the section on ANCHORING INCLUDE/EXCLUDE PATTERNS for
 a full discussion of how to specify a pattern that matches at the root
 of the transfer.
 .IP o
-@@ -2727,44 +2650,44 @@
+@@ -2757,44 +2762,44 @@
 .IP o
 rsync chooses between doing a simple string match and wildcard
 matching by checking if the pattern contains one of these three wildcard
 -characters: \(cq\&*\(cq\&, \(cq\&?\(cq\&, and \(cq\&[\(cq\& .
 +characters: \(oq*\(cq, \(oq?\(cq, and \(oq[\(cq .
 .IP o
 -a \(cq\&*\(cq\& matches any path component, but it stops at slashes.
 +a \(oq*\(cq matches any path component, but it stops at slashes.
 .IP o
 -use \(cq\&**\(cq\& to match anything, including slashes.
-+use '**' to match anything, including slashes.
++use \(oq**\(cq to match anything, including slashes.
 .IP o
 -a \(cq\&?\(cq\& matches any character except a slash (/).
 +a \(oq?\(cq matches any character except a slash (/).
 .IP o
 -a \(cq\&[\(cq\& introduces a character class, such as [a\-z] or [[:alpha:]].
 +hierarchy.  This is particularly important when using a trailing \(oq*\(cq rule.
 +For instance, this won't work:
 .PP
 .RS
 \f(CW+ /some/path/this\-file\-will\-not\-be\-found\fP
-@@ -2776,11 +2699,11 @@
+@@ -2806,11 +2811,11 @@
 .RE
 .PP
 -This fails because the parent directory \(dq\&some\(dq\& is excluded by the \(cq\&*\(cq\&
 -rule, so rsync never visits any of the files in the \(dq\&some\(dq\& or \(dq\&some/path\(dq\&
 +to be included by using a single rule: \(lq+ */\(rq (put it somewhere before the
 +\(lq\- *\(rq rule), and perhaps use the \fB\-\-prune\-empty\-dirs\fP option.  Another
 solution is to add specific include rules for all
 the parent dirs that need to be visited.  For instance, this set of rules
 works fine:
-@@ -2802,44 +2725,44 @@
+@@ -2832,83 +2837,83 @@
 Here are some examples of exclude/include matching:
 .PP
 .IP o
 -\(dq\&\- *.o\(dq\& would exclude all names matching *.o
 +\(lq\- *.o\(rq would exclude all names matching *.o
 +A \fBC\fP is used to indicate that all the global CVS-exclude rules
 +should be inserted as excludes in place of the \(lq\-C\(rq.  No arg should
 follow.
 .IP o
 An \fBs\fP is used to indicate that the rule applies to the sending
-@@ -2846,39 +2769,39 @@
 side.  When a rule affects the sending side, it prevents files from
 being transferred.  The default is for a rule to affect both sides
 unless \fB\-\-delete\-excluded\fP was specified, in which case default rules
 -become sender\-side only.  See also the hide (H) and show (S) rules,
 -which are an alternate way to specify sending\-side includes/excludes.
 -affect what files don\(cq\&t get deleted (see PER\-DIRECTORY RULES AND DELETE
 +affect what files don't get deleted (see PER-DIRECTORY RULES AND DELETE
 below).
 .PP
 Some examples:
-@@ -2897,60 +2820,56 @@
+@@ -2920,67 +2925,67 @@
+.br
+\f(CWdir\-merge .per\-dir\-filter\fP
+.br
+-\f(CWdir\-merge,n\- .non\-inherited\-per\-dir\-excludes\fP
++\f(CWdir\-merge,n\- .non-inherited\-per\-dir\-excludes\fP
+.br
+-\f(CW:n\- .non\-inherited\-per\-dir\-excludes\fP
++\f(CW:n\- .non-inherited\-per\-dir\-excludes\fP
+.br
 .RE
 .PP
 -The following modifiers are accepted after a merge or dir\-merge rule:
 +The following modifiers are accepted after a merge or dir-merge rule:
 -patterns, with no other rule\-parsing except for in\-file comments.
 +patterns, with no other rule-parsing except for in-file comments.
 .IP o
 A \fBC\fP is a way to specify that the file should be read in a
 -CVS\-compatible manner.  This turns on \(cq\&n\(cq\&, \(cq\&w\(cq\&, and \(cq\&\-\(cq\&, but also
--allows the list\-clearing token (!) to be specified.  If no filename is
++CVS-compatible manner.  This turns on \(oqn\(cq, \(oqw\(cq, and '\-', but also
+allows the list\-clearing token (!) to be specified.  If no filename is
 -provided, \(dq\&.cvsignore\(dq\& is assumed.
-+CVS-compatible manner.  This turns on \(oqn\(cq, \(oqw\(cq, and '\-', but also
-+allows the list-clearing token (!) to be specified.  If no filename is
 +provided, \(lq.cvsignore\(rq is assumed.
 .IP o
 -A \fBe\fP will exclude the merge\-file name from the transfer; e.g.
 -\(dq\&dir\-merge,e .rules\(dq\& is like \(dq\&dir\-merge .rules\(dq\& and \(dq\&\- .rules\(dq\&.
 +A \fBe\fP will exclude the merge-file name from the transfer; e.g.
 also disabled).
 .IP o
 -You may also specify any of the modifiers for the \(dq\&+\(dq\& or \(dq\&\-\(dq\& rules
 +You may also specify any of the modifiers for the \(lq+\(rq or \(lq\-\(rq rules
 (above) in order to have the rules that are read in from the file
--default to having that modifier set (except for the \fB!\fP modifier, which
+default to having that modifier set (except for the \fB!\fP modifier, which
 -would not be useful).  For instance, \(dq\&merge,\-/ .excl\(dq\& would
 -treat the contents of .excl as absolute\-path excludes,
 -while \(dq\&dir\-merge,s .filt\(dq\& and \(dq\&:sC\(dq\& would each make all their
 -per\-directory rules apply only on the sending side.  If the merge rule
--specifies sides to affect (via the \fBs\fP or \fBr\fP modifier or both),
++would not be useful).  For instance, \(lqmerge,\-/ .excl\(rq would
--then the rules in the file must not specify sides (via a modifier or
--a rule prefix such as \fBhide\fP).
-+default to having that modifier set.  For instance, \(lqmerge,\-/ .excl\(rq would
 +treat the contents of .excl as absolute-path excludes,
 +while \(lqdir-merge,s .filt\(rq and \(lq:sC\(rq would each make all their
-+per-directory rules apply only on the sending side.
++per-directory rules apply only on the sending side.  If the merge rule
+specifies sides to affect (via the \fBs\fP or \fBr\fP modifier or both),
+then the rules in the file must not specify sides (via a modifier or
+a rule prefix such as \fBhide\fP).
 .PP
 -Per\-directory rules are inherited in all subdirectories of the directory
 -where the merge\-file was found unless the \(cq\&n\(cq\& modifier was used.  Each
 -subdirectory\(cq\&s rules are prefixed to the inherited per\-directory rules
 +the spot where the merge-file was specified, so it is possible to override
 +dir-merge rules via a rule that got specified earlier in the list of global
 +rules.  When the list-clearing rule (\(lq!\(rq) is read from a per-directory
 file, it only clears the inherited rules for the current merge file.
 .PP
--Another way to prevent a single rule from a dir\-merge file from being inherited is to
+Another way to prevent a single rule from a dir\-merge file from being inherited is to
--anchor it with a leading slash.  Anchored rules in a per\-directory
+anchor it with a leading slash.  Anchored rules in a per\-directory
 -merge\-file are relative to the merge\-file\(cq\&s directory, so a pattern \(dq\&/foo\(dq\&
 -would only match the file \(dq\&foo\(dq\& in the directory where the dir\-merge filter
-+Another way to prevent a single rule from a dir-merge file from being inherited is to
++merge\-file are relative to the merge\-file's directory, so a pattern \(lq/foo\(rq
-+anchor it with a leading slash.  Anchored rules in a per-directory
++would only match the file \(lqfoo\(rq in the directory where the dir\-merge filter
-+merge-file are relative to the merge-file's directory, so a pattern \(lq/foo\(rq
-+would only match the file \(lqfoo\(rq in the directory where the dir-merge filter
 file was found.
 .PP
 -Here\(cq\&s an example filter file which you\(cq\&d specify via \fB\-\-filter=\(dq\&. file\(dq\&:\fP
 +Here's an example filter file which you'd specify via \fB\-\-filter=". file":\fP
 .PP
 .RS
 \f(CWmerge /home/user/.global\-filter\fP
-@@ -2967,18 +2886,18 @@
+@@ -2996,58 +3001,58 @@
+.RE
-.PP
-This will merge the contents of the /home/user/.global\-filter file at the
+.PP
+-This will merge the contents of the /home/user/.global\-filter file at the
 -start of the list and also turns the \(dq\&.rules\(dq\& filename into a per\-directory
++This will merge the contents of the /home/user/.global-filter file at the
 +start of the list and also turns the \(lq.rules\(rq filename into a per-directory
 filter file.  All rules read in prior to the start of the directory scan
 follow the global anchoring rules (i.e. a leading slash matches at the root
 of the transfer).
 .PP
 -per\-directory file.  For instance, here is a common filter (see \fB\-F\fP):
 +per-directory file.  For instance, here is a common filter (see \fB\-F\fP):
 .PP
 .RS
 -\f(CW\-\-filter='\&: /.rsync\-filter'\&\fP
-+\f(CW\-\-filter=': /.rsync\-filter'\fP
++\f(CW\-\-filter=': /.rsync-filter'\fP
 .RE
 .PP
-@@ -2986,38 +2905,38 @@
+-That rule tells rsync to scan for the file .rsync\-filter in all
++That rule tells rsync to scan for the file .rsync-filter in all
 directories from the root down through the parent directory of the
 transfer prior to the start of the normal directory scan of the file in
 the directories that are sent as a part of the transfer.  (Note: for an
 -rsync daemon, the root is always the same as the module\(cq\&s \(dq\&path\(dq\&.)
 +rsync daemon, the root is always the same as the module's \(lqpath\(rq.)
 .PP
 .RS
 \f(CWrsync \-avF /src/path/ /dest/dir\fP
 .br
 -\f(CWrsync \-av \-\-filter='\&: ../../.rsync\-filter'\& /src/path/ /dest/dir\fP
-+\f(CWrsync \-av \-\-filter=': ../../.rsync\-filter' /src/path/ /dest/dir\fP
++\f(CWrsync \-av \-\-filter=': ../../.rsync-filter' /src/path/ /dest/dir\fP
 .br
 -\f(CWrsync \-av \-\-filter='\&: .rsync\-filter'\& /src/path/ /dest/dir\fP
-+\f(CWrsync \-av \-\-filter=': .rsync\-filter' /src/path/ /dest/dir\fP
++\f(CWrsync \-av \-\-filter=': .rsync-filter' /src/path/ /dest/dir\fP
 .br
 .RE
 .PP
 -The first two commands above will look for \(dq\&.rsync\-filter\(dq\& in \(dq\&/\(dq\& and
 -and its subdirectories.  The last command avoids the parent\-dir scan
 -and only looks for the \(dq\&.rsync\-filter\(dq\& files in each directory that is
 +The first two commands above will look for \(lq.rsync\-filter\(rq in \(lq/\(rq and
 +\(lq/src\(rq before the normal scan begins looking for the file in \(lq/src/path\(rq
 +and its subdirectories.  The last command avoids the parent-dir scan
-+and only looks for the \(lq.rsync\-filter\(rq files in each directory that is
++and only looks for the \(lq.rsync-filter\(rq files in each directory that is
 a part of the transfer.
 .PP
 -If you want to include the contents of a \(dq\&.cvsignore\(dq\& in your patterns,
 -you should use the rule \(dq\&:C\(dq\&, which creates a dir\-merge of the .cvsignore
 -file, but parsed in a CVS\-compatible manner.  You can
 -\f(CWcat <<EOT | rsync \-avC \-\-filter='\&. \-'\& a/ b\fP
 +\f(CWcat <<EOT | rsync \-avC \-\-filter='. \-' a/ b\fP
 .br
 \f(CW+ foo.o\fP
 .br
-@@ -3027,49 +2946,49 @@
+@@ -3057,49 +3062,49 @@
 .br
 \f(CWEOT\fP
 .br
 -\f(CWrsync \-avC \-\-include=foo.o \-f :C \-\-exclude='\&*.old'\& a/ b\fP
 +\f(CWrsync \-avC \-\-include=foo.o \-f :C \-\-exclude='*.old' a/ b\fP
 +path of \(lq/home/me/foo/bar\(rq, and one with a path of \(lq/home/you/bar/baz\(rq.
 +Here is how the various command choices differ for a 2-source transfer:
 .PP
 .RS
 Example cmd: rsync \-a /home/me /home/you /dest
-@@ -3088,9 +3007,9 @@
+@@ -3118,9 +3123,9 @@
 .RS
 Example cmd: rsync \-a /home/me/ /home/you/ /dest
 .br
 -+/\- pattern: /foo/bar               (note missing \(dq\&me\(dq\&)
 ++/\- pattern: /foo/bar               (note missing \(lqme\(rq)
 -+/\- pattern: /bar/baz               (note missing \(dq\&you\(dq\&)
 ++/\- pattern: /bar/baz               (note missing \(lqyou\(rq)
 .br
 Target file: /dest/foo/bar
 .br
-@@ -3129,28 +3048,28 @@
+@@ -3159,28 +3164,28 @@
 .PP
 The easiest way to see what name you should filter is to just
 look at the output when using \fB\-\-verbose\fP and put a / in front of the name
 -(use the \fB\-\-dry\-run\fP option if you\(cq\&re not yet ready to copy any files).
 +(use the \fB\-\-dry\-run\fP option if you're not yet ready to copy any files).
 -the per\-directory merge files in the transfer and use \fB\-\-delete\-after\fP,
 +the per-directory merge files in the transfer and use \fB\-\-delete\-after\fP,
 because this ensures that the receiving side gets all the same exclude
 rules as the sending side before it tries to delete anything:
 .PP
-@@ -3159,14 +3078,14 @@
+@@ -3189,14 +3194,14 @@
 .RE
 .PP
 -However, if the merge files are not a part of the transfer, you\(cq\&ll need to
 +However, if the merge files are not a part of the transfer, you'll need to
 -rsync \-av \-\-filter=\(cq\&: .rules\(cq\& \-\-filter=\(cq\&. /my/extra.rules\(cq\&
 +rsync \-av \-\-filter=': .rules' \-\-filter='. /my/extra.rules'
 \-\-delete host:src/dir /dest
 .fi
-@@ -3174,17 +3093,17 @@
+@@ -3204,17 +3209,17 @@
 In the above example the extra.rules file can affect both sides of the
 transfer, but (on the sending side) the rules are subservient to the rules
 merged from the .rules files because they were specified after the
 -per\-directory merge rule.
 +per-directory merge rule.
 .PP
-In one final example, the remote side is excluding the .rsync\-filter
+-In one final example, the remote side is excluding the .rsync\-filter
-files from the transfer, but we want to use our own .rsync\-filter files
+-files from the transfer, but we want to use our own .rsync\-filter files
++In one final example, the remote side is excluding the .rsync-filter
++files from the transfer, but we want to use our own .rsync-filter files
 to control what gets deleted on the receiving side.  To do this we must
 -specifically exclude the per\-directory merge files (so that they don\(cq\&t get
 +specifically exclude the per-directory merge files (so that they don't get
 deleted) and then put rules into the local files to control what else
 should not get deleted.  Like one of these commands:
 -    rsync \-av \-\-filter='\&:e /.rsync\-filter'\& \-\-delete \e
 +    rsync \-av \-\-filter=':e /.rsync\-filter' \-\-delete \e
 host:src/dir /dest
 rsync \-avFF \-\-delete host:src/dir /dest
 .fi
-@@ -3198,9 +3117,9 @@
+@@ -3228,9 +3233,9 @@
 number of hosts.  Now suppose some changes have been made to this
 source tree and those changes need to be propagated to the other
 hosts. In order to do this using batch mode, rsync is run with the
 -write\-batch option to apply the changes made to the source tree to one
 -of the destination trees.  The write\-batch option causes the rsync
 +of the destination trees.  The write-batch option causes the rsync
 +client to store in a \(lqbatch file\(rq all the information needed to repeat
 this operation against other, identical destination trees.
 .PP
 Generating the batch file once saves having to perform the file
-@@ -3210,15 +3129,15 @@
+@@ -3240,15 +3245,15 @@
 at once, instead of sending the same data to every host individually.
 .PP
 To apply the recorded changes to another destination tree, run rsync
 -with the read\-batch option, specifying the name of the same batch
 +with the read-batch option, specifying the name of the same batch
 -a Bourne (or Bourne\-like) shell, optionally passing in an alternate
 +a Bourne (or Bourne-like) shell, optionally passing in an alternate
 destination tree pathname which is then used instead of the original
 destination path.  This is useful when the destination tree path on the
 current host differs from the one used to create the batch file.
-@@ -3244,47 +3163,47 @@
+@@ -3274,68 +3279,68 @@
 .PP
 In these examples, rsync is used to update /adest/dir/ from /source/dir/
 -and the information to repeat this operation is stored in \(dq\&foo\(dq\& and
 -\(dq\&foo.sh\(dq\&.  The host \(dq\&remote\(dq\& is then updated with the batched data going
 -protocol version in the batch file is too new for the batch\-reading rsync
 +protocol version in the batch file is too new for the batch-reading rsync
 to handle.  See also the \fB\-\-protocol\fP option for a way to have the
 creating rsync generate a batch file that an older rsync can understand.
 (Note that batch files changed format in version 2.6.3, so mixing versions
-@@ -3291,8 +3210,8 @@
 older than that with newer versions will not work.)
 .PP
 When reading a batch file, rsync will force the value of certain options
 -to match the data in the batch file if you didn\(cq\&t set them to the same
 -as the batch\-writing command.  Other options can (and should) be changed.
 +to match the data in the batch file if you didn't set them to the same
 +as the batch-writing command.  Other options can (and should) be changed.
 For instance \fB\-\-write\-batch\fP changes to \fB\-\-read\-batch\fP,
 \fB\-\-files\-from\fP is dropped, and the
 \fB\-\-filter\fP/\fB\-\-include\fP/\fB\-\-exclude\fP options are not needed unless
-@@ -3299,13 +3218,13 @@
 one of the \fB\-\-delete\fP options is specified.
 .PP
 The code that creates the BATCH.sh file transforms any filter/include/exclude
 -options into a single list that is appended as a \(dq\&here\(dq\& document to the
 +options into a single list that is appended as a \(lqhere\(rq document to the
 -The original batch mode in rsync was based on \(dq\&rsync+\(dq\&, but the latest
 +The original batch mode in rsync was based on \(lqrsync+\(rq, but the latest
 version uses a new implementation.
 .PP
 .SH "SYMBOLIC LINKS"
-@@ -3315,18 +3234,18 @@
+@@ -3345,16 +3350,16 @@
 link in the source directory.
 .PP
 By default, symbolic links are not transferred at all.  A message
 -\(dq\&skipping non\-regular\(dq\& file is emitted for any symlinks that exist.
 +\(lqskipping non-regular\(rq file is emitted for any symlinks that exist.
 -If \fB\-\-copy\-links\fP is specified, then symlinks are \(dq\&collapsed\(dq\& by
 +If \fB\-\-copy\-links\fP is specified, then symlinks are \(lqcollapsed\(rq by
 copying their referent, rather than the symlink.
 .PP
 -Rsync can also distinguish \(dq\&safe\(dq\& and \(dq\&unsafe\(dq\& symbolic links.  An
--example where this might be used is a web site mirror that wishes to
++Rsync can also distinguish \(lqsafe\(rq and \(lqunsafe\(rq symbolic links.  An
--ensure that the rsync module that is copied does not include symbolic links to
+example where this might be used is a web site mirror that wishes to
-+rsync also distinguishes \(lqsafe\(rq and \(lqunsafe\(rq symbolic links.  An
+ensure that the rsync module that is copied does not include symbolic links to
-+example where this might be used is a web site mirror that wishes
-+ensure the rsync module they copy does not include symbolic links to
 \fB/etc/passwd\fP in the public section of the site.  Using
-\fB\-\-copy\-unsafe\-links\fP will cause any links to be copied as the file
+@@ -3364,11 +3369,11 @@
-they point to on the destination.  Using \fB\-\-safe\-links\fP will cause
-@@ -3334,11 +3253,11 @@
 \fB\-\-links\fP for \fB\-\-safe\-links\fP to have any effect.)
 .PP
 Symbolic links are considered unsafe if they are absolute symlinks
 -(start with \fB/\fP), empty, or if they contain enough \(dq\&..\(dq\&
 +(start with \fB/\fP), empty, or if they contain enough \(lq..\(rq
 +Here's a summary of how the symlink options are interpreted.  The list is
 +in order of precedence, so if your combination of options isn't mentioned,
 use the first line that is a complete subset of your options:
 .PP
 .IP "\fB\-\-copy\-links\fP"
-@@ -3364,8 +3283,8 @@
+@@ -3394,8 +3399,8 @@
 .PP
 rsync occasionally produces error messages that may seem a little
 -cryptic. The one that seems to cause the most confusion is \(dq\&protocol
 -version mismatch \-\- is your shell clean?\(dq\&.
 +cryptic. The one that seems to cause the most confusion is \(lqprotocol
 +version mismatch \(em is your shell clean?\(rq.
 .PP
 This message is usually caused by your startup scripts or remote shell
 facility producing unwanted garbage on the stream that rsync is using
-@@ -3383,7 +3302,7 @@
+@@ -3413,7 +3418,7 @@
 data. Look at the contents and try to work out what is producing
 it. The most common cause is incorrectly configured shell startup
 scripts (such as .cshrc or .profile) that contain output statements
 -for non\-interactive logins.
 +for non-interactive logins.
 .PP
 If you are having trouble debugging filter patterns, then
 try specifying the \fB\-vv\fP option.  At this level of verbosity rsync will
-@@ -3402,13 +3321,13 @@
+@@ -3432,13 +3437,13 @@
 Errors selecting input/output files, dirs
 .IP "\fB4\fP"
 Requested action not supported: an attempt
 -was made to manipulate 64\-bit files on a platform that cannot support
 +was made to manipulate 64-bit files on a platform that cannot support
 -Daemon unable to append to log\-file
 +Daemon unable to append to log-file
 .IP "\fB10\fP"
 Error in socket I/O
 .IP "\fB11\fP"
-@@ -3447,7 +3366,7 @@
+@@ -3491,13 +3496,13 @@
-more details.
-.IP "\fBRSYNC_ICONV\fP"
-Specify a default \fB\-\-iconv\fP setting using this
--environment variable. (First supported in 3.0.0.)
-+environment variable.
-.IP "\fBRSYNC_RSH\fP"
-The RSYNC_RSH environment variable allows you to
-override the default shell used as the transport for rsync.  Command line
-@@ -3461,13 +3380,13 @@
 password allows you to run authenticated rsync connections to an rsync
 daemon without user intervention. Note that this does not supply a
 password to a remote shell transport such as ssh; to learn how to do that,
 -consult the remote shell\(cq\&s documentation.
 +consult the remote shell's documentation.
 -The HOME environment variable is used to find the user\(cq\&s
 +The HOME environment variable is used to find the user's
 default .cvsignore file.
 .PP
-@@ -3486,7 +3405,7 @@
+@@ -3516,7 +3521,7 @@
 .PP
 times are transferred as *nix time_t values
 .PP
 -When transferring to FAT filesystems rsync may re\-sync
 +When transferring to FAT filesystems rsync may re-sync
 unmodified files.
 See the comments on the \fB\-\-modify\-window\fP option.
 .PP
-@@ -3501,7 +3420,7 @@
+@@ -3552,27 +3557,27 @@
-.SH "VERSION"
-.PP
--This man page is current for version 3.0.8 of rsync.
-+This man page is current for version 3.0.6 of rsync.
-.PP
-.SH "INTERNAL OPTIONS"
-@@ -3522,7 +3441,7 @@
 .PP
 A WEB site is available at
 http://rsync.samba.org/.  The site
 -includes an FAQ\-O\-Matic which may cover questions unanswered by this
 +includes an FAQ-O-Matic which may cover questions unanswered by this
 manual page.
 .PP
 The primary ftp site for rsync is
-@@ -3529,20 +3448,20 @@
 ftp://rsync.samba.org/pub/rsync.
 .PP
 We would be delighted to hear from you if you like this program.
 -Please contact the mailing\-list at [email protected].
 +Please contact the mailing-list at [email protected].
 +Jean-loup Gailly and Mark Adler.
 .PP
 .SH "THANKS"
 .PP
--Special thanks go out to: John Van Essen, Matt McCutchen, Wesley W. Terpstra,
+Special thanks go out to: John Van Essen, Matt McCutchen, Wesley W. Terpstra,
-+Especial thanks go out to: John Van Essen, Matt McCutchen, Wesley W. Terpstra,
 David Dykstra, Jos Backus, Sebastian Krahmer, Martin Pool, and our
 -gone\-but\-not\-forgotten compadre, J.W. Schultz.
 +gone-but-not-forgotten compadre, J.W. Schultz.
 .PP
 Thanks also to Richard Brent, Brendan Mackay, Bill Waite, Stephen Rothwell

changeset 1351	5c589218fa09
parent 297	3940bc347ca8
child 1817	ff42a83716c4