Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Adam Nelson
2016-11-14 14:25:47 -05:00
35 changed files with 638 additions and 104 deletions
+2 -2
View File
@@ -16,7 +16,7 @@ Installation Guides
These guides go over the proper installation of :ref:`Python <which-python>`
for development purposes, as well as setuptools, pip and virtualenv.
- :ref:`Python 3 on Mac OS X <install3-osx>`.
- :ref:`Python 2 on Mac OS X <install-osx>`.
- :ref:`Python 3 on MacOS <install3-osx>`.
- :ref:`Python 2 on MacOS <install-osx>`.
- :ref:`Python 2 on Microsoft Windows <install-windows>`.
- :ref:`Python 2 on Ubuntu Linux <install-linux>`.