Merge "Release notes cleanup for 13.0.0 (mk2)"

8 files changed, 27 insertions, 27 deletions

diff --git a/releasenotes/notes/add-deploy-steps-drac-raid-interface-7023c03a96996265.yaml b/releasenotes/notes/add-deploy-steps-drac-raid-interface-7023c03a96996265.yaml
index c19dfc1a1..fe38c605e 100644
--- a/releasenotes/notes/add-deploy-steps-drac-raid-interface-7023c03a96996265.yaml
+++ b/releasenotes/notes/add-deploy-steps-drac-raid-interface-7023c03a96996265.yaml
@@ -1,10 +1,10 @@
 ---
 features:
   - |
-    Adds support for deploy steps to ``raid`` interface of ``idrac``
-    hardware type. The methods ``apply_configuration`` and
-    ``delete_configuration`` can be used as deploy steps.
+    Adds support for deploy steps to the ``idrac-wsman`` ``raid`` interface.
+    The methods ``apply_configuration`` and ``delete_configuration`` can be
+    used as deploy steps.
   - |
     Adds a new ``delete_existing`` argument to the ``create_configuration``
-    clean step on the ``idrac`` ``raid`` interface which can be used to
+    clean step on the ``idrac-wsman`` ``raid`` interface which can be used to
     delete existing virtual disks. The default for this argument is ``False``.
diff --git a/releasenotes/notes/add-deploy-steps-ilo-management-interface-9d0f45954eda643a.yaml b/releasenotes/notes/add-deploy-steps-ilo-management-interface-9d0f45954eda643a.yaml
index 0b60570d8..bc854ed56 100644
--- a/releasenotes/notes/add-deploy-steps-ilo-management-interface-9d0f45954eda643a.yaml
+++ b/releasenotes/notes/add-deploy-steps-ilo-management-interface-9d0f45954eda643a.yaml
@@ -1,8 +1,8 @@
 ---
 features:
   - |
-    Adds support for deploy steps to ``management`` interface of ``ilo``
-    hardware type. The methods ``reset_ilo``, ``reset_ilo_credential``,
+    Adds support for deploy steps to the ``management`` interface of the
+    ``ilo`` hardware type. The methods ``reset_ilo``, ``reset_ilo_credential``,
     ``reset_bios_to_default``, ``reset_secure_boot_keys_to_default``,
     ``clear_secure_boot_keys`` and ``update_firmware`` can be used as
     deploy steps.
diff --git a/releasenotes/notes/add-redfish-boot-interface-e7e05bdd2c894d80.yaml b/releasenotes/notes/add-redfish-boot-interface-e7e05bdd2c894d80.yaml
index 643ec0561..abec8534f 100644
--- a/releasenotes/notes/add-redfish-boot-interface-e7e05bdd2c894d80.yaml
+++ b/releasenotes/notes/add-redfish-boot-interface-e7e05bdd2c894d80.yaml
@@ -5,9 +5,9 @@ features:
     virtual media boot. The ``redfish-virtual-media`` boot interface operates
     on the same kernel/ramdisk as, for example, PXE boot interface does, however
     ``redfish-virtual-media`` boot interface can additionally require EFI
-    system partition image (ESP) when performing UEFI boot. New configuration
-    option ``bootloader`` or ``[driver_info]/bootloader`` property can be used
-    to convey ESP location to ironic. Bootable ISO images can be served to
-    BMC either from Swift or from a HTTP server running on ironic conductor
-    machine. This is controlled by the ``[redfish]use_swift`` ironic
-    configuration option.
+    system partition image (ESP) when performing UEFI boot. Either the
+    ``[conductor]bootloader`` configuration option or the
+    ``[driver_info]/bootloader`` node attribute can be used to convey ESP
+    location to ironic. Bootable ISO images can be served to BMCs either from
+    Swift or from an HTTP server running on an ironic conductor machine. This
+    is controlled by the ``[redfish]use_swift`` ironic configuration option.
diff --git a/releasenotes/notes/add_clean_step_clear_job_queue-7b774d8d0e36d1b2.yaml b/releasenotes/notes/add_clean_step_clear_job_queue-7b774d8d0e36d1b2.yaml
index 0232fc7ff..0e54d012e 100644
--- a/releasenotes/notes/add_clean_step_clear_job_queue-7b774d8d0e36d1b2.yaml
+++ b/releasenotes/notes/add_clean_step_clear_job_queue-7b774d8d0e36d1b2.yaml
@@ -1,11 +1,11 @@
 ---
 features:
   - |
