From 60b39ccd40526f9df029af91106ff10b9a643392 Mon Sep 17 00:00:00 2001
From: Bartosz Bezak <bartosz@stackhpc.com>
Date: Fri, 2 Dec 2022 13:51:30 +0100
Subject: [PATCH] [release] Tidy up release notes for Zed

Change-Id: If98434d7941cf319b0689441827290791f596a04
---
 .../bifrost-deploy-verbosity-f6a90727649285b5.yaml     |  7 +++----
 releasenotes/notes/bug-1982777-0cac9753aa18a037.yaml   |  3 +--
 ...t_function_creators-variables-8628098891513dac.yaml |  2 +-
 ...stone-token-provider-variable-6d18857276295bd6.yaml |  2 +-
 .../notes/feature-1968597-4b414566f82c90fa.yaml        | 10 +++-------
 ...conf-missing-taskflow-section-31b6654e29bec35d.yaml |  2 +-
 .../fix-zun_cni_daemon-mounts-9a7664896cfc7a9f.yaml    |  4 ++--
 .../notes/haproxy-active-passive-523139557659d6e5.yaml |  4 ++--
 ...nic-inspector-multiple-ranges-b7c734d38b90c331.yaml |  5 +++--
 .../notes/ironic-interface-afa7ffe9a341a892.yaml       |  5 ++---
 .../notes/ovn-probe-timeouts-6b7747486d59e58e.yaml     |  6 +++---
 ...deprecated-enable_ironic_ipxe-70addb60a0b3caa7.yaml |  6 +++---
 12 files changed, 25 insertions(+), 31 deletions(-)

diff --git a/releasenotes/notes/bifrost-deploy-verbosity-f6a90727649285b5.yaml b/releasenotes/notes/bifrost-deploy-verbosity-f6a90727649285b5.yaml
index 009307927..aef8c9bd7 100644
--- a/releasenotes/notes/bifrost-deploy-verbosity-f6a90727649285b5.yaml
+++ b/releasenotes/notes/bifrost-deploy-verbosity-f6a90727649285b5.yaml
@@ -1,7 +1,6 @@
 ---
 features:
   - |
-    With the parameter ``bifrost_deploy_verbosity`` it is possible
-    to set the verbosity of the bootstrap of Bifrost.
-
-    By default ``-vvvv`` is set.
+    Adds ``bifrost_deploy_verbosity`` parameter. It allows to change
+    the verbosity of the Bifrost bootstrap task.
+    ``-vvvv`` is a default value.
diff --git a/releasenotes/notes/bug-1982777-0cac9753aa18a037.yaml b/releasenotes/notes/bug-1982777-0cac9753aa18a037.yaml
index 0a80e3ce3..0ad2ad327 100644
--- a/releasenotes/notes/bug-1982777-0cac9753aa18a037.yaml
+++ b/releasenotes/notes/bug-1982777-0cac9753aa18a037.yaml
@@ -1,8 +1,7 @@
 ---
 fixes:
   - |
-    Fixes 1982777.
+    Fixes `LP#1982777 <https://launchpad.net/bugs/1982777>`__.
     Set multipathd user_friendly_names to "no"
     to make os-brick able to resize volumes online.
     Adds ability to override multipathd config.
-    `LP#1982777 <https://launchpad.net/bugs/1982777>`__
diff --git a/releasenotes/notes/bug-1987982-fix-keystone-log_bin_trust_function_creators-variables-8628098891513dac.yaml b/releasenotes/notes/bug-1987982-fix-keystone-log_bin_trust_function_creators-variables-8628098891513dac.yaml
index 5319b1cd0..06681dda9 100644
--- a/releasenotes/notes/bug-1987982-fix-keystone-log_bin_trust_function_creators-variables-8628098891513dac.yaml
+++ b/releasenotes/notes/bug-1987982-fix-keystone-log_bin_trust_function_creators-variables-8628098891513dac.yaml
@@ -1,6 +1,6 @@
 ---
 fixes:
   - |
-    Fixed `bug #1987982  <https://bugs.launchpad.net/kolla-ansible/+bug/1987982>`_
+    Fixed `bug #1987982  <https://bugs.launchpad.net/kolla-ansible/+bug/1987982>`_.
     This bug caused the database log_bin_trust_function_creators variable
     not to be set back to "OFF" after a keystone upgrade.
