test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[1.10.x] Fixed #27711 -- Demoted "Installing a distribution-specific package" in install intro. 

Backport of 991cd69621 from master
This commit is contained in:
Tim Graham 2017-01-10 09:29:23 -05:00
parent ec820df8bf
commit 5ea2228731
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
docs/intro/install.txt
View File

@ -53,13 +53,12 @@ Install Django
You've got three easy options to 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 * :ref:`Install an official release <installing-official-release>`. This
is the best approach for most users. 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 * :ref:`Install the latest development version
<installing-development-version>`. This option is for enthusiasts who want <installing-development-version>`. This option is for enthusiasts who want
the latest-and-greatest features and aren't afraid of running brand new code. the latest-and-greatest features and aren't afraid of running brand new code.

2
docs/topics/install.txt
View File

@ -181,6 +181,8 @@ This is the recommended way to install Django.
.. _virtualenvwrapper: https://virtualenvwrapper.readthedocs.io/en/latest/ .. _virtualenvwrapper: https://virtualenvwrapper.readthedocs.io/en/latest/
.. _standalone pip installer: https://pip.pypa.io/en/latest/installing/#installing-with-get-pip-py .. _standalone pip installer: https://pip.pypa.io/en/latest/installing/#installing-with-get-pip-py
.. _installing-distribution-package:
Installing a distribution-specific package Installing a distribution-specific package
------------------------------------------ ------------------------------------------