Merge branch 'maint'

* maint:
  news: document new 'subdir-objects' warning
  PLANS: one minor fixlet (mostly cosmetic)
  PLANS: we have already dropped support for split info files in master
  NEWS: fix a reference to Automake 1.14 where Automake 2.0 was intended
  PLANS: fix reference to non-existent 'next' branch
  PLANS: fix botched version reference
  maintcheck: fix two references to old location of aclocal and automake
  dist: deprecated shar and tar+compress formats

1 files changed, 12 insertions, 7 deletions

diff --git a/doc/automake.texi b/doc/automake.texi
index 779116944..e1d0b425e 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -8693,13 +8693,16 @@ Generate a @samp{zip} archive of the distribution.
 
 @item @code{dist-tarZ}
 Generate a tar archive of the distribution, compressed with the
-historical (obsolescent) program @command{compress}.  Use of this
-option is discouraged.
+historical (and obsolescent) program @command{compress}.  This
+option is deprecated, and it and the corresponding functionality
+will be removed altogether in Automake 2.0.
 @trindex dist-tarZ
 
 @item @code{dist-shar}
-Generate a @samp{shar} archive of the distribution.  This format archive
-is obsolescent, and use of this option is discouraged.
+Generate a @samp{shar} archive of the distribution.  This format
+archive is obsolescent, and use of this option is deprecated.
+It and the corresponding functionality will be removed altogether
+in Automake 2.0.
 @trindex dist-shar
 
 @end table
@@ -10095,15 +10098,17 @@ Hook @code{dist-zip} to @code{dist}.
 @cindex Option, @option{dist-shar}
 @opindex dist-shar
 Hook @code{dist-shar} to @code{dist}.  Use of this option
-is discouraged, as the @samp{shar} format is obsolescent and
-problematic.
+is deprecated, as the @samp{shar} format is obsolescent and
+problematic.  Support for it will be removed altogether in
+Automake 2.0.
 @trindex dist-shar
 
 @item @option{dist-tarZ}
 @cindex Option, @option{dist-tarZ}
 @opindex dist-tarZ
 Hook @code{dist-tarZ} to @code{dist}.  Use of this option
-is discouraged, as the @samp{compress} program is obsolete.
+is deprecated, as the @samp{compress} program is obsolete.
+Support for it will be removed altogether in Automake 2.0.
 @trindex dist-tarZ
 
 @item @option{filename-length-max=99}