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 `_. See our +You can install a released version of Ansible with ``pip`` or a package manager. See our `installation guide `_ 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 `_ if you want to open a PR. -* See the `Ansible release and maintenance `_ page for information about active branches. +* See the `Ansible release and maintenance `_ 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` for tips on updating your Ansible -playbooks to run on newer versions. You can download the Ansible release from ``_. +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 ``_. + + 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` for tips on updating your Ansible playbooks to run on newer versions. -You can download the ``ansible-base`` release from ``_. +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 `_ - Ansible release tarballs `Development Mailing List `_ Mailing list for development topics `irc.freenode.net `_