summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbin/nova-dhcpbridge2
-rwxr-xr-xbin/nova-manage2
-rw-r--r--nova/api/ec2/cloud.py2
3 files changed, 3 insertions, 3 deletions
diff --git a/bin/nova-dhcpbridge b/bin/nova-dhcpbridge
index 6187e052d..ee7bf2da9 100755
--- a/bin/nova-dhcpbridge
+++ b/bin/nova-dhcpbridge
@@ -111,7 +111,7 @@ CONF.register_cli_opt(
def main():
- """Parse environment and arguments and call the approproate action."""
+ """Parse environment and arguments and call the appropriate action."""
try:
config_file = os.environ['CONFIG_FILE']
except KeyError:
diff --git a/bin/nova-manage b/bin/nova-manage
index 67212a198..c783c304b 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -205,7 +205,7 @@ class ShellCommands(object):
@args('--path', dest='path', metavar='<path>', help='Script path')
def script(self, path):
- """Runs the script from the specifed path with flags set properly.
+ """Runs the script from the specified path with flags set properly.
arguments: path"""
exec(compile(open(path).read(), path, 'exec'), locals(), globals())
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py
index 73a4a02ae..353d08714 100644
--- a/nova/api/ec2/cloud.py
+++ b/nova/api/ec2/cloud.py
@@ -148,7 +148,7 @@ def _properties_get_mappings(properties):
def _format_block_device_mapping(bdm):
- """Contruct BlockDeviceMappingItemType
+ """Construct BlockDeviceMappingItemType
{'device_name': '...', 'snapshot_id': , ...}
=> BlockDeviceMappingItemType
"""