Merge from trunk.

9 files changed, 2 insertions, 59 deletions

diff --git a/doc/source/api/autoindex.rst b/doc/source/api/autoindex.rst
index 329a465db..d99d16eaa 100644
--- a/doc/source/api/autoindex.rst
+++ b/doc/source/api/autoindex.rst
@@ -26,7 +26,6 @@
    nova..compute.api.rst
    nova..compute.instance_types.rst
    nova..compute.manager.rst
-   nova..compute.monitor.rst
    nova..compute.power_state.rst
    nova..console.api.rst
    nova..console.fake.rst
@@ -115,13 +114,11 @@
    nova..tests.test_scheduler.rst
    nova..tests.test_service.rst
    nova..tests.test_test.rst
-   nova..tests.test_twistd.rst
    nova..tests.test_utils.rst
    nova..tests.test_virt.rst
    nova..tests.test_volume.rst
    nova..tests.test_xenapi.rst
    nova..tests.xenapi.stubs.rst
-   nova..twistd.rst
    nova..utils.rst
    nova..version.rst
    nova..virt.connection.rst
diff --git a/doc/source/api/nova..compute.monitor.rst b/doc/source/api/nova..compute.monitor.rst
deleted file mode 100644
index a91169ecd..000000000
--- a/doc/source/api/nova..compute.monitor.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-The :mod:`nova..compute.monitor` Module
-==============================================================================
-.. automodule:: nova..compute.monitor
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/doc/source/api/nova..tests.test_twistd.rst b/doc/source/api/nova..tests.test_twistd.rst
deleted file mode 100644
index cae0c0a28..000000000
--- a/doc/source/api/nova..tests.test_twistd.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-The :mod:`nova..tests.test_twistd` Module
-==============================================================================
-.. automodule:: nova..tests.test_twistd
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/doc/source/api/nova..twistd.rst b/doc/source/api/nova..twistd.rst
deleted file mode 100644
index d4145396d..000000000
--- a/doc/source/api/nova..twistd.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-The :mod:`nova..twistd` Module
-==============================================================================
-.. automodule:: nova..twistd
-  :members:
-  :undoc-members:
-  :show-inheritance:
diff --git a/doc/source/code.rst b/doc/source/code.rst
index 6b8d5661f..73fc31e1a 100644
--- a/doc/source/code.rst
+++ b/doc/source/code.rst
@@ -21,7 +21,6 @@ Generating source/api/nova..cloudpipe.pipelib.rst
 Generating source/api/nova..compute.disk.rst
 Generating source/api/nova..compute.instance_types.rst
 Generating source/api/nova..compute.manager.rst
-Generating source/api/nova..compute.monitor.rst
 Generating source/api/nova..compute.power_state.rst
 Generating source/api/nova..context.rst
 Generating source/api/nova..crypto.rst
@@ -79,11 +78,9 @@ Generating source/api/nova..tests.rpc_unittest.rst
 Generating source/api/nova..tests.runtime_flags.rst
 Generating source/api/nova..tests.scheduler_unittest.rst
 Generating source/api/nova..tests.service_unittest.rst
-Generating source/api/nova..tests.twistd_unittest.rst
 Generating source/api/nova..tests.validator_unittest.rst
 Generating source/api/nova..tests.virt_unittest.rst
 Generating source/api/nova..tests.volume_unittest.rst
-Generating source/api/nova..twistd.rst
 Generating source/api/nova..utils.rst
 Generating source/api/nova..validate.rst
 Generating source/api/nova..virt.connection.rst
diff --git a/doc/source/devref/architecture.rst b/doc/source/devref/architecture.rst
index 233cd6f08..7f44ecdf2 100644
--- a/doc/source/devref/architecture.rst
+++ b/doc/source/devref/architecture.rst
@@ -45,7 +45,7 @@ Below you will find a helpful explanation of the different components.
 * Web Dashboard: potential external component that talks to the api
 * api: component that receives http requests, converts commands and communicates with other components via the queue or http (in the case of objectstore)
 * Auth Manager: component responsible for users/projects/and roles.  Can backend to DB or LDAP.  This is not a separate binary, but rather a python class that is used by most components in the system.
-* objectstore: twisted http server that replicates s3 api and allows storage and retrieval of images
+* objectstore: http server that replicates s3 api and allows storage and retrieval of images
 * scheduler: decides which host gets each vm and volume
 * volume: manages dynamically attachable block devices.
 * network: manages ip forwarding, bridges, and vlans
diff --git a/doc/source/devref/compute.rst b/doc/source/devref/compute.rst
index 31cc2037f..50397cbec 100644
--- a/doc/source/devref/compute.rst
+++ b/doc/source/devref/compute.rst
@@ -118,19 +118,6 @@ The :mod:`nova.virt.fake` Driver
     :show-inheritance:
 
 
-Monitoring
-----------
-
-The :mod:`nova.compute.monitor` Module
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-.. automodule:: nova.compute.monitor
-    :noindex:
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-
 Tests
 -----
 
diff --git a/doc/source/devref/development.environment.rst b/doc/source/devref/development.environment.rst
index f3c454d64..09f1eb2c2 100644
--- a/doc/source/devref/development.environment.rst
+++ b/doc/source/devref/development.environment.rst
@@ -51,7 +51,7 @@ To activate the Nova virtualenv for the extent of your current shell session
 
  Also, make test will automatically use the virtualenv.
 
-If you don't want to create a virtualenv every time you branch (which takes a while as long as we have the large Twisted project as a dependency) you can reuse a single virtualenv for all branches.
+If you don't want to create a virtualenv every time you branch you can reuse a single virtualenv for all branches.
 
  #. If you don't have a nova/ directory containing trunk/ and other branches, do so now.
  #. Go into nova/trunk and install a virtualenv.
diff --git a/doc/source/devref/nova.rst b/doc/source/devref/nova.rst
index 093fbb3ee..beca99ecd 100644
--- a/doc/source/devref/nova.rst
+++ b/doc/source/devref/nova.rst
@@ -102,16 +102,6 @@ The :mod:`nova.test` Module
     :show-inheritance:  
 
 
-The :mod:`nova.twistd` Module
------------------------------
-
-.. automodule:: nova.twistd
-    :noindex:
-    :members:
-    :undoc-members:
-    :show-inheritance:  
-
-
 The :mod:`nova.utils` Module
 ----------------------------
 
@@ -215,16 +205,6 @@ The :mod:`runtime_flags` Module
     :show-inheritance:
 
 
-The :mod:`twistd_unittest` Module
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-.. automodule:: nova.tests.twistd_unittest
-    :noindex:
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-
 The :mod:`validator_unittest` Module
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~