diff options
author | Diego Garcia del Rio <diego@nuagenetworks.net> | 2015-02-24 19:17:41 -0800 |
---|---|---|
committer | Diego Garcia del Rio <diego@nuagenetworks.net> | 2015-02-24 20:00:03 -0800 |
commit | df8ffbd3571d1a8f5efc7129474517ea24efb0f6 (patch) | |
tree | fd959b9448538faae197bd5f8d17b164a74f025d /openstack_dashboard/management | |
parent | d7268a5c7e62033378a2d9ca390dd42bf0c3f45d (diff) | |
download | horizon-df8ffbd3571d1a8f5efc7129474517ea24efb0f6.tar.gz |
spelling mistakes on display outputs and docsstrings
Change-Id: Ic594db332c89e44293f4018e31d3fb47f69e7029
Diffstat (limited to 'openstack_dashboard/management')
-rw-r--r-- | openstack_dashboard/management/commands/migrate_settings.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/openstack_dashboard/management/commands/migrate_settings.py b/openstack_dashboard/management/commands/migrate_settings.py index 2a2190e68..ce4f7b9f1 100644 --- a/openstack_dashboard/management/commands/migrate_settings.py +++ b/openstack_dashboard/management/commands/migrate_settings.py @@ -195,7 +195,7 @@ class Command(BaseCommand): except subprocess.CalledProcessError: if os.path.exists(local_settings_reject): sys.exit( - 'Some conflict(s) occured. Please check "%s" ' + 'Some conflict(s) occurred. Please check "%s" ' 'to find unapplied parts of the diff.\n' 'Once conflicts are solved, it is safer to ' 'regenerate a newer diff with the "--gendiff" ' @@ -205,7 +205,7 @@ class Command(BaseCommand): local_settings_reject) ) else: - sys.exit('An unhandled error occured.') + sys.exit('An unhandled error occurred.') print('Generation of "%s" successful.' % os.path.join( dircontext.curdir, self.local_settings_file) |