Merge "[reno] update"

12 files changed, 28 insertions, 30 deletions

diff --git a/releasenotes/notes/add-cisco-ucs-hardware-types-ee597ff0416f158f.yaml b/releasenotes/notes/add-cisco-ucs-hardware-types-ee597ff0416f158f.yaml
index 56979345f..28ca717cc 100644
--- a/releasenotes/notes/add-cisco-ucs-hardware-types-ee597ff0416f158f.yaml
+++ b/releasenotes/notes/add-cisco-ucs-hardware-types-ee597ff0416f158f.yaml
@@ -14,10 +14,10 @@ features:
 
     * ``node.power_interface`` can be set to:
 
-      * ``cimc`` for CIMC API power control (power on/off, reboot etc)
-      * ``ucsm`` for UCSM API power control (power on/off, reboot etc)
+      * ``cimc`` for CIMC API power control (power on/off, reboot, etc.)
+      * ``ucsm`` for UCSM API power control (power on/off, reboot, etc.)
 
     * ``node.management_interface`` can be set to:
 
-      * ``cimc`` for CIMC API management control (setting the boot device etc)
-      * ``ucsm`` for UCSM API management control (setting the boot device etc)
+      * ``cimc`` for CIMC API management control (setting the boot device, etc.)
+      * ``ucsm`` for UCSM API management control (setting the boot device, etc.)
diff --git a/releasenotes/notes/added-redfish-driver-00ff5e3f7e9d6ee8.yaml b/releasenotes/notes/added-redfish-driver-00ff5e3f7e9d6ee8.yaml
index 403af9e11..b7245dee8 100644
--- a/releasenotes/notes/added-redfish-driver-00ff5e3f7e9d6ee8.yaml
+++ b/releasenotes/notes/added-redfish-driver-00ff5e3f7e9d6ee8.yaml
@@ -2,7 +2,8 @@
 features:
   - |
     Adds support for the `Redfish <https://www.dmtf.org/standards/redfish>`_
-    standard via a new ``redfish`` hardware type. It uses two new interfaces:
+    standard via a new ``redfish`` hardware type. (There is no equivalent
+    "classic" driver for this.) It uses two new interfaces:
 
     * ``redfish`` power interface supports all hard and soft power operations
     * ``redfish`` management interface supports:
diff --git a/releasenotes/notes/bug-1694645-57289200e35bd883.yaml b/releasenotes/notes/bug-1694645-57289200e35bd883.yaml
index c83c868e3..b93745726 100644
--- a/releasenotes/notes/bug-1694645-57289200e35bd883.yaml
+++ b/releasenotes/notes/bug-1694645-57289200e35bd883.yaml
@@ -6,7 +6,7 @@ fixes:
     location of the ``ldlinux.c32`` file.
 features:
   - |
-    New configuration option ``[DEFAULT]/ldlinux_32`` can used to set the
+    New configuration option ``[DEFAULT]/ldlinux_32`` can be used to set the
     location of the ``ldlinux.c32`` file (from the syslinux package).
     The default behavior is to look for it in the following locations:
 
diff --git a/releasenotes/notes/enable-osprofiler-support-e3839b0fa90d3831.yaml b/releasenotes/notes/enable-osprofiler-support-e3839b0fa90d3831.yaml
index 3bbf064ec..580a2842d 100644
--- a/releasenotes/notes/enable-osprofiler-support-e3839b0fa90d3831.yaml
+++ b/releasenotes/notes/enable-osprofiler-support-e3839b0fa90d3831.yaml
@@ -4,18 +4,14 @@ features:
     Adds `OSProfiler <https://docs.openstack.org/osprofiler/latest/>`_ support.
     This cross-project profiling library provides the ability to trace various
     OpenStack requests through all OpenStack services that support it.
