diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-07-03 19:49:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-07-03 19:49:01 +0000 |
| commit | 1850fe09641afe2f3319c6279ab8ce2a69f85056 (patch) | |
| tree | 12e6de523957f0aa43c48ad7032bab378e2b218f /doc | |
| parent | e65ddacef871f367ac4ac1f5ddf6dc779357fa3d (diff) | |
| parent | bf495949bc73d983572694902888f11a3dad7a68 (diff) | |
| download | keystone-1850fe09641afe2f3319c6279ab8ce2a69f85056.tar.gz keystone-1850fe09641afe2f3319c6279ab8ce2a69f85056.tar.xz keystone-1850fe09641afe2f3319c6279ab8ce2a69f85056.zip | |
Merge "fix sphinx warnings"
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/source/architecture.rst | 4 | ||||
| -rw-r--r-- | doc/source/conf.py | 2 | ||||
| -rw-r--r-- | doc/source/configuringservices.rst | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/doc/source/architecture.rst b/doc/source/architecture.rst index 1b538b4b..7ffaea4b 100644 --- a/doc/source/architecture.rst +++ b/doc/source/architecture.rst @@ -86,18 +86,22 @@ which are thin wrapper classes which load the appropriate service driver based on the keystone configuration. * Identity + * :mod:`keystone.identity.core.TenantController` * :mod:`keystone.identity.core.UserController` * :mod:`keystone.identity.core.RoleController` * Catalog + * :mod:`keystone.catalog.core.ServiceController` * :mod:`keystone.service.VersionController` * Token + * :mod:`keystone.service.TokenController` * Misc + * :mod:`keystone.service.ExtensionsController` At this time, the policy service and associated manager is not exposed as a URL diff --git a/doc/source/conf.py b/doc/source/conf.py index 073e598b..319faf06 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -79,7 +79,7 @@ release = '2012.1-dev' # List of patterns, relative to source directory, that match files and # directories to ignore when looking for source files. -exclude_patterns = [] +exclude_patterns = ['old'] # The reST default role (used for this markup: `text`) to use for all # documents. diff --git a/doc/source/configuringservices.rst b/doc/source/configuringservices.rst index 653b3e66..1c422530 100644 --- a/doc/source/configuringservices.rst +++ b/doc/source/configuringservices.rst @@ -21,7 +21,7 @@ Configuring Services to work with Keystone .. toctree:: :maxdepth: 1 - middleware_architecture + middlewarearchitecture Once Keystone is installed and running (see :doc:`configuration`), services need to be configured to work with it. To do this, we primarily install and |