bootstrap: allow bootstrap.texi to pass syntax-check.

* cfg.mk (sc_require_function_nl_brace): Skip texi files.
* gl/doc/bootstrap.texi: Fix assorted syntax-check violations.

Signed-off-by: Gary V. Vaughan <gary@gnu.org>

diff --git a/cfg.mk b/cfg.mk
index 10af0b6921db04999152a107231a4fd6d7cf1eae..090403f2436dabf5d34c69c49daa62085f48359c 100644 (file)
--- a/cfg.mk
+++ b/cfg.mk
@@ -198,7 +198,7 @@ sc_prohibit_test_const_follows_var:
          $(_sc_search_regexp)
 
 # Check for opening brace on next line in shell function definition.
-exclude_file_name_regexp--sc_require_function_nl_brace = (^HACKING|\.[ch])$$
+exclude_file_name_regexp--sc_require_function_nl_brace = (^HACKING|\.[ch]|\.texi)$$
 sc_require_function_nl_brace:
        @for file in $$($(VC_LIST_EXCEPT)); do                          \
          sed -n '/^func_[^      ]*[     ]*(/{                          \

diff --git a/gl/doc/bootstrap.texi b/gl/doc/bootstrap.texi
index b3f5da2312c3658035ff651895124a9d1fba9b22..dc824fa1fae334648827ed8f9cd2634bd714fb9c 100755 (executable)
--- a/gl/doc/bootstrap.texi
+++ b/gl/doc/bootstrap.texi
@@ -51,7 +51,7 @@ the value of a selection of the following shell variables in
 package.
 
 @example
-    vc_ignore=".gitignore"
+    vc_ignore=.gitignore
 @end example
 
 @table @code
@@ -61,11 +61,11 @@ package.
 A newline-delimited list of triples of @strong{programs} (which must
 accept the option @option{--version} without hanging or failing), the
 @strong{minimum version required} (or just `-' in the version field if
-any version will be sufficient) and @strong{homepage @acronym{url} (to
+any version will be sufficient) and @strong{homepage URL (to
 help users locate missing packages)
 
 @smallexample
-buildreq='      
+buildreq='
         git        1.5.5   http://git-scm.com
         help2man   1.29    http://www.gnu.org/s/help2man
 '
@@ -91,8 +91,8 @@ or else bail out with a diagnostic.
 @item buildreq_readme
 Name of a file containing instructions on installing missing packages
 required in @code{buildreq}. Usually, the instructions at the given
-@acronym{url} should be sufficient, though some projects add additional
-notes in @file{HACKING}.
+URL should be sufficient, though some projects add additional notes
+in @file{HACKING}.
 
 @smallexample
 buildreq_readme=README-hacking
@@ -166,7 +166,7 @@ fall-back automatically to the gnulib defaults; unless you set
 alternative values here in @file{bootstrap.conf}.
 
 If you check @file{gnulib-cache.m4} into your repository, then these
-values will be extracted automatically. @pxref{Usage Patterns}, for more
+values will be extracted automatically. @xref{Usage Patterns}, for more
 details.
 
 
@@ -175,7 +175,7 @@ details.
 The list of gnulib modules required at @command{gnulib-tool} time.
 
 If you check @file{gnulib-cache.m4} into your repository, then this list
-will be extracted automatically. @pxref{Usage Patterns}, for more
+will be extracted automatically. @xref{Usage Patterns}, for more
 details.