-
-    To initiate OpenStack request tracing, ``--os-profile <HMAC_KEY>`` option
-    needs to be added to an OpenStackClient command. As part of the output,
-    there will be a message with a Trace ID.
-
-    To see the HTML graphs, the following command should be used::
-
-        $ osprofiler trace show <trace_id> --html --out result.html
+    For more information, see
+    https://docs.openstack.org/ironic/latest/contributor/osprofiler-support.html.
 
 security:
-  - OSProfiler support requires passing of trace information between
+  - |
+    `OSProfiler <https://docs.openstack.org/osprofiler/latest/>`_ support
+    requires passing of trace information between
     various OpenStack services. This information is securely signed
-    by one of HMAC keys, defined in the ``ironic.conf`` configuration file.
+    by one of the HMAC keys, defined in the ``ironic.conf`` configuration file.
     To allow cross-project tracing, the same key should be used for all
     OpenStack services.
diff --git a/releasenotes/notes/fix-bug-1675529-479357c217819420.yaml b/releasenotes/notes/fix-bug-1675529-479357c217819420.yaml
index d83c32903..632828cf6 100644
--- a/releasenotes/notes/fix-bug-1675529-479357c217819420.yaml
+++ b/releasenotes/notes/fix-bug-1675529-479357c217819420.yaml
@@ -15,7 +15,7 @@ fixes:
     node if a power change action fails. Additionally, stops retrying power
     actions and power status polls on receipt of a non-retryable error from
     ipmitool. For more information, see `bug 1675529
-    <https//bugs.launchpad.net/ironic/+bug/1675529>`_.
+    <https://bugs.launchpad.net/ironic/+bug/1675529>`_.
 
     A new configuration option ``[conductor]/power_state_change_timeout``
     can be used to specify how many seconds to wait for a baremetal node
diff --git a/releasenotes/notes/fix-dir-permissions-bc56e83a651bbdb0.yaml b/releasenotes/notes/fix-dir-permissions-bc56e83a651bbdb0.yaml
index e36b4bb21..bf450a69d 100644
--- a/releasenotes/notes/fix-dir-permissions-bc56e83a651bbdb0.yaml
+++ b/releasenotes/notes/fix-dir-permissions-bc56e83a651bbdb0.yaml
@@ -3,5 +3,6 @@ fixes:
   - Adds the capability for an operator to explicitly define the permission
     for created tftpboot folders. This provides the ability for ironic to be
     utilized with a restrictive umask, where the tftp server may not be able
-    to read the file. Introduced a new config option ``[pxe]/dir_permission``
+    to read the file. Introduces a new configuration option
+    ``[pxe]/dir_permission``
     to specify the permission for the tftpboot directories to be created with.
diff --git a/releasenotes/notes/fix-keystone-parameters-cdb93576d7e7885b.yaml b/releasenotes/notes/fix-keystone-parameters-cdb93576d7e7885b.yaml
index c6625db0d..1f93100b0 100644
--- a/releasenotes/notes/fix-keystone-parameters-cdb93576d7e7885b.yaml
+++ b/releasenotes/notes/fix-keystone-parameters-cdb93576d7e7885b.yaml
@@ -1,4 +1,4 @@
 ---
 fixes:
-  - Fixes multi-region issue when region specified in config file
-    was ignored when getting keystone service url.
+  - Fixes a multi-region issue where the region specified in the configuration
+    file was ignored when getting the Identity service's (keystone) URL.
diff --git a/releasenotes/notes/irmc-add-clean-step-reset-bios-config-a8bed625670b7fdf.yaml b/releasenotes/notes/irmc-add-clean-step-reset-bios-config-a8bed625670b7fdf.yaml
index decc26c26..b40e1f0c5 100644
--- a/releasenotes/notes/irmc-add-clean-step-reset-bios-config-a8bed625670b7fdf.yaml
+++ b/releasenotes/notes/irmc-add-clean-step-reset-bios-config-a8bed625670b7fdf.yaml
@@ -11,8 +11,8 @@ upgrade:
     The default value for this option is 0, which means the clean step
     is disabled.
 deprecations:
