Merge branch 'maint' of ssh://git.sv.gnu.org/srv/git/automake into maint

Apparently I messed up doing a previous 'git pull', so that the "latest"
maint I've merged into master (and pushed!) wasn't a fast-forward from
origin/maint.  Yay for me.  This merge should help cleaning up the mess.

diff --git a/ChangeLog b/ChangeLog
index 1115907..1ec0355 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -53,6 +53,11 @@
        * tests/vtexi4.test: Likewise.
        * tests/Makefile.am (TESTS): Updated.
 
+2011-01-09  Peter Rosin  <peda@lysator.liu.se>
+
+       Fix another typo in Rule.pm comment.
+       * lib/Automake/Rule.pm: Fix typo.
+
 2011-01-09   Stefano Lattarini  <stefano.lattarini@gmail.com>
 
        cosmetics: remove trailing whitespaces

diff --git a/lib/Automake/Rule.pm b/lib/Automake/Rule.pm
index 60c48f1..a1bebf2 100644 (file)
--- a/lib/Automake/Rule.pm
+++ b/lib/Automake/Rule.pm
@@ -385,7 +385,7 @@ sub reset()
 
 =item C<register_suffix_rule ($where, $src, $dest)>
 
-Register a suffix rules defined on C<$where> that transforms
+Register a suffix rule defined on C<$where> that transforms
 files ending in C<$src> into files ending in C<$dest>.
 
 This upgrades the C<$suffix_rules> variables.