Merge branch 'stable-2.8' into stable-2.9

[ganeti-local] / man / hspace.rst

diff --git a/man/hspace.rst b/man/hspace.rst
index 74da340..d1336be 100644 (file)
--- a/man/hspace.rst
+++ b/man/hspace.rst
@@ -17,7 +17,7 @@ SYNOPSIS
 Backend options:
 
 { **-m** *cluster* | **-L[** *path* **] [-X]** | **-t** *data-file* |
-**\--simulate** *spec* }
+**\--simulate** *spec* | **-I** *path* }
 
 
 Algorithm options:
@@ -106,7 +106,7 @@ INI_MEM_INST, FIN_MEM_INST
 
 INI_MEM_OVERHEAD, FIN_MEM_OVERHEAD
   The initial and final memory overhead, i.e. memory used for the node
-  itself and unacounted memory (e.g. due to hypervisor overhead).
+  itself and unaccounted memory (e.g. due to hypervisor overhead).
 
 INI_MEM_EFF, HTS_INI_MEM_EFF
   The initial and final memory efficiency, represented as instance
@@ -191,8 +191,9 @@ OK
   that the computation failed and any values present should not be
   relied upon.
 
-Many of the INI_/FIN_ metrics will be also displayed with a TRL_ prefix,
-and denote the cluster status at the end of the tiered allocation run.
+Many of the ``INI_``/``FIN_`` metrics will be also displayed with a
+``TRL_`` prefix, and denote the cluster status at the end of the tiered
+allocation run.
 
 The human output format should be self-explanatory, so it is not
 described further.
@@ -207,6 +208,11 @@ The options that can be passed to the program are as follows:
   one of the Ganeti disk templates (e.g. plain, drbd, so on) should be
   passed in.
 
+\--spindle-use *spindles*
+  Override the spindle use for the instance read from the cluster. The
+  value can be 0 (for example for instances that use very low I/O), but not
+  negative. For shared storage the value is ignored.
+
 \--max-cpu=*cpu-ratio*
   The maximum virtual to physical cpu ratio, as a floating point number
   greater than or equal to one. For example, specifying *cpu-ratio* as
@@ -230,7 +236,7 @@ The options that can be passed to the program are as follows:
 -p, \--print-nodes
   Prints the before and after node status, in a format designed to allow
   the user to understand the node's most important parameters. See the
-  man page **htools**(1) for more details about this option.
+  man page **htools**\(1) for more details about this option.
 
 -O *name*
   This option (which can be given multiple times) will mark nodes as
@@ -258,22 +264,22 @@ The options that can be passed to the program are as follows:
   Backend specification: the name of the file holding node and instance
   information (if not collecting via RAPI or LUXI). This or one of the
   other backends must be selected. The option is described in the man
-  page **htools**(1).
+  page **htools**\(1).
 
 -m *cluster*
   Backend specification: collect data directly from the *cluster* given
   as an argument via RAPI. The option is described in the man page
-  **htools**(1).
+  **htools**\(1).
 
 -L [*path*]
   Backend specification: collect data directly from the master daemon,
   which is to be contacted via LUXI (an internal Ganeti protocol). The
-  option is described in the man page **htools**(1).
+  option is described in the man page **htools**\(1).
 
 \--simulate *description*
   Backend specification: similar to the **-t** option, this allows
   overriding the cluster data with a simulated cluster. For details
-  about the description, see the man page **htools**(1).
+  about the description, see the man page **htools**\(1).
 
 \--standard-alloc *disk,ram,cpu*
   This option overrides the instance size read from the cluster for the
@@ -334,7 +340,7 @@ upper-case letters of *M*, *G* and *T* (or their longer equivalents of
 *MB*, *GB*, *TB*, for which case doesn't matter).
 
 More details about the difference between the SI and binary systems can
-be read in the *units(7)* man page.
+be read in the **units**\(7) man page.
 
 EXIT STATUS
 -----------