diff options
| author | Steve Piercy <web@stevepiercy.com> | 2015-05-16 16:12:35 -0700 |
|---|---|---|
| committer | Steve Piercy <web@stevepiercy.com> | 2015-05-16 16:23:16 -0700 |
| commit | 109792709bf90eddf85eaaed1743b5cbb1faa34e (patch) | |
| tree | 3a20f43fc3bfbf476ceea046404562008af7f5d6 /docs | |
| parent | e14c66d6467759d9d10e73156edb630eb220da77 (diff) | |
| download | pyramid-109792709bf90eddf85eaaed1743b5cbb1faa34e.tar.gz pyramid-109792709bf90eddf85eaaed1743b5cbb1faa34e.tar.bz2 pyramid-109792709bf90eddf85eaaed1743b5cbb1faa34e.zip | |
cherrypick from 1.5
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/narr/install.rst | 6 | ||||
| -rw-r--r-- | docs/quick_tour.rst | 9 | ||||
| -rw-r--r-- | docs/quick_tutorial/requirements.rst | 10 |
3 files changed, 10 insertions, 15 deletions
diff --git a/docs/narr/install.rst b/docs/narr/install.rst index a825b61b9..0f114a9c7 100644 --- a/docs/narr/install.rst +++ b/docs/narr/install.rst @@ -33,11 +33,11 @@ For Mac OS X Users ~~~~~~~~~~~~~~~~~~ Python comes pre-installed on Mac OS X, but due to Apple's release cycle, -it is often out of date. Unless you have a need for a specific earlier version, -it is recommended to install the latest 2.x or 3.x version of Python. +it is often out of date. Unless you have a need for a specific earlier +version, it is recommended to install the latest 2.x or 3.x version of Python. You can install the latest verion of Python for Mac OS X from the binaries on -`python.org <https://www.python.org/download/mac/>`_. +`python.org <https://www.python.org/downloads/mac-osx/>`_. Alternatively, you can use the `homebrew <http://brew.sh/>`_ package manager. diff --git a/docs/quick_tour.rst b/docs/quick_tour.rst index e71725406..1b8c82b0a 100644 --- a/docs/quick_tour.rst +++ b/docs/quick_tour.rst @@ -14,11 +14,10 @@ Installation Once you have a standard Python environment setup, getting started with Pyramid is a breeze. Unfortunately "standard" is not so simple in Python. -For this Quick Tour, it means: -`Python <http://www.python.org/download/releases/>`_, a -`virtual environment <http://docs.python.org/dev/library/venv.html>`_ -(or `virtualenv for Python 2.7 <https://pypi.python.org/pypi/virtualenv>`_), -and `setuptools <https://pypi.python.org/pypi/setuptools/>`_. +For this Quick Tour, it means: `Python <https://www.python.org/downloads/>`_, +a `virtual environment <http://docs.python.org/dev/library/venv.html>`_ (or +`virtualenv for Python 2.7 <https://pypi.python.org/pypi/virtualenv>`_), and +`setuptools <https://pypi.python.org/pypi/setuptools/>`_. As an example, for Python 3.3+ on Linux: diff --git a/docs/quick_tutorial/requirements.rst b/docs/quick_tutorial/requirements.rst index b5778ea42..6628c4f17 100644 --- a/docs/quick_tutorial/requirements.rst +++ b/docs/quick_tutorial/requirements.rst @@ -58,11 +58,8 @@ Steps Install Python 3.3 or greater ----------------------------- -Download the latest standard Python 3.3+ release (not development -release) from -`python.org <http://www.python.org/download/releases/>`_. On that page, you -must click the latest version, then scroll down to the "Downloads" section -for your operating system. +Download the latest standard Python 3.3+ release (not development release) +from `python.org <https://www.python.org/downloads/>`_. Windows and Mac OS X users can download and run an installer. @@ -73,8 +70,7 @@ directions. Make sure you get the proper 32- or 64-bit build and Python version. Linux users can either use their package manager to install Python 3.3 -or may -`build Python 3.3 from source +or may `build Python 3.3 from source <http://pyramid.readthedocs.org/en/master/narr/install.html#package-manager- method>`_. |
