Updated with latest news and some spelling mistakes corrected.

[rsync/rsync.git] / rsync.yo

diff --git a/rsync.yo b/rsync.yo
index bce6155..a3c2159 100644 (file)
--- a/rsync.yo
+++ b/rsync.yo
@@ -915,29 +915,24 @@ Here is how the various command choices differ for a 2-source transfer:
 
 verb(
    Example cmd: rsync -a /home/me /home/you /dest
 
 verb(
    Example cmd: rsync -a /home/me /home/you /dest

-   Source root: /home       (me & you are part of transfer)

    +/- pattern: /me/foo/bar
    +/- pattern: /you/bar/baz
    Target file: /dest/me/foo/bar
    Target file: /dest/you/bar/baz
 
    Example cmd: rsync -a /home/me/ /home/you/ /dest
    +/- pattern: /me/foo/bar
    +/- pattern: /you/bar/baz
    Target file: /dest/me/foo/bar
    Target file: /dest/you/bar/baz
 
    Example cmd: rsync -a /home/me/ /home/you/ /dest

-   Source root: /home/me               (due to trailing /)
-   Source root: /home/you              (ditto)

    +/- pattern: /foo/bar               (note missing "me")
    +/- pattern: /bar/baz               (note missing "you")
    Target file: /dest/foo/bar
    Target file: /dest/bar/baz
 
    Example cmd: rsync -a --relative /home/me/ /home/you /dest
    +/- pattern: /foo/bar               (note missing "me")
    +/- pattern: /bar/baz               (note missing "you")
    Target file: /dest/foo/bar
    Target file: /dest/bar/baz
 
    Example cmd: rsync -a --relative /home/me/ /home/you /dest

-   Source root: /

    +/- pattern: /home/me/foo/bar       (note full path)
    +/- pattern: /home/you/bar/baz      (ditto)
    Target file: /dest/home/me/foo/bar
    Target file: /dest/home/you/bar/baz
 
    Example cmd: cd /home; rsync -a --relative me/foo you/ /dest
    +/- pattern: /home/me/foo/bar       (note full path)
    +/- pattern: /home/you/bar/baz      (ditto)
    Target file: /dest/home/me/foo/bar
    Target file: /dest/home/you/bar/baz
 
    Example cmd: cd /home; rsync -a --relative me/foo you/ /dest

-   Source root: /home

    +/- pattern: /me/foo/bar      (starts at specified path)
    +/- pattern: /you/bar/baz     (ditto)
    Target file: /dest/me/foo/bar
    +/- pattern: /me/foo/bar      (starts at specified path)
    +/- pattern: /you/bar/baz     (ditto)
    Target file: /dest/me/foo/bar


@@ -1214,7 +1209,7 @@ password to a shell transport such as ssh.
 
 dit(bf(USER) or bf(LOGNAME)) The USER or LOGNAME environment variables
 are used to determine the default username sent to an rsync server.
 
 dit(bf(USER) or bf(LOGNAME)) The USER or LOGNAME environment variables
 are used to determine the default username sent to an rsync server.

-If neither is set, the username defaults to "guest".
+If neither is set, the username defaults to "nobody".

 
 dit(bf(HOME)) The HOME environment variable is used to find the user's
 default .cvsignore file.
 
 dit(bf(HOME)) The HOME environment variable is used to find the user's
 default .cvsignore file.