summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Doc/Zsh/contrib.yo7
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 9b7571f8a..2ea6116d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2019-12-18  Daniel Shahaf  <danielsh@apache.org>
+
+	* 45073: Doc/Zsh/contrib.yo: regex-replace docs: Simplify grammar
+	(avoid a double negative, state defaults first).
+
 2019-12-17  Daniel Shahaf  <danielsh@apache.org>
 
 	* 45058: Src/Modules/zpty.c, Src/Zle/zle_main.c, Src/builtin.c,
diff --git a/Doc/Zsh/contrib.yo b/Doc/Zsh/contrib.yo
index a4dc8a3ae..d51fd518b 100644
--- a/Doc/Zsh/contrib.yo
+++ b/Doc/Zsh/contrib.yo
@@ -4284,9 +4284,10 @@ See also the tt(pager), tt(prompt) and tt(rprompt) styles below.
 findex(regexp-replace)
 item(tt(regexp-replace) var(var) var(regexp) var(replace))(
 Use regular expressions to perform a global search and replace operation
-on a variable.  If the option tt(RE_MATCH_PCRE) is not set, POSIX
-extended regular expressions are used, else Perl-compatible regular
-expressions (this requires the shell to be linked against the tt(pcre)
+on a variable.  POSIX extended regular expressions are used,
+unless the option tt(RE_MATCH_PCRE) has been set, in which case
+Perl-compatible regular expressions are used
+(this requires the shell to be linked against the tt(pcre)
 library).
 
 var(var) is the name of the variable containing the string to be matched.