diff options
| author | Tim Graham <timograham@gmail.com> | 2017-01-10 09:29:23 -0500 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2017-01-10 09:30:59 -0500 |
| commit | 5ea2228731674a913790b4a3ab4ca0669843005f (patch) | |
| tree | e0aba0daf0100a871abbeda1d480fa44acf88922 /docs | |
| parent | ec820df8bf3193a5517978f998c634e1a68477a6 (diff) | |
[1.10.x] Fixed #27711 -- Demoted "Installing a distribution-specific package" in install intro.
Backport of 991cd69621f95acd2192ac62a08eb139d3e22215 from master
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/intro/install.txt | 7 | ||||
| -rw-r--r-- | docs/topics/install.txt | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/docs/intro/install.txt b/docs/intro/install.txt index c1348fbe62..7a338ee858 100644 --- a/docs/intro/install.txt +++ b/docs/intro/install.txt @@ -53,13 +53,12 @@ Install Django You've got three easy options to install Django: -* Install a version of Django :doc:`provided by your operating system - distribution </misc/distributions>`. This is the quickest option for those - who have operating systems that distribute Django. - * :ref:`Install an official release <installing-official-release>`. This is the best approach for most users. +* Install a version of Django :ref:`provided by your operating system + distribution <installing-distribution-package>`. + * :ref:`Install the latest development version <installing-development-version>`. This option is for enthusiasts who want the latest-and-greatest features and aren't afraid of running brand new code. diff --git a/docs/topics/install.txt b/docs/topics/install.txt index fbd6447743..5bdd98596d 100644 --- a/docs/topics/install.txt +++ b/docs/topics/install.txt @@ -181,6 +181,8 @@ This is the recommended way to install Django. .. _virtualenvwrapper: https://virtualenvwrapper.readthedocs.io/en/latest/ .. _standalone pip installer: https://pip.pypa.io/en/latest/installing/#installing-with-get-pip-py +.. _installing-distribution-package: + Installing a distribution-specific package ------------------------------------------ |