doc: Improve man pages

* Add long options if not be written
* Remove optional tags in OPTIONS section

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>

diff --git a/doc/ja/lxc-console.sgml.in b/doc/ja/lxc-console.sgml.in
index 3ab395c6996cdd70b65dbec9829a0e4c9e184ac3..fbf7b7b5556b9c63d690ed7b9de214e1a66b0040 100644 (file)
--- a/doc/ja/lxc-console.sgml.in
+++ b/doc/ja/lxc-console.sgml.in
@@ -120,7 +120,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
 
       <varlistentry>
        <term>
-         <option>-e <optional><replaceable>escape character</replaceable></optional></option>
+         <option>-e, --escape <replaceable>escape character</replaceable></option>
        </term>
        <listitem>
          <para>
@@ -138,7 +138,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
       </varlistentry>
       <varlistentry>
        <term>
-         <option>-t <optional><replaceable>ttynum</replaceable></optional></option>
+         <option>-t, --tty <replaceable>ttynum</replaceable></option>
        </term>
        <listitem>
          <para>

diff --git a/doc/ja/lxc-create.sgml.in b/doc/ja/lxc-create.sgml.in
index e319caa4abd09be585b3a6aa10635ec72eeb4063..3991976a686dd2fc9a64886b9b394baaced267f6 100644 (file)
--- a/doc/ja/lxc-create.sgml.in
+++ b/doc/ja/lxc-create.sgml.in
@@ -112,7 +112,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
 
       <varlistentry>
        <term>
-         <option>-f <replaceable>config_file</replaceable></option>
+         <option>-f, --config <replaceable>config_file</replaceable></option>
        </term>
        <listitem>
          <para>
@@ -127,7 +127,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
 
       <varlistentry>
        <term>
-         <option>-t <replaceable>template</replaceable></option>
+         <option>-t, --template <replaceable>template</replaceable></option>
        </term>
        <listitem>
          <para>
@@ -151,7 +151,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
 
       <varlistentry>
        <term>
-         <option>-B <replaceable>backingstore</replaceable></option>
+         <option>-B, --bdev <replaceable>backingstore</replaceable></option>
        </term>
        <listitem>
           <para>

diff --git a/doc/ja/lxc-device.sgml.in b/doc/ja/lxc-device.sgml.in
index b7ce11585e4be372f8fcee840649519c76437c96..cb637e18d4d0aeb73fd87714869090dc806d345c 100644 (file)
--- a/doc/ja/lxc-device.sgml.in
+++ b/doc/ja/lxc-device.sgml.in
@@ -76,7 +76,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
     <variablelist>
       <varlistentry>
         <term>
-          <option><optional>-h</optional></option>
+          <option>-h</option>
         </term>
         <listitem>
           <para>
@@ -89,9 +89,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
       </varlistentry>
 
       <varlistentry>
-        <term>
-          <option>-n</option>
-        </term>
+        <term><option>-n, --name=<replaceable>NAME</replaceable></option></term>
         <listitem>
           <para>
             <!--

diff --git a/doc/ja/lxc-info.sgml.in b/doc/ja/lxc-info.sgml.in
index 8df1928fe6433c2a5bab5a8e22afdcfd3abce3fe..23d8cbbc9a2dc726be73f5d5c2962b73eb2eca21 100644 (file)
--- a/doc/ja/lxc-info.sgml.in
+++ b/doc/ja/lxc-info.sgml.in
@@ -80,7 +80,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
 
       <varlistentry>
         <term>
-          <option><optional>-c <replaceable>KEY</replaceable></optional></option>
+          <option>-c, --config <replaceable>KEY</replaceable></option>
         </term>
         <listitem>
           <para>
@@ -95,7 +95,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
 
       <varlistentry>
         <term>
-          <option><optional>-s</optional></option>
+          <option>-s, --state</option>
         </term>
         <listitem>
           <para>
@@ -109,7 +109,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
 
       <varlistentry>
         <term>
-          <option><optional>-p</optional></option>
+          <option>-p, --pid</option>
         </term>
         <listitem>
           <para>
@@ -123,21 +123,21 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
 
       <varlistentry>
         <term>
-          <option><optional>-i</optional></option>
+          <option>-i, --ips</option>
         </term>
         <listitem>
           <para>
             <!--
             Just print the container's IP addresses.
             -->
-            コンテナの IP アドレスを表示します。。
+            コンテナの IP アドレスを表示します。
           </para>
         </listitem>
       </varlistentry>
 
       <varlistentry>
         <term>
-          <option><optional>-S</optional></option>
+          <option>-S, --stats</option>
         </term>
         <listitem>
           <para>
@@ -174,7 +174,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
 
       <varlistentry>
         <term>
-          <option><optional>-H</optional></option>
+          <option>-H, --no-humanize</option>
         </term>
         <listitem>
           <para>

