From 19251e7a4054fa9d3129691ec13c6de591d9dde9 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Mon, 16 Jan 2017 12:38:58 -0800
Subject: [PATCH] nits

* doc/sed.texi: small wording changes; avoid passive voice
* doc/local.mk: Tweak to avoid syntax-check issue.
---
 doc/local.mk |  3 +--
 doc/sed.texi | 40 ++++++++++++++++++++--------------------
 2 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/doc/local.mk b/doc/local.mk
index 0c5f5de..3026c64 100644
--- a/doc/local.mk
+++ b/doc/local.mk
@@ -36,8 +36,7 @@ else !BUILD_MAN_PAGE

 if BUILD_DUMMY_MAN_PAGE
 doc/sed.1: doc/sed-dummy.1
-	$(AM_V_at)$(SED) \
-	            's/VERSION/@PACKAGE_VERSION@/' $< > address@hidden		\
+	$(AM_V_at)$(SED) 's/VERSION/$(PACKAGE_VERSION)/' $< > address@hidden	\
 	  && chmod a-w address@hidden						\
 	  && mv address@hidden $@
 endif BUILD_DUMMY_MAN_PAGE
diff --git a/doc/sed.texi b/doc/sed.texi
index 7c83e23..c45b150 100644
--- a/doc/sed.texi
+++ b/doc/sed.texi
@@ -3182,20 +3182,20 @@ Commands without addresses affect all lines.
 Commands with addresses affect only matching lines.
 @xref {Execution Cycle} and @ref{Addresses overview}.

address@hidden does not support a typical @code{if/then} commands.
address@hidden does not support a typical @code{if/then} construct.
 Instead, some commands can be used as conditionals or to change the
 default flow control:

 @table @code

 @item d
-deletes (empties) the current pattern space,
-and restarts the program cycle without processing the rest of the commands
+delete (clears) the current pattern space,
+and restart the program cycle without processing the rest of the commands
 and without printing the pattern space.

 @item D
-deletes the content of the pattern space @emph{up to
-the first newline}. the program cycle without processing the rest of
+delete the contents of the pattern space @emph{up to the first newline},
+and restart the program cycle without processing the rest of
 the commands and without printing the pattern space.

 @item [addr]X
@@ -3204,27 +3204,27 @@ the commands and without printing the pattern space.
 @item /regexp/@{ X ; X ; X @}
 Addresses and regular expressions can be used as an @code{if/then}
 conditional: If @var{[addr]} matches the current pattern space,
-the command(s) will be executed.
+execute the command(s).
 For example: The command @code{/^#/d} means:
 @emph{if} the current pattern matches the regular expression @code{^#} (a line
-starting with a hash), @emph{then} the @code{d} command will be executed:
-the line will be deleted without being printed, and the program cycle will
-restart immediately.
+starting with a hash), @emph{then} execute the @code{d} command:
+delete the line without printing it, and restart the program cycle
+immediately.

 @item b
-branches unconditionally (that is: always jumps to a label, skipping
+branch unconditionally (that is: always jump to a label, skipping
 or repeating other commands, without restarting a new cycle). Combined
 with an address, the branch can be conditionally executed on matched
 lines.

 @item t
-branches conditionally (that is: jumps to a label) @emph{only if} a previous
address@hidden///} command has been successful since an input line was read
+branch conditionally (that is: jump to a label) @emph{only if} a
address@hidden///} command has succeeded since the last input line was read
 or another conditional branch was taken.

 @item T
-similar but opposite to the @code{t} command: it branches only if
-there have been @emph{no} successful substitutions since the last
+similar but opposite to the @code{t} command: branch only if
+there has been @emph{no} successful substitutions since the last
 input line was read.
 @end table

@@ -3346,13 +3346,13 @@ input line.
 In the second example, the @code{N} commands appends the next input
 line to the pattern space (with a newline).  Lines are accumulated in
 the pattern space until there are no more input lines to read, then
address@hidden commands terminates the @command{sed} program. When the
+the @code{N} command terminates the @command{sed} program. When the
 program terminates, the end-of-cycle actions are performed, and the
 entire pattern space is printed.

 @item
 The second example requires @value{SSED},
-as it uses the non-POSIX-standard behavior of @code{N}.
+because it uses the non-POSIX-standard behavior of @code{N}.
 See the address@hidden command on the last line'' paragraph
 in @ref{Reporting Bugs}.

@@ -3509,8 +3509,8 @@ Emulating standard utilities:
 @node Joining lines
 @section Joining lines

-This section uses @code{N},@code{D},@code{P} commands to process
-multiple lines, and @code{b},@code{t} commands for branching.
+This section uses @code{N}, @code{D} and @code{P} commands to process
+multiple lines, and the @code{b} and @code{t} commands for branching.
 @xref{Multiline techniques} and @ref{Branching and flow control}.

 Join specific lines (e.g. if lines 2 and 3 need to be joined):
@@ -3532,7 +3532,7 @@ hello
 @codequoteundirected off
 @codequotebacktick off

-Join lines ending with backslashes:
+Join backslash-continued lines:

 @codequoteundirected on
 @codequotebacktick on
@@ -3557,7 +3557,7 @@ and another line
 @codequoteundirected off
 @codequotebacktick off

-Join lines starting with whitespace (e.g SMTP headers):
+Join lines that start with whitespace (e.g SMTP headers):

 @codequoteundirected on
 @codequotebacktick on
-- 
2.9.3