[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-1036-gcb387ad

[Stefano Lattarini]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=cb387adeb06f92656007a4983b23c077f7843de7

The branch, master has been updated
       via  cb387adeb06f92656007a4983b23c077f7843de7 (commit)
      from  9bb2b6f474d6a1e1371c82323726449ef2daac02 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 ChangeLog         |    6 ++++++
 doc/automake.texi |    5 -----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0fdb295..d89b280 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2011-09-20  Stefano Lattarini  <address@hidden>
 
+       docs: remove mention of deprecated option `--acdir'
+       * doc/automake.texi (aclocal Options): Remove mention of
+       deprecated `--acdir' option.
+
+2011-09-20  Stefano Lattarini  <address@hidden>
+
        * NEWS: Cleanup after botched merges.
 
 2011-09-20  Stefano Lattarini  <address@hidden>
diff --git a/doc/automake.texi b/doc/automake.texi
index 68995d9..18dcf3f 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -3200,11 +3200,6 @@ Look for the system-wide third-party macro files (and 
the special
 @file{dirlist} file) in @var{dir} instead of in the installation
 directory.  This is typically used for debugging.
 
address@hidden address@hidden
address@hidden --acdir
address@hidden shorthand for address@hidden@var{dir}
address@hidden''.  Will be removed in future aclocal versions.
-
 @item address@hidden
 @opindex --diff
 Run @var{command} on M4 file that would be installed or overwritten


hooks/post-receive
-- 
GNU Automake