realpython · kennethreitz · Jan 8, 2018 · Nov 29, 2016 · Nov 30, 2016 · Nov 30, 2016
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
@@ -0,0 +1,3 @@
+Be cordial or be on your way.
+
+https://www.kennethreitz.org/essays/be-cordial-or-be-on-your-way
diff --git a/Readme.rst b/Readme.rst
@@ -3,6 +3,8 @@ Hitchhiker's Guide to Python
 
 **Python Best Practices Guidebook**
 
+.. image:: https://farm1.staticflickr.com/628/33173824932_58add34581_k_d.jpg
+
 -----------
 
 **Work in progress. If you'd like to help, please do. There's a lot of work to
@@ -16,7 +18,7 @@ basis.
 
 Topics include:
 
-- Platform- and version-specific installations
+- Platform and version-specific installations
 - Py2app, Py2exe, bbfreeze, pyInstaller
 - Pip
 - Numpy, scipy, statpy, pyplot, matplotlib

diff --git a/docs/_static/ad.png b/docs/_static/ad.png
diff --git a/docs/_templates/hacks.html b/docs/_templates/hacks.html
@@ -1,3 +1,34 @@
+<!-- Alabaster (krTheme++) Hacks -->
+<aside id="python27">
+    Python 3, the new best practice, is here to stay.
+    Python 2 will retire in only <time></time> months!
+</aside>
+
+<!-- Python 2 Death Clock™ -->
+<style type="text/css">
+  body { margin-top: 4em; }
+  #python27 {
+      position: fixed;
+      top: 0;
+      left: 0; right: 0;
+      height:  auto;
+      text-align: center;
+      color: white;
+      background-color: black;
+      font-size: larger;
+      line-height: 3;
+  }
+
+</style>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.18.1/moment.min.js"></script>
+<script>
+  var death = new Date('2020-04-12');
+
+  var diff = moment.duration(death - moment());
+
+  document.querySelector('#python27 time').innerText = (diff.years() * 12) + diff.months();
+</script>
+
 <script type="text/javascript">
   var _gauges = _gauges || [];
   (function() {

diff --git a/docs/_templates/sidebarintro.html b/docs/_templates/sidebarintro.html
@@ -19,6 +19,13 @@ <h3>Stay Informed</h3>
 <p><a href="https://twitter.com/kennethreitz" class="twitter-follow-button" data-show-count="false">Follow @kennethreitz</a> <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script></p>
 
 <p><a href="http://tinyletter.com/kennethreitz">Join Mailing List</a>.</p>
+<p><a href="https://saythanks.io/to/kennethreitz">Say Thanks!</a></p>
+
+<a href="http://www.dataquest.io/?utm_source=hitchhikersguide&utm_medium=ad">
+<img src="{{ pathto('_static/ad.png', 1) }}" alt="">
+</a>
+
+<hr>
 
 <h3>O'Reilly Book</h3>
 
@@ -32,12 +39,15 @@ <h3>Other Projects</h3>
 
 <p>More <a href="http://kennethreitz.org/">Kenneth Reitz</a> projects:</p>
 <ul>
+    <li><a href="http://wsl-guide.org/">wsl-guide.org</a></li>
+    <li><a href="http://edmsynths.com/">edmsynths.com</a></li>
+    <li><a href="http://pipenv.org/">pipenv</a></li>
     <li><a href="http://pep8.org/">pep8.org</a></li>
     <li><a href="http://python-requests.org">Requests: HTTP for Humans</a></li>
+    <li><a href="https://github.com/kennethreitz/maya">Maya: Datetimes for Humans</a></li>
     <li><a href="https://github.com/kennethreitz/records">Records: SQL for Humans</a></li>
     <li><a href="http://www.git-legit.org">Legit: Git for Humans</a></li>
     <li><a href="http://docs.python-tablib.org/en/latest/">Tablib: Tabular Datasets</a></li>
-    <li><a href="http://markdownplease.com">Markdown, Please!</a></li>
 </ul>
 
 <h3>Contributors</h3>
@@ -62,6 +72,7 @@ <h3>Translations</h3>
   <li><a href="http://docs.python-guide.org/en/latest/">English</a></li>
   <li><a href="https://python-guide-fr.readthedocs.io/fr/latest/">French</a></li>
   <li><a href="https://pythonguidecn.readthedocs.io/zh/latest/">Chinese</a></li>
-  <li><a href="https://python-guide-ja.readthedocs.io/en/latest/">Japanese</a></li>
+  <li><a href="http://python-guideja.readthedocs.io/ja/latest/">Japanese</a></li>
   <li><a href="https://python-guide-kr.readthedocs.io/ko/latest/">Korean</a></li>
+  <li><a href="http://python-guide-pt-br.readthedocs.io/pt_BR/latest/">Brazilian Portuguese</a></li>
 </ul>
diff --git a/docs/_templates/sidebarlogo.html b/docs/_templates/sidebarlogo.html
@@ -16,9 +16,15 @@ <h3>Get Updates</h3>
   allowtransparency="true" frameborder="0" scrolling="0" width="200" height="20"></iframe></p>
 
 <p><a href="https://twitter.com/kennethreitz" class="twitter-follow-button" data-show-count="false">Follow @kennethreitz</a> <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script></p>
-
+<p><a href="https://saythanks.io/to/kennethreitz">Say Thanks!</a></p>
 <p><a href="http://tinyletter.com/kennethreitz">Join Mailing List</a>.</p>
 
+<a href="http://www.dataquest.io/?utm_source=hitchhikersguide&utm_medium=ad">
+<img src="{{ pathto('_static/ad.png', 1) }}" alt="">
+</a>
+
+<hr>
+
 <h3>O'Reilly Book</h3>
 
 <p>This guide is now available in tangible book form!</p>
@@ -27,23 +33,29 @@ <h3>O'Reilly Book</h3>
 
 <p>All proceeds are being directly donated to the <a href="https://djangogirls.org">DjangoGirls</a> organization.</p>
 
+
+
 <h3>Other Projects</h3>
 
 <p>More <a href="http://kennethreitz.org/">Kenneth Reitz</a> projects:</p>
 <ul>
+    <li><a href="http://wsl-guide.org/">wsl-guide.org</a></li>
+    <li><a href="http://edmsynths.com/">edmsynths.com</a></li>
+    <li><a href="http://pipenv.org/">pipenv</a></li>
     <li><a href="http://pep8.org/">pep8.org</a></li>
     <li><a href="http://python-requests.org">Requests: HTTP for Humans</a></li>
+    <li><a href="https://github.com/kennethreitz/maya">Maya: Datetimes for Humans</a></li>
     <li><a href="https://github.com/kennethreitz/records">Records: SQL for Humans</a></li>
     <li><a href="http://www.git-legit.org">Legit: Git for Humans</a></li>
     <li><a href="http://docs.python-tablib.org/en/latest/">Tablib: Tabular Datasets</a></li>
-    <li><a href="http://markdownplease.com">Markdown, Please!</a></li>
 </ul>
 
 <h3>Translations</h3>
 <ul>
   <li><a href="http://docs.python-guide.org/en/latest/">English</a></li>
   <li><a href="https://python-guide-fr.readthedocs.io/fr/latest/">French</a></li>
   <li><a href="https://pythonguidecn.readthedocs.io/zh/latest/">Chinese</a></li>
-  <li><a href="https://python-guide-ja.readthedocs.io/en/latest/">Japanese</a></li>
+  <li><a href="http://python-guideja.readthedocs.io/ja/latest/">Japanese</a></li>
   <li><a href="https://python-guide-kr.readthedocs.io/ko/latest/">Korean</a></li>
+  <li><a href="http://python-guide-pt-br.readthedocs.io/pt_BR/latest/">Brazilian Portuguese</a></li>
 </ul>
diff --git a/docs/conf.py b/docs/conf.py
@@ -109,7 +109,8 @@
     'github_user': 'kennethreitz',
     'github_repo': 'python-guide',
     'github_banner': True,
-    'show_related': False
+    'show_related': False,
+    'note_bg': '#FFF59C'
 }
 
 # Add any paths that contain custom themes here, relative to this directory.

diff --git a/docs/contents.rst.inc b/docs/contents.rst.inc
@@ -1,24 +1,50 @@
 Getting Started with Python
 ---------------------------
 
-New to Python? Let's properly setup up your Python environment.
+New to Python? Let's properly setup up your Python environment:
 
 .. toctree::
    :maxdepth: 2
 
    starting/which-python
 
-- Properly Install Python
+- Properly Install Python on your system:
 
  .. toctree::
     :maxdepth: 1
 
     starting/installation
+    starting/install3/osx
+    starting/install3/win
+    starting/install3/linux
     starting/install/osx
     starting/install/win
     starting/install/linux
 
 
+- Using Virtualenvs with Pipenv:
+
+ .. toctree::
+    :maxdepth: 2
+
+    dev/virtualenvs
+
+
+Python Development Environments
+-------------------------------
+
+This part of the guide focus on the Python development environment,
+and the best-practice tools that are available for writing Python code.
+
+.. toctree::
+   :maxdepth: 2
+
+   dev/env
+   dev/virtualenvs
+   dev/pip-virtualenv
+
+
+
 
 Writing Great Python Code
 -------------------------
@@ -80,22 +106,6 @@ This part of the guide focuses on deploying your Python code.
    shipping/freezing
 
 
-Python Development Environments
--------------------------------
-
-This part of the guide focus on the Python development environment,
-and the best-practice tools that are available for writing Python code.
-
-.. toctree::
-   :maxdepth: 2
-
-   dev/env
-   dev/virtualenvs
-   dev/pip-virtualenv
-
-
-
-
 Additional Notes
 ----------------
 

diff --git a/docs/dev/env.rst b/docs/dev/env.rst
@@ -1,6 +1,8 @@
 Your Development Environment
 ============================
 
+.. image:: https://farm3.staticflickr.com/2930/33175624924_7febc46cc4_k_d.jpg
+
 
 Text Editors
 ::::::::::::
@@ -35,11 +37,11 @@ source files.
 There is also a handy syntax plugin called syntax_ featuring some improvements
 over the syntax file included in Vim 6.1.
 
-These plugins supply you with a basic environment for developing in Python.
-To get the most out of Vim, you should continually check your code for syntax
-errors and PEP8 compliance. Luckily PEP8_ and Pyflakes_ will do this for you.
-If your Vim is compiled with :option:`+python` you can also utilize some very
-handy plugins to do these checks from within the editor.
+These plugins supply you with a basic environment for developing in Python. To
+get the most out of Vim, you should continually check your code for syntax
+errors and PEP8 compliance. Luckily pycodestyle_ and Pyflakes_ will do this
+for you. If your Vim is compiled with ``+python`` you can also utilize some
+very handy plugins to do these checks from within the editor.
 
 For PEP8 checking and pyflakes, you can install vim-flake8_. Now you can map the
 function ``Flake8`` to any hotkey or action you want in Vim. The plugin will
@@ -68,12 +70,12 @@ Python-mode
 Python-mode_ is a complex solution for working with Python code in Vim.
 It has:
 
-- Asynchronous Python code checking (``pylint``, ``pyflakes``, ``pep8``, ``mccabe``) in any combination
+- Asynchronous Python code checking (``pylint``, ``pyflakes``, ``pycodestyle``, ``mccabe``) in any combination
 - Code refactoring and autocompletion with Rope
 - Fast Python folding
 - Virtualenv support
 - Search through Python documentation and run Python code
-- Auto PEP8_ error fixes
+- Auto pycodestyle_ error fixes
 
 And more.
 
@@ -86,7 +88,7 @@ using ``<Tab>`` key or any other customized keys.
 .. _indent: http://www.vim.org/scripts/script.php?script_id=974
 .. _syntax: http://www.vim.org/scripts/script.php?script_id=790
 .. _Pyflakes: http://pypi.python.org/pypi/pyflakes/
-.. _PEP8: http://pypi.python.org/pypi/pep8/
+.. _pycodestyle: https://pypi.python.org/pypi/pycodestyle/
 .. _syntastic: https://github.com/scrooloose/syntastic
 .. _Python-mode: https://github.com/klen/python-mode
 .. _SuperTab: http://www.vim.org/scripts/script.php?script_id=1643
@@ -148,10 +150,10 @@ known for IntelliJ IDEA. Both share the same code base and most of PyCharm's
 features can be brought to IntelliJ with the free
 `Python Plug-In <https://plugins.jetbrains.com/plugin/?idea&pluginId=631>`_.  There are two
 versions of PyCharm: Professional Edition (Free 30-day trial) and Community
-Edition(Apache 2.0 License) with fewer features.
+Edition (Apache 2.0 License) with fewer features.
 
 Python (on Visual Studio Code)
------------------------------
+------------------------------
 
 `Python for Visual Studio <https://marketplace.visualstudio.com/items?itemName=donjayamanne.python>`_ is an extension for the `Visual Studio Code IDE <https://code.visualstudio.com>`_.
 This is a free, light weight, open source IDE, with support for Mac, Windows, and Linux.

diff --git a/docs/dev/pip-virtualenv.rst b/docs/dev/pip-virtualenv.rst
@@ -3,6 +3,8 @@
 Further Configuration of Pip and Virtualenv
 ===========================================
 
+.. image:: https://farm4.staticflickr.com/3934/34018732105_f0e6758859_k_d.jpg
+
 Requiring an active virtual environment for ``pip``
 ---------------------------------------------------
 
@@ -18,8 +20,8 @@ environment of the project. Over time this can result in a messy global package
 list.
 
 In order to make sure that you install packages to your active virtual
-environment when you use ``pip install``, consider adding the following two
-lines to your :file:`~/.bashrc` file:
+environment when you use ``pip install``, consider adding the following
+line to your :file:`~/.bashrc` file:
 
 .. code-block:: console
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		Be cordial or be on your way.

		https://www.kennethreitz.org/essays/be-cordial-or-be-on-your-way