--- OLD/rsync.1 Thu Jan 1 00:00:00 1970 +++ NEW/rsync.1 Thu Jan 1 00:00:00 1970 @@ -53,7 +53,7 @@ .PP .IP o for copying local files\&. This is invoked when neither -source nor destination path contains a : separator +source nor destination path contains a : separator. .IP .IP o for copying from the local machine to a remote machine using @@ -288,11 +288,11 @@ .RS get: .br -rsync -avuzb --exclude \'*~\' samba:samba/ \&. +\ \ \ \ \ \ \ \ rsync -avuzb --exclude \'*~\' samba:samba/ \&. .PP put: .br -rsync -Cavuzb \&. samba:samba/ +\ \ \ \ \ \ \ \ rsync -Cavuzb \&. samba:samba/ .PP sync: get put .RE @@ -348,7 +348,7 @@ -e, --rsh=COMMAND specify the remote shell to use --rsync-path=PATH specify path to rsync on the remote machine -C, --cvs-exclude auto ignore files in the same way CVS does - --existing only update files that already exist + --existing update only files that already exist --ignore-existing ignore files that already exist on the receiving side --delete delete files that don\'t exist on the sending side --delete-excluded also delete excluded files on the receiving side @@ -360,7 +360,7 @@ --numeric-ids don\'t map uid/gid values by user/group name --timeout=TIME set IO timeout in seconds -I, --ignore-times don\'t exclude files that match length and time - --size-only only use file size when determining if a file should be transferred + --size-only use only file size when determining if a file should be transferred --modify-window=NUM Timestamp window (seconds) for file match (default=0) -T --temp-dir=DIR create temporary files in directory DIR --compare-dest=DIR also compare destination files relative to DIR @@ -375,8 +375,8 @@ --daemon run as a rsync daemon --no-detach do not detach from the parent --address=ADDRESS bind to the specified address - --config=FILE specify alternate rsyncd\&.conf file - --port=PORT specify alternate rsyncd port number + --config=FILE specify alternative rsyncd\&.conf file + --port=PORT specify alternative rsyncd port number --blocking-io use blocking IO for the remote shell --no-blocking-io turn off --blocking-io --stats give some file transfer stats @@ -544,7 +544,7 @@ the remote system to be the same as the local system\&. Without this option hard links are treated like regular files\&. .IP -Note that rsync can only detect hard links if both parts of the link +Note that rsync can detect hard links only if both parts of the link are in the list of files being sent\&. .IP This option can be quite slow, so only use it if you need it\&. @@ -577,7 +577,7 @@ destination file to be the same as the source file\&. If the receiving program is not running as the super-user, only groups that the receiver is a member of will be preserved (by group name, not group id -number)\&. +number, unless --numeric-ids is given)\&. .IP .IP "\fB-D, --devices\fP" This option causes rsync to transfer character and @@ -612,7 +612,7 @@ .IP .IP "\fB--existing\fP" This tells rsync not to create any new files - -only update files that already exist on the destination\&. +update only files that already exist on the destination\&. .IP .IP "\fB--ignore-existing\fP" This tells rsync not to update files that already exist on @@ -659,7 +659,7 @@ .IP "\fB--force\fP" This options tells rsync to delete directories even if they are not empty when they are to be replaced by non-directories\&. This -is only relevant without --delete because deletions are now done depth-first\&. +is relevant only without --delete because deletions are now done depth-first\&. Requires the --recursive option (which is implied by -a) to have any effect\&. .IP .IP "\fB-B , --block-size=BLOCKSIZE\fP" @@ -686,7 +686,7 @@ -e "ssh -p 2234" .RE .IP -(Note that ssh users can alternately customize site-specific connect +(Note that ssh users can alternatively customize site-specific connect options in their \&.ssh/config file\&.) .IP You can also choose the remote shell program using the RSYNC_RSH @@ -769,8 +769,8 @@ .IP Current versions of rsync actually use an adaptive algorithm for the checksum length by default, using a 16 byte file checksum to determine -if a 2nd pass is required with a longer block checksum\&. Only use this -option if you have read the source code and know what you are doing\&. +if a 2nd pass is required with a longer block checksum\&. Use this +option only if you have read the source code and know what you are doing\&. .IP .IP "\fB-T, --temp-dir=DIR\fP" This option instructs rsync to use DIR as a @@ -852,20 +852,20 @@ .IP .IP "\fB--address\fP" By default rsync will bind to the wildcard address -when run as a daemon with the --daemon option or when connecting to a +when run as a daemon with the --daemon option or when connecting to an rsync server\&. The --address option allows you to specify a specific IP address (or hostname) to bind to\&. This makes virtual hosting possible in conjunction with the --config option\&. .IP .IP "\fB--config=FILE\fP" -This specifies an alternate config file than -the default\&. This is only relevant when --daemon is specified\&. +This specifies an alternative config file than +the default\&. This is relevant only when --daemon is specified\&. The default is /etc/rsyncd\&.conf unless the daemon is running over a remote shell program and the remote user is not root; in that case the default is rsyncd\&.conf in the current directory (typically $HOME)\&. .IP .IP "\fB--port=PORT\fP" -This specifies an alternate TCP port number to use +This specifies an alternative TCP port number to use rather than the default port 873\&. .IP .IP "\fB--blocking-io\fP" @@ -914,7 +914,7 @@ .IP "\fB--password-file\fP" This option allows you to provide a password in a file for accessing a remote rsync server\&. Note that this option -is only useful when accessing a rsync server using the built in +is useful only when accessing a rsync server using the built in transport, not when using a remote shell as the transport\&. The file must not be world readable\&. It should contain just the password as a single line\&. @@ -988,7 +988,7 @@ if the pattern contains a / (not counting a trailing /) then it is matched against the full filename, including any leading directory\&. If the pattern doesn\'t contain a / then it is matched -only against the final component of the filename\&. Again, remember +against only the final component of the filename\&. Again, remember that the algorithm is applied recursively so "full filename" can actually be any portion of a path\&. .IP @@ -1072,7 +1072,7 @@ .PP The \&.rsync_argvs file contains a command-line suitable for updating a destination tree using that batch update fileset\&. It can be executed -using a Bourne(-like) shell, optionally passing in an alternate +using a Bourne(-like) shell, optionally passing in an alternative destination tree pathname which is then used instead of the original path\&. This is useful when the destination tree path differs from the original destination tree path\&. @@ -1171,7 +1171,7 @@ .nf - rsh remotehost /bin/true > out\&.dat + rsh remotehost true > out\&.dat .fi