Improved the examples for the --relative option.

[rsync/rsync.git] / rsync.yo

diff --git a/rsync.yo b/rsync.yo
index e4e498f..88ae07b 100644 (file)
--- a/rsync.yo
+++ b/rsync.yo
@@ -466,15 +466,21 @@ just the last parts of the filenames. This is particularly useful when
 you want to send several different directories at the same time. For
 example, if you used the command
 
 you want to send several different directories at the same time. For
 example, if you used the command
 

-verb(rsync foo/bar/foo.c remote:/tmp/)
+verb(rsync /foo/bar/foo.c remote:/tmp/)

 
 then this would create a file called foo.c in /tmp/ on the remote
 machine. If instead you used
 
 
 then this would create a file called foo.c in /tmp/ on the remote
 machine. If instead you used
 

-verb(rsync -R foo/bar/foo.c remote:/tmp/)
+verb(rsync -R /foo/bar/foo.c remote:/tmp/)

 
 then a file called /tmp/foo/bar/foo.c would be created on the remote
 
 then a file called /tmp/foo/bar/foo.c would be created on the remote

-machine -- the full path name is preserved.
+machine -- the full path name is preserved.  To limit the amount of
+path information that is sent, do something like this:
+
+verb(cd /foo
+rsync -R bar/foo.c remote:/tmp/)
+
+That would create /tmp/bar/foo.c on the remote machine.

 
 dit(bf(--no-relative)) Turn off the --relative option.  This is only
 needed if you want to use --files-from without its implied --relative
 
 dit(bf(--no-relative)) Turn off the --relative option.  This is only
 needed if you want to use --files-from without its implied --relative


@@ -509,11 +515,13 @@ dit(bf(--suffix=SUFFIX)) This option allows you to override the default
 backup suffix used with the --backup (-b) option. The default suffix is a ~
 if no --backup-dir was specified, otherwise it is an empty string.
 
 backup suffix used with the --backup (-b) option. The default suffix is a ~
 if no --backup-dir was specified, otherwise it is an empty string.
 

-dit(bf(-u, --update)) This forces rsync to skip any files for which the
-destination file already exists and has a date later than the source
-file.
+dit(bf(-u, --update)) This forces rsync to skip any files which exist on
+the destination and have a modified time that is newer than the source
+file.  (If an existing destination file has a modify time equal to the
+source file's, it will be updated if the sizes are different.)

 
 

-In the currently implementation, a difference of file format is always
+In the current implementation of --update, a difference of file format
+between the sender and receiver is always

 considered to be important enough for an update, no matter what date
 is on the objects.  In other words, if the source has a directory or a
 symlink where the destination has a file, the transfer would occur
 considered to be important enough for an update, no matter what date
 is on the objects.  In other words, if the source has a directory or a
 symlink where the destination has a file, the transfer would occur


@@ -968,7 +976,7 @@ 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.
 
 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:
+After a file is complete, the data looks like this:

 
 verb(
      1238099 100%  146.38kB/s    0:00:08  (5, 57.1% of 396)
 
 verb(
      1238099 100%  146.38kB/s    0:00:08  (5, 57.1% of 396)