summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorAnne Gentle <anne@openstack.org>2010-12-28 21:41:28 -0600
committerAnne Gentle <anne@openstack.org>2010-12-28 21:41:28 -0600
commitd753b97675a0fa31a79acff259cc2465170146b7 (patch)
tree7dbcacd55923ca89419da2b3e4b5fabf0328cc09 /doc
parenta7983cad94f88ca10a0dc3620c8eeb8a06122174 (diff)
Additional edits in nova.concepts.rst while waiting for script changes
Diffstat (limited to 'doc')
-rw-r--r--doc/source/nova.concepts.rst6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/source/nova.concepts.rst b/doc/source/nova.concepts.rst
index aa9c3b3f1..f29f0bfd1 100644
--- a/doc/source/nova.concepts.rst
+++ b/doc/source/nova.concepts.rst
@@ -105,7 +105,7 @@ It is important to know that there are user-specific (sometimes called global) r
For example: A user can access api commands allowed to the netadmin role (like allocate_address) only if he has the user-specific netadmin role AND the project-specific netadmin role.
-More information about RBAC can be found in the :ref:`auth`.
+More information about RBAC can be found in :ref:`auth`.
Concept: API
------------
@@ -157,13 +157,13 @@ The nova-manage command is used to perform many essential functions for
administration and ongoing maintenance of nova, such as user creation,
vpn management, and much more.
-See doc:`nova.manage` in the Administration Guide for more details.
+See :ref:`nova.manage` in the Administration Guide for more details.
Concept: Flags
--------------
-Nova uses python-gflags for a distributed command line system, and the flags can either be set when running a command at the command line or within flag files. When you install Nova packages, each nova service gets its own flag file. For example, nova-network.conf is used for configuring the nova-network service, and so forth.
+Nova uses python-gflags for a distributed command line system, and the flags can either be set when running a command at the command line or within a flag file. When you install Nova packages for the Austin release, each nova service gets its own flag file. For example, nova-network.conf is used for configuring the nova-network service, and so forth. In releases beyond Austin which was released in October 2010, all flags are set in nova.conf.
Concept: Plugins