Merge branch 'minor'

1 files changed, 13 insertions, 3 deletions

diff --git a/doc/automake.texi b/doc/automake.texi
index 626e41ac9..ec95e8dac 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -2580,6 +2580,11 @@ for more information.
 Look for Automake data files in directory @var{dir} instead of in the
 installation directory.  This is typically used for debugging.
 
+@vindex AUTOMAKE_LIBDIR
+The environment variable @env{AUTOMAKE_LIBDIR} provides another way to
+set the directory containing Automake data files.  However
+@option{--libdir} takes precedence over it.
+
 @item --print-libdir
 @opindex --print-libdir
 Print the path of the installation directory containing Automake-provided
@@ -3217,6 +3222,11 @@ overridden using the @env{AUTOM4TE} environment variable.
 Look for the automake-provided macro files in @var{dir} instead of
 in the installation directory.  This is typically used for debugging.
 
+@vindex ACLOCAL_AUTOMAKE_DIR
+The environment variable @env{ACLOCAL_AUTOMAKE_DIR} provides another
+way to set the directory containing automake-provided macro files.
+However @option{--automake-acdir} takes precedence over it.
+
 @item --system-acdir=@var{dir}
 @opindex --system-acdir
 Look for the system-wide third-party macro files (and the special
@@ -8555,7 +8565,7 @@ to supply additional flags to @command{configure}, define them in the
 provided there by defining the @code{DISTCHECK_CONFIGURE_FLAGS} variable,
 on the command line when invoking @command{make}.
 @c See automake bug#14991 for more details about how the following holds.
-It's worth nothing that @command{make distcheck} needs complete control
+It's worth noting that @command{make distcheck} needs complete control
 over the @command{configure} options @option{--srcdir} and
 @option{--prefix}, so those options cannot be overridden by
 @code{AM_DISTCHECK_CONFIGURE_FLAGS} nor by
@@ -8861,7 +8871,7 @@ Note however that, for tests based on more complex test protocols,
 the exact effects of @code{XFAIL_TESTS} and @code{DISABLE_HARD_ERRORS}
 might change, or they might even have no effect at all (for example,
 @c Keep this in sync with tap-no-disable-hard-errors.sh
-in tests using TAP, there is not way to disable hard errors, and the
+in tests using TAP, there is no way to disable hard errors, and the
 @code{DISABLE_HARD_ERRORS} variable has no effect on them).
 
 @anchor{Testsuite progress on console}
@@ -9129,7 +9139,7 @@ as a side-effect.
 It's important to note that, differently from what we've seen for the
 serial test harness (@pxref{Serial Test Harness}), the
 @code{AM_TESTS_ENVIRONMENT} and @code{TESTS_ENVIRONMENT} variables
-@emph{cannot} be use to define a custom test runner; the
+@emph{cannot} be used to define a custom test runner; the
 @code{LOG_COMPILER} and @code{LOG_FLAGS} (or their extension-specific
 counterparts) should be used instead: