Merge "fix typos in documentation"

This commit is contained in:
Zuul 2018-08-18 01:59:56 +00:00 committed by Gerrit Code Review
commit 258abf61d3
3 changed files with 3 additions and 3 deletions

View File

@ -33,7 +33,7 @@ class ModifySettingsTests(AdjutantAPITestCase):
Tests designed to test the modify_dict_settings decorator.
This is a bit weird to test because it's hard to directly test
a lot of this stuff (especially in cases where dicts are updated rather
than overriden).
than overridden).
"""
# NOTE(amelia): Assumes the default settings for ResetUserPasswordAction

View File

@ -112,7 +112,7 @@ DEFAULT_TASK_SETTINGS:
# html_template: completed.txt
# Default Action settings:
# These can be overriden at a per task level below in the
# These can be overridden at a per task level below in the
# task settings so that multiple tasks can use the same actions
# slightly differently.
#

View File

@ -8,7 +8,7 @@ of Adjutant is to provide a variety of common tasks and actions that can
be easily extended or changed based upon the needs of your OpenStack.
The default Adjutant configuration is found in conf/conf.yaml, and but will
be overriden if a file is placed at ``/etc/adjutant/conf.yaml``.
be overridden if a file is placed at ``/etc/adjutant/conf.yaml``.
The first part of the configuration file contains standard Django settings.