Fixing merge conflicts with new branch

7 files changed, 61 insertions, 77 deletions

diff --git a/doc/source/adminguide/distros/ubuntu.10.04.rst b/doc/source/adminguide/distros/ubuntu.10.04.rst
index ce368fab8..9d856458a 100644
--- a/doc/source/adminguide/distros/ubuntu.10.04.rst
+++ b/doc/source/adminguide/distros/ubuntu.10.04.rst
@@ -16,13 +16,13 @@ Here's a script you can use to install (and then run) Nova on Ubuntu or Debian (
 Step 2: Install dependencies
 ----------------------------
 
-Nova requires rabbitmq for messaging and optionally you can use redis for storing state, so install these first.
+Nova requires rabbitmq for messaging, so install that first.
 
 *Note:* You must have sudo installed to run these commands as shown here.
 
 ::
 
-    sudo apt-get install rabbitmq-server redis-server
+    sudo apt-get install rabbitmq-server
 
 
 You'll see messages starting with "Reading package lists... Done" and you must confirm by typing Y that you want to continue.
@@ -31,11 +31,10 @@ If you're running on Ubuntu 10.04, you'll need to install Twisted and python-gfl
 
 ::
 
-    sudo apt-get install python-twisted
-
-    sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 95C71FE2
-    sudo sh -c 'echo "deb http://ppa.launchpad.net/openstack/openstack-ppa/ubuntu lucid main" > /etc/apt/sources.list.d/openstackppa.list'
-    sudo apt-get update && sudo apt-get install python-gflags
+    sudo add-get install python-software-properties
+    sudo add-apt-repository ppa:nova-core/trunk
+    sudo apt-get update
+    sudo apt-get install python-twisted python-gflags
 
 
 Once you've done this, continue at Step 3 here: :doc:`../single.node.install`
diff --git a/doc/source/adminguide/getting.started.rst b/doc/source/adminguide/getting.started.rst
index 3e8073606..0cadeb45e 100644
--- a/doc/source/adminguide/getting.started.rst
+++ b/doc/source/adminguide/getting.started.rst
@@ -76,11 +76,11 @@ External unix tools that are required:
 * aoetools and vblade-persist (if you use aoe-volumes)
 
 Nova uses cutting-edge versions of many packages. There are ubuntu packages in
-the nova-core ppa.  You can use add this ppa to your sources list on an ubuntu
-machine with the following commands::
+the nova-core trunk ppa.  You can use add this ppa to your sources list on an
+ubuntu machine with the following commands::
 
   sudo apt-get install -y python-software-properties
-  sudo add-apt-repository ppa:nova-core/ppa
+  sudo add-apt-repository ppa:nova-core/trunk
 
 Recommended
 -----------
diff --git a/doc/source/adminguide/multi.node.install.rst b/doc/source/adminguide/multi.node.install.rst
index 641b7c12a..bc1ce4137 100644
--- a/doc/source/adminguide/multi.node.install.rst
+++ b/doc/source/adminguide/multi.node.install.rst
@@ -45,29 +45,33 @@ Assumptions
   
  
 Step 1 - Use apt-get to get the latest code
------------------------------------------
- 
-1. Setup Nova PPA with https://launchpad.net/~nova-core/+archive/trunk.  The ‘python-software-properties’ package is a pre-requisite for setting up the nova package repo:
- 
+-------------------------------------------
+
+1. Setup Nova PPA with https://launchpad.net/~nova-core/+archive/trunk. The ‘python-software-properties’ package is a pre-requisite for setting up the nova package repo:
+
 ::
-   
-apt-get -y install python-software-properties
-add-apt-repository ppa:nova-core/trunk
- 
-2. Update apt-get:
- 
+    
+    sudo apt-get install python-software-properties
+    sudo add-apt-repository ppa:nova-core/trunk
+	
+2. Run update.
+
 ::
-   
-apt-get update
- 
-3. Install nova-packages (dependencies should be automatically installed).
- 
+    
+    sudo apt-get update
+
+3. Install nova-pkgs (dependencies should be automatically installed).
+
 ::
- 
-apt-get -y install bzr nova-common nova-doc python-mysqldb python-greenlet python-nova nova-api nova-network nova-objectstore nova-scheduler nova-compute unzip vim euca2ools rabbitmq-server dnsmasq open-iscsi kpartx kvm gawk iptables ebtables user-mode-linux kvm libvirt-bin screen iscsitarget euca2ools vlan curl python-twisted python-sqlalchemy python-mox python-greenlet python-carrot python-daemon python-eventlet python-gflags python-libvirt python-libxml2 python-routes
- 
-Step 2 – Setting up nova.conf  (installed in /etc/nova)
----------------------------------------------------------
+
+    sudo apt-get install python-greenlet
+    sudo apt-get install nova-common nova-doc python-nova nova-api nova-network nova-objectstore nova-scheduler
+
+It is highly likely that there will be errors when the nova services come up since they are not yet configured. Don't worry, you're only at step 1!
+
+Step 2 Setup configuration file (installed in /etc/nova)
+--------------------------------------------------------
+
 1.  Nova development has consolidated all config files to nova.conf as of November 2010.   There is a default set of options that are already configured in nova.conf:
  
 ::
