diff --git a/lib/cli.py b/lib/cli.py
index 6bff1152387867d433c65c18a8a580dca5f45d12..feb0fe41a0e6cd0e9088381824112dbd45ba2f61 100644
--- a/lib/cli.py
+++ b/lib/cli.py
@@ -1404,14 +1404,17 @@ IGNORE_ERRORS_OPT = cli_option("-I", "--ignore-errors", default=[],
 
 DISK_STATE_OPT = cli_option("--disk-state", default=[], dest="disk_state",
                             action="append",
-                            help=("Specify disk state information in the format"
-                                  " storage_type/identifier:option=value,..."),
+                            help=("Specify disk state information in the"
+                                  " format"
+                                  " storage_type/identifier:option=value,...;"
+                                  " note this is unused for now"),
                             type="identkeyval")
 
 HV_STATE_OPT = cli_option("--hypervisor-state", default=[], dest="hv_state",
                           action="append",
                           help=("Specify hypervisor state information in the"
-                                " format hypervisor:option=value,..."),
+                                " format hypervisor:option=value,...;"
+                                " note this is unused for now"),
                           type="identkeyval")
 
 IGNORE_IPOLICY_OPT = cli_option("--ignore-ipolicy", dest="ignore_ipolicy",
diff --git a/man/ganeti.rst b/man/ganeti.rst
index c7137c0ab6fca5d575ccf0ae9be790e824cf4841..2d5c82f729f8fd49e6a76c493b3d9fe43f370d7e 100644
--- a/man/ganeti.rst
+++ b/man/ganeti.rst
@@ -144,6 +144,9 @@ cpu_node
   discovered or set manually. Only used for estimating how many VCPUs
   are left for instances
 
+Note that currently this option is unused by Ganeti; values will be
+recorded but will not influence the Ganeti operation.
+
 
 Disk State Parameters
 ~~~~~~~~~~~~~~~~~~~~~
@@ -166,6 +169,9 @@ disk_overhead
   Disk that is expected to be used by other volumes (set via
   ``reserved_lvs``); usually should be zero
 
+Note that currently this option is unused by Ganeti; values will be
+recorded but will not influence the Ganeti operation.
+
 
 Cluster configuration
 ~~~~~~~~~~~~~~~~~~~~~