Merge "Release note cleanup for 3.12.0"

11 files changed, 31 insertions, 33 deletions

diff --git a/doc/source/cli/backwards-incompatible.rst b/doc/source/cli/backwards-incompatible.rst
index 571d791f..fcb68684 100644
--- a/doc/source/cli/backwards-incompatible.rst
+++ b/doc/source/cli/backwards-incompatible.rst
@@ -27,8 +27,8 @@ Backwards Incompatible Changes
 ..   * Remove in: <5.0>
 ..   * Commit: <tbd>
 
-Release 3.12.0
---------------
+Release 3.12
+------------
 
 1. Replace ``Display Name`` by ``Name`` in volume list.
 
diff --git a/releasenotes/notes/add-direction-to-network-qos-bw-limit-rule-a3c5b6892074d5ae.yaml b/releasenotes/notes/add-direction-to-network-qos-bw-limit-rule-a3c5b6892074d5ae.yaml
deleted file mode 100644
index 43a8e56d..00000000
--- a/releasenotes/notes/add-direction-to-network-qos-bw-limit-rule-a3c5b6892074d5ae.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-features:
-  - |
-    Added directionality to Network QoS rule type ``bandwidth-limit`` in
-    ``network qos rule create`` and ``network qos rule set`` commands.
-    This makes the options ``--egress`` and ``--ingress`` valid for the ``bandwidth-limit``
-    rule type.
-    [Bug `1614121 <https://bugs.launchpad.net/python-openstackclient/+bug/1614121>`_]
diff --git a/releasenotes/notes/bp-network-l3-adv-commands-cc1df715a184f1b2.yaml b/releasenotes/notes/bp-network-l3-adv-commands-cc1df715a184f1b2.yaml
index f978f4d6..c05a06c0 100644
--- a/releasenotes/notes/bp-network-l3-adv-commands-cc1df715a184f1b2.yaml
+++ b/releasenotes/notes/bp-network-l3-adv-commands-cc1df715a184f1b2.yaml
@@ -1,8 +1,10 @@
 ---
 features:
   - |
-    Add network l3-agent related commands ``network agent add router``,
-    ``network agent remove router`` for adding/removing routers to l3 agents.
-    Add ``network agent list --router``, and ``router list --agent`` for
-    listing agents on routers and routers on specific agents.
+    Add  ``network agent add router`` and ``network agent remove router``
+    commands for adding/removing routers to network l3 agents.
+    [Blueprint :oscbp:`network-l3-commands`]
+  - |
+    Add ``--router`` option to ``network agent list`` to filter by router,
+    and ``--agent`` option to ``router list`` command to filter by agent.
     [Blueprint :oscbp:`network-l3-commands`]
diff --git a/releasenotes/notes/bug-1584596-5b3109487b451bec.yaml b/releasenotes/notes/bug-1584596-5b3109487b451bec.yaml
index 9d45713d..b5b58bd2 100644
--- a/releasenotes/notes/bug-1584596-5b3109487b451bec.yaml
+++ b/releasenotes/notes/bug-1584596-5b3109487b451bec.yaml
@@ -1,5 +1,5 @@
 ---
-fixes:
+features:
   - |
     Add command ``openstack project purge`` to clean a project's resources.
     [Bug `1584596 <https://bugs.launchpad.net/bugs/1584596>`_]
diff --git a/releasenotes/notes/bug-1614121-a3c5b6892074d5ae.yaml b/releasenotes/notes/bug-1614121-a3c5b6892074d5ae.yaml
new file mode 100644
index 00000000..b81520f4
--- /dev/null
+++ b/releasenotes/notes/bug-1614121-a3c5b6892074d5ae.yaml
@@ -0,0 +1,7 @@
+---
+features:
+  - |
+    Added ``--egress`` and ``--ingress`` options to
+    ``network qos rule create`` and ``network qos rule set`` commands.
+    This adds directionality to Network QoS ``bandwidth-limit`` rule type.
+    [Bug `1614121 <https://bugs.launchpad.net/python-openstackclient/+bug/1614121>`_]
diff --git a/releasenotes/notes/bug-1658189-d2b390ad74c96c79.yaml b/releasenotes/notes/bug-1658189-d2b390ad74c96c79.yaml
index 211c4c31..91df4bb8 100644
--- a/releasenotes/notes/bug-1658189-d2b390ad74c96c79.yaml
+++ b/releasenotes/notes/bug-1658189-d2b390ad74c96c79.yaml
@@ -1,6 +1,6 @@
 ---
 fixes:
   - |
