X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/43cd760fc1ddc035bc887720ea291b80cb5cf622..4e308a95267d1b6564d9e345f7f7dadf0a9073e3:/rsync.yo diff --git a/rsync.yo b/rsync.yo index 6c4db30f..6aaaecd2 100644 --- a/rsync.yo +++ b/rsync.yo @@ -1,5 +1,5 @@ mailto(rsync-bugs@samba.org) -manpage(rsync)(1)(26 Jan 2003)()() +manpage(rsync)(1)(1 Jan 2004)()() manpagename(rsync)(faster, flexible replacement for rcp) manpagesynopsis() @@ -77,7 +77,7 @@ itemize( using a remote shell program as the transport, using rsync server on the remote machine. This is invoked when the destination path contains a :: separator and the - --rsh=COMMMAND option is also provided. + --rsh=COMMAND option is also provided. it() for listing files on a remote machine. This is done the same way as rsync transfers except that you leave off the @@ -111,7 +111,7 @@ manpagesection(USAGE) You use rsync in the same way you use rcp. You must specify a source and a destination, one of which may be remote. -Perhaps the best way to explain the syntax is some examples: +Perhaps the best way to explain the syntax is with some examples: quote(rsync *.c foo:src/) @@ -162,8 +162,8 @@ running on TCP port 873. 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's configuration must allow -proxying to port 873. +your web proxy. Note that your web proxy's configuration must support +proxy connections to port 873. Using rsync in this way is the same as using it with a remote shell except that: @@ -217,7 +217,7 @@ used to check against the rsyncd.conf on the remote host. manpagesection(RUNNING AN RSYNC SERVER) -An rsync server is configured using a config file. Please see the +An rsync server is configured using a configuration file. Please see the rsyncd.conf(5) man page for more information. By default the configuration file is called /etc/rsyncd.conf, unless rsync is running over a remote shell program and is not running as root; in that case, the default name @@ -285,9 +285,9 @@ verb( -R, --relative use relative path names --no-relative turn off --relative --no-implied-dirs don't send implied dirs with -R - -b, --backup make backups (see --suffix) + -b, --backup make backups (see --suffix & --backup-dir) --backup-dir make backups into this directory - --suffix=SUFFIX define backup suffix (default ~ w/o --backup-dir) + --suffix=SUFFIX backup suffix (default ~ w/o --backup-dir) -u, --update update only (don't overwrite newer files) -l, --links copy symlinks as symlinks -L, --copy-links copy the referent of symlinks @@ -305,24 +305,24 @@ verb( --no-whole-file turn off --whole-file -x, --one-file-system don't cross filesystem boundaries -B, --block-size=SIZE checksum blocking size (default 700) - -e, --rsh=COMMAND specify the remote shell to use + -e, --rsh=COMMAND specify the remote shell --rsync-path=PATH specify path to rsync on the remote machine --existing only update 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 - --delete-after delete after transferring, not before + --ignore-existing ignore files that already exist on receiver + --delete delete files that don't exist on sender + --delete-excluded also delete excluded files on receiver + --delete-after receiver deletes after transfer, not before --ignore-errors delete even if there are IO errors --max-delete=NUM don't delete more than NUM files --partial keep partially transferred files - --force force deletion of directories even if not empty + --force force deletion of dirs even if not empty --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 - --modify-window=NUM Timestamp window (seconds) for file match (default=0) + -I, --ignore-times turn off mod time & file size quick check + --size-only ignore mod time for quick check (use size) + --modify-window=NUM compare mod times with reduced accuracy -T --temp-dir=DIR create temporary files in directory DIR - --compare-dest=DIR also compare destination files relative to DIR + --compare-dest=DIR also compare received files relative to DIR --link-dest=DIR create hardlinks to DIR for unchanged files -P equivalent to --partial --progress -z, --compress compress file data @@ -332,7 +332,7 @@ verb( --include=PATTERN don't exclude files matching PATTERN --include-from=FILE don't exclude patterns listed in FILE --files-from=FILE read FILE for list of source-file names - -0 --from0 file names we read are separated by nulls, not newlines + -0 --from0 all file lists are delimited by nulls --version print version number --daemon run as a rsync daemon --no-detach do not detach from the parent @@ -346,8 +346,8 @@ verb( --log-format=FORMAT log file transfers using specified format --password-file=FILE get password from FILE --bwlimit=KBPS limit I/O bandwidth, KBytes per second - --read-batch=PREFIX read batch fileset starting with PREFIX --write-batch=PREFIX write batch fileset starting with PREFIX + --read-batch=PREFIX read batch fileset starting with PREFIX -h, --help show this help screen @@ -381,11 +381,11 @@ from the remote server. This flag is useful when invoking rsync from cron. dit(bf(-I, --ignore-times)) Normally rsync will skip any files that are -already the same length and have the same time-stamp. This option turns -off this behavior. +already the same size and have the same modification time-stamp. +This option turns off this "quick check" behavior. dit(bf(--size-only)) Normally rsync will skip any files that are -already the same length and have the same time-stamp. With the +already the same size and have the same modification time-stamp. With the --size-only option files will be skipped if they have the same size, regardless of timestamp. This is useful when starting to use rsync after using another mirroring system which may not preserve timestamps @@ -496,7 +496,7 @@ dit(bf(-W, --whole-file)) With this option the incremental rsync 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 target machines is higher than the bandwidth to disk (especially when the -"disk" is actually a networked file system). This is the default when both +"disk" is actually a networked filesystem). This is the default when both the source and target are on the local machine. dit(bf(--no-whole-file)) Turn off --whole-file, for use when it is the @@ -519,7 +519,7 @@ remote system cannot get access to the usernames from /etc/passwd. dit(bf(-g, --group)) 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, only groups that the -receiver is a member of will be preserved (by group name, not group id +receiver is a member of will be preserved (by group name, not group ID number). dit(bf(-D, --devices)) This option causes rsync to transfer character and @@ -580,10 +580,10 @@ receiving side that are not on the sending side, this tells rsync to also delete any files on the receiving side that are excluded (see --exclude). Implies --delete. -dit(bf(--delete-after)) By default rsync does file deletions before -transferring files to try to ensure that there is sufficient space on -the receiving filesystem. If you want to delete after transferring -then use the --delete-after switch. Implies --delete. +dit(bf(--delete-after)) By default rsync does file deletions on the +receiving side before transferring files to try to ensure that there is +sufficient space on the receiving filesystem. If you want to delete +after transferring, use the --delete-after switch. Implies --delete. dit(bf(--ignore-errors)) Tells --delete to go ahead and delete files even when there are IO errors. @@ -602,7 +602,7 @@ remote copies of rsync. Typically, rsync is configured to use ssh by default, but you may prefer to use rsh on a local network. If this option is used with bf([user@]host::module/path), then the -remote shell em(COMMMAND) will be used to run an rsync server on the +remote shell em(COMMAND) will be used to run an rsync server 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 server on the remote host. See the section "CONNECTING @@ -748,16 +748,16 @@ compressing transport, as it takes advantage of the implicit information sent for matching data blocks. dit(bf(--numeric-ids)) With this option rsync will transfer numeric group -and user ids rather than using user and group names and mapping them +and user IDs rather than using user and group names and mapping them at both ends. -By default rsync will use the user name and group name to determine +By default rsync will use the username and groupname to determine what ownership to give files. The special uid 0 and the special group 0 are never mapped via user/group names even if the --numeric-ids option is not specified. If the source system is a daemon using chroot, or if a user or group -name does not exist on the destination system, then the numeric id +name does not exist on the destination system, then the numeric ID from the source system is used instead. dit(bf(--timeout=TIMEOUT)) This option allows you to set a maximum IO @@ -800,8 +800,8 @@ dit(bf(--port=PORT)) This specifies an alternate TCP port number to use rather than the default port 873. dit(bf(--blocking-io)) This tells rsync to use blocking IO when launching -a remote shell transport. If the remote shell is either rsh or remsh (and -assuming the RSYNC_RSH_IO value does not apply), rsync defaults to using +a remote shell transport. If the remote shell is either rsh or remsh, +rsync defaults to using blocking IO, otherwise it defaults to using non-blocking IO. (Note that ssh prefers non-blocking IO.) @@ -828,6 +828,29 @@ showing the progress of the transfer. This gives a bored user something to watch. Implies --verbose without incrementing verbosity. +When the file is transferring, the data looks like this: + +verb( + 782448 63% 110.64kB/s 0:00:04 +) + +This tells you the current file size, the percentage of the transfer that +is complete, the current calculated file-completion rate (including both +data over the wire and data being matched locally), and the estimated time +remaining in this transfer. + +After the a file is complete, it the data looks like this: + +verb( + 1238099 100% 146.38kB/s 0:00:08 (5, 57.1% of 396) +) + +This tells you the final file size, that it's 100% complete, the final +transfer rate for the file, the amount of elapsed time it took to transfer +the file, and the addition of a total-transfer summary in parentheses. +These additional numbers tell you how many files have been updated, and +what percent of the total number of files has been scanned. + dit(bf(-P)) The -P option is equivalent to --partial --progress. I found myself typing that combination quite often so I created an option to make it easier. @@ -844,7 +867,7 @@ transfer rate in kilobytes per second. This option is most effective when using rsync with large files (several megabytes and up). Due to the nature of rsync transfers, blocks of data are sent, then if rsync determines the transfer was too fast, it will wait before sending the next data block. The -result is an average transfer rate equalling the specified limit. A value +result is an average transfer rate equaling the specified limit. A value of zero specifies no limit. dit(bf(--write-batch=PREFIX)) Generate a set of files that can be @@ -1062,7 +1085,7 @@ ensure the rsync module they copy does not include symbolic links to bf(/etc/passwd) in the public section of the site. Using bf(--copy-unsafe-links) will cause any links to be copied as the file they point to on the destination. Using bf(--safe-links) will cause -unsafe links to be ommitted altogether. +unsafe links to be omitted altogether. Symbolic links are considered unsafe if they are absolute symlinks (start with bf(/)), empty, or if they contain enough bf("..") @@ -1104,7 +1127,7 @@ dit(bf(2)) Protocol incompatibility dit(bf(3)) Errors selecting input/output files, dirs dit(bf(4)) Requested action not supported: an attempt was made to manipulate 64-bit files on a platform that cannot support -them; or an option was speciifed that is supported by the client and +them; or an option was specifed that is supported by the client and not by the server. dit(bf(5)) Error starting client-server protocol dit(bf(10)) Error in socket IO @@ -1132,13 +1155,6 @@ dit(bf(RSYNC_RSH)) The RSYNC_RSH environment variable allows you to override the default shell used as the transport for rsync. Command line options are permitted after the command name, just as in the -e option. -dit(bf(RSYNC_RSH_IO)) The RSYNC_RSH_IO environment variable allows you to -override the blocking IO default for the shell specified in RSYNC_RSH. Set -it to either "blocking" or "non-blocking". This value is only used if the -remote-shell choice exactly matches the value of the RSYNC_RSH variable. -Otherwise the default blocking-IO value will be used, as mentioned in -the --blocking-io option's description above. - dit(bf(RSYNC_PROXY)) The RSYNC_PROXY environment variable allows you to redirect your rsync client to use a web proxy when connecting to a rsync daemon. You should set RSYNC_PROXY to a hostname:port pair. @@ -1170,7 +1186,7 @@ manpagebugs() times are transferred as unix time_t values -When transferring to FAT filesystmes rsync may resync +When transferring to FAT filesystems rsync may resync unmodified files. See the comments on the --modify-window option.