diff hgext/convert/__init__.py @ 18324:2eae2f9e85ef

merge with stable

--- a/hgext/convert/__init__.py	Sun Jan 13 21:36:35 2013 +0100
+++ b/hgext/convert/__init__.py	Mon Jan 14 10:17:06 2013 -0600
@@ -195,12 +195,12 @@
         environment variable) for changeset date/times. The default
         is False (use UTC).
 
-    :hook.cvslog: Specify a Python function to be called at the end of
+    :hooks.cvslog: Specify a Python function to be called at the end of
         gathering the CVS log. The function is passed a list with the
         log entries, and can modify the entries in-place, or add or
         delete them.
 
-    :hook.cvschangesets: Specify a Python function to be called after
+    :hooks.cvschangesets: Specify a Python function to be called after
         the changesets are calculated from the CVS log. The
         function is passed a list with the changeset entries, and can
         modify the changesets in-place, or add or delete them.