diff --git a/AUTHORS b/AUTHORS index b8d2014c77..c5e82a053a 100644 --- a/AUTHORS +++ b/AUTHORS @@ -72,6 +72,7 @@ Michael Basnight Michael Still Monty Taylor Pádraig Brady +Paul McMillan Paul Voccio Peng Yong Pete Zaitcev diff --git a/doc/source/configuringservices.rst b/doc/source/configuringservices.rst index 2b0a5d2c68..a714bd2985 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 11207a9541..4acb3b2ea8 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 bb334543ab..477592b95b 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::