@@ 39,18 39,18 @@ Usage:
     xgrep.py [-h] [--help]
 
 Normally, `xgrep.py` outputs the matching parts of the XML files together with
-their filenames and the XPath expression. If `-r <ns>` is set, the
+their file names and the XPath expression. If `-r <ns>` is set, the
 [EXSLT function `<ns>:test()`](http://exslt.org/regexp/functions/test/) can be
 used in the XPath expression for matching regular expressions. The option `-m`
-outputs only the matching parts, without filenames or XPath expressions. The
-option `-i` indents the matching parts, and the option `-n` includes namespace
+outputs only the matching parts, without file names or XPath expressions. The
+option `-i` indents the matching parts, and the option `-N` includes namespace
 declarations. The `-C` option preserves color and formatting codes when piping
 output through [GNU less](http://www.gnu.org/software/less/) and similar
 programs.
 
-The options `-c`, `-l`, `-L`, `-n`, and `-q` mimic the behaviour
-of [GNU grep](http://www.gnu.org/software/grep/). The latter option suppresses
-any output, but still returns the exit status (`0` if there are matches, `1` if
+The options `-c`, `-l`, `-L`, `-n`, and `-q` mimic the behaviour of
+[GNU grep](http://www.gnu.org/software/grep/). The latter option suppresses any
+output, but still returns the exit status (`0` if there are matches, `1` if
 there are none, and `2` for errors).
 
 Andreas Nolda (andreas@nolda.org)