Merge branch 'branch-1.13.2' into maint

* branch-1.13.2:
  docs: '.txi' and '.texinfo' extensions are deprecated
  NEWS: document recent documentation improvements
  docs: more precise cross reference
  docs: 'dist-shar' and 'dist-tarZ' are obsolescent today
  docs: improve documentation of 'dist-*' targets slightly
  docs: make even clearer 'dist-gzip' is the default.
  docs: document 'dist-xz' together with the other 'dist-*' options
  docs: 'no-define' option and AM_INIT_AUTOMAKE three-args usage: fixlets
  warn: correct broken hyperlink in warning message

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

diff --cc NEWS
index 62d38b2,83a72ed..6163e51
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -119,26 -71,13 +119,32 @@@ New in 1.13.2
    - The parallel testsuite is no longer reported as "experimental"; it
      is well tested, ans should be stable now.
  
- 
+   - The 'shar' and 'tarZ' distribution formats and the 'dist-shar' and
+     'dist-tarZ' options are obsolescent, and their use is deprecated
+     in the documentation.
+ 
+   - Other minor miscellaneous fixes and improvements; in particular,
+     some improvements in cross-references.
+ 
 +* Obsolescent features:
 +
 +  - Use of suffix-less info files (that can be specified through the
 +    '@setfilename' macro in Texinfo input files) is discouraged, and
 +    its use will raise warnings in the 'obsolete' category.  Simply
 +    use the '.info' extension for all your info files, transforming
 +    usages like:
 +
 +        @setfilename myprogram
 +
 +    into:
 +
 +        @setfilename myprogram.info
 +
 +  - Use of Texinfo input files with '.txi' or '.texinfo' extensions
 +    is discouraged, and its use will raise warnings in the 'obsolete'
 +    category.  You are advised to simply use the '.texi' extension
 +    instead.
 +
  * Bugs fixed:
  
    - The obsolete macros AM_CONFIG_HEADER or AM_PROG_CC_STDC work once

diff --cc automake.in
Simple merge

diff --cc doc/automake.texi
Simple merge