From 4ce07c451e26a29f7c712b0f7cefc552ae7537a9 Mon Sep 17 00:00:00 2001
From: Evgeni Golov <evgeni@debian.org>
Date: Sun, 30 Oct 2016 14:16:38 +0100
Subject: [PATCH 1/2] improve help text for --fancy and --fancy-format

Signed-off-by: Evgeni Golov <evgeni@debian.org>
---
 src/lxc/tools/lxc_ls.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/lxc/tools/lxc_ls.c b/src/lxc/tools/lxc_ls.c
index 8e7cbef70..5e2cb4af1 100644
--- a/src/lxc/tools/lxc_ls.c
+++ b/src/lxc/tools/lxc_ls.c
@@ -185,8 +185,10 @@ lxc-ls list containers\n\
 \n\
 Options :\n\
   -1, --line         show one entry per line\n\
-  -f, --fancy        column-based output\n\
-  -F, --fancy-format column-based output\n\
+  -f, --fancy        use a fancy, column-based output\n\
+  -F, --fancy-format comma separated list of columns to show in the fancy output\n\
+                     valid columns are: NAME, STATE, PID, RAM, SWAP, AUTOSTART,\n\
+                     GROUPS, INTERFACE, IPV4 and IPV6\n\
   --active           list only active containers\n\
   --running          list only running containers\n\
   --frozen           list only frozen containers\n\

From 8b662579103384e8c0f07aed4b3cd8eec3567e84 Mon Sep 17 00:00:00 2001
From: Evgeni Golov <evgeni@debian.org>
Date: Sun, 30 Oct 2016 14:17:55 +0100
Subject: [PATCH 2/2] improve wording of the help page for lxc-ls

it's "list of columns", not "list of column"

Signed-off-by: Evgeni Golov <evgeni@debian.org>
---
 doc/ja/lxc-ls.sgml.in | 2 +-
 doc/ko/lxc-ls.sgml.in | 2 +-
 doc/lxc-ls.sgml.in    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/ja/lxc-ls.sgml.in b/doc/ja/lxc-ls.sgml.in
index a3c0c6129..918992693 100644
--- a/doc/ja/lxc-ls.sgml.in
+++ b/doc/ja/lxc-ls.sgml.in
@@ -173,7 +173,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
         <listitem>
           <para>
             <!--
-            Comma separate list of column to show in the fancy output.
+            Comma separated list of columns to show in the fancy output.
             The list of accepted and default fields is listed in \-\-help.
             -->
             装飾付き出力で表示するカラムのコンマ区切りのリスト。デフォルトで表示される項目と指定可能な項目名は --help オプションで確認してください。
diff --git a/doc/ko/lxc-ls.sgml.in b/doc/ko/lxc-ls.sgml.in
index d7c354aa1..368528c6e 100644
--- a/doc/ko/lxc-ls.sgml.in
+++ b/doc/ko/lxc-ls.sgml.in
@@ -173,7 +173,7 @@ by Sungbae Yoo <sungbae.yoo at samsung.com>
         <listitem>
           <para>
             <!--
-            Comma separate list of column to show in the fancy output.
+            Comma separated list of columns to show in the fancy output.
             The list of accepted and default fields is listed in \-\-help.
             -->
             &#045;&#045;fancy로 출력할때 어떤 컬럼을 보여줄지 쉼표(,)로 구분된 리스트.
diff --git a/doc/lxc-ls.sgml.in b/doc/lxc-ls.sgml.in
index d2850f23b..2b2823779 100644
--- a/doc/lxc-ls.sgml.in
+++ b/doc/lxc-ls.sgml.in
@@ -146,7 +146,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
         </term>
         <listitem>
           <para>
-            Comma separated list of column to show in the fancy output.
+            Comma separated list of columns to show in the fancy output.
             The list of accepted and default fields is listed in --help.
           </para>
         </listitem>