diff --git a/doc/ja/lxc-ls.sgml.in b/doc/ja/lxc-ls.sgml.in
index 58607838a2e329fd008b4df09f1718556a3d08ff..0812216f8692c66e7ed265645309babf7ef9ef39 100644 (file)
--- a/doc/ja/lxc-ls.sgml.in
+++ b/doc/ja/lxc-ls.sgml.in
@@ -85,7 +85,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
     <variablelist>
       <varlistentry>
         <term>
-          <option><optional>-1</optional></option>
+          <option>-1</option>
         </term>
         <listitem>
           <para>
@@ -99,7 +99,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
 
       <varlistentry>
         <term>
-          <option><optional>-P, --lxcpath</optional></option>
+          <option>-P, --lxcpath</option>
         </term>
         <listitem>
           <para>
@@ -113,7 +113,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
 
       <varlistentry>
        <term>
-         <option><optional>--active</optional></option>
+         <option>--active</option>
        </term>
        <listitem>
          <para>
@@ -127,7 +127,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
 
       <varlistentry>
         <term>
-          <option><optional>--frozen</optional></option>
+          <option>--frozen</option>
         </term>
         <listitem>
           <para>
@@ -141,7 +141,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
 
       <varlistentry>
         <term>
-          <option><optional>--running</optional></option>
+          <option>--running</option>
         </term>
         <listitem>
           <para>
@@ -155,7 +155,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
 
       <varlistentry>
         <term>
-          <option><optional>--stopped</optional></option>
+          <option>--stopped</option>
         </term>
         <listitem>
           <para>
@@ -169,7 +169,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
 
       <varlistentry>
         <term>
-          <option><optional>-f, --fancy</optional></option>
+          <option>-f, --fancy</option>
         </term>
         <listitem>
           <para>
@@ -183,7 +183,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
 
       <varlistentry>
         <term>
-          <option><optional>-F, --fancy-format <replaceable>format</replaceable></optional></option>
+          <option>-F, --fancy-format <replaceable>format</replaceable></option>
         </term>
         <listitem>
           <para>
@@ -198,7 +198,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
 
       <varlistentry>
         <term>
-          <option><optional>-g, --groups <replaceable>groups</replaceable></optional></option>
+          <option>-g, --groups <replaceable>groups</replaceable></option>
         </term>
         <listitem>
           <para>
@@ -213,7 +213,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
 
       <varlistentry>
         <term>
-          <option><optional>--nesting</optional></option>
+          <option>--nesting</option>
         </term>
         <listitem>
           <para>
@@ -227,7 +227,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
 
       <varlistentry>
         <term>
-          <option><optional>filter</optional></option>
+          <option>filter</option>
         </term>
         <listitem>
           <para>
@@ -243,7 +243,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
 
       <varlistentry>
         <term>
-          <option><optional>--version</optional></option>
+          <option>--version</option>
         </term>
         <listitem>
           <para>

diff --git a/doc/ja/lxc-start-ephemeral.sgml.in b/doc/ja/lxc-start-ephemeral.sgml.in
index 3f79c742d2bd4a89e093414aa5dc896d9f2b02e3..0fb673825055c4a17d05e6a802c5cf2b067cce80 100644 (file)
--- a/doc/ja/lxc-start-ephemeral.sgml.in
+++ b/doc/ja/lxc-start-ephemeral.sgml.in
@@ -82,7 +82,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
     <variablelist>
       <varlistentry>
         <term>
-          <option>-o</option>
+          <option>-o, --orig <replaceable>orig</replaceable></option>
         </term>
         <listitem>
           <para>
@@ -96,7 +96,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
 
       <varlistentry>
         <term>
-          <option><optional>-n</optional></option>
+          <option>-n, --name <replaceable>name</replaceable></option>
         </term>
         <listitem>
           <para>
@@ -110,7 +110,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
 
       <varlistentry>
         <term>
-          <option><optional>-d</optional></option>
+          <option>-d, --daemon</option>
         </term>
         <listitem>
           <para>
@@ -126,7 +126,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
 
       <varlistentry>
         <term>
-          <option><optional>--bdir</optional></option>
+          <option>-b, --bdir <replaceable>bdir</replaceable></option>
         </term>
         <listitem>
           <para>
@@ -142,7 +142,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
 
       <varlistentry>
         <term>
-          <option><optional>--user</optional></option>
+          <option>-u, --user <replaceable>user</replaceable></option>
         </term>
         <listitem>
           <para>
@@ -158,7 +158,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
 
       <varlistentry>
         <term>
-          <option><optional>--key</optional></option>
+          <option>-S, --key <replaceable>key</replaceable></option>
         </term>
         <listitem>
           <para>
@@ -172,7 +172,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
 
       <varlistentry>
         <term>
-          <option><optional>--storage-type</optional></option>
+          <option>-s, --storage-type <replaceable>storage type</replaceable></option>
         </term>
         <listitem>
           <para>
@@ -186,7 +186,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
 
       <varlistentry>
         <term>
