diff options
| author | Vishvananda Ishaya <vishvananda@gmail.com> | 2010-07-18 13:25:43 -0500 |
|---|---|---|
| committer | Vishvananda Ishaya <vishvananda@gmail.com> | 2010-07-18 13:25:43 -0500 |
| commit | 5d647826d6345bfdd87bad10995319679f39679f (patch) | |
| tree | 979b3fa11717c38b868b08239cbf3a50b4e27f49 /docs | |
| parent | 0b396e1315a76112ab978a677e96d7b3a371faa9 (diff) | |
| parent | b09e69c5579526fcc1a08c7e3c3a3c880fa09297 (diff) | |
| download | nova-5d647826d6345bfdd87bad10995319679f39679f.tar.gz nova-5d647826d6345bfdd87bad10995319679f39679f.tar.xz nova-5d647826d6345bfdd87bad10995319679f39679f.zip | |
merged in trunk and fixed import merge errors
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/auth.rst | 4 | ||||
| -rw-r--r-- | docs/conf.py | 2 | ||||
| -rw-r--r-- | docs/index.rst | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/docs/auth.rst b/docs/auth.rst index 476ca9154..70aca704a 100644 --- a/docs/auth.rst +++ b/docs/auth.rst @@ -172,10 +172,10 @@ Further Challenges -The :mod:`access` Module +The :mod:`rbac` Module -------------------------- -.. automodule:: nova.auth.access +.. automodule:: nova.auth.rbac :members: :undoc-members: :show-inheritance: diff --git a/docs/conf.py b/docs/conf.py index 784d8c096..fb3fd1a30 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -18,7 +18,7 @@ import sys, os # documentation root, use os.path.abspath to make it absolute, like shown here. sys.path.append(os.path.abspath('/Users/jmckenty/Projects/cc')) sys.path.append([os.path.abspath('../nova'),os.path.abspath('../'),os.path.abspath('../vendor')]) -from nova import vendor + # -- General configuration ----------------------------------------------------- diff --git a/docs/index.rst b/docs/index.rst index 039bf00ff..ef2e8f63e 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -44,6 +44,8 @@ Contents: fakes binaries todo + modules + packages Indices and tables ================== |