diff --git a/doc/source/contributing.rst b/doc/source/contributing.rst index 8c9e6584ec..b2a219b596 100644 --- a/doc/source/contributing.rst +++ b/doc/source/contributing.rst @@ -5,7 +5,7 @@ Contributing DevStack uses the standard OpenStack contribution process as outlined in `the OpenStack wiki 'How To Contribute' `__. This -means that you will need to meet the requirements of the Contribututors +means that you will need to meet the requirements of the Contributors License Agreement (CLA). If you have already done that for another OpenStack project you are good to go. diff --git a/doc/source/exerciserc.rst b/doc/source/exerciserc.rst index f3780c34c5..dacae2ecf2 100644 --- a/doc/source/exerciserc.rst +++ b/doc/source/exerciserc.rst @@ -3,7 +3,7 @@ exerciserc - Exercise Settings ============================== ``exerciserc`` is used to configure settings for the exercise scripts. -The values shown below are the default values. Thse can all be +The values shown below are the default values. These can all be overridden by setting them in the ``localrc`` section. ACTIVE\_TIMEOUT diff --git a/doc/source/faq.rst b/doc/source/faq.rst index f39471cb4e..92d794572e 100644 --- a/doc/source/faq.rst +++ b/doc/source/faq.rst @@ -123,7 +123,7 @@ Q: Why not use [STRIKEOUT:``tools/pip-requires``]\ ``requirements.txt`` to grab [STRIKEOUT:The majority of deployments will use packages to install OpenStack that will have distro-based packages as dependencies. DevStack installs as many of these Python packages as possible to - mimic the expected production environemnt.] Certain Linux + mimic the expected production environment.] Certain Linux distributions have a 'lack of workaround' in their Python configurations that installs vendor packaged Python modules and pip-installed modules to the SAME DIRECTORY TREE. This is causing diff --git a/doc/source/local.conf.rst b/doc/source/local.conf.rst index b2f7557e6d..a1ca60a75d 100644 --- a/doc/source/local.conf.rst +++ b/doc/source/local.conf.rst @@ -2,7 +2,7 @@ local.conf - User Settings ========================== -``local.conf`` is a user-maintained setings file that is sourced in +``local.conf`` is a user-maintained settings file that is sourced in ``stackrc``. It contains a section that replaces the historical ``localrc`` file. See the description of :doc:`local.conf ` for more details about the mechanics diff --git a/doc/source/openrc.rst b/doc/source/openrc.rst index 56ff5c2edb..0b090c77b7 100644 --- a/doc/source/openrc.rst +++ b/doc/source/openrc.rst @@ -4,7 +4,7 @@ openrc - User Authentication Settings ``openrc`` configures login credentials suitable for use with the OpenStack command-line tools. ``openrc`` sources ``stackrc`` at the -beginning (which in turn sources the ``localrc`` setion of +beginning (which in turn sources the ``localrc`` section of ``local.conf``) in order to pick up ``HOST_IP`` and/or ``SERVICE_HOST`` to use in the endpoints. The values shown below are the default values.