[FYI] {branch-1.13.2} docs: '.txi' and '.texinfo' extensions are discouraged

[Stefano Lattarini]

And future Automake versions will start warning about them (see
commit 'v1.13.1-6-ge1ed314').

* doc/automake.texi (Txinfo): Adjust.
* NEWS: Update.

Signed-off-by: Stefano Lattarini <address@hidden>
---
 NEWS              | 3 +++
 doc/automake.texi | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/NEWS b/NEWS
index 83a72ed..c2c3592 100644
--- a/NEWS
+++ b/NEWS
@@ -75,6 +75,9 @@ New in 1.13.2:
     'dist-tarZ' options are obsolescent, and their use is deprecated
     in the documentation.
 
+  - Make it clear that '.txi' and '.texinfo' extensions for Texinfo
+    files are discouraged, and will soon be deprecated.
+
   - Other minor miscellaneous fixes and improvements; in particular,
     some improvements in cross-references.
 
diff --git a/doc/automake.texi b/doc/automake.texi
index 26ff60e..479d90f 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -7823,9 +7823,9 @@ Currently Automake provides support for Texinfo and man 
pages.
 If the current directory contains Texinfo source, you must declare it
 with the @code{TEXINFOS} primary.  Generally Texinfo files are converted
 into info, and thus the @code{info_TEXINFOS} variable is most commonly used
-here.  Any Texinfo source file must end in the @file{.texi},
address@hidden, or @file{.texinfo} extension.  We recommend @file{.texi}
-for new manuals.
+here.  Any Texinfo source file should have the @file{.texi} extension.
+We also accept @file{.txi} or @file{.texinfo} extensions, but their use
+is discouraged now, and future Automake versions will warn about them.
 
 Automake generates rules to build @file{.info}, @file{.dvi},
 @file{.ps}, @file{.pdf} and @file{.html} files from your Texinfo
-- 
1.8.1.rc3.438.ge9abef6