Merge branch 'maint'

* maint:
  aclocal: better URL reference in error message

diff --cc ChangeLog
Simple merge

diff --cc aclocal.in
index 02963eec6ad8581e41dd02b4e7b6d45317ea77a4,ce77e1d3b0227b174158ef597beebdfb62e597aa..bc0804a782f86982da1969b85af1ebb1986b23bd
--- 1/aclocal.in
--- 2/aclocal.in
+++ b/aclocal.in
@@@ -561,9 -562,9 +561,9 @@@ sub scan_file ($$$
          $defun_seen = 1;
          if (! defined $1)
            {
 -            msg ('syntax', "$file:$.", "warning: underquoted definition of $2"
 -                 . "\n  run info '(automake)Extending aclocal'\n"
 +            msg ('syntax', "$file:$.", "underquoted definition of $2"
 +                 . "\n  run info Automake 'Extending aclocal'\n"
-                  . "  or see http://sources.redhat.com/automake/"
+                  . "  or see http://www.gnu.org/software/automake/manual/"
                   . "automake.html#Extending-aclocal")
                unless $underquoted_manual_once;
              $underquoted_manual_once = 1;