- Moved the description of '%i's output into the rsync manpage.

- A few minor tweaks to the "log format" setting.

diff --git a/rsyncd.conf.yo b/rsyncd.conf.yo
index bebaf99..d99cd5d 100644 (file)
--- a/rsyncd.conf.yo
+++ b/rsyncd.conf.yo
@@ -366,11 +366,17 @@ if a transfer is aborted, no mention will be made in the log file.
 If you want to customize the log lines, see the "log format" option.
 
 dit(bf(log format)) The "log format" option allows you to specify the
-format used for logging file transfers when transfer logging is
-enabled. The format is a text string containing embedded single
-character escape sequences prefixed with a percent (%) character.
+format used for logging file transfers when transfer logging is enabled.
+The format is a text string containing embedded single-character escape
+sequences prefixed with a percent (%) character.
 
-The prefixes that are understood are:
+The default log format is "%o %h [%a] %m (%u) %f %l", and a "%t [%p] "
+is always prefixed when using the "log file" option.
+(A perl script that will summarize this default log format is included
+in the rsync source code distribution in the "support" subdirectory:
+rsyncstats.)
+
+The single-character escapes that are understood are as follows:
 
 quote(itemize(
   it() %h for the remote host name
@@ -391,54 +397,12 @@ 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 prefixed when using the "log file" option.
-
-A perl script called rsyncstats to summarize this format is included
-in the rsync source code distribution in the "support" subdirectory.
-
-The %i format is a set of cryptic characters that are output as follows:
-
-quote(tt(  =Xcstpog ITEM_NAME))
-
-The bf(=) is output as either a bf(<) (receive) or a bf(>) (send) if the
-item is being transferred, a bf(.) if only the attributes are being
-updated, or a bf(=) if the items are identical.  Note that when a symlink
-or a device gets its value changed, that is considered to be a transfer (as
-opposed to a change in permissions or ownership).
-
-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 or
-a "." for no change.  Three exceptions to this are: (1) a newly created
-item replaces each letter with a "+", (2) an identical item replaces each
-letter with a space, and (3) an unknown attribute replaces each letter with
-a "?" (this happens when talking to an older rsync).
-
-The attribute that is associated with each letter is as follows:
-
-quote(itemize(
-  it() A bf(c) means the checksum of the file is different and will be
-  updated by the file transfer (requries bf(--checksum)).
-  it() A bf(s) means the size of the file is different and will be updated
-  by the file transfer.
-  it() A bf(t) means the modified time is different and is being updated to
-  the server's value (requires bf(--times)).  An alternate value of bf(T)
-  means that the time will be set to the transfer time, which happens
-  anytime a symlink is transferred, or when a file or device is transferred
-  without bf(--times).
-  it() A bf(p) means the permissions are different and are being updated to
-  the server's value (requires bf(--perms)).
-  it() An bf(o) means the owner is being updated (requires bf(--owner) and
-  root privileges).
-  it() A bf(g) means the group is being updated (requires bf(--group) and
-  the authority to set the requested group).
-))
+For a list of what the characters mean that are output by "%i", see the
+bf(--itemize-changes) option in the rsync manpage.
 
-One other output is possible: when deleting files, each deleted file will
-be logged with the "%i" taking on a value of "deleting".
+Note that some of the logged output changes when talking with older
+rsync versions.  For instance, deleted files were only logged as verbose
+messages prior to protocol 29.
 
 dit(bf(timeout)) The "timeout" option allows you to override the
 clients choice for I/O timeout for this module. Using this option you