diff --git a/contrib/ci/post_test_hook.sh b/contrib/ci/post_test_hook.sh
index ae61714d4b..9d0b3fb782 100755
--- a/contrib/ci/post_test_hook.sh
+++ b/contrib/ci/post_test_hook.sh
@@ -83,7 +83,7 @@ if [[ -z "$MULTITENANCY_ENABLED" ]]; then
     elif [[ $WITH_SHARE_SERVER_HANDLING_MODES -ge 1 ]]; then
         iniset $BASE/new/tempest/etc/tempest.conf share multitenancy_enabled True
     else
-        echo 'Should never get here. If get, then error occured.'
+        echo 'Should never get here unless an error occurred.'
         exit 1
     fi
 else
diff --git a/doc/source/devref/huawei_nas_driver.rst b/doc/source/devref/huawei_nas_driver.rst
index 2a116c9a62..2a4d6317c0 100644
--- a/doc/source/devref/huawei_nas_driver.rst
+++ b/doc/source/devref/huawei_nas_driver.rst
@@ -93,7 +93,7 @@ storage systems, the driver configuration file is as follows:
 - `Thin_StoragePool` is a name of a Thin storage pool to be used.
 - `Thick_StoragePool` is a name of a Thick storage pool to be used.
 - `WaitInterval` is the interval time of querying the file system status.
-- `Timeout` is the timeout period for wating command execution of a device to
+- `Timeout` is the timeout period for waiting command execution of a device to
   complete.
 
 Backend Configuration
diff --git a/doc/source/devref/rpc.rst b/doc/source/devref/rpc.rst
index 60dfb6aa6a..f95cb70e7d 100644
--- a/doc/source/devref/rpc.rst
+++ b/doc/source/devref/rpc.rst
@@ -139,8 +139,8 @@ More precisely Consumers need the following parameters:
     * Auto_delete: if set, the exchange is deleted when all queues have finished using it. Default is False.
     * Exclusive: exclusive queues (such as non-shared) may only be consumed from by the current connection. When exclusive is on, this also implies auto_delete. Default is False.
     * Exchange_type: AMQP defines several default exchange types (routing algorithms) that covers most of the common messaging use cases.
-    * Auto_ack: acknowledgement is handled automatically once messages are received. By default auto_ack is set to False, and the receiver is required to manually handle acknowledgment.
-    * No_ack: it disable acknowledgement on the server-side. This is different from auto_ack in that acknowledgement is turned off altogether. This functionality increases performance but at the cost of reliability. Messages can get lost if a client dies before it can deliver them to the application.
+    * Auto_ack: acknowledgment is handled automatically once messages are received. By default auto_ack is set to False, and the receiver is required to manually handle acknowledgment.
+    * No_ack: it disable acknowledgment on the server-side. This is different from auto_ack in that acknowledgment is turned off altogether. This functionality increases performance but at the cost of reliability. Messages can get lost if a client dies before it can deliver them to the application.
     * Auto_declare: if this is True and the exchange name is set, the exchange will be automatically declared at instantiation. Auto declare is on by default.
       Publishers specify most the parameters of Consumers (such as they do not specify a queue name), but they can also specify the following:
     * Delivery_mode: the default delivery mode used for messages. The value is an integer. The following delivery modes are supported by RabbitMQ: