From: Wayne Davison <wayne@opencoder.net>
Date: Sun, 21 Jun 2020 15:40:23 +0000 (-0700)
Subject: Some more docs/news changes.
X-Git-Tag: v3.2.1pre1~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dfa34b479270de6a7db2737d1f232344199292f6;p=thirdparty%2Frsync.git

Some more docs/news changes.

- Mention the -VV behavior.
- Mention how the protect-args default is presented in -V list.
---

diff --git a/NEWS.md b/NEWS.md
index c67936ae..0e4ad855 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -21,6 +21,14 @@ Protocol: 31 (unchanged)
 
 ### ENHANCEMENTS:
 
- - None.
+ - Added "atimes" to the capabilities list that `--version` outputs.
+
+ - Mention either "default protect-args" or "optional protect-args" in the
+   `--version` capabilities depending on how rsync was configured.
+
+ - Some info on optimizations was elided from the `--version` capabilities
+   since they aren't really user-facing capabilities.  You can get the info
+   back (plus the status of a couple extra optimizations) by repeating the
+   `--version` option (e.g. `-VV`).
 
 ------------------------------------------------------------------------------
diff --git a/options.c b/options.c
index 1207ab0a..6c99dd4b 100644
--- a/options.c
+++ b/options.c
@@ -632,7 +632,7 @@ static void print_capabilities(enum logcode f)
 #else
 		"optional "
 #endif
-			"protected-args",
+			"protect-args",
 
 #ifndef ICONV_OPTION
 		"no "
diff --git a/rsync.1.md b/rsync.1.md
index 57f750af..137c25a5 100644
--- a/rsync.1.md
+++ b/rsync.1.md
@@ -518,6 +518,9 @@ your home directory (remove the '=' for that).
     list of compression algorithms, a list of compiled-in capabilities, a link
     to the rsync web site, and some license/copyright info.
 
+    Repeat the option (`-VV`) to include some optimization info at the end of
+    the capabilities list.
+
 0.  `--verbose`, `-v`
 
     This option increases the amount of information you are given during the
@@ -2068,6 +2071,9 @@ your home directory (remove the '=' for that).
 
     Rsync can also be configured (at build time) to have this option enabled by
     default (with is overridden by both the environment and the command-line).
+    Run `rsync -V` to check if this is the case, as it will display "default
+    protect-args" or "optional protect-args" depending on how it was compiled.
+
     This option will eventually become a new default setting at some
     as-yet-undetermined point in the future.