Merge "Removed old sections; improved syntax consistency"

This commit is contained in:
Jenkins 2012-05-02 20:13:40 +00:00 committed by Gerrit Code Review
commit f75af88b20
1 changed files with 5 additions and 17 deletions

View File

@ -15,6 +15,7 @@ for most deployments will actually be shims in front of existing user systems.
Development Development
----------- -----------
Setting up a development environment Setting up a development environment
------------------------------------ ------------------------------------
@ -22,20 +23,22 @@ Please see the documentation under ``doc/source/`` for development setup
(``doc/source/setup.rst``) and configuration (``doc/source/setup.rst``) and configuration
(``doc/source/configuration.rst``). (``doc/source/configuration.rst``).
Building the Documentation Building the Documentation
-------------------------- --------------------------
The documentation is all generated with Sphinx from within the docs directory. The documentation is all generated with Sphinx from within the docs directory.
To generate the full set of HTML documentation: To generate the full set of HTML documentation::
cd docs cd docs
make autodoc make autodoc
make html make html
make man make man
the results are in the docs/build/html and docs/build/man directories the results are in the ``docs/build/html`` and ``docs/build/man`` directories
respectively. respectively.
------------ ------------
The Services The Services
------------ ------------
@ -81,7 +84,6 @@ The Policy service provides a rule-based authorization engine and the
associated rule management interface. associated rule management interface.
---------- ----------
Data Model Data Model
---------- ----------
@ -170,12 +172,6 @@ of checks and will possibly write completely custom backends. Backends included
in Keystone are: in Keystone are:
Trivial True
------------
Allows all actions.
Simple Match Simple Match
------------ ------------
@ -219,11 +215,3 @@ to which capabilities are allowed for that role. For example::
In the backend this would look up the policy for 'action:nova:add_network' and In the backend this would look up the policy for 'action:nova:add_network' and
then do what is effectively a 'Simple Match' style match against the creds. then do what is effectively a 'Simple Match' style match against the creds.
-----------
Still To Do
-----------
* LDAP backend.
* Diablo migration.