summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-10-27 14:10:49 +0000
committerGerrit Code Review <review@openstack.org>2014-10-27 14:10:49 +0000
commit20f488d45ef010b9e15719a4ae238e087963a569 (patch)
tree67dad14e7608f03f2deb02399ee5c3b97870aa37 /doc
parent5f90a0b623684fd444ad143b4da0921b6cacdd47 (diff)
parent3cf7f9481596b93bca1a29dce9d283966fbacb48 (diff)
downloadpython-keystoneclient-20f488d45ef010b9e15719a4ae238e087963a569.tar.gz
Merge "Correct typos in using-sessions"
Diffstat (limited to 'doc')
-rw-r--r--doc/source/using-api-v2.rst2
-rw-r--r--doc/source/using-sessions.rst10
2 files changed, 6 insertions, 6 deletions
diff --git a/doc/source/using-api-v2.rst b/doc/source/using-api-v2.rst
index 192e683..52feefa 100644
--- a/doc/source/using-api-v2.rst
+++ b/doc/source/using-api-v2.rst
@@ -13,7 +13,7 @@ The main concepts in the Identity v2 API are:
* services
* endpoints
-The client v2 API lets you query and make changes through
+The V2 client API lets you query and make changes through
managers. For example, to manipulate tenants, you interact with a
``keystoneclient.v2_0.tenants.TenantManager`` object.
diff --git a/doc/source/using-sessions.rst b/doc/source/using-sessions.rst
index 099dc70..7d31a2d 100644
--- a/doc/source/using-sessions.rst
+++ b/doc/source/using-sessions.rst
@@ -75,13 +75,13 @@ fashion by passing the Session object to the client's constructor.
Migrating keystoneclient to use a Session
-----------------------------------------
-By using a session with a keystonclient Client we define that you have opted in
-to new behaviour defined by the session. For example authentication is now
-on-demand rather than on creation. To allow this change in behaviour there are
-a number of functions that have changed behaviour or are no longer available.
+By using a session with a keystoneclient Client we presume that you have opted
+in to new behavior defined by the session. For example authentication is now
+on-demand rather than on creation. To allow this change in behavior there are
+a number of functions that have changed behavior or are no longer available.
For example the
-:py:meth:`keystoneclient.httpclient.HTTPClient.authenticate` command used
+:py:meth:`keystoneclient.httpclient.HTTPClient.authenticate` method used
to be able to always re-authenticate the current client and fetch a new token.
As this is now controlled by the Session and not the client this has changed,
however the function will still exist to provide compatibility with older