From ae2836325f77311fdaaf9f5a82d13fedfa3312bb Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Fri, 28 Jan 2005 22:01:02 +0000 Subject: [PATCH] Fixed some typos. --- rsync.yo | 14 +++++++------- rsyncd.conf.yo | 11 ++++++----- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/rsync.yo b/rsync.yo index 1566368a..e681af79 100644 --- a/rsync.yo +++ b/rsync.yo @@ -290,8 +290,8 @@ quote( get:nl() sync: get put) 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't very efficient. +connection. I then do CVS operations on the remote machine, which saves a +lot of time as the remote CVS protocol isn't very efficient. I mirror a directory between my "old" and "new" ftp sites with the command @@ -722,7 +722,7 @@ specified). dit(bf(--delete-during, --del)) Request that the file-deletions on the receiving side be done incrementally as the transfer happens. This is -a faster method than chosing the before- or after-transfer algorithm, +a faster method than choosing the before- or after-transfer algorithm, but it is only supported beginning with rsync version 2.6.4. See --delete (which is implied) for more details on file-deletion. @@ -1269,7 +1269,7 @@ comment lines that start with a "#". manpagesection(INCLUDE/EXCLUDE PATTERN RULES) -You can include and exclude files by specifing patterns using the "+" and +You can include and exclude files by specifying patterns using the "+" and "-" filter rules (as introduced in the FILTER RULES section above). These rules specify a pattern that is matched against the names of the files that are going to be transferred. These patterns can take several forms: @@ -1308,7 +1308,7 @@ itemize( directories. If the pattern doesn't contain a / or a "**", then it is matched only against the final component of the filename. (Remember that the algorithm is applied recursively so "full filename" - can actually be any portion of a path fomr the starting directory on + can actually be any portion of a path from the starting directory on down.) ) @@ -1469,7 +1469,7 @@ Some examples of this pre-scanning for per-directory files: verb( rsync -avF /src/path/ /dest/dir rsync -av --filter=': ../../.rsync-filter' /src/path/ /dest/dir - rsync -av --fitler=': .rsync-filter' /src/path/ /dest/dir + rsync -av --filter=': .rsync-filter' /src/path/ /dest/dir ) The first two commands above will look for ".rsync-filter" in "/" and @@ -1485,7 +1485,7 @@ interpreted according to the same parsing rules that CVS uses. You can use this to affect where the --cvs-exclude (-C) option's inclusion of the per-directory .cvsignore file gets placed into your rules by putting a ":C" wherever you like in your filter rules. Without this, rsync would -add the per-dir rule for the .cvignore file at the end of all your other +add the per-dir rule for the .cvsignore file at the end of all your other rules (giving it a lower priority than your command-line rules). For example: diff --git a/rsyncd.conf.yo b/rsyncd.conf.yo index c74dc21a..f81e3e97 100644 --- a/rsyncd.conf.yo +++ b/rsyncd.conf.yo @@ -350,10 +350,10 @@ The default is no "hosts deny" option, which means all hosts can connect. dit(bf(ignore errors)) The "ignore errors" option tells rsyncd to ignore I/O errors on the server when deciding whether to run the delete phase of the transfer. Normally rsync skips the --delete step if any -I/O errors have occurred in order to prevent disasterous deletion due +I/O errors have occurred in order to prevent disastrous deletion due to a temporary resource shortage or other I/O error. In some cases this test is counter productive so you can use this option to turn off this -behaviour. +behavior. dit(bf(ignore nonreadable)) This tells the rsync server to completely ignore files that are not readable by the user. This is useful for @@ -572,7 +572,8 @@ documentation! manpageauthor() -rsync was written by Andrew Tridgell and Paul Mackerras. They may be -contacted via email at tridge@samba.org and -Paul.Mackerras@cs.anu.edu.au +rsync was written by Andrew Tridgell and Paul Mackerras. +Many people have later contributed to it. +Mailing lists for support and development are available at +url(http://lists.samba.org)(lists.samba.org) -- 2.34.1