diff options
| author | Sandra McCann <samccann@redhat.com> | 2023-02-16 18:11:03 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-16 17:11:03 -0600 |
| commit | da131ec48bfb66deb3f2024492584a9853cfd83f (patch) | |
| tree | 7dc2e96b903707ce0bc7247e9bbdc92453bec081 | |
| parent | 58d66a756801c444ba7252b81efa67658462068d (diff) | |
| download | ansible-da131ec48bfb66deb3f2024492584a9853cfd83f.tar.gz | |
Backportapalooza 02 16 (#80019)
* fixes typo in Ansible 7 roadmap (#79996)
Co-authored-by: Alicia Cozine <acozine@users.noreply.github.com>
(cherry picked from commit 75274021d3ef84d580e2f6197d60127c5af8cdc4)
* update banner' (#79971)
(cherry picked from commit f841c2803a1e36bb6f392c466d36b669f9243464)
---------
Co-authored-by: Alicia Cozine <879121+acozine@users.noreply.github.com>
| -rw-r--r-- | docs/docsite/.templates/banner.html | 5 | ||||
| -rw-r--r-- | docs/docsite/rst/roadmap/COLLECTIONS_7.rst | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/docs/docsite/.templates/banner.html b/docs/docsite/.templates/banner.html index 388152211d..698870fedc 100644 --- a/docs/docsite/.templates/banner.html +++ b/docs/docsite/.templates/banner.html @@ -20,7 +20,10 @@ '<div id="latest_extra_banner_id" class="admonition important">' + '<br>' + '<p>' + - 'Continue building on your automation knowledge, visit the <a href="https://events.experiences.redhat.com/widget/redhat/rhaf22/SessionCatalog2022">AnsibleFest content hub!</a> ' + + '<b>Experience AnsibleFest at Red Hat Summit</b>' + + '</p>' + + '<p>' + + 'We\'re bringing AnsibleFest to Red Hat Summit in Boston, May 23-25. It\'s the best of Fest combined with Red Hat Summit for even more learning and technical engagement. <a href="https://www.redhat.com/en/summit/ansiblefest?intcmp=7013a0000034lvhAAA">Learn more.</a> ' + '</p>' + '<br>' + diff --git a/docs/docsite/rst/roadmap/COLLECTIONS_7.rst b/docs/docsite/rst/roadmap/COLLECTIONS_7.rst index ca76340875..dcd9262142 100644 --- a/docs/docsite/rst/roadmap/COLLECTIONS_7.rst +++ b/docs/docsite/rst/roadmap/COLLECTIONS_7.rst @@ -46,7 +46,7 @@ Release schedule Ansible minor releases ======================= -Ansible 7.x minor releases will occur approximately every four weeks if changes to collections have been made or to align to a later ansible-core-2.14.x. Ansible 7.x minor releases may contain new features but not backwards incompatibilities. In practice, this means we will include new collection versions where either the patch or the minor version number has changed but not when the major number has changed. For example, if Ansible-7.0.0 ships with community.crypto 2.3.0; Ansible-6.1.0 may ship with community.crypto 2.4.0 but would not ship with community.crypto 3.0.0. +Ansible 7.x minor releases will occur approximately every four weeks if changes to collections have been made or to align to a later ansible-core-2.14.x. Ansible 7.x minor releases may contain new features but not backwards incompatibilities. In practice, this means we will include new collection versions where either the patch or the minor version number has changed but not when the major number has changed. For example, if Ansible-7.0.0 ships with community.crypto 2.3.0; Ansible-7.1.0 may ship with community.crypto 2.4.0 but would not ship with community.crypto 3.0.0. .. note:: |