Index: rsync.yo
===================================================================
RCS file: /cvsroot/rsync/rsync.yo,v
retrieving revision 1.321
diff -u -r1.321 rsync.yo
--- rsync.yo	21 Jan 2006 19:55:47 -0000	1.321
+++ rsync.yo	21 Jan 2006 20:32:00 -0000
@@ -732,24 +732,22 @@
 filesystem. It doesn't seem to handle seeks over null regions
 correctly and ends up corrupting the files.
 
-dit(bf(-x, --one-file-system)) This tells rsync not to cross filesystem
-boundaries  when recursing.  This  is useful for transferring the
-contents of only one filesystem.
-
-dit(bf(-x, --one-file-system)) This tells rsync to avoid recursing into a
+dit(bf(-x, --one-file-system)) This tells rsync not to recurse into a
 directory that is the mount-point for another filesystem, including (as of
-2.6.7), "bind" mount-points.  You can still copy the contents of multiple
-file systems if you include a source dir from each file system -- this just
-limits rsync's directory-recursion algorithm.
-
-Rsync will copy the directory at each encountered mount-point unless this
-option is repeated.  Note, however, that the attributes of this mount-point
-directory are copied from those currently visible in the filesystem, not
-the inaccessible attributes of the underlying directory.
-
-This option does not affect the "collapsing" of symlinks that options such
-as bf(--copy-links) perform, irrespective of what filesystem the symlink's
-referent may be on.
+2.6.7) "bind" mount-points.  You can still copy files from multiple
+filesystems if you include a source dir from each filesystem; rsync will
+recurse independently inside each source dir but will not recurse into
+other mount-points found within them.
+
+If this option is repeated, rsync skips mount-points entirely.  Otherwise,
+it copies each mount-point it encounters using the attributes of the root
+directory of the mounted filesystem (since those of the underlying
+mount-point directory are inaccessible).
+
+When rsync needs to copy a symlink target that lies on another filesystem
+(because of bf(--copy-links) or bf(--copy-unsafe-links)), it copies the
+target despite bf(--one-file-system) if the target is not a directory.
+If the target is a directory, rsync treats it like a mount-point.
 
 dit(bf(--existing, --ignore-non-existing)) This tells rsync to skip
 updating files that do not exist yet on the destination.  If this option is