Merge "Tidy up release notes for Train"

10 files changed, 23 insertions, 23 deletions

diff --git a/releasenotes/notes/add-hacluster-role-d10bc3918395ccdf.yaml b/releasenotes/notes/add-hacluster-role-d10bc3918395ccdf.yaml
index 2c19f852b..9af5a582b 100644
--- a/releasenotes/notes/add-hacluster-role-d10bc3918395ccdf.yaml
+++ b/releasenotes/notes/add-hacluster-role-d10bc3918395ccdf.yaml
@@ -1,9 +1,9 @@
 ---
 features:
   - |
-    Add HAcluster Docker images. These images contain High Availability
-    solution such as Corosync, Pacemaker, Pacemaker Remote and PCS.
+    Adds HAcluster images. These images contain services supporting High
+    Availability such as Corosync, Pacemaker, Pacemaker Remote and PCS.
 
     HAcluster will not handle any OpenStack control plane resources, it
     will be used as third party for OpenStack Masakari for example to handle
-    the instances failover if a Nova compute crash.
+    instance failover following a Nova compute crash.
diff --git a/releasenotes/notes/deprecate-almanach-0ca0c9bb8522119a.yaml b/releasenotes/notes/deprecate-almanach-0ca0c9bb8522119a.yaml
index 85b46ed2f..917af194d 100644
--- a/releasenotes/notes/deprecate-almanach-0ca0c9bb8522119a.yaml
+++ b/releasenotes/notes/deprecate-almanach-0ca0c9bb8522119a.yaml
@@ -3,4 +3,4 @@ deprecations:
   - |
     The Almanach images are deprecated and will be removed in the Ussuri cycle.
     This includes ``almanach-api`` and ``almanach-collector``.
-    These are not used by Kolla downstreams.
+    These are not used by Kolla downstream projects.
diff --git a/releasenotes/notes/deprecate-dind-9ed17229d2c3137b.yaml b/releasenotes/notes/deprecate-dind-9ed17229d2c3137b.yaml
index 5c675924d..341f55552 100644
--- a/releasenotes/notes/deprecate-dind-9ed17229d2c3137b.yaml
+++ b/releasenotes/notes/deprecate-dind-9ed17229d2c3137b.yaml
@@ -1,7 +1,7 @@
 ---
 deprecations:
   - |
