Merge branch 'maint'

diff --git a/.gitattributes b/.gitattributes
index e8495d5..b6c3614 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,2 @@
 ChangeLog merge=merge-changelog
+*.texi* diff=texinfo

diff --git a/ChangeLog b/ChangeLog
index 152e0c6..10581ee 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2009-09-18  Peter Johansson  <trojkan@gmail.com>  (tiny change)
+
+       Fix link to "Recursive Make Considered Harmful" paper.
+       * doc/automake.texi (Alternative): Fix broken URL.
+
+2009-09-11  Reuben Thomas <rrt@sc3d.org>  (tiny patch)
+
+       Fix outdated reference to sh-utils in the manual.
+       * doc/automake.texi (Options): The reference to `sh-utils'
+       should be to `coreutils'.
+
 2009-09-06  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        Avoid sleeping for one second most of the time in sanity check.

diff --git a/doc/automake.texi b/doc/automake.texi
index b3f4a76..f6633d8 100644 (file)
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -4345,7 +4345,7 @@ variables it cannot ensure the corresponding directory exists.
 @section An Alternative Approach to Subdirectories
 
 If you've ever read Peter Miller's excellent paper,
-@uref{http://www.pcug.org.au/~millerp/rmch/recu-make-cons-harm.html,
+@uref{http://miller.emu.id.au/pmiller/books/rmch/,
 Recursive Make Considered Harmful}, the preceding sections on the use of
 subdirectories will probably come as unwelcome advice.  For those who
 haven't read the paper, Miller's main thesis is that recursive
@@ -9203,7 +9203,7 @@ run-time dependencies are satisfied after installation.
 
 @vindex AM_INSTALLCHECK_STD_OPTIONS_EXEMPT
 In a few situations, programs (or scripts) have to be exempted from this
-test.  For instance, @command{false} (from GNU sh-utils) is never
+test.  For instance, @command{false} (from GNU coreutils) is never
 successful, even for @option{--help} or @option{--version}.  You can list
 such programs in the variable @code{AM_INSTALLCHECK_STD_OPTIONS_EXEMPT}.
 Programs (not scripts) listed in this variable should be suffixed by