summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docs/docsite/rst/roadmap/COLLECTIONS_4.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/docsite/rst/roadmap/COLLECTIONS_4.rst b/docs/docsite/rst/roadmap/COLLECTIONS_4.rst
index e4192175cd..d4a55f8ad8 100644
--- a/docs/docsite/rst/roadmap/COLLECTIONS_4.rst
+++ b/docs/docsite/rst/roadmap/COLLECTIONS_4.rst
@@ -12,7 +12,7 @@ Release schedule
=================
-:2021-01-26: New Collections will be reviewed for inclusion in Ansible 4.
+:2021-01-26: New Collections will be reviewed for inclusion in Ansible 4. Request to include new collection can be submitted to this `github discussion <https://github.com/ansible-collections/ansible-inclusion/discussions/new>`_.
:2021-03-03: Ansible-4.0.0 alpha1 (biweekly ``ansible`` alphas. These are timed to coincide with the start of the ``ansible-core-2.11`` pre-releases).
:2021-03-16: Ansible-4.0.0 alpha2
:2021-03-30: Ansible-4.0.0 alpha3
@@ -28,7 +28,7 @@ Release schedule
:2021-05-18: Ansible-4.0.0 release
:2021-06-08: Release of Ansible-4.1.0 (bugfix + compatible features: every three weeks)
-.. [1] No new modules or major features accepted after this date. In practice this means we will freeze the semver collection versions to compatible release versions. For example, if the version of community.crypto on this date was community-crypto-2.1.0; ansible-3.0.0 could ship with community-crypto-2.1.1. It would not ship with community-crypto-2.2.0.
+.. [1] No new modules or major features accepted after this date. In practice, this means we will freeze the semver collection versions to compatible release versions. For example, if the version of community.crypto on this date was community-crypto-2.1.0; ansible-3.0.0 could ship with community-crypto-2.1.1. It would not ship with community-crypto-2.2.0.
.. [2] After this date only changes blocking a release are accepted. Accepted changes require creating a new rc and may slip the final release date.
.. [3] Collections will only be updated to a new version if a blocker is approved. Collection owners should discuss any blockers at a community IRC meeting (before this freeze) to decide whether to bump the version of the collection for a fix. See the `Community IRC meeting agenda <https://github.com/ansible/community/issues/539>`_.