-          <option><optional>--union-type</optional></option>
+          <option>-U, --union-type <replaceable>union type</replaceable></option>
         </term>
         <listitem>
           <para>
@@ -202,7 +202,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
 
       <varlistentry>
         <term>
-          <option><optional>--keep-data</optional></option>
+          <option>-k, --keep-data</option>
         </term>
         <listitem>
           <para>
@@ -218,7 +218,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
 
       <varlistentry>
         <term>
-          <option><optional>COMMAND</optional></option>
+          <option>COMMAND</option>
         </term>
         <listitem>
           <para>

diff --git a/doc/ja/lxc-top.sgml.in b/doc/ja/lxc-top.sgml.in
index c134b3aca693a48b3cb4d01440143054b83bb4cf..66a79b4785556c8bc7d482ce9f8e16da5b457da5 100644 (file)
--- a/doc/ja/lxc-top.sgml.in
+++ b/doc/ja/lxc-top.sgml.in
@@ -79,7 +79,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
       <varlistentry>
         <term>
-          <option><optional>-d, --delay <replaceable>delay</replaceable></optional></option>
+          <option>-d, --delay <replaceable>delay</replaceable></option>
         </term>
         <listitem>
           <para>
@@ -93,7 +93,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
       </varlistentry>
       <varlistentry>
         <term>
-          <option><optional>-s, --sort <replaceable>sortby</replaceable></optional></option>
+          <option>-s, --sort <replaceable>sortby</replaceable></option>
         </term>
         <listitem>
           <para>
@@ -110,7 +110,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
       </varlistentry>
       <varlistentry>
         <term>
-          <option><optional>-r, --reverse</optional></option>
+          <option>-r, --reverse</option>
         </term>
         <listitem>
           <para>

diff --git a/doc/ja/lxc-wait.sgml.in b/doc/ja/lxc-wait.sgml.in
index e51d964e289f23340ea6a1b87dc1386818c23151..e60493cd74793f42f0d84c2aa0964535da0465e1 100644 (file)
--- a/doc/ja/lxc-wait.sgml.in
+++ b/doc/ja/lxc-wait.sgml.in
@@ -78,7 +78,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
 
       <varlistentry>
        <term>
-         <option>-s <replaceable>states</replaceable></option>
+         <option>-s, --state <replaceable>states</replaceable></option>
        </term>
        <listitem>
          <para>
@@ -94,7 +94,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
 
       <varlistentry>
        <term>
-         <option>-t <replaceable>timeout</replaceable></option>
+         <option>-t, --timeout <replaceable>timeout</replaceable></option>
        </term>
        <listitem>
          <para>

diff --git a/doc/ko/lxc-console.sgml.in b/doc/ko/lxc-console.sgml.in
index 8d435d906f5024a05a99f5e99a8447b83cf05b60..fd6820a819d2b673e3096c6ef3f93480a55b5bf7 100644 (file)
--- a/doc/ko/lxc-console.sgml.in
+++ b/doc/ko/lxc-console.sgml.in
@@ -118,7 +118,7 @@ by Sungbae Yoo <sungbae.yoo at samsung.com>
 
       <varlistentry>
        <term>
-         <option>-e <optional><replaceable>escape character</replaceable></optional></option>
+         <option>-e, --escape <replaceable>escape character</replaceable></option>
        </term>
        <listitem>
          <para>
@@ -136,7 +136,7 @@ by Sungbae Yoo <sungbae.yoo at samsung.com>
       </varlistentry>
       <varlistentry>
        <term>
-         <option>-t <optional><replaceable>ttynum</replaceable></optional></option>
+         <option>-t, --tty <replaceable>ttynum</replaceable></option>
        </term>
        <listitem>
          <para>

diff --git a/doc/ko/lxc-create.sgml.in b/doc/ko/lxc-create.sgml.in
index d794306f3973dbf13f049f893dd2993b6325440b..ed685a42f8b77102dee53f8fa99f70aa2319a9f1 100644 (file)
--- a/doc/ko/lxc-create.sgml.in
+++ b/doc/ko/lxc-create.sgml.in
@@ -112,7 +112,7 @@ by Sungbae Yoo <sungbae.yoo at samsung.com>
 
       <varlistentry>
        <term>
-         <option>-f <replaceable>config_file</replaceable></option>
+         <option>-f, --config <replaceable>config_file</replaceable></option>
        </term>
        <listitem>
          <para>
@@ -127,7 +127,7 @@ by Sungbae Yoo <sungbae.yoo at samsung.com>
 
       <varlistentry>
        <term>
-         <option>-t <replaceable>template</replaceable></option>
+         <option>-t, --template <replaceable>template</replaceable></option>
        </term>
        <listitem>
          <para>
@@ -150,7 +150,7 @@ by Sungbae Yoo <sungbae.yoo at samsung.com>
 
       <varlistentry>
        <term>
