--- a/hgext/convert/__init__.py	Fri Jul 09 14:01:55 2010 +0200
+++ b/hgext/convert/__init__.py	Thu Jul 08 15:44:14 2010 +0200
@@ -77,22 +77,27 @@
     srcauthor=whatever string you want
 
     The filemap is a file that allows filtering and remapping of files
-    and directories. Comment lines start with '#'. Each line can
-    contain one of the following directives::
+    and directories. Each line can contain one of the following
+    directives::
+
+      include path/to/file-or-dir
+
+      exclude path/to/file-or-dir
 
-      include path/to/file
+      rename path/to/source path/to/destination
 
-      exclude path/to/file
-
-      rename from/file to/file
+    Comment lines start with '#'. A specificed path matches if it
+    equals the full relative name of a file or one of its parent
+    directories. The 'include' or 'exclude' directive with the longest
+    matching path applies, so line order does not matter.
 
     The 'include' directive causes a file, or all files under a
     directory, to be included in the destination repository, and the
     exclusion of all other files and directories not explicitly
     included. The 'exclude' directive causes files or directories to
-    be omitted. The 'rename' directive renames a file or directory. To
-    rename from a subdirectory into the root of the repository, use
-    '.' as the path to rename to.
+    be omitted. The 'rename' directive renames a file or directory if
+    is converted. To rename from a subdirectory into the root of the
+    repository, use '.' as the path to rename to.
 
     The splicemap is a file that allows insertion of synthetic
     history, letting you specify the parents of a revision. This is