-    Adds ``clear_job_queue`` cleaning step to hardware type ``idrac``.
-    ``clear_job_queue`` cleaning step clears the Lifecycle Controller
-    job queue including any pending jobs.
+    Adds a ``clear_job_queue`` cleaning step to the ``idrac-wsman`` management
+    interface.  The ``clear_job_queue`` cleaning step clears the Lifecycle
+    Controller job queue including any pending jobs.
 fixes:
   - |
-    Fixes an issue where if there is a pending bios config job in job queue,
-    then ironic will abandon the introspection attempt for the node,
-    which will cause overall introspection to fail.
+    Fixes an issue where if there is a pending BIOS config job in job queue,
+    then ironic will abandon an introspection attempt for the node, which will
+    cause overall introspection to fail.
diff --git a/releasenotes/notes/cisco-drivers-deleted-5a42a8c508704c64.yaml b/releasenotes/notes/cisco-drivers-deleted-5a42a8c508704c64.yaml
index a487c3ac9..fd93bc3b5 100644
--- a/releasenotes/notes/cisco-drivers-deleted-5a42a8c508704c64.yaml
+++ b/releasenotes/notes/cisco-drivers-deleted-5a42a8c508704c64.yaml
@@ -2,8 +2,8 @@
 upgrade:
   - |
     The Cisco ``cisco-ucs-managed`` and ``cisco-ucs-standalone`` hardware types
-    and ``cimc`` and ``ucsm`` hardware interfaces were deprecated in Stein.
-    They have been removed in Train.
+    and ``cimc`` and ``ucsm`` hardware interfaces which were deprecated in
+    the 12.1.0 release have now been removed.
 
     After upgrading, if any of these hardware types or interfaces are specified
     in ironic's configuration options, the ironic-conductor service will fail
diff --git a/releasenotes/notes/cleaning-maintenance-7ae83b1e4ff992b0.yaml b/releasenotes/notes/cleaning-maintenance-7ae83b1e4ff992b0.yaml
index b5b1f7125..d4e21028e 100644
--- a/releasenotes/notes/cleaning-maintenance-7ae83b1e4ff992b0.yaml
+++ b/releasenotes/notes/cleaning-maintenance-7ae83b1e4ff992b0.yaml
@@ -1,10 +1,10 @@
 ---
 fixes:
   - |
-    Currently ironic allows entering deployment or cleaning for nodes in
+    Currently Ironic allows entering deployment or cleaning for nodes in
     maintenance mode. However, heartbeats do not cause any actions for such
-    nodes, thus deployment or cleaning never finish if the nodes are not moved
-    out of maintenance. A new configuration option
+    nodes, thus deployment or cleaning will never finish if the nodes are not
+    moved out of maintenance. A new configuration option
     ``[conductor]allow_provisioning_in_maintenance`` (defaulting to ``True``)
     is added to configure this behavior. If it is set to ``False``, deployment
     and cleaning will be prevented from nodes in maintenance mode.
diff --git a/releasenotes/notes/ilo-fix-uefi-iscsi-boot-702ced18e28c5c61.yaml b/releasenotes/notes/ilo-fix-uefi-iscsi-boot-702ced18e28c5c61.yaml
index 2a2e8f821..b9421b20b 100644
--- a/releasenotes/notes/ilo-fix-uefi-iscsi-boot-702ced18e28c5c61.yaml
+++ b/releasenotes/notes/ilo-fix-uefi-iscsi-boot-702ced18e28c5c61.yaml
@@ -1,6 +1,6 @@
 ---
 fixes:
-  - Fixes a bug in the iLO UEFI iSCSI Boot, where it fails if server has
-    multiple nic adapters, since Proliant Servers has a limitation of
-    creating only four iSCSI nic sources and existing implementation
+  - Fixes a bug in iLO UEFI iSCSI Boot, where it fails if a server has
+    multiple NIC adapters, since Proliant Servers have a limitation of
+    creating only four iSCSI NIC sources and the existing implementation
     would try to create for more and failed accordingly.
diff --git a/releasenotes/notes/no-coreos-f8717f9bb6a64627.yaml b/releasenotes/notes/no-coreos-f8717f9bb6a64627.yaml
index 49a0023ad..e9714b0db 100644
--- a/releasenotes/notes/no-coreos-f8717f9bb6a64627.yaml
+++ b/releasenotes/notes/no-coreos-f8717f9bb6a64627.yaml
@@ -1,7 +1,7 @@
 ---
 upgrade:
   - |
-    The explicit support for CoreOS ironic-python-agent images have been
+    Explicit support for CoreOS Ironic Python Agent images has been
     removed. If you use a ramdisk based on CoreOS, you may want to re-add
     ``coreos.configdrive=0`` to your PXE templates, see `story 1433812
     <https://storyboard.openstack.org/#!/story/1433812>`_ for the background.