-         <option>-B <replaceable>backingstore</replaceable></option>
+         <option>-B, --bdev <replaceable>backingstore</replaceable></option>
        </term>
        <listitem>
           <para>

diff --git a/doc/ko/lxc-device.sgml.in b/doc/ko/lxc-device.sgml.in
index 2c8cbd49020c3d09304519fb5f3fec65af3d6dbd..b2c5cf45c39a2a3fa2988d23038eda255dae7f8a 100644 (file)
--- a/doc/ko/lxc-device.sgml.in
+++ b/doc/ko/lxc-device.sgml.in
@@ -76,7 +76,7 @@ by Sungbae Yoo <sungbae.yoo at samsung.com>
     <variablelist>
       <varlistentry>
         <term>
-          <option><optional>-h</optional></option>
+          <option>-h</option>
         </term>
         <listitem>
           <para>
@@ -89,9 +89,7 @@ by Sungbae Yoo <sungbae.yoo at samsung.com>
       </varlistentry>
 
       <varlistentry>
-        <term>
-          <option>-n</option>
-        </term>
+        <term><option>-n, --name=<replaceable>NAME</replaceable></option></term>
         <listitem>
           <para>
             <!--

diff --git a/doc/ko/lxc-info.sgml.in b/doc/ko/lxc-info.sgml.in
index 08ebcf39040a6d6ec852691bf93ca9483356d47f..4f99c5a0a4fe21728183830ee0046e2a2f5a35d5 100644 (file)
--- a/doc/ko/lxc-info.sgml.in
+++ b/doc/ko/lxc-info.sgml.in
@@ -80,7 +80,7 @@ by Sungbae Yoo <sungbae.yoo at samsung.com>
 
       <varlistentry>
         <term>
-          <option><optional>-c <replaceable>KEY</replaceable></optional></option>
+          <option>-c, --config <replaceable>KEY</replaceable></option>
         </term>
         <listitem>
           <para>
@@ -95,7 +95,7 @@ by Sungbae Yoo <sungbae.yoo at samsung.com>
 
       <varlistentry>
         <term>
-          <option><optional>-s</optional></option>
+          <option>-s, --state</option>
         </term>
         <listitem>
           <para>
@@ -109,7 +109,7 @@ by Sungbae Yoo <sungbae.yoo at samsung.com>
 
       <varlistentry>
         <term>
-          <option><optional>-p</optional></option>
+          <option>-p, --pid</option>
         </term>
         <listitem>
           <para>
@@ -124,7 +124,7 @@ by Sungbae Yoo <sungbae.yoo at samsung.com>
 
       <varlistentry>
         <term>
-          <option><optional>-i</optional></option>
+          <option>-i, --ips</option>
         </term>
         <listitem>
           <para>
@@ -138,7 +138,7 @@ by Sungbae Yoo <sungbae.yoo at samsung.com>
 
       <varlistentry>
         <term>
-          <option><optional>-S</optional></option>
+          <option>-S, --stats</option>
         </term>
         <listitem>
           <para>
@@ -174,7 +174,7 @@ by Sungbae Yoo <sungbae.yoo at samsung.com>
 
       <varlistentry>
         <term>
-          <option><optional>-H</optional></option>
+          <option>-H, --no-humanize</option>
         </term>
         <listitem>
           <para>

diff --git a/doc/ko/lxc-ls.sgml.in b/doc/ko/lxc-ls.sgml.in
index d3323b053c0507719fcbb7eb8add26745f8dd634..a6b9f0be8459f3528ba77a0d6a5169dfd0176b81 100644 (file)
--- a/doc/ko/lxc-ls.sgml.in
+++ b/doc/ko/lxc-ls.sgml.in
@@ -85,7 +85,7 @@ by Sungbae Yoo <sungbae.yoo at samsung.com>
     <variablelist>
       <varlistentry>
         <term>
-          <option><optional>-1</optional></option>
+          <option>-1</option>
         </term>
         <listitem>
           <para>
@@ -99,7 +99,7 @@ by Sungbae Yoo <sungbae.yoo at samsung.com>
 
       <varlistentry>
        <term>
-         <option><optional>-P, --lxcpath</optional></option>
+         <option>-P, --lxcpath</option>
        </term>
        <listitem>
          <para>
@@ -113,7 +113,7 @@ by Sungbae Yoo <sungbae.yoo at samsung.com>
 
       <varlistentry>
        <term>
-         <option><optional>--active</optional></option>
+         <option>--active</option>
        </term>
        <listitem>
          <para>
@@ -127,7 +127,7 @@ by Sungbae Yoo <sungbae.yoo at samsung.com>
 
       <varlistentry>
         <term>
-          <option><optional>--frozen</optional></option>
+          <option>--frozen</option>
         </term>
         <listitem>
           <para>
@@ -141,7 +141,7 @@ by Sungbae Yoo <sungbae.yoo at samsung.com>
 
       <varlistentry>
         <term>
-          <option><optional>--running</optional></option>
+          <option>--running</option>
         </term>
         <listitem>
           <para>
