From e60cbcdf15514183d51e5d5acb33c2c8223979fc Mon Sep 17 00:00:00 2001 From: melissaml Date: Mon, 23 Apr 2018 12:47:27 +0800 Subject: [PATCH] fix typos in documentation Change-Id: I8aad7184df1249cd0caaf8ec40b0f7872556670d --- doc/source/contributor/code-rules.rst | 8 ++++---- doc/source/reference/configuration/using-overrides.rst | 2 +- ...c_kernel_modules_with_group_vars-8d169f564ffd450c.yaml | 2 +- .../userspace_group_and_host_vars-14f77b5eb518e32d.yaml | 4 ++-- tests/test-vars-overrides.yml | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/doc/source/contributor/code-rules.rst b/doc/source/contributor/code-rules.rst index 3e822117ec..b8663991a0 100644 --- a/doc/source/contributor/code-rules.rst +++ b/doc/source/contributor/code-rules.rst @@ -332,27 +332,27 @@ include at least the following: are executed on for the Python requirements and the tox execution to work. This must be copied from the ``openstack-ansible-tests`` repository and will be automatically - be overriden by our proposal bot should any change happen. + be overridden by our proposal bot should any change happen. * ``setup.cfg`` and ``setup.py``: Information about the repository used when building artifacts. * ``run_tests.sh``: A script for developers to execute all standard tests on a suitable host. This must be copied from the ``openstack-ansible-tests`` repository and will be automatically - be overriden by our proposal bot should any change happen. + be overridden by our proposal bot should any change happen. * ``Vagrantfile``: A configuration file to allow a developer to easily create a test virtual machine using `Vagrant`_. This must automatically execute ``run_tests.sh``. This must be copied from the ``openstack-ansible-tests`` repository and will be automatically - be overriden by our proposal bot should any change happen. + be overridden by our proposal bot should any change happen. * ``README.rst``, ``LICENSE``, ``CONTRIBUTING.rst``: A set of standard files whose content is self-explanatory. * ``.gitignore``: A standard git configuration file for the repository which should be pretty uniform across all the repositories. This must be copied from the ``openstack-ansible-tests`` repository and will be automatically - be overriden by our proposal bot should any change happen. + be overridden by our proposal bot should any change happen. * ``.gitreview``: A standard file configured for the project to inform the ``git-review`` plugin where to find the upstream gerrit remote for the repository. diff --git a/doc/source/reference/configuration/using-overrides.rst b/doc/source/reference/configuration/using-overrides.rst index e7c0401961..0c31f80dfa 100644 --- a/doc/source/reference/configuration/using-overrides.rst +++ b/doc/source/reference/configuration/using-overrides.rst @@ -13,7 +13,7 @@ Every role has a file, ``defaults/main.yml`` which holds the usual variables overridable by a deployer, like a regular Ansible role. This defaults are the closest possible to OpenStack standards. -They can be overriden at multiple levels. +They can be overridden at multiple levels. Group vars and host vars ------------------------ diff --git a/releasenotes/notes/specific_kernel_modules_with_group_vars-8d169f564ffd450c.yaml b/releasenotes/notes/specific_kernel_modules_with_group_vars-8d169f564ffd450c.yaml index a9f3da87bc..eaf2f9adb7 100644 --- a/releasenotes/notes/specific_kernel_modules_with_group_vars-8d169f564ffd450c.yaml +++ b/releasenotes/notes/specific_kernel_modules_with_group_vars-8d169f564ffd450c.yaml @@ -1,7 +1,7 @@ --- upgrade: - | - If you have overriden your + If you have overridden your ``openstack_host_specific_kernel_modules``, please remove its group matching, and move that override directly to the appropriate group. diff --git a/releasenotes/notes/userspace_group_and_host_vars-14f77b5eb518e32d.yaml b/releasenotes/notes/userspace_group_and_host_vars-14f77b5eb518e32d.yaml index dc890ce9ca..d47854725f 100644 --- a/releasenotes/notes/userspace_group_and_host_vars-14f77b5eb518e32d.yaml +++ b/releasenotes/notes/userspace_group_and_host_vars-14f77b5eb518e32d.yaml @@ -4,7 +4,7 @@ features: ``GROUP_VARS_PATH`` with the folders of its choice (separated by the colon sign) to define an user space group_vars folder. These vars will apply but - be (currently) overriden by the OpenStack-Ansible + be (currently) overridden by the OpenStack-Ansible default group vars, by the set facts, and by the user_* variables. If the deployer defines multiple paths, the variables found are merged, and @@ -14,7 +14,7 @@ features: ``HOST_VARS_PATH`` with the folders of its choice (separated by the colon sign) to define an user space host_vars folder. These vars will apply but - be (currently) overriden by the OpenStack-Ansible + be (currently) overridden by the OpenStack-Ansible default host vars, by the set facts, and by the user_* variables. If the deployer defines multiple paths, the variables found are merged, and diff --git a/tests/test-vars-overrides.yml b/tests/test-vars-overrides.yml index f915d52133..1c6b925e7d 100644 --- a/tests/test-vars-overrides.yml +++ b/tests/test-vars-overrides.yml @@ -27,7 +27,7 @@ assert: that: - "babar == 'elephant'" - - name: Ensuring lxc_hosts_package_state is well overriden + - name: Ensuring lxc_hosts_package_state is well overridden assert: that: - "lxc_hosts_package_state == 'present'" @@ -42,7 +42,7 @@ assert: that: - "tintin == 'milou'" - - name: Ensuring security_package_state is overriden + - name: Ensuring security_package_state is overridden assert: that: - "security_package_state == 'present'"