[FYI] {master} docs: remove mention of deprecated option `--acdir'

[Stefano Lattarini]

* doc/automake.texi (aclocal Options): Remove mention of
deprecated `--acdir' option.
---
 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
-- 
1.7.2.3