@@ -155,7 +155,7 @@ by Sungbae Yoo <sungbae.yoo at samsung.com>
 
       <varlistentry>
         <term>
-          <option><optional>--stopped</optional></option>
+          <option>--stopped</option>
         </term>
         <listitem>
           <para>
@@ -169,7 +169,7 @@ by Sungbae Yoo <sungbae.yoo at samsung.com>
 
       <varlistentry>
         <term>
-          <option><optional>-f, --fancy</optional></option>
+          <option>-f, --fancy</option>
         </term>
         <listitem>
           <para>
@@ -183,7 +183,7 @@ by Sungbae Yoo <sungbae.yoo at samsung.com>
 
       <varlistentry>
         <term>
-          <option><optional>-F, --fancy-format <replaceable>format</replaceable></optional></option>
+          <option>-F, --fancy-format <replaceable>format</replaceable></option>
         </term>
         <listitem>
           <para>
@@ -199,7 +199,7 @@ by Sungbae Yoo <sungbae.yoo at samsung.com>
 
       <varlistentry>
         <term>
-          <option><optional>-g, --groups <replaceable>groups</replaceable></optional></option>
+          <option>-g, --groups <replaceable>groups</replaceable></option>
         </term>
         <listitem>
           <para>
@@ -215,7 +215,7 @@ by Sungbae Yoo <sungbae.yoo at samsung.com>
 
       <varlistentry>
         <term>
-          <option><optional>--nesting</optional></option>
+          <option>--nesting</option>
         </term>
         <listitem>
           <para>
@@ -229,7 +229,7 @@ by Sungbae Yoo <sungbae.yoo at samsung.com>
 
       <varlistentry>
         <term>
-          <option><optional>filter</optional></option>
+          <option>filter</option>
         </term>
         <listitem>
           <para>
@@ -245,7 +245,7 @@ by Sungbae Yoo <sungbae.yoo at samsung.com>
 
       <varlistentry>
         <term>
-          <option><optional>--version</optional></option>
+          <option>--version</option>
         </term>
         <listitem>
           <para>

diff --git a/doc/ko/lxc-start-ephemeral.sgml.in b/doc/ko/lxc-start-ephemeral.sgml.in
index 57f8be49fc8795ec118365f4b7192a9ae7178df8..2ae544f4be33323f3d622f9c2b84af0473a40d3d 100644 (file)
--- a/doc/ko/lxc-start-ephemeral.sgml.in
+++ b/doc/ko/lxc-start-ephemeral.sgml.in
@@ -82,7 +82,7 @@ by Sungbae Yoo <sungbae.yoo at samsung.com>
     <variablelist>
       <varlistentry>
         <term>
-          <option>-o</option>
+          <option>-o, --orig <replaceable>orig</replaceable></option>
         </term>
         <listitem>
           <para>
@@ -96,7 +96,7 @@ by Sungbae Yoo <sungbae.yoo at samsung.com>
 
       <varlistentry>
         <term>
-          <option><optional>-n</optional></option>
+          <option>-n, --name <replaceable>name</replaceable></option>
         </term>
         <listitem>
           <para>
@@ -110,7 +110,7 @@ by Sungbae Yoo <sungbae.yoo at samsung.com>
 
       <varlistentry>
         <term>
-          <option><optional>-d</optional></option>
+          <option>-d, --daemon</option>
         </term>
         <listitem>
           <para>
@@ -126,7 +126,7 @@ by Sungbae Yoo <sungbae.yoo at samsung.com>
 
       <varlistentry>
         <term>
-          <option><optional>--bdir</optional></option>
+          <option>-b, --bdir <replaceable>bdir</replaceable></option>
         </term>
         <listitem>
           <para>
@@ -142,7 +142,7 @@ by Sungbae Yoo <sungbae.yoo at samsung.com>
 
       <varlistentry>
         <term>
-          <option><optional>--user</optional></option>
+          <option>-u, --user <replaceable>user</replaceable></option>
         </term>
         <listitem>
           <para>
@@ -158,7 +158,7 @@ by Sungbae Yoo <sungbae.yoo at samsung.com>
 
       <varlistentry>
         <term>
-          <option><optional>--key</optional></option>
+          <option>-S, --key <replaceable>key</replaceable></option>
         </term>
         <listitem>
           <para>
@@ -172,7 +172,7 @@ by Sungbae Yoo <sungbae.yoo at samsung.com>
 
       <varlistentry>
         <term>
-          <option><optional>--storage-type</optional></option>
+          <option>-s, --storage-type <replaceable>storage type</replaceable></option>
         </term>
         <listitem>
           <para>
@@ -186,7 +186,7 @@ by Sungbae Yoo <sungbae.yoo at samsung.com>
 
       <varlistentry>
         <term>
-          <option><optional>--union-type</optional></option>
+          <option>-U, --union-type <replaceable>union type</replaceable></option>
         </term>
         <listitem>
           <para>