diff --git a/releasenotes/notes/drop-keystone-token-provider-variable-6d18857276295bd6.yaml b/releasenotes/notes/drop-keystone-token-provider-variable-6d18857276295bd6.yaml
index 1daf939c8..309672a2b 100644
--- a/releasenotes/notes/drop-keystone-token-provider-variable-6d18857276295bd6.yaml
+++ b/releasenotes/notes/drop-keystone-token-provider-variable-6d18857276295bd6.yaml
@@ -1,4 +1,4 @@
 ---
 upgrade:
-  - The variable keystone_token_provider does not exist anymore,
+  - The variable ``keystone_token_provider`` does not exist anymore,
     because there is no alternative.
diff --git a/releasenotes/notes/feature-1968597-4b414566f82c90fa.yaml b/releasenotes/notes/feature-1968597-4b414566f82c90fa.yaml
index 0697080c4..bab72f91e 100644
--- a/releasenotes/notes/feature-1968597-4b414566f82c90fa.yaml
+++ b/releasenotes/notes/feature-1968597-4b414566f82c90fa.yaml
@@ -1,14 +1,10 @@
 ---
 features:
   - |
-    Adds ability to configure the Prometheus pushgateway options of its URL.
+    Adds a new variable ``ceilometer_prometheus_pushgateway_options``.
 
-    Adds a new variable ``ceilometer_prometheus_pushgateway_options``. This is
-    a dictionary whose keys are the options to be set and its values contain
-    what to set them to.
-
-    These options and respective values are then added to the pushgateway's
-    URL, checking that no "None" value is being set.
+    It is dictionary whose keys and respective values are added to
+    the pushgateway's URL, checking that no "None" value is being set.
 
     For example, the following configurations:
 
diff --git a/releasenotes/notes/fix-masakari-conf-missing-taskflow-section-31b6654e29bec35d.yaml b/releasenotes/notes/fix-masakari-conf-missing-taskflow-section-31b6654e29bec35d.yaml
index 43a058b73..70727f8a9 100644
--- a/releasenotes/notes/fix-masakari-conf-missing-taskflow-section-31b6654e29bec35d.yaml
+++ b/releasenotes/notes/fix-masakari-conf-missing-taskflow-section-31b6654e29bec35d.yaml
@@ -1,5 +1,5 @@
 ---
 fixes:
   - |
-    fix missing [taskflow] section in masakari.conf.j2
+    Fixes missing ``[taskflow]`` section in masakari.conf.j2
     `LP#1966536 <https://bugs.launchpad.net/kolla-ansible/+bug/1966536>`__
diff --git a/releasenotes/notes/fix-zun_cni_daemon-mounts-9a7664896cfc7a9f.yaml b/releasenotes/notes/fix-zun_cni_daemon-mounts-9a7664896cfc7a9f.yaml
index 536af8d13..52d92d67c 100644
--- a/releasenotes/notes/fix-zun_cni_daemon-mounts-9a7664896cfc7a9f.yaml
+++ b/releasenotes/notes/fix-zun_cni_daemon-mounts-9a7664896cfc7a9f.yaml
@@ -1,5 +1,5 @@
 ---
 fixes:
   - |
-    Fix zun capsules lose the network namespaces after restarting
-    zun_cni_daemon container
+    Fixes Zun capsules loosing network namespaces after
+    restarting zun_cni_daemon container
diff --git a/releasenotes/notes/haproxy-active-passive-523139557659d6e5.yaml b/releasenotes/notes/haproxy-active-passive-523139557659d6e5.yaml
index f500605c9..501bdcb41 100644
--- a/releasenotes/notes/haproxy-active-passive-523139557659d6e5.yaml
+++ b/releasenotes/notes/haproxy-active-passive-523139557659d6e5.yaml
@@ -1,5 +1,5 @@
 ---
 features:
   - |
