Clean up release notes from the upcoming release

Change-Id: Iacdc3fdcf1fc221995963f8900a7e8ee06c9900d

releasenotes/notes/bfv-pxe-boot-3375d331ee2f04f2.yaml

@@ -1,5 +1,5 @@
 ---
 fixes:
-  - Fixes a problem when using boot from volume with the pxe boot interface,
+  - Fixes a problem when using boot from volume with the ``pxe`` boot interface
-    now when booting the correct iscsi initiator is used.
+    (`bug 1724275 <https://bugs.launchpad.net/ironic/+bug/1724275>`_).
-    `bug 1724275 <https://bugs.launchpad.net/ironic/+bug/1724275>`_
+    Now the correct iSCSI initiator is used.

releasenotes/notes/bug-1696296-a972c8d879b98940.yaml

@@ -5,5 +5,5 @@ fixes:
     the service could not report its heartbeat due to the database connection
     experiencing an unexpected failure. Full tracebacks of these exceptions are
     now logged, and if the database connection recovers in a reasonable amount
-    of time the service will still be available.
+    of time the service will still be available. See `bug 1696296
-    See https://bugs.launchpad.net/ironic/+bug/1696296.
+    <https://bugs.launchpad.net/ironic/+bug/1696296>`_ for details.

releasenotes/notes/fix-get-boot-device-not-persistent-5d6acffac3b287f7.yaml

@@ -1,6 +1,6 @@
 ---
 fixes:
   - |
-    Fixes ``get_boot_device`` method from oneview drivers' management interface.
+    The ``oneview`` management interface now correctly detects whether the
-    Now the method returns the persistent boot option correctly, based on the
+    current boot device setting is persistent. Previously it always
-    iLO information of the node.
+    returned ``True``.

releasenotes/notes/introduce-hponeview-client-6652d468034963b2.yaml

@@ -1,6 +0,0 @@
----
-upgrade:
-  - |
-    Adds the ``hpOneView`` and ``ilorest`` library requirement
-    to the OneView Driver, in order to prepare for the eventual
-    removal of dependency on ``python-oneviewclient`` library.

releasenotes/notes/keystoneauth-adapter-opts-ca4f68f568e6cf6f.yaml

@@ -1,41 +1,36 @@
 ---
-upgrade:
+features:
   - |
-    To facilitate automatic discovery of services from the keystone catalog,
+    To facilitate automatic discovery of services from the service catalog,
     the configuration file sections for service clients may include these
     configuration options: ``service_type``, ``service_name``,
-    ``valid_interfaces``, ``region_name`` and other keystoneauth Adaper-related
+    ``valid_interfaces``, ``region_name`` and other keystoneauth options.
-    options.
 
     These options together must uniquely specify an endpoint for a service
-    registered in the keystone catalog.
+    registered in the service catalog. Alternatively, the ``endpoint_override``
-    Consult the ``keystoneauth`` library documentation for full list of
+    option can be used to specify the endpoint.
+
+    Consult the `keystoneauth library documentation
+    <https://docs.openstack.org/keystoneauth/latest/>`_ for a full list of
     available options, their meaning and possible values.
 
     Default values for ``service_type`` are set by ironic to sane defaults
-    based on required services and their entries in ``service-types-authority``.
+    based on required services and their entries in the `service types
+    authority <https://service-types.openstack.org/service-types.json>`_.
 
     The ``valid_interfaces`` option defaults to ``['internal', 'public']``.
 
     The ``region_name`` option defaults to ``None`` and must be explicitly set
     for multi-regional setup for endpoint discovery to succeed.
 
-    The configuration file sections where these new options are available are:
+    Currently only the ``[service_catalog]`` section supports these options.
-
-    - service_catalog
-
-features:
-  - |
-    Options for service endpoint discovery can now be set per-service in
-    appropriate service configuration file sections:
-
-    - ``[service_catalog]`` for baremetal API discovery
 
 deprecations:
   - |
     Configuration option ``[conductor]api_url`` is deprecated
-    and will be ignored in the Rocky release.
+    and will be removed in the Rocky release. Instead, use the
-    Instead, use ``[service_catalog]endpoint_override`` configuration option
+    ``[service_catalog]endpoint_override`` configuration option to set
-    to set specific ironic API address if automatic discovery of ironic API
+    the Bare Metal API endpoint if its automatic discovery from the service
-    endpoint from keystone catalog is not desired.
+    catalog is not desired.
+
     This new option defaults to ``None`` and must be set explicitly if needed.

