removed unused instance parameter from vm list ... as it is unused. added parameters to docstring for vm list.

2 files changed, 16 insertions, 2 deletions

diff --git a/bin/nova-manage b/bin/nova-manage
index bd3f9f50d..6903c16c9 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -570,8 +570,12 @@ class NetworkCommands(object):
 class VmCommands(object):
     """Class for mangaging VM instances."""
 
-    def list(self, host=None, instance=None):
-        """Show a list of all instances"""
+    def list(self, host=None):
+        """Show a list of all instances
+        
+        :param host: show all instance on specified host.
+        :param instance: show specificed instance.
+        """
         print "%-10s %-15s %-10s %-10s %-19s %-12s %-12s %-12s" \
               "  %-10s %-10s %-10s %-5s" % (
             _('instance'),
diff --git a/doc/source/man/novamanage.rst b/doc/source/man/novamanage.rst
index 1d8446f08..b7688f0d8 100644
--- a/doc/source/man/novamanage.rst
+++ b/doc/source/man/novamanage.rst
@@ -240,6 +240,16 @@ Nova Images
 
     Converts all images in directory from the old (Bexar) format to the new format.
 
+Nova VM
+~~~~~~~~~~~
+
+``nova-manage vm list [host]``
+    Show a list of all instances. Accepts optional hostname (to show only instances on specific host).
+
+``nova-manage live-migration <ec2_id> <destination host name>``
+    Live migrate instance from current host to destination host. Requires instance id (which comes from euca-describe-instance) and destination host name.
+
+
 FILES
 ========