From 80fe5da14cd1911a70c7fbcaddf49cca051a0ca1 Mon Sep 17 00:00:00 2001
From: Florent Xicluna <florent.xicluna@gmail.com>
Date: Mon, 25 Feb 2013 10:48:36 +0100
Subject: [PATCH 1/3] Fix space

---
 flake8/hooks.py | 2 +-
 flake8/main.py  | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/flake8/hooks.py b/flake8/hooks.py
index bd6ba33..4d5eb3b 100644
--- a/flake8/hooks.py
+++ b/flake8/hooks.py
@@ -14,7 +14,7 @@ from flake8.main import DEFAULT_CONFIG
 
 def git_hook(complexity=-1, strict=False, ignore=None, lazy=False):
     """This is the function used by the git hook.
-    
+
     :param int complexity: (optional), any value > 0 enables complexity
         checking with mccabe
     :param bool strict: (optional), if True, this returns the total number of
diff --git a/flake8/main.py b/flake8/main.py
index 692e9f4..2f5c851 100644
--- a/flake8/main.py
+++ b/flake8/main.py
@@ -42,8 +42,7 @@ def main():
 
 
 def check_file(path, ignore=(), complexity=-1):
-    """Checks a file using pep8 and pyflakes by default and mccabe 
-    optionally.
+    """Checks a file using pep8 and pyflakes by default and mccabe optionally.
 
     :param str path: path to the file to be checked
     :param tuple ignore: (optional), error and warning codes to be ignored

From 348b484e623e061028e2e39419d67b4147e30c3e Mon Sep 17 00:00:00 2001
From: Florent Xicluna <florent.xicluna@gmail.com>
Date: Mon, 25 Feb 2013 10:49:01 +0100
Subject: [PATCH 2/3] Doc: re-order the chapters

---
 docs/index.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/index.rst b/docs/index.rst
index c0f429f..f5aae99 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -6,13 +6,13 @@ Documentation
 
 .. toctree::
 
-    api
-    extensions
     config
+    warnings
     vcs
     buildout
     setuptools
-    warnings
+    api
+    extensions
     changes
 
 Original Projects

From 4c4c91fd858ec3cd709bfdcf7951502fd49c2dc8 Mon Sep 17 00:00:00 2001
From: Florent Xicluna <florent.xicluna@gmail.com>
Date: Mon, 25 Feb 2013 10:51:55 +0100
Subject: [PATCH 3/3] Doc: fix shebang, issue #81

---
 docs/vcs.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/vcs.rst b/docs/vcs.rst
index 5b938f6..444d607 100644
--- a/docs/vcs.rst
+++ b/docs/vcs.rst
@@ -30,7 +30,7 @@ Git hook
 To use the Git hook on any *commit*, add a **pre-commit** file in the
 *.git/hooks* directory containing::
 
-    #!/usr/bin/python
+    #!/usr/bin/env python
     import sys
     from flake8.run import git_hook