-    Supports configuration of arbitrary HAProxy services in active/passive
-    mode.
+    Adds support for setting up arbitrary HAProxy services in
+    active/passive mode.
diff --git a/releasenotes/notes/ironic-inspector-multiple-ranges-b7c734d38b90c331.yaml b/releasenotes/notes/ironic-inspector-multiple-ranges-b7c734d38b90c331.yaml
index ac1768b13..5d81c3a6b 100644
--- a/releasenotes/notes/ironic-inspector-multiple-ranges-b7c734d38b90c331.yaml
+++ b/releasenotes/notes/ironic-inspector-multiple-ranges-b7c734d38b90c331.yaml
@@ -12,8 +12,9 @@ upgrade:
     ``ironic_dnsmasq_dhcp_default_lease_time`` variable or per range via
     ``lease_time`` parameter.
   - |
-    Replace usage of ``ironic_dnsmasq_dhcp_range`` together with
-    ``ironic_dnsmasq_default_gateway`` to ``ironic_dnsmasq_dhcp_ranges``.
+    Replaced ``ironic_dnsmasq_dhcp_range`` and
+    ``ironic_dnsmasq_default_gateway`` in favour of
+    ``ironic_dnsmasq_dhcp_ranges``.
     For example, if you have::
 
       ironic_dnsmasq_dhcp_range: "10.42.0.2,10.42.0.254,255.255.255.0"
diff --git a/releasenotes/notes/ironic-interface-afa7ffe9a341a892.yaml b/releasenotes/notes/ironic-interface-afa7ffe9a341a892.yaml
index 3d9b5dffa..7c99dad08 100644
--- a/releasenotes/notes/ironic-interface-afa7ffe9a341a892.yaml
+++ b/releasenotes/notes/ironic-interface-afa7ffe9a341a892.yaml
@@ -1,6 +1,5 @@
 ---
 features:
   - |
-    With the ``ironic_http_interface/ironic_http_interface_address``
-    parameters it is possible to set the addresses for the
-    ``ironic_http`` service.
+    Adds ``ironic_http_interface/ironic_http_interface_address``
+    parameters to set the addresses for the ``ironic_http`` service.
diff --git a/releasenotes/notes/ovn-probe-timeouts-6b7747486d59e58e.yaml b/releasenotes/notes/ovn-probe-timeouts-6b7747486d59e58e.yaml
index bc5a82fca..df142f39f 100644
--- a/releasenotes/notes/ovn-probe-timeouts-6b7747486d59e58e.yaml
+++ b/releasenotes/notes/ovn-probe-timeouts-6b7747486d59e58e.yaml
@@ -1,8 +1,8 @@
 ---
 features:
   - |
-    For ovn added ovn-openflow-probe-interval variable, it sets
-    the inactivity probe interval of the OpenFlow  connection
+    Adds ``ovn-openflow-probe-interval`` variable. It sets
+    the inactivity probe interval of the OpenFlow connection
     to the OpenvSwitch integration bridge, in seconds. If the
     value is zero, it disables the connection keepalive feature.
     The default value is 60 seconds.
@@ -10,5 +10,5 @@ features:
 upgrade:
   - |
     For ovn the default value of openflow-probe-interval was
-    changed to 60 seconds. Use the ovn-openflow-probe-interval
+    changed to 60 seconds. Use the ``ovn-openflow-probe-interval``
     variable to override.
diff --git a/releasenotes/notes/remove-deprecated-enable_ironic_ipxe-70addb60a0b3caa7.yaml b/releasenotes/notes/remove-deprecated-enable_ironic_ipxe-70addb60a0b3caa7.yaml
index 5b8cea8c3..ea868cb00 100644
--- a/releasenotes/notes/remove-deprecated-enable_ironic_ipxe-70addb60a0b3caa7.yaml
+++ b/releasenotes/notes/remove-deprecated-enable_ironic_ipxe-70addb60a0b3caa7.yaml
@@ -1,6 +1,6 @@
 ---
 upgrade:
   - |
-    The deprecated ``enable_ironic_ipxe`` has been removed. The iPXE still
-    works by default and it can be disabled by setting the more-aptly-named
-    ``ironic_dnsmasq_serve_ipxe`` to ``false``.
+    The deprecated ``enable_ironic_ipxe`` variable has been removed.
+    The iPXE still works by default and it can be disabled by setting
+    the more-aptly-named ``ironic_dnsmasq_serve_ipxe`` to ``false``.
-- 
GitLab