@@ -202,7 +202,7 @@ by Sungbae Yoo <sungbae.yoo at samsung.com>
 
       <varlistentry>
         <term>
-          <option><optional>--keep-data</optional></option>
+          <option>-k, --keep-data</option>
         </term>
         <listitem>
           <para>
@@ -219,7 +219,7 @@ by Sungbae Yoo <sungbae.yoo at samsung.com>
 
       <varlistentry>
         <term>
-          <option><optional>COMMAND</optional></option>
+          <option>COMMAND</option>
         </term>
         <listitem>
           <para>

diff --git a/doc/ko/lxc-top.sgml.in b/doc/ko/lxc-top.sgml.in
index 7f4357f01cd44f6eaf363a590a1303ebc0f55885..3c34b6b217c4e622d2ace749dc899680014e453a 100644 (file)
--- a/doc/ko/lxc-top.sgml.in
+++ b/doc/ko/lxc-top.sgml.in
@@ -82,7 +82,7 @@ by Sungbae Yoo <sungbae.yoo at samsung.com>
 
       <varlistentry>
         <term>
-          <option><optional>-d, --delay <replaceable>delay</replaceable></optional></option>
+          <option>-d, --delay <replaceable>delay</replaceable></option>
         </term>
         <listitem>
           <para>
@@ -97,7 +97,7 @@ by Sungbae Yoo <sungbae.yoo at samsung.com>
       </varlistentry>
       <varlistentry>
         <term>
-          <option><optional>-s, --sort <replaceable>sortby</replaceable></optional></option>
+          <option>-s, --sort <replaceable>sortby</replaceable></option>
         </term>
         <listitem>
           <para>
@@ -113,7 +113,7 @@ by Sungbae Yoo <sungbae.yoo at samsung.com>
       </varlistentry>
       <varlistentry>
         <term>
-          <option><optional>-r, --reverse</optional></option>
+          <option>-r, --reverse</option>
         </term>
         <listitem>
           <para>

diff --git a/doc/ko/lxc-wait.sgml.in b/doc/ko/lxc-wait.sgml.in
index e780270c220059a58b881cb3adfc999e91c3dac9..396c4d3dbc29ff7153088e064bfb2201758258ab 100644 (file)
--- a/doc/ko/lxc-wait.sgml.in
+++ b/doc/ko/lxc-wait.sgml.in
@@ -77,7 +77,7 @@ by Sungbae Yoo <sungbae.yoo at samsung.com>
 
       <varlistentry>
        <term>
-         <option>-s <replaceable>states</replaceable></option>
+         <option>-s, --state <replaceable>states</replaceable></option>
        </term>
        <listitem>
          <para>
@@ -93,7 +93,7 @@ by Sungbae Yoo <sungbae.yoo at samsung.com>
 
       <varlistentry>
        <term>
-         <option>-t <replaceable>timeout</replaceable></option>
+         <option>-t, --timeout <replaceable>timeout</replaceable></option>
        </term>
        <listitem>
          <para>

diff --git a/doc/lxc-console.sgml.in b/doc/lxc-console.sgml.in
index fd4caa6ae2bb0b8a307988a95c038f128dae0906..8f0bb1f91434e5c9499dcb14b46dff0fd73cb5c9 100644 (file)
--- a/doc/lxc-console.sgml.in
+++ b/doc/lxc-console.sgml.in
@@ -96,7 +96,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
       <varlistentry>
        <term>
-         <option>-e <optional><replaceable>escape character</replaceable></optional></option>
+         <option>-e, --escape <replaceable>escape character</replaceable></option>
        </term>
        <listitem>
          <para>
@@ -109,7 +109,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
       </varlistentry>
       <varlistentry>
        <term>
-         <option>-t <optional><replaceable>ttynum</replaceable></optional></option>
+         <option>-t, --tty <replaceable>ttynum</replaceable></option>
        </term>
        <listitem>
          <para>

diff --git a/doc/lxc-create.sgml.in b/doc/lxc-create.sgml.in
index ffaa73882f5cea972333b3bbec047cc8183f00ad..1e97c40b15dcde396b793aff0d2c51bf37483c67 100644 (file)
--- a/doc/lxc-create.sgml.in
+++ b/doc/lxc-create.sgml.in
@@ -92,7 +92,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
       <varlistentry>
        <term>
-         <option>-f <replaceable>config_file</replaceable></option>
+         <option>-f, --config <replaceable>config_file</replaceable></option>
        </term>
        <listitem>
          <para>
@@ -104,7 +104,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
       <varlistentry>
        <term>
-         <option>-t <replaceable>template</replaceable></option>
+         <option>-t, --template <replaceable>template</replaceable></option>
        </term>
        <listitem>
          <para>
@@ -122,7 +122,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
       <varlistentry>
        <term>
-         <option>-B <replaceable>backingstore</replaceable></option>
+         <option>-B, --bdev <replaceable>backingstore</replaceable></option>
        </term>
        <listitem>
          <para>

diff --git a/doc/lxc-device.sgml.in b/doc/lxc-device.sgml.in
index c90d3749314daa00c35fd23c27977b23c8c4b303..8e17bbf21cbd9a1352798329e77af62effce67ec 100644 (file)
--- a/doc/lxc-device.sgml.in
+++ b/doc/lxc-device.sgml.in
@@ -67,7 +67,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
     <variablelist>
       <varlistentry>
         <term>
-          <option><optional>-h</optional></option>
+          <option>-h</option>
         </term>
         <listitem>
           <para>
@@ -77,9 +77,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
       </varlistentry>
 
       <varlistentry>
-        <term>
-          <option>-n</option>
-        </term>
+        <term><option>-n, --name=<replaceable>NAME</replaceable></option></term>
         <listitem>
           <para>
              The name of the target container.

diff --git a/doc/lxc-info.sgml.in b/doc/lxc-info.sgml.in
index 5707975fbe2e3f0eda41bc366649f50d17caa0eb..02353a2c8d55ee8d8ae296bd5a12743ed93c885a 100644 (file)
--- a/doc/lxc-info.sgml.in
+++ b/doc/lxc-info.sgml.in
@@ -71,7 +71,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
       <varlistentry>
         <term>
-          <option><optional>-c <replaceable>KEY</replaceable></optional></option>
+          <option>-c, --config <replaceable>KEY</replaceable></option>
         </term>
         <listitem>
           <para>
@@ -83,7 +83,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
       <varlistentry>
         <term>
-          <option><optional>-s</optional></option>
+          <option>-s, --state</option>
         </term>
         <listitem>
           <para>
@@ -94,7 +94,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
       <varlistentry>
         <term>
-          <option><optional>-p</optional></option>
+          <option>-p, --pid</option>
         </term>
         <listitem>
           <para>
@@ -105,7 +105,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
       <varlistentry>
         <term>
-          <option><optional>-i</optional></option>
+          <option>-i, --ips</option>
         </term>
         <listitem>
           <para>
@@ -116,7 +116,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
       <varlistentry>
         <term>
-          <option><optional>-S</optional></option>
+          <option>-S, --stats</option>
         </term>
         <listitem>
           <para>
@@ -139,7 +139,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
       <varlistentry>
         <term>
-          <option><optional>-H</optional></option>
+          <option>-H, --no-humanize</option>
         </term>
         <listitem>
           <para>

diff --git a/doc/lxc-ls.sgml.in b/doc/lxc-ls.sgml.in
index 63826e16e17d7804027ed71551210f552438cc5e..41a23e6a7dfbc3aab3a3066bd92901744f355094 100644 (file)
--- a/doc/lxc-ls.sgml.in
+++ b/doc/lxc-ls.sgml.in
@@ -77,7 +77,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
     <variablelist>
       <varlistentry>
         <term>
-          <option><optional>-1</optional></option>
+          <option>-1</option>
         </term>
         <listitem>
           <para>
@@ -88,7 +88,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
       <varlistentry>
         <term>
-          <option><optional>-P, --lxcpath</optional></option>
+          <option>-P, --lxcpath</option>
         </term>
         <listitem>
           <para>
@@ -99,7 +99,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
       <varlistentry>
         <term>
-          <option><optional>--active</optional></option>
+          <option>--active</option>
         </term>
         <listitem>
           <para>
@@ -110,7 +110,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
       <varlistentry>
         <term>
-          <option><optional>--frozen</optional></option>
+          <option>--frozen</option>
         </term>
         <listitem>
           <para>
@@ -121,7 +121,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
       <varlistentry>
         <term>
-          <option><optional>--running</optional></option>
+          <option>--running</option>
         </term>
         <listitem>
           <para>
@@ -132,7 +132,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
       <varlistentry>
         <term>
-          <option><optional>--stopped</optional></option>
+          <option>--stopped</option>
         </term>
         <listitem>
           <para>
@@ -143,7 +143,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
       <varlistentry>
         <term>
-          <option><optional>-f, --fancy</optional></option>
+          <option>-f, --fancy</option>
         </term>
         <listitem>
           <para>
@@ -154,7 +154,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
       <varlistentry>
         <term>
-          <option><optional>-F, --fancy-format <replaceable>format</replaceable></optional></option>
+          <option>-F, --fancy-format <replaceable>format</replaceable></option>
         </term>
         <listitem>
           <para>
@@ -166,7 +166,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
       <varlistentry>
         <term>
-          <option><optional>-g, --groups <replaceable>groups</replaceable></optional></option>
+          <option>-g, --groups <replaceable>groups</replaceable></option>
         </term>
         <listitem>
           <para>
@@ -178,7 +178,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
       <varlistentry>
         <term>
-          <option><optional>--nesting</optional></option>
+          <option>--nesting</option>
         </term>
         <listitem>
           <para>
@@ -189,7 +189,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
       <varlistentry>
         <term>
-          <option><optional>filter</optional></option>
+          <option>filter</option>
         </term>
         <listitem>
           <para>
@@ -201,7 +201,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
       <varlistentry>
         <term>
-          <option><optional>--version</optional></option>
+          <option>--version</option>
         </term>
         <listitem>
           <para>

diff --git a/doc/lxc-start-ephemeral.sgml.in b/doc/lxc-start-ephemeral.sgml.in
index 6f3a325162e015790c3328246b7abefe154a5530..0e2c7adb59946db6ddffb2ba9c6672939660117c 100644 (file)
--- a/doc/lxc-start-ephemeral.sgml.in
+++ b/doc/lxc-start-ephemeral.sgml.in
@@ -73,7 +73,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
     <variablelist>
       <varlistentry>
         <term>
-          <option>-o</option>
+          <option>-o, --orig <replaceable>orig</replaceable></option>
         </term>
         <listitem>
           <para>
@@ -84,7 +84,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
       <varlistentry>
         <term>
-          <option><optional>-n</optional></option>
+          <option>-n, --name <replaceable>name</replaceable></option>
         </term>
         <listitem>
           <para>
@@ -95,7 +95,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
       <varlistentry>
         <term>
-          <option><optional>-d</optional></option>
+          <option>-d, --daemon</option>
         </term>
         <listitem>
           <para>
@@ -107,7 +107,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
       <varlistentry>
         <term>
-          <option><optional>--bdir</optional></option>
+          <option>-b, --bdir <replaceable>bdir</replaceable></option>
         </term>
         <listitem>
           <para>
@@ -119,7 +119,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
       <varlistentry>
         <term>
-          <option><optional>--user</optional></option>
+          <option>-u, --user <replaceable>user</replaceable></option>
         </term>
         <listitem>
           <para>
@@ -131,7 +131,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
       <varlistentry>
         <term>
-          <option><optional>--key</optional></option>
+          <option>-S, --key <replaceable>key</replaceable></option>
         </term>
         <listitem>
           <para>
@@ -142,7 +142,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
       <varlistentry>
         <term>
-          <option><optional>--storage-type</optional></option>
+          <option>-s, --storage-type <replaceable>storage type</replaceable></option>
         </term>
         <listitem>
           <para>
@@ -153,7 +153,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
       <varlistentry>
         <term>
-          <option><optional>--union-type</optional></option>
+          <option>-U, --union-type <replaceable>union type</replaceable></option>
         </term>
         <listitem>
           <para>
@@ -165,7 +165,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
       <varlistentry>
         <term>
-          <option><optional>--keep-data</optional></option>
+          <option>-k, --keep-data</option>
         </term>
         <listitem>
           <para>
@@ -178,7 +178,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
       <varlistentry>
         <term>
-          <option><optional>COMMAND</optional></option>
+          <option>COMMAND</option>
         </term>
         <listitem>
           <para>

diff --git a/doc/lxc-top.sgml.in b/doc/lxc-top.sgml.in
index 2e2f77473b7b1f3e7d173a9e5ccb95c450538741..38aa951e776c7d25e878f19cbee2848b1130337b 100644 (file)
--- a/doc/lxc-top.sgml.in
+++ b/doc/lxc-top.sgml.in
@@ -72,7 +72,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
       <varlistentry>
         <term>
-          <option><optional>-d, --delay <replaceable>delay</replaceable></optional></option>
+          <option>-d, --delay <replaceable>delay</replaceable></option>
         </term>
         <listitem>
           <para>
@@ -83,7 +83,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
       </varlistentry>
       <varlistentry>
         <term>
-          <option><optional>-s, --sort <replaceable>sortby</replaceable></optional></option>
+          <option>-s, --sort <replaceable>sortby</replaceable></option>
         </term>
         <listitem>
           <para>
@@ -96,7 +96,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
       </varlistentry>
       <varlistentry>
         <term>
-          <option><optional>-r, --reverse</optional></option>
+          <option>-r, --reverse</option>
         </term>
         <listitem>
           <para>

diff --git a/doc/lxc-wait.sgml.in b/doc/lxc-wait.sgml.in
index 5c5c9581b0c92c424977b80fa755a9f484536e07..c32f8a5107f7eba8b2280d2c390b1308832c9e3d 100644 (file)
--- a/doc/lxc-wait.sgml.in
+++ b/doc/lxc-wait.sgml.in
@@ -69,7 +69,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
       <varlistentry>
        <term>
-         <option>-s <replaceable>states</replaceable></option>
+         <option>-s, --state <replaceable>states</replaceable></option>
        </term>
        <listitem>
          <para>
@@ -81,7 +81,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
       <varlistentry>
        <term>
-         <option>-t <replaceable>timeout</replaceable></option>
+         <option>-t, --timeout <replaceable>timeout</replaceable></option>
        </term>
        <listitem>
          <para>