Merge branch 'master' into ng/master

* master:
  docs: AM_CFLAGS: remove reference to non-existing "more detailed" desc
  maintcheck: prefer '$(am__cd)' over plain 'cd'
  fetch: improve, and reduce code duplication
  docs: add rule to generate manuals for www.gnu.org
  docs: copy the 'gendocs.sh' script from Texinfo CVS repository
  sync: update files from upstream with "make fetch"
  release: generate a stub for the release announcement
  release: distinguish major and minor releases
  tests: avoid two spurious failures on FreeBSD

+ Extra non-trivial changes:

* Makefile.am (clean_texinfo_clutter_cmd, clean-web-manuals): Simply
use "cd" rather than "$(am__cd)".

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/doc/automake-ng.texi b/doc/automake-ng.texi
index c850e3dc7..8bdfec171 100644
--- a/doc/automake-ng.texi
+++ b/doc/automake-ng.texi
@@ -6047,9 +6047,9 @@ per-library) @code{_CPPFLAGS} variable if it is defined.
 
 @item AM_CFLAGS
 This is the variable the @file{Makefile.am} author can use to pass
-in additional C compiler flags.  It is more fully documented elsewhere.
-In some situations, this is not used, in preference to the
-per-executable (or per-library) @code{_CFLAGS}.
+in additional C compiler flags.  In some situations, this is
+not used, in preference to the per-executable (or per-library)
+@code{_CFLAGS}.
 
 @item COMPILE
 This is the command used to actually compile a C source file.  The