A bit more man page & NEWS tweaking.

diff --git a/NEWS.md b/NEWS.md
index 1d813a3fcc7c3b3babc3e6cf4e8d267a0af8efb4..c5c2e1b5b3e108dee4b890a5861179daffc687ef 100644 (file)
--- a/NEWS.md
+++ b/NEWS.md
@@ -22,7 +22,7 @@ Protocol: 31 (unchanged)
    apply to both.
 
  - Simplify how the negotiation environment variables apply when interacting
-   with an older rsync version.
+   with an older rsync version and when they contain only invalid names.
 
  - Do not allow a negotiated checksum or compression choice of "none" unless
    the user authorized it via an environment variable or command-line option.
@@ -43,11 +43,13 @@ Protocol: 31 (unchanged)
 ### PACKAGING RELATED:
 
  - Prepared the checksum code for an upcoming xxHash release that provides new
-   XXH3 & XXH128 checksum routines.  These will not be compiled into rsync
-   until the xxhash v0.8.0 include files are installed on the build host, and
-   that release is a few weeks away at the time this was written.  So, if it's
-   now the future and you have packaged and installed xxhash-0.8.0-devel, a
-   fresh rebuild of rsync 3.2.2 will give you the new checksum routines.
+   XXH3 (64-bit) & XXH128 (128-bit) checksum routines.  These will not be
+   compiled into rsync until the xxhash v0.8.0 include files are installed on
+   the build host, and that release is a few weeks away at the time this was
+   written.  So, if it's now the future and you have packaged and installed
+   xxhash-0.8.0-devel, a fresh rebuild of rsync 3.2.2 will give you the new
+   checksum routines.  Just make sure that the new rsync package depends on
+   xxhash >= 0.8.0.
 
 ------------------------------------------------------------------------------
 <a name="3.2.1"></a>

diff --git a/rsync.1.md b/rsync.1.md
index 07691efc6d0119b8e3028b4cbd691b6c89246ff3..d1ffd444e4716445522d3c51376c07c960965eec 100644 (file)
--- a/rsync.1.md
+++ b/rsync.1.md
@@ -1495,7 +1495,7 @@ your home directory (remove the '=' for that).
 
     When both sides of the transfer are at least 3.2.0, rsync chooses the first
     algorithm in the client's list of choices that is also in the server's list
-    of choices.  If no common checksum choice is found, the client exits with
+    of choices.  If no common checksum choice is found, rsync exits with
     an error.  If the remote rsync is too old to support checksum negotiation,
     a value is chosen based on the protocol version (which chooses between MD5
     and various flavors of MD4 based on protocol age).
@@ -1503,12 +1503,12 @@ your home directory (remove the '=' for that).
     The default order can be customized by setting the environment variable
     RSYNC_CHECKSUM_LIST to a space-separated list of acceptable checksum names.
     If the environment variable contains a "`&`" character, the string is
-    separated into the "client list & server list".  If the resulting string is
-    empty (or contains only whitespace) the default checksum list is used.
-    This method does not allow you to specify the transfer checksum separately
-    from the pre-transfer checksum, and it discards "auto" and all unknown
-    checksum names.  A list with only invalid names will result in a failed
-    negotiation.
+    separated into the "client list & server list" otherwise the same string
+    applies to both.  If the string (or string portion) contains no
+    non-whitespace characters, the default checksum list is used.  This method
+    does not allow you to specify the transfer checksum separately from the
+    pre-transfer checksum, and it discards "auto" and all unknown checksum
+    names.  A list with only invalid names results in a failed negotiation.
 
     The use of the `--checksum-choice` option overrides this environment list.
 
@@ -2297,17 +2297,18 @@ your home directory (remove the '=' for that).
 
     When both sides of the transfer are at least 3.2.0, rsync chooses the first
     algorithm in the client's list of choices that is also in the server's list
-    of choices.  If no common compress choice is found, the client exits with
+    of choices.  If no common compress choice is found, rsync exits with
     an error.  If the remote rsync is too old to support checksum negotiation,
     its list is assumed to be "zlib".
 
     The default order can be customized by setting the environment variable
     RSYNC_COMPRESS_LIST to a space-separated list of acceptable compression
     names.  If the environment variable contains a "`&`" character, the string
-    is separated into the "client list & server list".  If the resulting string
-    is empty (or contains only whitespace) the default compress list is used.
-    Any unknown compression names are discarded from the list, but a list with
-    only invalid names will result in a failed negotiation.
+    is separated into the "client list & server list" otherwise the same string
+    applies to both.  If the string (or string portion) contains no
+    non-whitespace characters, the default compress list is used.  Any unknown
+    compression names are discarded from the list, but a list with only invalid
+    names results in a failed negotiation.
 
     There are some older rsync versions that were configured to reject a `-z`
     option and require the use of `-zz` because their compression library was