... and fix a typo.
Signed-off-by: Jose A. Lopes <[email protected]>
---
man/gnt-cluster.rst | 8 +++++++-
man/gnt-instance.rst | 6 +++---
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/man/gnt-cluster.rst b/man/gnt-cluster.rst
index 72756c2..869e1c6 100644
--- a/man/gnt-cluster.rst
+++ b/man/gnt-cluster.rst
@@ -202,6 +202,7 @@ INIT
| [\--hypervisor-state *hvstate*]
| [\--drbd-usermode-helper *helper*]
| [\--enabled-disk-templates *template* [,*template*...]]
+| [\--user-shutdown {yes \| no}]
| {*clustername*}
This commands is only run once initially on the first node of the
@@ -310,6 +311,9 @@ Either a single hypervisor name or a comma-separated list of
hypervisor names can be specified. If this option is not specified,
only the xen-pvm hypervisor is enabled by default.
+The ``--user-shutdown`` option enables or disables user shutdown
+detection at the cluster level.
+
The ``-H (--hypervisor-parameters)`` option allows you to set default
hypervisor specific parameters for the cluster. The format of this
option is the name of the hypervisor, followed by a colon and a
@@ -660,6 +664,7 @@ MODIFY
| [\--drbd-usermode-helper *helper*]
| [\--file-storage-dir *dir*]
| [\--shared-file-storage-dir *dir*]
+| [\--user-shutdown {yes \| no}]
Modify the options for the cluster.
@@ -670,7 +675,8 @@ The ``--vg-name``, ``--enabled-hypervisors``, ``-H
(--hypervisor-parameters)``,
``--prealloc-wipe-disks``, ``--uid-pool``, ``--node-parameters``,
``--master-netdev``, ``--master-netmask``, ``--use-external-mip-script``,
``--drbd-usermode-helper``, ``--file-storage-dir``,
-``--shared-file-storage-dir``, and ``--enabled-disk-templates`` options are
+``--shared-file-storage-dir``, ``--enabled-disk-templates``, and
+``--user-shutdown`` options are
described in the **init** command.
The ``--hypervisor-state`` and ``--disk-state`` options are described in
diff --git a/man/gnt-instance.rst b/man/gnt-instance.rst
index 0d801d3..54179aa 100644
--- a/man/gnt-instance.rst
+++ b/man/gnt-instance.rst
@@ -822,9 +822,9 @@ vnet\_hdr
It is set to ``true`` by default.
The ``-O (--os-parameters)`` option allows customisation of the OS
-parameters. The actual parameter names and values depends on the OS
-being used, but the syntax is the same key=value. For example, setting
-a hypothetical ``dhcp`` parameter to yes can be achieved by::
+parameters. The actual parameter names and values depend on the OS being
+used, but the syntax is the same key=value. For example, setting a
+hypothetical ``dhcp`` parameter to yes can be achieved by::
gnt-instance add -O dhcp=yes ...
--
2.0.0.526.g5318336