More cleanups.

diff --git a/NEWS b/NEWS
index f44920d..16b614f 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -13,9 +13,9 @@ Changes since 2.6.3:
       being pushed (since the stats come from the sending side).
       (Requires protocol 29 for a pull.)
 
       being pushed (since the stats come from the sending side).
       (Requires protocol 29 for a pull.)
 

-    - The "%o" (operation) value now has a third value besides "send" and
-      "recv": "del." (with trailing dot to make it 4 chars).  This changes
-      the way deletions are logged in the daemon's log file.
+    - The "%o" (operation) log format now has a third value (besides "send"
+      and "recv"):  "del." (with trailing dot to make it 4 chars).  This
+      changes the way deletions are logged in the daemon's log file.

   
   BUG FIXES:
 
   
   BUG FIXES:
 


@@ -29,9 +29,9 @@ Changes since 2.6.3:
     - Avoid a mkdir warning when removing a directory in the destination
       that already exists in the --backup-dir.
 
     - Avoid a mkdir warning when removing a directory in the destination
       that already exists in the --backup-dir.
 

-    - An OS that has a binary mode for its files (such as cygwin0 needed
+    - An OS that has a binary mode for its files (such as cygwin) needed

       setmode(fd, O_BINARY) called on the temp-file we opened with
       setmode(fd, O_BINARY) called on the temp-file we opened with

-      mkstemp().  (Fix derived from the Cygwin's 2.6.3 rsync package.)
+      mkstemp().  (Fix derived from the cygwin's 2.6.3 rsync package.)

 
     - Fixed a potential hang when verbosity is high, the client side is
       the sender, and the file-list is large.
 
     - Fixed a potential hang when verbosity is high, the client side is
       the sender, and the file-list is large.


@@ -47,9 +47,9 @@ Changes since 2.6.3:
     - The "ignore nonreadable" daemon parameter used to erroneously affect
       symlinks that pointed to a non-existent file.  This has been fixed.
 
     - The "ignore nonreadable" daemon parameter used to erroneously affect
       symlinks that pointed to a non-existent file.  This has been fixed.
 

-    - If the OS does not have lchown() and its chown() tries to set the
-      referent of a symlink (as it should), we no longer try to set the
-      user and group of a symlink.
+    - If the OS does not have lchown() and a chown() of a symlink will
+      affect the referent of a symlink (as it should), we no longer try
+      to set the user and group of a symlink.

 
     - The generator now properly runs the hard-link loop and the dir-time
       rewriting loop after we're sure that the redo phase is complete.
 
     - The generator now properly runs the hard-link loop and the dir-time
       rewriting loop after we're sure that the redo phase is complete.


@@ -66,7 +66,7 @@ Changes since 2.6.3:
     - If an rsync daemon specified "dont compress = ..." for a file and the
       client tried to specify --compress, the libz code was not handling a
       compression level of 0 properly.  This could cause a transfer failure
     - If an rsync daemon specified "dont compress = ..." for a file and the
       client tried to specify --compress, the libz code was not handling a
       compression level of 0 properly.  This could cause a transfer failure

-      if the block-size for a file was large enough (i.e. rsync might have
+      if the block-size for a file was large enough (e.g. rsync might have

       exited with an error for large files).
 
     - Fixed a bug that would sometimes surface when using --compress and
       exited with an error for large files).
 
     - Fixed a bug that would sometimes surface when using --compress and


@@ -86,7 +86,7 @@ Changes since 2.6.3:
 
     - When --progress is specified, the output of items that the generator
       is creating (e.g. dirs, symlinks) is now integrated into the progress
 
     - When --progress is specified, the output of items that the generator
       is creating (e.g. dirs, symlinks) is now integrated into the progress

-      output without overlapping it.
+      output without overlapping it.  (Requires protocol 29.)

 
   ENHANCEMENTS:
 
 
   ENHANCEMENTS:
 


@@ -97,10 +97,10 @@ Changes since 2.6.3:
       from on the receiving side incrementally as each directory in the
       transfer is being processed.  This makes it more efficient than the
       default, before-the-transfer behavior, which is now available as
       from on the receiving side incrementally as each directory in the
       transfer is being processed.  This makes it more efficient than the
       default, before-the-transfer behavior, which is now available as

-      --delete-before (this is the default --delete-WHEN option that will
-      be chosen if --delete or --delete-excluded is specified without a
-      --delete-WHEN choice).  All the --del* options infer --delete, so an
-      rsync daemon that refuses "delete" will still refuse to allow any
+      --delete-before (that is still the default --delete-WHEN option that
+      will be chosen if --delete or --delete-excluded is specified without
+      a --delete-WHEN choice).  All the --del* options infer --delete, so
+      an rsync daemon that refuses "delete" will still refuse to allow any

       file-deleting options.
 
     - All the --delete-WHEN options are now more memory efficient:
       file-deleting options.
 
     - All the --delete-WHEN options are now more memory efficient:


@@ -120,7 +120,7 @@ Changes since 2.6.3:
     - The daemon-mode options were separated from the normal rsync options
       so that they can't be mixed together.  This makes it impossible to
       start a daemon that had improper default option values that could
     - The daemon-mode options were separated from the normal rsync options
       so that they can't be mixed together.  This makes it impossible to
       start a daemon that had improper default option values that could

-      cause problems (e.g. a hang or an abort) when a client connects.
+      cause problems when a client connects (e.g. a hang or an abort).

 
     - The --bwlimit option may now be used in combination with --daemon
       to specify both a default value for the daemon side and a value
 
     - The --bwlimit option may now be used in combination with --daemon
       to specify both a default value for the daemon side and a value


@@ -149,8 +149,8 @@ Changes since 2.6.3:
       but may also be specified manually if you want to force the use of
       the --list-only option over a remote-shell connection.
 
       but may also be specified manually if you want to force the use of
       the --list-only option over a remote-shell connection.
 

-    - Added the --omit-dir-times (-O) option which will avoid updating the
-      modified time for directories when --times was specified.  This
+    - Added the --omit-dir-times (-O) option, which will avoid updating
+      the modified time for directories when --times was specified.  This

       option will avoid an extra pass through the file-list at the end of
       the transfer (to tweak all the directory times), which can result in
       an appreciable speedup for a really large transfer. (Promoted from
       option will avoid an extra pass through the file-list at the end of
       the transfer (to tweak all the directory times), which can result in
       an appreciable speedup for a really large transfer. (Promoted from


@@ -255,13 +255,14 @@ Changes since 2.6.3:
     - A 16-bit flag-word is transmitted after every file-list index.  This
       indicates what is changing between the sender and the receiver.  The
       generator now transmits an index and a flag-word to indicate when
     - A 16-bit flag-word is transmitted after every file-list index.  This
       indicates what is changing between the sender and the receiver.  The
       generator now transmits an index and a flag-word to indicate when

-      dirs and symlinks have changed (resorting to the old-style outputting
-      of local change-messages for older protocols).
+      dirs and symlinks have changed, which makes the outputting of the
+      information more consistent and less prone to screen corruption (it
+      resorts to the old-style outputting of generator-created change-
+      messages for older protocol versions).

 
 

-    - If --inplace is specified, the generator sends an extra byte after
-      the flag-word indicating what kind of basis file is being used for
-      the transfer (see the FNAMECMP_* defines).  This information is used
-      to optimize the transfer when the basis file is not the destination.
+    - If --inplace is specified, the generator flags any transfer that is
+      using an alternate basis file so that the sender can use the entire
+      file in the rsync algorithm (unlike a normal --inplace update).

 
     - The sending of exclude names is done using filter-rule syntax.  This
       means that all names have a prefixed rule indicator, even excludes
 
     - The sending of exclude names is done using filter-rule syntax.  This
       means that all names have a prefixed rule indicator, even excludes


@@ -277,23 +278,22 @@ Changes since 2.6.3:
       directory "foo/" and "foo/bar".)
 
     - When talking to a protocol 29 rsync daemon, a list-only request
       directory "foo/" and "foo/bar".)
 
     - When talking to a protocol 29 rsync daemon, a list-only request

-      is able to note this before the options are sent over the wire, and
-      the new --list-only option is encluded in the options sent over the
-      socket.
+      is able to note this before the options are sent over the wire and
+      the new --list-only option is included in the options.

 
     - When the --stats bytes are sent over the wire (or stored in a batch),
       they now include two elapsed-time values: one for how long it took to
       build the file-list, and one for how long it took to send it over the
       wire (each expressed in thousandths of a second).
 
 
     - When the --stats bytes are sent over the wire (or stored in a batch),
       they now include two elapsed-time values: one for how long it took to
       build the file-list, and one for how long it took to send it over the
       wire (each expressed in thousandths of a second).
 

-    - When --delete-excluded is specified with some filter rules (AKA
-      excludes), a client sender will now initiate a send of the filter
-      rules to the receiver (older protocols used to omit the sending of
-      excludes in this situation since there were no receiver-specific
-      rules that survived --delete-excluded back then).  Note that, as with
-      all the filter-list sending, only items that are significant to the
-      other side will actually be sent over the wire, so the filter-rule
-      list is often empty in this scenario.
+    - When --delete-excluded is specified with some filter excludes, a
+      client sender will now initiate a send of the filter rules to the
+      receiver (older protocols used to omit the sending of excludes in
+      this situation since there were no receiver-specific rules that
+      survived --delete-excluded back then).  Note that, as with all the
+      filter-list sending, only items that are significant to the other
+      side will actually be sent over the wire, so the filter-rule list
+      is often empty in this scenario.

 
     - A protocol-29 batch file includes a bit for the setting of the --dirs
       option.  Also, the shell script created by --write-batch will use the
 
     - A protocol-29 batch file includes a bit for the setting of the --dirs
       option.  Also, the shell script created by --write-batch will use the