From 6f1f44d422ed3f384ea6d4d729227277f0988b99 Mon Sep 17 00:00:00 2001
From: Dean Troyer <dtroyer@gmail.com>
Date: Fri, 17 May 2019 16:02:13 -0500
Subject: [PATCH] Batch up minor cleanups for release

Change-Id: Id45788e17c5388cee54e79cab1c120cfcc8f9f62
Signed-off-by: Dean Troyer <dtroyer@gmail.com>
---
 .../tests/functional/network/v2/test_floating_ip.py           | 2 +-
 .../tests/functional/network/v2/test_subnet_pool.py           | 4 ++--
 releasenotes/notes/bug-1633582-df2bee534c2da7fc.yaml          | 4 ++--
 releasenotes/notes/bug-27882-402ced7ffe930058.yaml            | 2 +-
 releasenotes/source/pre_20_releases.rst                       | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/openstackclient/tests/functional/network/v2/test_floating_ip.py b/openstackclient/tests/functional/network/v2/test_floating_ip.py
index 1d11fc5d2d..f189c2da6c 100644
--- a/openstackclient/tests/functional/network/v2/test_floating_ip.py
+++ b/openstackclient/tests/functional/network/v2/test_floating_ip.py
@@ -83,7 +83,7 @@ class FloatingIpTests(common.NetworkTests):
                         raise
                     pass
                 else:
-                    # break and no longer retry if create sucessfully
+                    # break and no longer retry if create successfully
                     break
 
     @classmethod
diff --git a/openstackclient/tests/functional/network/v2/test_subnet_pool.py b/openstackclient/tests/functional/network/v2/test_subnet_pool.py
index 46aa6f1433..6be505292c 100644
--- a/openstackclient/tests/functional/network/v2/test_subnet_pool.py
+++ b/openstackclient/tests/functional/network/v2/test_subnet_pool.py
@@ -266,7 +266,7 @@ class SubnetPoolTests(common.NetworkTagTests):
         #                pool.  The error appears to be in a lower layer,
         #                once that is fixed add a test for subnet pool unset
         #                --default-quota.
-        #                The unset command of --pool-prefixes also doesnt work
+        #                The unset command of --pool-prefixes also doesn't work
         #                right now. It would be fixed in a separate patch once
         #                the lower layer is fixed.
         # cmd_output = self.openstack(
@@ -319,7 +319,7 @@ class SubnetPoolTests(common.NetworkTagTests):
                     raise
                 pass
             else:
-                # Break and no longer retry if create is sucessful
+                # Break and no longer retry if create is successful
                 break
 
         return cmd_output, pool_prefix
diff --git a/releasenotes/notes/bug-1633582-df2bee534c2da7fc.yaml b/releasenotes/notes/bug-1633582-df2bee534c2da7fc.yaml
index 2cd3a07ced..5d195a393b 100644
--- a/releasenotes/notes/bug-1633582-df2bee534c2da7fc.yaml
+++ b/releasenotes/notes/bug-1633582-df2bee534c2da7fc.yaml
@@ -2,8 +2,8 @@
 deprecations:
   - |
     ``volume transfer request accept`` has been changed to move the ``auth-key``
-    positional argument to a requried option ``--auth-key``.  This leaves
-    the transfer request ID as the only positional arguemnt, as per the
+    positional argument to a required option ``--auth-key``.  This leaves
+    the transfer request ID as the only positional argument, as per the
     OpenStackClient command format.  The old format is still functional, but is
     deprecated and will be removed in the next major release.
 fixes:
diff --git a/releasenotes/notes/bug-27882-402ced7ffe930058.yaml b/releasenotes/notes/bug-27882-402ced7ffe930058.yaml
index 6bd090aa5c..bf300de429 100644
--- a/releasenotes/notes/bug-27882-402ced7ffe930058.yaml
+++ b/releasenotes/notes/bug-27882-402ced7ffe930058.yaml
@@ -2,4 +2,4 @@
 fixes:
   - |
     The ``--limit`` option of the ``image list`` command was previously ignored.
-    [Bug `https://storyboard.openstack.org/#!/story/2004314`]
+    [Bug `2004314 <https://storyboard.openstack.org/#!/story/2004314>`_]
diff --git a/releasenotes/source/pre_20_releases.rst b/releasenotes/source/pre_20_releases.rst
index 06e7c667c2..049be75b5f 100644
--- a/releasenotes/source/pre_20_releases.rst
+++ b/releasenotes/source/pre_20_releases.rst
@@ -347,7 +347,7 @@ Pre-2.0 Releases
   ``--proto ICMP`` is selected.
   Bug `1443963 <https://bugs.launchpad.net/bugs/1443963>`_
 
-* Correctly pass ``--location`` arguemnt in ``image create`` command.
+* Correctly pass ``--location`` argument in ``image create`` command.
   Bug `1445460 <https://bugs.launchpad.net/bugs/1445460>`_
 
 * Correctly handle use of ``role`` commands for project admins.  Using IDs will