[bug-diffutils] [PATCH 1/3] maint: avoid new syntax-check failure due to @xref use

[Jim Meyering]

I've already posted 3/3 so have omitted it.
Updating to latest gnulib would have induced a new syntax-check failure,
so I've put that fix first.  Also, I've elided the boring bootstrap-
and init.sh-syncing diffs below:

>From 5cb0eea638e5db4de66bcf99d9ce4f6fd974e04e Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Tue, 28 Aug 2012 10:58:48 +0200
Subject: [PATCH 1/3] maint: avoid new syntax-check failure due to @xref use

* doc/diffutils.texi: Change several "; @xref{..." to ".  @xref{...",
since @xref should start a sentence.
---
 doc/diffutils.texi | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/doc/diffutils.texi b/doc/diffutils.texi
index d4a68f8..2908120 100644
--- a/doc/diffutils.texi
+++ b/doc/diffutils.texi
@@ -821,7 +821,7 @@ The fractional seconds are omitted on hosts that do not 
support
 fractional time stamps.

 You can change the header's content with the
address@hidden@var{label}} option; see @xref{Alternate Names}.
address@hidden@var{label}} option. @xref{Alternate Names}.

 Next come one or more hunks of differences; each hunk shows one area
 where the files differ.  Unified format hunks look like this:
@@ -993,7 +993,7 @@ The corresponding lines differ, and only the second line is 
incomplete.
 @end table

 Normally, an output line is incomplete if and only if the lines that it
-contains are incomplete; @xref{Incomplete Lines}.  However, when an
+contains are incomplete.  @xref{Incomplete Lines}.  However, when an
 output line represents two differing lines, one might be incomplete
 while the other is not.  In this case, the output line is complete,
 but its the gutter is marked @samp{\} if the first line is incomplete,
@@ -1708,7 +1708,7 @@ might contain duplicate or otherwise incorrect code.

 The @command{patch} @option{-D @var{name}} option behaves like
 the @command{diff} @option{-D @var{name}} option, except it operates on
-a file and a diff to produce a merged file; @xref{patch Options}.
+a file and a diff to produce a merged file.  @xref{patch Options}.

 @node Incomplete Lines
 @chapter Incomplete Lines
@@ -1727,10 +1727,10 @@ line by a following line that starts with @samp{\}.  
However, the
 @acronym{RCS} format (@pxref{RCS}) outputs the incomplete line as-is,
 without any trailing newline or following line.  The side by side
 format normally represents incomplete lines as-is, but in some cases
-uses a @samp{\} or @samp{/} gutter marker; @xref{Side by Side}.  The
+uses a @samp{\} or @samp{/} gutter marker.  @xref{Side by Side}.  The
 if-then-else line format preserves a line's incompleteness with
address@hidden, and discards the newline with @samp{%l}; @xref{Line
-Formats}.  Finally, with the @command{ed} and forward @command{ed}
address@hidden, and discards the newline with @samp{%l}.  @xref{Line Formats}.
+Finally, with the @command{ed} and forward @command{ed}
 output formats (@pxref{Output Formats}) @command{diff} cannot
 represent an incomplete line, so it pretends there was a newline and
 reports an error.
--
1.7.12.116.g31e0100


>From 6c273a4db62c4f7b0667545c31a5ad24b913598a Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Tue, 28 Aug 2012 08:47:27 +0200
Subject: [PATCH 2/3] build: update gnulib, bootstrap and init.sh to latest

---
 bootstrap     | 118 ++++++++++++++++++++++++++++++++++------------------------
 gnulib        |   2 +-
 tests/init.sh |  18 +++++++--
 3 files changed, 84 insertions(+), 54 deletions(-)

diff --git a/bootstrap b/bootstrap
index ce37a2c..e3e270b 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Print a version string.
-scriptversion=2012-05-15.06; # UTC
+scriptversion=2012-07-19.14; # UTC
...
diff --git a/gnulib b/gnulib
index 258577f..68f693f 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit 258577fccc77760d91f8c28286aaa4838ca9cd90
+Subproject commit 68f693ff1db33bf24695f0f42c62e7801966fd06
diff --git a/tests/init.sh b/tests/init.sh
...
--
1.7.12.116.g31e0100