From b78207dd0cadc712867da0855c77992c32e28da6 Mon Sep 17 00:00:00 2001
From: Chet Ramey <chet.ramey@case.edu>
Date: Wed, 30 Mar 2016 10:56:12 -0400
Subject: [PATCH] commit bash-20160325 snapshot

---
 bashline.c       | 2 +-
 doc/bash.1       | 4 ++--
 doc/bashref.texi | 5 ++---
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/bashline.c b/bashline.c
index 2040aa9e..040f1908 100644
--- a/bashline.c
+++ b/bashline.c
@@ -4080,7 +4080,7 @@ bash_execute_unix_command (count, key)
   ce = rl_get_termcap ("ce");
   if (ce)	/* clear current line */
     {
-#if 0
+#if 1
       fprintf (rl_outstream, "\r");
       tputs (ce, 1, putx);
 #else
diff --git a/doc/bash.1 b/doc/bash.1
index 8dfc18e3..1a6e621c 100644
--- a/doc/bash.1
+++ b/doc/bash.1
@@ -3902,9 +3902,9 @@ The format of here-documents is:
 No parameter and variable expansion, command substitution,
 arithmetic expansion, or pathname expansion is performed on
 .IR word .
-If any characters in
+If any part of
 .I word
-are quoted, the
+is quoted, the
 .I delimiter
 is the result of quote removal on
 .IR word ,
diff --git a/doc/bashref.texi b/doc/bashref.texi
index 6b029940..96247447 100644
--- a/doc/bashref.texi
+++ b/doc/bashref.texi
@@ -2730,7 +2730,7 @@ The format of here-documents is:
 
 No parameter and variable expansion, command substitution,
 arithmetic expansion, or filename expansion is performed on
-@var{word}.  If any characters in @var{word} are quoted, the
+@var{word}.  If any part of @var{word} is quoted, the
 @var{delimiter} is the result of quote removal on @var{word},
 and the lines in the here-document are not expanded.
 If @var{word} is unquoted,
@@ -3621,8 +3621,7 @@ less than zero, non-zero otherwise.
 test @var{expr}
 @end example
 
-Evaluate a conditional express
-ion @var{expr} and return a status of 0
+Evaluate a conditional expression @var{expr} and return a status of 0
 (true) or 1 (false).
 Each operator and operand must be a separate argument.
 Expressions are composed of the primaries described below in