diff options
-rw-r--r-- | AUTHORS | 1 | ||||
-rw-r--r-- | doc/source/configuringservices.rst | 2 | ||||
-rw-r--r-- | doc/source/developing.rst | 4 | ||||
-rw-r--r-- | doc/source/old/endpoints.rst | 2 |
4 files changed, 5 insertions, 4 deletions
@@ -72,6 +72,7 @@ Michael Basnight <mbasnight@gmail.com> Michael Still <mikal@stillhq.com> Monty Taylor <mordred@inaugust.com> Pádraig Brady <P@draigBrady.com> +Paul McMillan <paul.mcmillan@nebula.com> Paul Voccio <paul@substation9.com> Peng Yong <ppyy@pubyun.com> Pete Zaitcev <zaitcev@kotori.zaitcev.us> diff --git a/doc/source/configuringservices.rst b/doc/source/configuringservices.rst index 2b0a5d2c..a714bd29 100644 --- a/doc/source/configuringservices.rst +++ b/doc/source/configuringservices.rst @@ -175,7 +175,7 @@ Configuring Swift to use Keystone --------------------------------- Similar to Nova, swift can be configured to use Keystone for authentication -rather than it's built in 'tempauth'. +rather than its built in 'tempauth'. 1. Add a service endpoint for Swift to Keystone diff --git a/doc/source/developing.rst b/doc/source/developing.rst index 11207a95..4acb3b2e 100644 --- a/doc/source/developing.rst +++ b/doc/source/developing.rst @@ -60,9 +60,9 @@ You can interact with Keystone through the command line using :doc:`man/keystone-manage` which allows you to establish tenants, users, etc. -You can also interact with Keystone through it's REST API. There is a python +You can also interact with Keystone through its REST API. There is a python keystone client library `python-keystoneclient`_ which interacts exclusively -through the REST API, and which keystone itself uses to provide it's +through the REST API, and which keystone itself uses to provide its command-line interface. When initially getting set up, after you've configured which databases to use, diff --git a/doc/source/old/endpoints.rst b/doc/source/old/endpoints.rst index bb334543..477592b9 100644 --- a/doc/source/old/endpoints.rst +++ b/doc/source/old/endpoints.rst @@ -285,7 +285,7 @@ them all whenever a service changed versions or I added a new service. To provide a simpler mechanism to manage endpoints on tenants, Keystone uses Endpoint Templates. I can, for example, define a template with parametrized URLs -and set it's `global` to true and that will show up as an endpoint on all the tenants +and set its `global` to true and that will show up as an endpoint on all the tenants I have. Here is an example: Define a global Endpoint Template:: |