-  - The use of the ``pxe`` boot interface with the ``irmc`` hardware typed has
-    been deprecated. It is recommended for to switch to the new ``irmc-pxe``
+  - The use of the ``pxe`` boot interface with the ``irmc`` hardware type has
+    been deprecated. It is recommended to switch to the new ``irmc-pxe``
     boot interface as soon as possible.
 issues:
   - The ``restore_irmc_bios_config`` clean step does not work for nodes using
diff --git a/releasenotes/notes/non-persistent-boot-5e3a0cd78e9dc91b.yaml b/releasenotes/notes/non-persistent-boot-5e3a0cd78e9dc91b.yaml
index 5cf07abc0..8e14e50cc 100644
--- a/releasenotes/notes/non-persistent-boot-5e3a0cd78e9dc91b.yaml
+++ b/releasenotes/notes/non-persistent-boot-5e3a0cd78e9dc91b.yaml
@@ -3,5 +3,5 @@ fixes:
     Fixes a bug which caused boot device changes to be persistent in
     places where they did not need to be during cleaning and deployment
     phases, due to the default behavior of PXE interface forcing a persistent
-    change.
-    For more info, see https://bugs.launchpad.net/ironic/+bug/1701721
+    change. For more information, see
+    `bug 1701721 <https://bugs.launchpad.net/ironic/+bug/1701721>`_.
diff --git a/releasenotes/notes/oneview-hardware-type-69bbb79da434871f.yaml b/releasenotes/notes/oneview-hardware-type-69bbb79da434871f.yaml
index f2a924605..284f78b8e 100644
--- a/releasenotes/notes/oneview-hardware-type-69bbb79da434871f.yaml
+++ b/releasenotes/notes/oneview-hardware-type-69bbb79da434871f.yaml
@@ -1,14 +1,13 @@
 ---
 features:
   - |
-    Add a new hardware type ``oneview`` for HPE OneView supported
-    servers. ``oneview`` hardware type supplies support following
-    driver interfaces:
+    Adds a new hardware type ``oneview`` for HPE OneView supported
+    servers. This hardware type supports the following driver interfaces:
 
     * boot: ``pxe``
     * console: ``no-console``
     * deploy: ``oneview-direct`` and ``oneview-iscsi``
-      (Based on 'direct' and 'iscsi' respectively)
+      (based on "direct" and "iscsi" respectively)
     * inspect: ``oneview`` and ``no-inspect``
     * management: ``oneview``
     * network: ``flat``, ``neutron`` and ``no-op``
diff --git a/releasenotes/notes/port-physical-network-a7009dc514353796.yaml b/releasenotes/notes/port-physical-network-a7009dc514353796.yaml
index bfe204159..5d979736d 100644
--- a/releasenotes/notes/port-physical-network-a7009dc514353796.yaml
+++ b/releasenotes/notes/port-physical-network-a7009dc514353796.yaml
@@ -10,7 +10,7 @@ features:
     when attaching virtual interfaces (VIFs).
 
     The REST API endpoints related to ports provide support for the
-    ``physical_network`` field.  The `ironic developer documentation
+    ``physical_network`` field.  The `multi-tenancy documentation
     <https://docs.openstack.org/ironic/latest/admin/multitenancy.html>`_
     provides information on how to configure and use physical networks.
 upgrade:
diff --git a/releasenotes/notes/rolling-upgrades-ccad5159ca3cedbe.yaml b/releasenotes/notes/rolling-upgrades-ccad5159ca3cedbe.yaml
index b4b2cbecf..584eee937 100644
--- a/releasenotes/notes/rolling-upgrades-ccad5159ca3cedbe.yaml
+++ b/releasenotes/notes/rolling-upgrades-ccad5159ca3cedbe.yaml
@@ -1,4 +1,5 @@
 ---
 features:
   - Adds support for rolling upgrades, starting from upgrading Ocata to Pike.
-    For details, see http://docs.openstack.org/ironic/admin/upgrade-guide.html.
+    For details, see
+    http://docs.openstack.org/ironic/latest/admin/upgrade-guide.html.