-    Make ``role assignment list`` callable without administrator permissions
-    if restricted to own project with ``--project`` parameter.
+    Make the ``role assignment list`` command callable without administrator
+    permissions if restricted to the user's own project with the ``--project`` option.
     [Bug `1658189 <https://bugs.launchpad.net/python-openstackclient/+bug/1658189>`_]
diff --git a/releasenotes/notes/bug-1667266-6497727abc2af9a5.yaml b/releasenotes/notes/bug-1667266-6497727abc2af9a5.yaml
index bedfa67f..ee21a6c1 100644
--- a/releasenotes/notes/bug-1667266-6497727abc2af9a5.yaml
+++ b/releasenotes/notes/bug-1667266-6497727abc2af9a5.yaml
@@ -1,9 +1,8 @@
 ---
 fixes:
   - |
-    Make ``block-device-mapping`` option of ``server create`` command more
-    stable and clear. Fix ValueError when input block device mapping option in
-    wrong format. Support to create block device from snapshot. Add details in
-    help message about block-device-mapping option format and regular value of
-    each item.
+    Clarify the ``--block-device-mapping`` option of the ``server create``
+    command: fix ValueError when the ``--block-device-mapping`` option's
+    argument is in the wrong format; support creating a block device from
+    a snapshot; add details to the help output about the option format.
     [Bug `1667266 <https://bugs.launchpad.net/python-openstackclient/+bug/1667266>`_]
diff --git a/releasenotes/notes/bug-1687814-743ad8418923d5e3.yaml b/releasenotes/notes/bug-1687814-743ad8418923d5e3.yaml
index bdd6e3f0..81c801e6 100644
--- a/releasenotes/notes/bug-1687814-743ad8418923d5e3.yaml
+++ b/releasenotes/notes/bug-1687814-743ad8418923d5e3.yaml
@@ -1,7 +1,7 @@
 ---
 fixes:
   - |
-    Allow security groups in ``server create`` command to be specified by name or ID with
-    the ``--security-group`` option.  This also checks that the security group exist before
-    creating the server.
+    Allow the ``--security-group`` option from the ``server create`` command
+    to be specified by name or ID.  This also checks that the security group exist
+    before creating the server.
     [Bug `1687814 <https://bugs.launchpad.net/python-openstackclient/+bug/1687814>`_]
diff --git a/releasenotes/notes/bug-1696111-e2cf9233fa872eb7.yaml b/releasenotes/notes/bug-1696111-e2cf9233fa872eb7.yaml
index 50154a88..39e24c33 100644
--- a/releasenotes/notes/bug-1696111-e2cf9233fa872eb7.yaml
+++ b/releasenotes/notes/bug-1696111-e2cf9233fa872eb7.yaml
@@ -3,5 +3,4 @@ fixes:
   - |
     Fixed an issue where a trust could not be created if multiple roles had
     the same name. A role's ID is now sent to the identity service instead.
-
-    [Bug '1696111 <https://bugs.launchpad.net/keystone/+bug/1696111>'_]
+    [Bug `1696111 <https://bugs.launchpad.net/keystone/+bug/1696111>`_]
diff --git a/releasenotes/notes/bug-1704097-8ff1ce1444b81b04.yaml b/releasenotes/notes/bug-1704097-8ff1ce1444b81b04.yaml
index c20d0c99..ce82d8bd 100644
--- a/releasenotes/notes/bug-1704097-8ff1ce1444b81b04.yaml
+++ b/releasenotes/notes/bug-1704097-8ff1ce1444b81b04.yaml
@@ -1,9 +1,8 @@
 ---
 fixes:
   - |
-    Fix an issue when run commands `project show`, `user show` and `user set`
-    with `--domain` specific, the domain filter won't work if the login user's
-    project name or user name is same with the resource name user hoping to
-    get.
-
+    Fix an issue with the ``--domain`` option when used with the ``project show``,
+    ``user show`` and ``user set`` commands.  The domain filter did not work when
+    the login user's project name or user name is the same as the requested resource
+    name in the specified domain.
     [Bug `1704097 <https://bugs.launchpad.net/python-openstackclient/+bug/1704097>`_]
diff --git a/releasenotes/notes/object-stdout-db76cc500948b0e8.yaml b/releasenotes/notes/object-stdout-db76cc500948b0e8.yaml
index 29b21131..8072bc38 100644
--- a/releasenotes/notes/object-stdout-db76cc500948b0e8.yaml
+++ b/releasenotes/notes/object-stdout-db76cc500948b0e8.yaml
@@ -2,4 +2,4 @@
 features:
   - |
     Add support for streaming Swift objects to stdout when using the ``object
-    save`` command, by specifying ``--filename -``.
+    save`` command by specifying ``-`` as a file name: ``--filename -``.