diff --git a/designate/backend/agent_backend/impl_denominator.py b/designate/backend/agent_backend/impl_denominator.py index dc4889909..835a2b2dc 100644 --- a/designate/backend/agent_backend/impl_denominator.py +++ b/designate/backend/agent_backend/impl_denominator.py @@ -69,7 +69,7 @@ class Denominator(object): def _base(self): call = ['denominator', '-q', '-n', self.config.name] - # NOTE: When path to denominator configuration file is ommited, + # NOTE: When path to denominator configuration file is ommitted, # ~/.denominatorconfig file will be used by default. if self.config.config_file: call.extend(['-C', self.config.config_file]) diff --git a/designate/backend/impl_infoblox/ibexceptions.py b/designate/backend/impl_infoblox/ibexceptions.py index dd17f859f..e2c086904 100644 --- a/designate/backend/impl_infoblox/ibexceptions.py +++ b/designate/backend/impl_infoblox/ibexceptions.py @@ -90,7 +90,7 @@ class InfobloxCannotUpdateObject(InfobloxException): class InfobloxFuncException(InfobloxException): - message = _("Error occured during function's '%(func_name)s' call: " + message = _("Error occurred during function's '%(func_name)s' call: " "ref %(ref)s: %(content)s [code %(code)s]") diff --git a/designate/central/service.py b/designate/central/service.py index 108758e30..d79d7f1bc 100644 --- a/designate/central/service.py +++ b/designate/central/service.py @@ -2663,7 +2663,7 @@ class Service(service.RPCService, service.Service): zone_import.message = 'An SOA record is required.' zone_import.status = 'ERROR' except Exception: - zone_import.message = 'An undefined error occured.' + zone_import.message = 'An undefined error occurred.' zone_import.status = 'ERROR' return zone, zone_import @@ -2687,7 +2687,7 @@ class Service(service.RPCService, service.Service): zone_import.status = 'ERROR' zone_import.message = e.message except Exception: - zone_import.message = 'An undefined error occured.' + zone_import.message = 'An undefined error occurred.' zone_import.status = 'ERROR' self.update_zone_import(context, zone_import) diff --git a/designate/schema/format.py b/designate/schema/format.py index ea6a04578..128394647 100644 --- a/designate/schema/format.py +++ b/designate/schema/format.py @@ -220,7 +220,7 @@ def is_uuid(instance): @draft3_format_checker.checks("floating-ip-id") @draft4_format_checker.checks("floating-ip-id") def is_floating_ip_id(instance): - # TODO(kiall): Apparantly, this is used in exactly zero places outside the + # TODO(kiall): Apparently, this is used in exactly zero places outside the # tests. Determine if we should remove this code... if not isinstance(instance, compat.str_types): return True diff --git a/designate/tests/test_api/test_v1/test_records.py b/designate/tests/test_api/test_v1/test_records.py index b5e911a96..4ac41b01a 100644 --- a/designate/tests/test_api/test_v1/test_records.py +++ b/designate/tests/test_api/test_v1/test_records.py @@ -169,7 +169,8 @@ class ApiV1RecordsTest(ApiV1Test): status_code=400) def test_create_wildcard_record_after_named(self): - # We want to test that a wildcard record rs doesnt use the previous one + # We want to test that a wildcard record rs does not use the + # previous one # https://bugs.launchpad.net/designate/+bug/1391426 name = "foo.%s" % self.zone.name diff --git a/designate/tests/test_pool_manager/test_service.py b/designate/tests/test_pool_manager/test_service.py index c5e0c1ed6..1be44c2fc 100644 --- a/designate/tests/test_pool_manager/test_service.py +++ b/designate/tests/test_pool_manager/test_service.py @@ -188,7 +188,7 @@ class PoolManagerServiceNoopTest(PoolManagerTestCase): self.assertFalse(mock_notify_zone_changed.called) self.assertFalse(mock_poll_for_serial_number.called) - # Since consensus is not reached this early, we immediatly call + # Since consensus is not reached this early, we immediately call # central's update_status. self.assertTrue(mock_update_status.called) @@ -212,7 +212,7 @@ class PoolManagerServiceNoopTest(PoolManagerTestCase): self.admin_context, zone, 'CREATE') self.assertEqual(0, len(create_statuses)) - # Since consensus is not reached this early, we immediatly call + # Since consensus is not reached this early, we immediately call # central's update_status. self.assertTrue(mock_update_status.called) diff --git a/doc/source/devstack.rst b/doc/source/devstack.rst index 0ff66db62..d137c5eb9 100644 --- a/doc/source/devstack.rst +++ b/doc/source/devstack.rst @@ -26,7 +26,7 @@ Instructions .. note:: - If you want to use local sources for development then you should concider + If you want to use local sources for development then you should consider using the contrib/vagrant folder in the `repository `_. diff --git a/doc/source/install/ubuntu-liberty.rst b/doc/source/install/ubuntu-liberty.rst index 3eada621a..676ecf372 100644 --- a/doc/source/install/ubuntu-liberty.rst +++ b/doc/source/install/ubuntu-liberty.rst @@ -8,8 +8,8 @@ Guide `_. This section assumes the Identity service runs on the host ``controller``. -Install and configure Basic Enviroment -====================================== +Install and configure Basic Environment +======================================= Enable OpenStack repository ---------------------------