-    ``dind`` image is deprecated and will be removed in the Ussuri cycle.
-    It is not used by Kolla downstreams (Kolla-Ansible, TripleO,
+    The ``dind`` image is deprecated and will be removed in the Ussuri cycle.
+    It is not used by Kolla downstream projects (Kolla-Ansible, TripleO,
     OpenStack-Helm). It has not seen recent usage and the upstream
     project seems no longer active.
diff --git a/releasenotes/notes/deprecate-dragonflow-0404a4a1aa5a6644.yaml b/releasenotes/notes/deprecate-dragonflow-0404a4a1aa5a6644.yaml
index 5bed60ad2..cf2f23c27 100644
--- a/releasenotes/notes/deprecate-dragonflow-0404a4a1aa5a6644.yaml
+++ b/releasenotes/notes/deprecate-dragonflow-0404a4a1aa5a6644.yaml
@@ -4,4 +4,4 @@ deprecations:
     The Dragonflow images are deprecated and will be removed in the Ussuri
     cycle.  This includes ``dragonflow-controller``, ``dragonflow-metadata``,
     and ``dragonflow-publisher-service``.
-    These are not used by Kolla downstreams.
+    These are not used by Kolla downstream projects.
diff --git a/releasenotes/notes/deprecate-kubernetes-dbabf9f86c15a0ee.yaml b/releasenotes/notes/deprecate-kubernetes-dbabf9f86c15a0ee.yaml
index 069611698..92e08bd6d 100644
--- a/releasenotes/notes/deprecate-kubernetes-dbabf9f86c15a0ee.yaml
+++ b/releasenotes/notes/deprecate-kubernetes-dbabf9f86c15a0ee.yaml
@@ -1,19 +1,20 @@
 ---
 upgrade:
   - |
-    ``fluentd`` image no longer includes the ``kubernetes_metadata_filter``
-    plugin. It is not used by Kolla downstreams (Kolla-Ansible, TripleO,
-    OpenStack-Helm). It can be installed by customizing ``fluentd_packages``.
+    The ``fluentd`` image no longer includes the ``kubernetes_metadata_filter``
+    plugin. It is not used by Kolla downstream projects (Kolla-Ansible,
+    TripleO, OpenStack-Helm). It can be installed by customizing
+    ``fluentd_packages``.
 deprecations:
   - |
     Kubernetes-related images are deprecated and will be removed in
-    the U cycle. They are not used by Kolla downstreams (Kolla-Ansible, TripleO,
-    OpenStack-Helm). They were used in the Kolla-Kubernetes project which has
-    been retired in the Rocky cycle.
+    the Ussuri cycle. They are not used by Kolla downstream projects
+    (Kolla-Ansible, TripleO, OpenStack-Helm). They were used in the
+    Kolla-Kubernetes project which was retired in the Rocky cycle.
     The deprecated images include: ``helm-repository``, ``kube-*``,
     ``kubernetes-entrypoint`` and ``kubetoolbox``.
     The ``install_kubectl`` macro is deprecated as well and, along with it,
     the ``magnum-conductor`` image's ``kubectl`` command because it is of limited
     usefulness being pinned to an old version. Magnum end-users use
-    an externally-provided ``kubectl`` anyway.
+    an externally-provided ``kubectl``.
     Please note this deprecation does not affect Magnum nor Qinling support.
diff --git a/releasenotes/notes/drop-xtrabackup-e58a97b617ff708c.yaml b/releasenotes/notes/drop-xtrabackup-e58a97b617ff708c.yaml
index 987bd4df7..2163c95e6 100644
--- a/releasenotes/notes/drop-xtrabackup-e58a97b617ff708c.yaml
+++ b/releasenotes/notes/drop-xtrabackup-e58a97b617ff708c.yaml
@@ -1,5 +1,6 @@
 ---
 upgrade:
   - |
-    Percona XtraBackup tool got dropped in favour of MariaDB Backup.
-    "xtrabackup" image is no longer present.
+    The ``xtrabackup`` image has been removed because XtraBackup is no longer
+    compatible with the versions of MariaDB shipped with Kolla images.
+    Mariabackup should be used instead.
diff --git a/releasenotes/notes/masakari-a047b0387a474186.yaml b/releasenotes/notes/masakari-a047b0387a474186.yaml
index 0e334677b..c978fbf9e 100644
--- a/releasenotes/notes/masakari-a047b0387a474186.yaml
+++ b/releasenotes/notes/masakari-a047b0387a474186.yaml
@@ -1,5 +1,5 @@
 ---
 features:
-   - Add Masakari images. Masakari provides Instances
+   - Adds Masakari images. Masakari provides Instances
      High Availability Service for OpenStack clouds by
      automatically recovering failed Instances.
diff --git a/releasenotes/notes/more-flexible-image-skipping-8e1320ed78976026.yaml b/releasenotes/notes/more-flexible-image-skipping-8e1320ed78976026.yaml
index 1bf0a09c9..934f7faaa 100644
--- a/releasenotes/notes/more-flexible-image-skipping-8e1320ed78976026.yaml
+++ b/releasenotes/notes/more-flexible-image-skipping-8e1320ed78976026.yaml
@@ -1,5 +1,5 @@
 ---
 features:
   - |
-    Kolla skipped images feature is now more flexible, allowing filtering
-    based on used image distribution, installation type and processor architecture.
+    Improves the skipped images feature, allowing filtering based on used image
+    distribution, installation type and processor architecture.
diff --git a/releasenotes/notes/remove-tripleo-ui-855da0b4f4c73385.yaml b/releasenotes/notes/remove-tripleo-ui-855da0b4f4c73385.yaml
index 10b951b30..344de3952 100644
--- a/releasenotes/notes/remove-tripleo-ui-855da0b4f4c73385.yaml
+++ b/releasenotes/notes/remove-tripleo-ui-855da0b4f4c73385.yaml
@@ -1,4 +1,5 @@
 ---
 upgrade:
   - |
-    The tripleo-ui container is no longer built as the project has been retired.
+    The ``tripleo-ui`` container is no longer built as the project has been
+    retired.
diff --git a/releasenotes/notes/retire-neutron-lbaas-4441ce36928fc375.yaml b/releasenotes/notes/retire-neutron-lbaas-4441ce36928fc375.yaml
index ff7518d45..71f286375 100644
--- a/releasenotes/notes/retire-neutron-lbaas-4441ce36928fc375.yaml
+++ b/releasenotes/notes/retire-neutron-lbaas-4441ce36928fc375.yaml
@@ -5,6 +5,3 @@ upgrade:
     release will not upgrade Neutron LBaaS. Learn more about its retirement and
     Octavia as its successor at
     https://wiki.openstack.org/wiki/Neutron/LBaaS/Deprecation
-deprecations:
-  - |
-    The Neutron LBaaS project was retired and support for it in Kolla removed.