@@ -133,7 +137,7 @@ chown -R root:nova /etc/nova
 chmod 644 /etc/nova/nova.conf
  
 Step 3 - Setup the SQL DB (MySQL for this setup)
------------------------
+------------------------------------------------
  
 1. First you 'preseed' to bypass all the installation prompts
 ::
diff --git a/doc/source/devref/addmethod.openstackapi.rst b/doc/source/devref/addmethod.openstackapi.rst
index 6484613df..4baa46e20 100644
--- a/doc/source/devref/addmethod.openstackapi.rst
+++ b/doc/source/devref/addmethod.openstackapi.rst
@@ -24,7 +24,7 @@ Routing
 
 To map URLs to controllers+actions, OpenStack uses the Routes package, a clone of Rails routes for Python implementations. See http://routes.groovie.org/ fore more information.
 
-URLs are mapped to "action" methods on "controller" classes in nova/api/openstack/__init__/ApiRouter.__init__ .
+URLs are mapped to "action" methods on "controller" classes in `nova/api/openstack/__init__/ApiRouter.__init__` .
 
 See http://routes.groovie.org/manual.html for all syntax, but you'll probably just need these two:
    - mapper.connect() lets you map a single URL to a single action on a controller.
@@ -33,9 +33,9 @@ See http://routes.groovie.org/manual.html for all syntax, but you'll probably ju
 Controllers and actions
 -----------------------
 
-Controllers live in nova/api/openstack, and inherit from nova.wsgi.Controller.
+Controllers live in `nova/api/openstack`, and inherit from nova.wsgi.Controller.
 
-See nova/api/openstack/servers.py for an example.
+See `nova/api/openstack/servers.py` for an example.
 
 Action methods take parameters that are sucked out of the URL by mapper.connect() or .resource().  The first two parameters are self and the WebOb request, from which you can get the req.environ, req.body, req.headers, etc.
 
@@ -46,7 +46,7 @@ Actions return a dictionary, and wsgi.Controller serializes that to JSON or XML
 
 If you define a new controller, you'll need to define a _serialization_metadata attribute on the class, to tell wsgi.Controller how to convert your dictionary to XML.  It needs to know the singular form of any list tag (e.g. <servers> list contains <server> tags) and which dictionary keys are to be XML attributes as opposed to subtags (e.g. <server id="4"/> instead of <server><id>4</id></server>).  
 
-See nova/api/openstack/servers.py for an example.
+See `nova/api/openstack/servers.py` for an example.
 
 Faults
 ------
diff --git a/doc/source/devref/rabbit.rst b/doc/source/devref/rabbit.rst
index 4ed5a67ae..c17a13222 100644
--- a/doc/source/devref/rabbit.rst
+++ b/doc/source/devref/rabbit.rst
@@ -72,8 +72,8 @@ RPC Casts
 
 The diagram below the message flow during an rp.cast operation: 
 
-    1. a Topic Publisher is instantiated to send the message request to the queuing system.
-    2. once the message is dispatched by the exchange, it is fetched by the Topic Consumer dictated by the routing key (such as 'topic') and passed to the Worker in charge of the task.
+    1. A Topic Publisher is instantiated to send the message request to the queuing system.
+    2. Once the message is dispatched by the exchange, it is fetched by the Topic Consumer dictated by the routing key (such as 'topic') and passed to the Worker in charge of the task.
 
 .. image:: /images/rabbit/flow2.png
    :width: 60%
diff --git a/doc/source/nova.concepts.rst b/doc/source/nova.concepts.rst
index 83d518e54..11d446031 100644
--- a/doc/source/nova.concepts.rst
+++ b/doc/source/nova.concepts.rst
@@ -75,7 +75,7 @@ Nova is built on a shared-nothing, messaging-based architecture. All of the majo
 
 To achieve the shared-nothing property with multiple copies of the same component, Nova keeps all the cloud system state in a distributed data store. Updates to system state are written into this store, using atomic transactions when required. Requests for system state are read out of this store. In limited cases, the read results are cached within controllers for short periods of time (for example, the current list of system users.) 
 
-    .. note:: The database schema is available on the `OpenStack Wiki <http://wiki.openstack.org/NovaDatabaseSchema>`_.
+    .. note:: The database schema is available on the `OpenStack Wiki <http://wiki.openstack.org/NovaDatabaseSchema>`_. 
 
 Concept: Storage
 ----------------
@@ -129,12 +129,12 @@ The simplest networking mode.  Each instance receives a fixed ip from the pool.
 Flat DHCP Mode
 ~~~~~~~~~~~~~~
 
