Merge "fixed typos found by RETF rules in RST files"

This commit is contained in:
Jenkins 2014-05-02 20:13:19 +00:00 committed by Gerrit Code Review
commit a725b67480
6 changed files with 6 additions and 6 deletions

View File

@ -231,7 +231,7 @@ became the default configuration option in the Grizzly release.
Caching Layer
-------------
Keystone supports a caching layer that is above the configurable subsystems (e.g ``token``,
Keystone supports a caching layer that is above the configurable subsystems (e.g. ``token``,
``identity``, etc). Keystone uses the `dogpile.cache`_ library which allows for flexible
cache backends. The majority of the caching configuration options are set in the ``[cache]``
section. However, each section that has the capability to be cached usually has a ``caching``

View File

@ -166,7 +166,7 @@ get more details of the middleware in :doc:`middlewarearchitecture`.
Configuring Nova to use Keystone
--------------------------------
When configuring Nova, it is important to create a admin service token for
When configuring Nova, it is important to create an admin service token for
the service (from the Configuration step above) and include that as the key
'admin_token' in Nova's api-paste.ini [filter:authtoken] section or in
nova.conf [keystone_authtoken] section.

View File

@ -135,7 +135,7 @@ The communication of the filter details between the controller level and its
drivers is handled by the passing of a reference to a Hints object,
which is a list of dicts describing the filters. A driver that satisfies a
filter must delete the filter from the Hints object so that when it is returned
back to the controller level, it knows to only execute any unsatisfied
to the controller level, it knows to only execute any unsatisfied
filters.
The contract for a driver for ``list_{entity}`` methods is therefore:

View File

@ -45,7 +45,7 @@ Web servers like Apache HTTP support many methods of authentication. Keystone
can profit from this feature and let the authentication be done in the web
server, that will pass down the authenticated user to Keystone using the
``REMOTE_USER`` environment variable. This user must exist in advance in the
identity backend so as to get a token from the controller.
identity backend to get a token from the controller.
To use this method, Keystone should be running on :doc:`HTTPD <apache-httpd>`.

View File

@ -40,7 +40,7 @@ OPTIONS
-h, --help show this help message and exit
--config-dir DIR Path to a config directory to pull \*.conf files from.
This file set is sorted, so as to provide a
This file set is sorted, to provide a
predictable parse order if individual options are
over-ridden. The set is parsed after the file(s)
specified via previous --config-file, arguments hence

View File

@ -51,7 +51,7 @@ OPTIONS
-h, --help show this help message and exit
--config-dir DIR Path to a config directory to pull \*.conf files from.
This file set is sorted, so as to provide a
This file set is sorted, to provide a
predictable parse order if individual options are
over-ridden. The set is parsed after the file(s)
specified via previous --config-file, arguments hence