Merge remote-tracking branch 'origin/master'

diff --git a/docs/_templates/sidebarintro.html b/docs/_templates/sidebarintro.html
index 7ea44d9..b9901b3 100644 (file)
--- a/docs/_templates/sidebarintro.html
+++ b/docs/_templates/sidebarintro.html
@@ -3,6 +3,16 @@
   This opinionated guide exists to provide both novice and expert Python developers a best-practice handbook to the installation, configuration, and usage of Python on a daily basis.
 </p>
 
+<h3>Donate</h3>
+<p>
+    If you enjoy this guide, consider supporting the author <a href="https://www.gittip.com/kennethreitz/">on Gittip</a>:
+</p>
+<p>
+  <iframe style="border: 0; margin: 0; padding: 0;"
+      src="https://www.gittip.com/kennethreitz/widget.html"
+      width="48pt" height="20pt"></iframe>
+</p>
+
 <h3>Feedback</h3>
 <p>
   Feedback is greatly appreciated. If you have any questions, comments,

diff --git a/docs/_templates/sidebarlogo.html b/docs/_templates/sidebarlogo.html
index a39cee9..d7f12de 100644 (file)
--- a/docs/_templates/sidebarlogo.html
+++ b/docs/_templates/sidebarlogo.html
@@ -2,3 +2,13 @@
 <p>
   This opinionated guide exists to provide both novice and expert Python developers a best-practice handbook to the installation, configuration, and usage of Python on a daily basis.
 </p>
+
+<h3>Donate</h3>
+<p>
+    If you enjoy this guide, consider supporting the author <a href="https://www.gittip.com/kennethreitz/">on Gittip</a>:
+</p>
+<p>
+  <iframe style="border: 0; margin: 0; padding: 0;"
+      src="https://www.gittip.com/kennethreitz/widget.html"
+      width="48pt" height="20pt"></iframe>
+</p>
\ No newline at end of file

diff --git a/docs/dev/env.rst b/docs/dev/env.rst
index a539a9f..88dd0d2 100644 (file)
--- a/docs/dev/env.rst
+++ b/docs/dev/env.rst
@@ -60,6 +60,24 @@ to do that which also shows status and warning messages in the statusbar would b
     let g:syntastic_auto_loc_list=1
     let g:syntastic_loc_list_height=5
 
+Python-mode
+^^^^^^^^^^^
+
+Python-mode_ is complex solution in VIM for work with python code.
+It's have:
+
+- Async python code checking (pylint, pyflakes, pep8, mccabe) in any combination;
+- Code refactoring and autocompletion with Rope;
+- Fastest python folding;
+- Nice and powered python syntax;
+- Virtual env support;
+- Search by python documentation and run python code;
+- More other things like auto pep8 error fixes;
+- Very customizable an documented as well;
+- Have all required libraries in self;
+
+And more stuff.
+
 
 .. _indent: http://www.vim.org/scripts/script.php?script_id=974
 .. _syntax: http://www.vim.org/scripts/script.php?script_id=790
@@ -68,6 +86,7 @@ to do that which also shows status and warning messages in the statusbar would b
 .. _PEP8: http://pypi.python.org/pypi/pep8/
 .. _vim-pep8: https://github.com/nvie/vim-pep8
 .. _syntastic: https://github.com/scrooloose/syntastic
+.. _Python-mode: https://github.com/klen/python-mode
 
 .. todo:: add supertab notes
 
@@ -89,9 +108,6 @@ extraordinary features."
 Sublime Text has excellent support for editing Python code and uses Python for
 its plugin API.
 
-`Sublime Text 2 <http://www.sublimetext.com/blog/articles/sublime-text-2-beta>`_
-is currently in beta.
-
 IDEs
 ::::