@@ -174,7 +174,7 @@ These scripts are executed serially by ``exercise.sh`` in testing situations.

   the script on non-zero exit codes::

     # This script exits on an error so that errors don't compound and you see

-    # only the first error that occured.

+    # only the first error that occurred.

     set -o errexit

     # Print the commands being run so that we can see the command that triggers

@@ -21,10 +21,10 @@ export RUNNING_TIMEOUT=${RUNNING_TIMEOUT:-$(($BOOT_TIMEOUT + $ACTIVE_TIMEOUT))}

 # Max time to wait for a vm to terminate

 export TERMINATE_TIMEOUT=${TERMINATE_TIMEOUT:-30}

-# Max time to wait for a euca-volume command to propogate

+# Max time to wait for a euca-volume command to propagate

 export VOLUME_TIMEOUT=${VOLUME_TIMEOUT:-30}

-# Max time to wait for a euca-delete command to propogate

+# Max time to wait for a euca-delete command to propagate

 export VOLUME_DELETE_TIMEOUT=${SNAPSHOT_DELETE_TIMEOUT:-60}

 # The size of the volume we want to boot from; some storage back-ends

@@ -11,7 +11,7 @@ echo "Begin DevStack Exercise: $0"

 echo "*********************************************************************"

 # This script exits on an error so that errors don't compound and you see

-# only the first error that occured.

+# only the first error that occurred.

 set -o errexit

 # Print the commands being run so that we can see the command that triggers

@@ -10,7 +10,7 @@ echo "Begin DevStack Exercise: $0"

 echo "*********************************************************************"

 # This script exits on an error so that errors don't compound and you see

-# only the first error that occured.

+# only the first error that occurred.

 set -o errexit

 # Print the commands being run so that we can see the command that triggers

@@ -2,14 +2,14 @@

 # **client-args.sh**

-# Test OpenStack client authentication aguemnts handling

+# Test OpenStack client authentication arguments handling

 echo "*********************************************************************"

 echo "Begin DevStack Exercise: $0"

 echo "*********************************************************************"

 # This script exits on an error so that errors don't compound and you see

-# only the first error that occured.

+# only the first error that occurred.

 set -o errexit

 # Print the commands being run so that we can see the command that triggers

@@ -2,14 +2,14 @@

 # **client-env.sh**

-# Test OpenStack client enviroment variable handling

+# Test OpenStack client environment variable handling

 echo "*********************************************************************"

 echo "Begin DevStack Exercise: $0"

 echo "*********************************************************************"

 # This script exits on an error so that errors don't compound and you see

-# only the first error that occured.

+# only the first error that occurred.

 set -o errexit

 # Print the commands being run so that we can see the command that triggers

@@ -10,7 +10,7 @@ echo "Begin DevStack Exercise: $0"

 echo "*********************************************************************"

 # This script exits on an error so that errors don't compound and you see

-# only the first error that occured.

+# only the first error that occurred.

 set -o errexit

 # Print the commands being run so that we can see the command that triggers

@@ -90,7 +90,7 @@ if [[ "$ENABLED_SERVICES" =~ "c-vol" ]]; then

    # Test volume has become available

    if ! timeout $RUNNING_TIMEOUT sh -c "while ! euca-describe-volumes $VOLUME | grep -q available; do sleep 1; done"; then

-       die $LINENO "volume didnt become available within $RUNNING_TIMEOUT seconds"

+       die $LINENO "volume didn't become available within $RUNNING_TIMEOUT seconds"

    fi

    # Attach volume to an instance

@@ -9,7 +9,7 @@ echo "Begin DevStack Exercise: $0"

 echo "*********************************************************************"

 # This script exits on an error so that errors don't compound and you see

-# only the first error that occured.

+# only the first error that occurred.

 set -o errexit

 # Print the commands being run so that we can see the command that triggers

@@ -9,7 +9,7 @@ echo "Begin DevStack Exercise: $0"

 echo "*********************************************************************"

 # This script exits on an error so that errors don't compound and you see

-# only the first error that occured.

+# only the first error that occurred.

 set -o errexit

 # Print the commands being run so that we can see the command that triggers

@@ -10,7 +10,7 @@ echo "Begin DevStack Exercise: $0"

 echo "*********************************************************************"

 # This script exits on an error so that errors don't compound and you see

-# only the first error that occured.

+# only the first error that occurred.

 set -o errtrace

@@ -9,7 +9,7 @@ echo "Begin DevStack Exercise: $0"

 echo "*********************************************************************"

 # This script exits on an error so that errors don't compound and you see

-# only the first error that occured.

+# only the first error that occurred.

 set -o errexit

 # Print the commands being run so that we can see the command that triggers

@@ -9,7 +9,7 @@ echo "Begin DevStack Exercise: $0"

 echo "*********************************************************************"

 # This script exits on an error so that errors don't compound and you see

-# only the first error that occured.

+# only the first error that occurred.

 set -o errexit

 # Print the commands being run so that we can see the command that triggers

@@ -3,7 +3,7 @@

 # Dependencies:

 # ``functions`` file

-# ``lib/nova`` service is runing

+# ``lib/nova`` service is running

 # <list other global vars that are assumed to be defined>

 # - ``DEST``, ``FILES``

 # - ``ADMIN_PASSWORD``

@@ -78,7 +78,7 @@ function configure_tempest() {

     # sudo python setup.py deploy

     # This function exits on an error so that errors don't compound and you see

-    # only the first error that occured.

+    # only the first error that occurred.

     errexit=$(set +o | grep errexit)

     set -o errexit

@@ -37,7 +37,7 @@ source $RC_DIR/lib/tls

 # The introduction of Keystone to the OpenStack ecosystem has standardized the

 # term **tenant** as the entity that owns resources.  In some places references

 # still exist to the original Nova term **project** for this use.  Also,

-# **tenant_name** is prefered to **tenant_id**.

+# **tenant_name** is preferred to **tenant_id**.

 export OS_TENANT_NAME=${OS_TENANT_NAME:-demo}

 # In addition to the owning entity (tenant), nova stores the entity performing

@@ -1,7 +1,7 @@

 #!/usr/bin/env bash

 # Sample ``local.sh`` for user-configurable tasks to run automatically

-# at the sucessful conclusion of ``stack.sh``.

+# at the successful conclusion of ``stack.sh``.

 # NOTE: Copy this file to the root ``devstack`` directory for it to

 # work properly.

@@ -37,7 +37,7 @@ fi

 builtin_name="Debian Squeeze 6.0 (32-bit)"

 builtin_uuid=$(xe template-list name-label="$builtin_name" --minimal)

 if [[ -z $builtin_uuid ]]; then

-    echo "Cant find the Debian Squeeze 32bit template on your XenServer."

+    echo "Can't find the Debian Squeeze 32bit template on your XenServer."

     exit 1

 fi