-This is similar to the flat mode, in that all instances are attached to the same bridge.  In this mode nova does a bit more configuration, it will attempt to bridge into an ethernet device (eth0 by default).  It will also run dnsmasq as a dhcpserver listening on this bridge.  Instances receive their fixed IPs by doing a dhcpdiscover.
+This is similar to the flat mode, in that all instances are attached to the same bridge.  In this mode Nova does a bit more configuration, it will attempt to bridge into an ethernet device (eth0 by default).  It will also run dnsmasq as a dhcpserver listening on this bridge.  Instances receive their fixed IPs by doing a dhcpdiscover.
 
 VLAN DHCP Mode
 ~~~~~~~~~~~~~~
 
-This is the default networking mode and supports the most features.  For multiple machine installation, it requires a switch that supports host-managed vlan tagging.  In this mode, nova will create a vlan and bridge for each project.  The project gets a range of private ips that are only accessible from inside the vlan.  In order for a user to access the instances in their project, a special vpn instance (code named :ref:`cloudpipe <cloudpipe>`) needs to be created.  Nova generates a certificate and key for the user to access the vpn and starts the vpn automatically. More information on cloudpipe can be found :ref:`here <cloudpipe>`.
+This is the default networking mode and supports the most features.  For multiple machine installation, it requires a switch that supports host-managed vlan tagging.  In this mode, Nova will create a vlan and bridge for each project.  The project gets a range of private ips that are only accessible from inside the vlan.  In order for a user to access the instances in their project, a special vpn instance (code named :ref:`cloudpipe <cloudpipe>`) needs to be created.  Nova generates a certificate and key for the user to access the vpn and starts the vpn automatically. More information on cloudpipe can be found :ref:`here <cloudpipe>`.
 
 The following diagram illustrates how the communication that occurs between the vlan (the dashed box) and the public internet (represented by the two clouds)
 
@@ -154,18 +154,16 @@ Concept: nova-manage
 --------------------
 
 The nova-manage command is used to perform many essential functions for
-administration and ongoing maintenance of nova, such as user creation,
+administration and ongoing maintenance of Nova, such as user creation,
 vpn management, and much more.
 
-See :ref:`nova.manage` in the Administration Guide for more details.
-
+See :doc:`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 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
 ----------------
 
@@ -181,7 +179,7 @@ Concept: Plugins
 Concept: IPC/RPC
 ----------------
 
-Nova utilizes the RabbitMQ implementation of the AMQP messaging standard for performing communication between the various nova services.  This message queuing service is used for both local and remote communication because Nova is designed so that there is no requirement that any of the services exist on the same physical machine.  RabbitMQ in particular is very robust and provides the efficiency and reliability that Nova needs.  More information about RabbitMQ can be found at http://www.rabbitmq.com/. 
+Nova utilizes the RabbitMQ implementation of the AMQP messaging standard for performing communication between the various Nova services.  This message queuing service is used for both local and remote communication because Nova is designed so that there is no requirement that any of the services exist on the same physical machine.  RabbitMQ in particular is very robust and provides the efficiency and reliability that Nova needs.  More information about RabbitMQ can be found at http://www.rabbitmq.com/. 
 
 Concept: Fakes
 --------------
diff --git a/doc/source/quickstart.rst b/doc/source/quickstart.rst
index ae2b64d8a..fa5d96738 100644
--- a/doc/source/quickstart.rst
+++ b/doc/source/quickstart.rst
@@ -59,38 +59,21 @@ different configurations (though for more complex setups you should see
 * HOST_IP
     * Default: address of first interface from the ifconfig command
     * Values: 127.0.0.1, or any other valid address
-
-TEST
-~~~~
-
-**Default**: 0
-**Values**: 1, run tests after checkout and initial setup
-
-USE_MYSQL
-~~~~~~~~~
-
-**Default**: 0, use sqlite3
-**Values**: 1, use mysql instead of sqlite3
-
-MYSQL_PASS
-~~~~~~~~~~
-
-Only useful if $USE_MYSQL=1.
-
-**Default**: nova
-**Values**: value of root password for mysql
-
-USE_LDAP
-~~~~~~~~
-
-**Default**: 0, use :mod:`nova.auth.dbdriver`
-**Values**: 1, use :mod:`nova.auth.ldapdriver`
-
-LIBVIRT_TYPE
-~~~~~~~~~~~~
-
-**Default**: qemu
-**Values**: uml, kvm
+* TEST
+    * Default: 0
+    * Values: 1, run tests after checkout and initial setup
+* USE_MYSQL
+    * Default: 0, use sqlite3
+    * Values: 1, use mysql instead of sqlite3
+* MYSQL_PASS (Only useful if $USE_MYSQL=1)
+    * Default: nova
+    * Values: value of root password for mysql
+* USE_LDAP
+    * Default: 0, use :mod:`nova.auth.dbdriver`
+    * Values: 1, use :mod:`nova.auth.ldapdriver`
+* LIBVIRT_TYPE
+    * Default: qemu
+    * Values: uml, kvm
 
 Usage
 -----