summaryrefslogtreecommitdiff
path: root/docs/docsite
diff options
context:
space:
mode:
authorWeiXinFam-Insta <86450936+WeiXinFam-Insta@users.noreply.github.com>2023-04-07 04:55:39 +1000
committerGitHub <noreply@github.com>2023-04-06 14:55:39 -0400
commit0460f780810bb91b052809b0bf850633b2df7769 (patch)
tree1be18b1719e35a2b05a2cdd06d565a8995c282c4 /docs/docsite
parentdb8f1756bc016faddf6cac37d12d8bc195f29278 (diff)
downloadansible-0460f780810bb91b052809b0bf850633b2df7769.tar.gz
Documentation changes for #80367 and #80270 (#80391)
Diffstat (limited to 'docs/docsite')
-rw-r--r--docs/docsite/rst/installation_guide/intro_installation.rst2
-rw-r--r--docs/docsite/rst/playbook_guide/playbooks_blocks.rst2
-rw-r--r--docs/docsite/rst/reference_appendices/release_and_maintenance.rst1
3 files changed, 4 insertions, 1 deletions
diff --git a/docs/docsite/rst/installation_guide/intro_installation.rst b/docs/docsite/rst/installation_guide/intro_installation.rst
index d8627889f6..32aa7bb919 100644
--- a/docs/docsite/rst/installation_guide/intro_installation.rst
+++ b/docs/docsite/rst/installation_guide/intro_installation.rst
@@ -67,6 +67,8 @@ Selecting an Ansible package and version to install
Ansible's community packages are distributed in two ways: a minimalist language and runtime package called ``ansible-core``, and a much larger "batteries included" package called ``ansible``, which adds a community-curated selection of :ref:`Ansible Collections <collections>` for automating a wide variety of devices. Choose the package that fits your needs; The following instructions use ``ansible``, but you can substitute ``ansible-core`` if you prefer to start with a more minimal package and separately install only the Ansible Collections you require. The ``ansible`` or ``ansible-core`` packages may be available in your operating systems package manager, and you are free to install these packages with your preferred method. These installation instructions only cover the officially supported means of installing the python package with ``pip``.
+See the :ref:`Ansible package release status table<ansible_changelogs>` for the ``ansible-core`` version included in the package.
+
Installing and upgrading Ansible
================================
diff --git a/docs/docsite/rst/playbook_guide/playbooks_blocks.rst b/docs/docsite/rst/playbook_guide/playbooks_blocks.rst
index 805045daa3..947d106022 100644
--- a/docs/docsite/rst/playbook_guide/playbooks_blocks.rst
+++ b/docs/docsite/rst/playbook_guide/playbooks_blocks.rst
@@ -154,7 +154,7 @@ You can use blocks with ``flush_handlers`` in a rescue task to ensure that all h
ansible.builtin.debug:
msg: 'I execute normally'
changed_when: true
- notify: run me even after an error
+ notify: Run me even after an error
- name: Force a failure
ansible.builtin.command: /bin/false
diff --git a/docs/docsite/rst/reference_appendices/release_and_maintenance.rst b/docs/docsite/rst/reference_appendices/release_and_maintenance.rst
index 551ff25fd3..f9bdc82548 100644
--- a/docs/docsite/rst/reference_appendices/release_and_maintenance.rst
+++ b/docs/docsite/rst/reference_appendices/release_and_maintenance.rst
@@ -71,6 +71,7 @@ Work in Collections is tracked within the individual Collection repositories.
You can refer to the :ref:`Ansible package porting guides<porting_guides>` for tips on updating your playbooks to run on newer versions of Ansible. For Ansible 2.10 and later releases, you can install the Ansible package with ``pip``. See :ref:`intro_installation_guide` for details. You can download older Ansible releases from `<https://releases.ansible.com/ansible/>`_.
+.. _ansible_changelogs:
Ansible community changelogs
----------------------------