releasenotes/notes/new_capabilities-5241619c4b46a460.yaml

@@ -2,7 +2,7 @@
 features:
   - |
     Adds support for the following Boolean capabilities keys to
-    ``ilo`` inspect interface:
+    the ``ilo`` inspect interface:
 
     * ``sriov_enabled``
     * ``has_ssd``

releasenotes/notes/oneview-timeout-power-88b02a9cd45876d7.yaml

@@ -1,5 +1,5 @@
 ---
 features:
   - |
-    Adds support for 'timeout' parameter when powering on/off an Ironic node
+    Adds support for ``timeout`` parameter when powering on/off a bare metal
-    that is being managed using 'oneview' hardware type.
+    node managed by the ``oneview`` hardware type.

releasenotes/notes/oneview-validations-f6d702d1fab77f91.yaml

@@ -1,7 +0,0 @@
----
-other:
-  - |
-    Adds the implementation of the validations for the OneView hardware type,
-    migrating from python-oneviewclient library to OneView driver. This process
-    is part of migrating from ``python-oneviewclient`` to ``python-hpOneView``
-    and ``python-ilorest-library``.

releasenotes/notes/reboot-do-not-power-off-if-already-1452256167d40009.yaml

@@ -1,9 +1,8 @@
 ---
 fixes:
   - |
-    Fixes a problem when using ipmitool and rebooting a node which would cause
+    Fixes a problem when rebooting a node using the ``ipmitool`` power
-    a deploy to fail. Now when rebooting a node we check if the node is already
+    interface could cause a deploy to fail. Now it no longer tries to power off
-    powered off, if it is we don't attempt to power off the node. This is
+    nodes that are already off, because some BMCs will error in these cases.
-    because some BMCs will error if the node is already powered off and an
+    See `bug 1718794 <https://bugs.launchpad.net/ironic/+bug/1718794>`_
-    ipmitool request is made to power it off. See
+    for details.
-    https://bugs.launchpad.net/ironic/+bug/1718794 for details.

releasenotes/notes/rebuild-configdrive-f52479fd55b0f5ce.yaml

@@ -1,10 +1,11 @@
 ---
 features:
   - |
-    Starting with REST API version 1.35, it is possible to provide
+    Starting with the Bare Metal API version 1.35, it is possible to provide
     a configdrive when rebuilding a node.
 fixes:
   - |
     Fixes the problem of an old configdrive (used for deploying the node)
-    being used again when rebuilding the node. Starting with REST API 1.35,
+    being used again when rebuilding the node. Starting with the Bare Metal API
-    it is possible to specify a different configdrive when rebuilding a node.
+    version 1.35, it is possible to specify a different configdrive when
+    rebuilding a node.

releasenotes/notes/remove-python-oneviewclient-f47e22322f7d151f.yaml

@@ -1,6 +1,6 @@
 ---
-other:
+upgrade:
   - |
-    The OneView drivers no longer use ``python-oneviewclient`` to communicate with
+    The ``oneview`` drivers now use ``hpOneView`` and
-    OneView appliances. The ``oneview`` hardware type now uses the ``hpOneView``
+    ``python-ilorest-library`` libraries to communicate with OneView
-    and ``python-ilorest-library`` libraries.
+    appliances. The ``python-oneviewclient`` library is no longer used.

releasenotes/notes/update-ilorest-library-oneview-132c93ac7014d254.yaml

@@ -1,5 +0,0 @@
----
-upgrade:
-  - |
-    The minimum required version of python-ilorest-library for the hardware
-    type OneView was bumped to 2.1.0.

releasenotes/notes/use-dhcp-option-numbers-8b0b0efae912ff5f.yaml

@@ -4,4 +4,4 @@ fixes:
     Uses standard DHCP option codes instead of dnsmasq-specific option names,
     because different backends use different option names. This fixes the
     `compatibility issues with neutron's DHCP backends
-    <https://bugs.launchpad.net/ironic/+bug/1717236>`.
+    <https://bugs.launchpad.net/ironic/+bug/1717236>`_.