diff options
Diffstat (limited to 'doc/source')
| -rw-r--r-- | doc/source/adminguide/index.rst | 21 | ||||
| -rw-r--r-- | doc/source/index.rst | 1 | ||||
| -rw-r--r-- | doc/source/nova.concepts.rst (renamed from doc/source/concepts.and.introduction.rst) | 4 | ||||
| -rw-r--r-- | doc/source/object.model.rst | 14 |
4 files changed, 30 insertions, 10 deletions
diff --git a/doc/source/adminguide/index.rst b/doc/source/adminguide/index.rst index f89819429..9a6a70d45 100644 --- a/doc/source/adminguide/index.rst +++ b/doc/source/adminguide/index.rst @@ -57,13 +57,32 @@ For background on the core objects refenced in this section, see :doc:`../object managing.volumes managing.networks +Deployment +---------- + +.. todo:: talk about deployment scenarios + +.. toctree:: + :maxdepth: 1 + + multi.node.install + + +Networking +^^^^^^^^^^ + +.. toctree:: + :maxdepth: 1 + + multi.node.install + + Advanced Topics --------------- .. toctree:: :maxdepth: 1 - multi.node.install flags monitoring diff --git a/doc/source/index.rst b/doc/source/index.rst index e92352971..5f38f63e5 100644 --- a/doc/source/index.rst +++ b/doc/source/index.rst @@ -44,6 +44,7 @@ Key Concepts :maxdepth: 1 cloud101 + nova.concepts service.architecture object.model diff --git a/doc/source/concepts.and.introduction.rst b/doc/source/nova.concepts.rst index d409fbaec..ce251dd14 100644 --- a/doc/source/concepts.and.introduction.rst +++ b/doc/source/nova.concepts.rst @@ -16,8 +16,8 @@ under the License. -Concepts and Introduction -========================= +Nova Concepts and Introduction +============================== Introduction diff --git a/doc/source/object.model.rst b/doc/source/object.model.rst index 4544fe9d9..c8d4df736 100644 --- a/doc/source/object.model.rst +++ b/doc/source/object.model.rst @@ -22,10 +22,17 @@ Object Model } +Users +----- + Projects -------- +Images +------ + + Instances --------- @@ -34,13 +41,6 @@ Volumes ------- -Users ------ - - -Images ------- - Security Groups --------------- |