merge upstream

Author: simon-weber

docs/_themes/README.rst

@@ -2,7 +2,7 @@ krTheme Sphinx Style
 ====================
 
 This repository contains sphinx styles Kenneth Reitz uses in most of 
-his projects. It is a drivative of Mitsuhiko's themes for Flask and Flask related
+his projects. It is a derivative of Mitsuhiko's themes for Flask and Flask related
 projects.  To use this style in your Sphinx documentation, follow
 this guide:
 

docs/scenarios/client.rst

@@ -24,7 +24,7 @@ your URLs, or to form-encode your POST data. Keep-alive and HTTP connection
 pooling are 100% automatic, powered by urllib3, which is embedded within
 Requests.
 
-- `Documention <http://docs.python-requests.org/en/latest/index.html>`_
+- `Documentation <http://docs.python-requests.org/en/latest/index.html>`_
 - `PyPi <http://pypi.python.org/pypi/requests>`_
 - `GitHub <https://github.com/kennethreitz/requests>`_
 

docs/shipping/freezing.rst

@@ -74,7 +74,7 @@ Prerequisite is to install :ref:`Python on Windows <install-windows>`.
 
    $ python setup.py py2exe
 
-6. Provide the Microsoft Visual C runtime DLL. Two options: `globally install dll on target machine <https://www.microsoft.com/en-us/download/details.aspx?id=29>`_ or `distribute dll aloneside with .exe <http://www.py2exe.org/index.cgi/Tutorial#Step52>`_.
+6. Provide the Microsoft Visual C runtime DLL. Two options: `globally install dll on target machine <https://www.microsoft.com/en-us/download/details.aspx?id=29>`_ or `distribute dll alongside with .exe <http://www.py2exe.org/index.cgi/Tutorial#Step52>`_.
 
 PyInstaller
 ~~~~~~~~~~~

docs/writing/style.rst

@@ -1,4 +1,5 @@
-.. code_style:
+.. _code_style:
+
 Code Style
 ==========
 
@@ -456,7 +457,7 @@ list of what is considered false.
     if not attr:
         print 'attr is falsey!'
 
-    # or, since None is considered false, explicity check for it
+    # or, since None is considered false, explicitly check for it
     if attr is None:
         print 'attr is None!'