X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/527a010f103f61f1db2d61668a8215c2c0bbe78f..15954da08fb9280c754db3a4382c18f5ed0cf04b:/rsyncd.conf.yo

diff --git a/rsyncd.conf.yo b/rsyncd.conf.yo
index 1263349e..ca0954c8 100644
--- a/rsyncd.conf.yo
+++ b/rsyncd.conf.yo
@@ -389,8 +389,8 @@ quote(itemize(
   it() %i an itemized list of what is being updated
 ))
 
-The default log format is "%o %h [%a] %m (%u) %f %l", and a "%t [%p] "
-is always added to the beginning when using the "log file" option.
+The default log format is "%o %h [%a] %m (%u) %l %f%L", and a "%t [%p] "
+is always prefixed when using the "log file" option.
 
 A perl script called rsyncstats to summarize this format is included
 in the rsync source code distribution.
@@ -399,14 +399,18 @@ The %i format is a set of cryptic characters that are output as follows:
 
 quote(tt(  *Xcstpog ITEM_NAME))
 
-The bf(*) is either bf(<) (receive) or bf(>) (send) or bf(*) (--dry-run) if
-the item is being updated, otherwise it is a space.  The bf(X) will be
-replaced by one of the following: an "f" for a file, a "d" for a dir, an
-"L" for a symlink, or a "D" for a device.  The rest of the letters in the
-string above are the actual letters that will be output if the associated
-attribute for the item is being updated; otherwise the letter will be
-replaced by either a "-" for no change, or a "+" if this is a new item.
-The meanings of the attribute letters are as follows:
+The bf(*) is either bf(<) (receive), bf(>) (send), or bf(*) (--dry-run) if
+the item is being updated, otherwise it is a space.
+
+The bf(X) will be replaced by one of the following: an "f" for a file, a
+"d" for a dir, an "L" for a symlink, or a "D" for a device.
+
+The rest of the letters in the string above are the actual letters that
+will be output if the associated attribute for the item is being updated;
+otherwise the letter will be replaced by either a "." for no change, a "+"
+for a new item, or a "?" if the attribute is not known (which happens when
+talking to an older rsync).  The meanings of the attribute letters are as
+follows:
 
 quote(itemize(
   it() A bf(c) means the checksum of the file is different and will be
@@ -415,8 +419,8 @@ quote(itemize(
   by the file transfer.
   it() A bf(t) means the modified time is being updated to the server's
   value (requires --times).  An alternate value of bf(T) means that the
-  time is being set to the transfer time (which happens when symlinks are
-  updated or when a file or device is updated without --times).
+  time is being set to the transfer time, which happens when symlinks are
+  updated, or when a file or device is updated without --times.
   it() A bf(p) means the permissions are being updated (requires
   bf(--perms)).
   it() An bf(o) means the owner is being updated (requires bf(--owner) and