diff --git a/cinderclient/base.py b/cinderclient/base.py
index 30dbbd908..280286cfe 100644
--- a/cinderclient/base.py
+++ b/cinderclient/base.py
@@ -110,7 +110,7 @@ class Manager(utils.HookableMixin):
         try:
             os.makedirs(cache_dir, 0o755)
         except OSError:
-            # NOTE(kiall): This is typicaly either permission denied while
+            # NOTE(kiall): This is typically either permission denied while
             #              attempting to create the directory, or the directory
             #              already exists. Either way, don't fail.
             pass
@@ -124,7 +124,7 @@ class Manager(utils.HookableMixin):
         try:
             setattr(self, cache_attr, open(path, mode))
         except IOError:
-            # NOTE(kiall): This is typicaly a permission denied while
+            # NOTE(kiall): This is typically a permission denied while
             #              attempting to write the cache file.
             pass
 
diff --git a/cinderclient/shell.py b/cinderclient/shell.py
index 8592cb803..385b05d3d 100644
--- a/cinderclient/shell.py
+++ b/cinderclient/shell.py
@@ -298,7 +298,7 @@ class OpenStackCinderShell(object):
 
     def _find_actions(self, subparsers, actions_module):
         for attr in (a for a in dir(actions_module) if a.startswith('do_')):
-            # I prefer to be hypen-separated instead of underscores.
+            # I prefer to be hyphen-separated instead of underscores.
             command = attr[3:].replace('_', '-')
             callback = getattr(actions_module, attr)
             desc = callback.__doc__ or ''
diff --git a/cinderclient/utils.py b/cinderclient/utils.py
index 7a728d72c..a9418739a 100644
--- a/cinderclient/utils.py
+++ b/cinderclient/utils.py
@@ -56,7 +56,7 @@ def add_arg(f, *args, **kwargs):
     # NOTE(sirp): avoid dups that can occur when the module is shared across
     # tests.
     if (args, kwargs) not in f.arguments:
-        # Because of the sematics of decorator composition if we just append
+        # Because of the semantics of decorator composition if we just append
         # to the options list positional options will appear to be backwards.
         f.arguments.insert(0, (args, kwargs))
 
diff --git a/doc/source/index.rst b/doc/source/index.rst
index 74b08e762..52317a4a9 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -32,6 +32,7 @@ Release Notes
 MASTER
 ------
 .. _1254951: http://bugs.launchpad.net/python-cinderclient/+bug/1254951
+.. _1254587: http://bugs.launchpad.net/python-cinderclient/+bug/1254587
 
 1.0.7
 -----