~kampka/ubuntu/quantal/lxc/upstart-instance

140 by Serge Hallyn
* 0204-ubuntu-cloud-userdata-path: Fix broken behavior when a relative
1
Description: Document the default two-line output in lxc-ls
2
Author: Serge Hallyn <serge.hallyn@ubuntu.com>
3
Forwarded: no
4
5
Index: lxc/doc/lxc-ls.sgml.in
6
===================================================================
7
--- lxc.orig/doc/lxc-ls.sgml.in	2012-08-30 09:48:55.396845000 -0500
8
+++ lxc/doc/lxc-ls.sgml.in	2012-08-30 10:04:34.779746043 -0500
9
@@ -57,7 +57,14 @@
10
     <title>Description</title>
11
     <para>
12
       <command>lxc-ls</command> list the containers existing on the
13
-      system.
14
+      system.  By default it lists them in two lines.  The first line
15
+      contains all defined containers, while the second contains all
16
+      running containers.  If additional arguments are given, they are
17
+      passed to the 'ls' program.  This can change the output to be
18
+      multiple lines.  For instance, 'lxc-ls -l' will print a full line
19
+      for each container.  Since lxc-ls will still print first the
20
+      existing, then the running containers, running containers will
21
+      appear to be listed twice.
22
     </para>
23
   </refsect1>
24