documentation typos, spotted by afayolle

4 files changed, 9 insertions, 9 deletions

diff --git a/doc/FAQ.txt b/doc/FAQ.txt
index b3a06c8..bb58c47 100644
--- a/doc/FAQ.txt
+++ b/doc/FAQ.txt
@@ -124,7 +124,7 @@ python path.
 
 	- your cwd is "/whatever/directory"
 
-	- "directory" is a python package and "/whatever" is in the python	
+	- "directory" is a python package and "/whatever" is in the python
           path
 
 	- "directory" is a python package and your cwd is "/whatever" and so
@@ -233,7 +233,7 @@ module level by adding the corresponding option in a comment at the
 top of the file: ::
 
 	# pylint: disable=W0401, E0202
-	# pylint: enable-msg=C0302
+	# pylint: enable=C0302
 
 4.5 What is the format of the configuration file?
 ---------------------------------------------------
diff --git a/doc/flymake.txt b/doc/flymake.txt
index 1b068af..251a2dd 100644
--- a/doc/flymake.txt
+++ b/doc/flymake.txt
@@ -17,7 +17,7 @@ To enable flymake for python, insert the following into your .emacs ::
     (add-hook 'python-mode-hook '(lambda () (flymake-mode)))
 
 Above stuff is in pylint/elisp/pylint-flymake.el, which should be automatically
-installed on debian systems, in which cases you don't have to put it in your .emacs file.
+installed on Debian systems, in which cases you don't have to put it in your .emacs file.
 
 Other things you may find useful to set ::
 
diff --git a/doc/manual.txt b/doc/manual.txt
index cb9130f..b8d44e8 100644
--- a/doc/manual.txt
+++ b/doc/manual.txt
@@ -71,7 +71,7 @@ Distributions
 '''''''''''''
 The source tarball is available at ftp://download.logilab.org/pub/pylint.
 
-You may apt-get a well-tested debian or ubuntu package by adding one of::
+You may apt-get a well-tested Debian or Ubuntu package by adding one of::
 
     deb http://download.logilab.org/production unstable/
     deb http://download.logilab.org/production sid/
@@ -79,7 +79,7 @@ You may apt-get a well-tested debian or ubuntu package by adding one of::
     deb http://download.logilab.org/production lenny/
 
 to your */etc/apt/sources.list* file. Pylint is also available in the
-standard Debian distribution (but add our public debian repository
+standard Debian distribution (but add our public Debian repository
 anyway if you want to get the latest releases and upgrades earlier)
 
 Pylint is also available in Gentoo, Fedora 4, Ubuntu, FreeBSD, Darwin
@@ -198,7 +198,7 @@ Pylint output
 -------------
 
 The default format for the output is raw text. But passing pylint the
-``--output-format=html`` or ``-h y`` or ``-o html`` option will produce an HTML document.
+``--output-format=html`` or ``-f html`` option will produce an HTML document.
 
 There are several sections in Pylint's output.
 
@@ -212,7 +212,7 @@ format: ::
   MESSAGE_TYPE: LINE_NUM:[OBJECT:] MESSAGE
 
 You can get another output format, useful since it's recognized by
-most editors or other development tools using the ``--parseable=y``
+most editors or other development tools using the ``--output-format=parseable``
 option.
 
 The message type can be:
@@ -396,7 +396,7 @@ http://lists.logilab.org/mailman/listinfo/python-projects
 Archives are available at
 http://lists.logilab.org/pipermail/python-projects/
 
-If you prefer speaking french instead of english, you can use the
+If you prefer speaking French instead of English, you can use the
 generic forum-fr@logilab.org mailing list:
 
 * (un)subscribe: http://lists.logilab.org/mailman/listinfo/forum-fr
diff --git a/doc/quickstart.txt b/doc/quickstart.txt
index a772e8c..5262f76 100644
--- a/doc/quickstart.txt
+++ b/doc/quickstart.txt
@@ -96,7 +96,7 @@ format: ::
   MESSAGE_TYPE: LINE_NUM:[OBJECT:] MESSAGE
 
 You can get another output format, useful since it's recognized by
-most editors or other development tools using the ``--parseable=y``
+most editors or other development tools using the ``--output-format=parseable``
 option.
 
 The message type can be: