From e23cb7ca083139a816bccdce2199a744f9334a11 Mon Sep 17 00:00:00 2001
From: Michael Hanselmann <hansmi@google.com>
Date: Thu, 20 Dec 2012 14:08:24 +0100
Subject: [PATCH] gnt-network(8): Re-add editor settings and re-wrap
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Commit a04cc7a added βgnt-network.rstβ, but didn't copy the editor
settings from another reST file.
Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Guido Trotter <ultrotter@google.com>
---
man/gnt-network.rst | 66 ++++++++++++++++++++++++++-------------------
1 file changed, 38 insertions(+), 28 deletions(-)
diff --git a/man/gnt-network.rst b/man/gnt-network.rst
index 305ad231d..5eef890de 100644
--- a/man/gnt-network.rst
+++ b/man/gnt-network.rst
@@ -14,8 +14,8 @@ Synopsis
DESCRIPTION
-----------
-The **gnt-network** command is used for network definition administration
-in the Ganeti system.
+The **gnt-network** command is used for network definition
+administration in the Ganeti system.
COMMANDS
--------
@@ -38,18 +38,20 @@ Creates a new network with the given name. The network will be unused
initially. To connect it to a node group, use ``gnt-network connect``.
``--network`` option is mandatory. All other are optional.
-The ``--network`` option allows you to specify the network in a CIDR notation.
+The ``--network`` option allows you to specify the network in a CIDR
+notation.
-The ``--gateway`` option allows you to specify the default gateway for this
-network.
+The ``--gateway`` option allows you to specify the default gateway for
+this network.
The ``--network-type`` can be none, private or public.
IPv6 semantics can be assigned to the network via the ``--network6`` and
-``--gateway6`` options. IP pool is meaningless for IPV6 so those two values
-can be used for EUI64 generation from a NIC's MAC address.
+``--gateway6`` options. IP pool is meaningless for IPV6 so those two
+values can be used for EUI64 generation from a NIC's MAC address.
-See **ganeti(7)** for a description of ``--submit`` and other common options.
+See **ganeti(7)** for a description of ``--submit`` and other common
+options.
MODIFY
~~~~~~
@@ -67,10 +69,12 @@ MODIFY
Modifies parameters from the network.
-Unable to modify network (IP address range). Create a new network if you want
-to do so. All other options are documented in the **add** command above.
+Unable to modify network (IP address range). Create a new network if you
+want to do so. All other options are documented in the **add** command
+above.
-See **ganeti(7)** for a description of ``--submit`` and other common options.
+See **ganeti(7)** for a description of ``--submit`` and other common
+options.
REMOVE
~~~~~~
@@ -87,22 +91,22 @@ LIST
| **list** [--no-headers] [--separator=*SEPARATOR*] [-v]
| [-o *[+]FIELD,...*] [network...]
-Lists all existing networks in the cluster. If no group names are given, then
-all groups are included. Otherwise, only the named groups will be listed.
+Lists all existing networks in the cluster. If no group names are given,
+then all groups are included. Otherwise, only the named groups will be
+listed.
The ``--no-headers`` option will skip the initial header line. The
-``--separator`` option takes an argument which denotes what will be
-used between the output fields. Both these options are to help
-scripting.
+``--separator`` option takes an argument which denotes what will be used
+between the output fields. Both these options are to help scripting.
The ``-v`` option activates verbose mode, which changes the display of
special field states (see **ganeti(7)**).
-The ``-o`` option takes a comma-separated list of output fields.
-If the value of the option starts with the character ``+``, the new
-fields will be added to the default list. This allows to quickly
-see the default list plus a few other fields, instead of retyping
-the entire list of fields.
+The ``-o`` option takes a comma-separated list of output fields. If the
+value of the option starts with the character ``+``, the new fields will
+be added to the default list. This allows to quickly see the default
+list plus a few other fields, instead of retyping the entire list of
+fields.
The available fields and their meaning are:
@@ -144,8 +148,8 @@ REMOVE-TAGS
**remove-tags** [\--from *file*] {*networkname*} {*tag*...}
-Remove tags from the given network. If any of the tags are not
-existing on the network, the entire operation will abort.
+Remove tags from the given network. If any of the tags are not existing
+on the network, the entire operation will abort.
If the ``--from`` option is given, the list of tags to be removed will
be extended with the contents of that file (each line becomes a tag). In
@@ -166,14 +170,20 @@ CONNECT
| **connect** {*network*} {*mode*} {*link*} [*groups*...]
-Connect a network to given node groups (all if not specified) with the network
-parameters *mode* and *link*. Every network interface will inherit those
-parameters if assigned in a network.
+Connect a network to given node groups (all if not specified) with the
+network parameters *mode* and *link*. Every network interface will
+inherit those parameters if assigned in a network.
DISCONNECT
~~~~~~~~~~
| **disconnect** {*network*} [*groups*...]
-Disconnect a network from given node groups (all if not specified). This is
-possible only if no instance is using the network.
+Disconnect a network from given node groups (all if not specified). This
+is possible only if no instance is using the network.
+
+.. vim: set textwidth=72 :
+.. Local Variables:
+.. mode: rst
+.. fill-column: 72
+.. End:
--
GitLab