From 70e25dc15828614a1e937567c8023bf0f33b8143 Mon Sep 17 00:00:00 2001
From: Sandra McCann <samccann@redhat.com>
Date: Thu, 24 Sep 2020 10:57:16 -0400
Subject: [PATCH] clarify releases download for older releases only (#71892)
---
README.rst | 5 ++---
.../rst/reference_appendices/release_and_maintenance.rst | 8 ++++----
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/README.rst b/README.rst
index a28240394a7..1959e9a02ab 100644
--- a/README.rst
+++ b/README.rst
@@ -28,8 +28,7 @@ Design Principles
Use Ansible
===========
-You can install a released version of Ansible via ``pip``, a package manager, or
-our `release repository <https://releases.ansible.com/ansible/>`_. See our
+You can install a released version of Ansible with ``pip`` or a package manager. See our
`installation guide <https://docs.ansible.com/ansible/latest/installation_guide/intro_installation.html>`_ for details on installing Ansible
on a variety of platforms.
@@ -72,7 +71,7 @@ Branch Info
* The ``devel`` branch corresponds to the release actively under development.
* The ``stable-2.X`` branches correspond to stable releases.
* Create a branch based on ``devel`` and set up a `dev environment <https://docs.ansible.com/ansible/latest/dev_guide/developing_modules_general.html#common-environment-setup>`_ if you want to open a PR.
-* See the `Ansible release and maintenance <https://docs.ansible.com/ansible/latest/reference_appendices/release_and_maintenance.html>`_ page for information about active branches.
+* See the `Ansible release and maintenance <https://docs.ansible.com/ansible/devel/reference_appendices/release_and_maintenance.html>`_ page for information about active branches.
Roadmap
=======
diff --git a/docs/docsite/rst/reference_appendices/release_and_maintenance.rst b/docs/docsite/rst/reference_appendices/release_and_maintenance.rst
index 5f643d9841b..8f757cdd7fb 100644
--- a/docs/docsite/rst/reference_appendices/release_and_maintenance.rst
+++ b/docs/docsite/rst/reference_appendices/release_and_maintenance.rst
@@ -27,7 +27,9 @@ Older, unmaintained versions of Ansible can contain unfixed security
vulnerabilities (*CVE*).
You can refer to the :ref:`porting guides<porting_guides>` for tips on updating your Ansible
-playbooks to run on newer versions. You can download the Ansible release from `<https://releases.ansible.com/ansible/>`_.
+playbooks to run on newer versions. For Ansible 2.10 and later releases, you can install the Ansible package with ``pip``. See :ref:`intro_installation_guide` for details. For older releases, You can download the Ansible release from `<https://releases.ansible.com/ansible/>`_.
+
+
This table links to the release notes for each major Ansible release. These release notes (changelogs) contain the dates and significant changes in each minor release.
@@ -81,7 +83,7 @@ vulnerabilities (*CVE*).
You can refer to the :ref:`porting guides<porting_guides>` for tips on updating your Ansible
playbooks to run on newer versions.
-You can download the ``ansible-base`` release from `<https://releases.ansible.com/ansible/>`_.
+You can install ``ansible-base`` with ``pip``. See :ref:`intro_installation_guide` for details.
.. note:: ``ansible-base`` maintenance continues for 3 releases. Thus the latest release receives
security and general bug fixes when it is first released, security and critical bug fixes when
@@ -204,8 +206,6 @@ For modules/plugins, we keep the documentation after the removal for users of ol
Testing strategies
:ref:`ansible_community_guide`
Community information and contributing
- `Ansible release tarballs <https://releases.ansible.com/ansible/>`_
- Ansible release tarballs
`Development Mailing List <https://groups.google.com/group/ansible-devel>`_
Mailing list for development topics
`irc.freenode.net <http://irc.freenode.net>`_