diff --git a/lib/client/gnt_instance.py b/lib/client/gnt_instance.py
index a3e54b397c3d4848bb23462db442bcae527ba079..df99bdb9e700a930c0c959953f35281f06742342 100644
--- a/lib/client/gnt_instance.py
+++ b/lib/client/gnt_instance.py
@@ -1600,8 +1600,8 @@ commands = {
     [AUTO_REPLACE_OPT, DISKIDX_OPT, IALLOCATOR_OPT, EARLY_RELEASE_OPT,
      NEW_SECONDARY_OPT, ON_PRIMARY_OPT, ON_SECONDARY_OPT, SUBMIT_OPT,
      DRY_RUN_OPT, PRIORITY_OPT, IGNORE_IPOLICY_OPT],
-    "[-s|-p|-n NODE|-I NAME] <instance>",
-    "Replaces all disks for the instance"),
+    "[-s|-p|-a|-n NODE|-I NAME] <instance>",
+    "Replaces disks for the instance"),
   "modify": (
     SetInstanceParams, ARGS_ONE_INSTANCE,
     [BACKEND_OPT, DISK_OPT, FORCE_OPT, HVOPTS_OPT, NET_OPT, SUBMIT_OPT,
diff --git a/man/gnt-instance.rst b/man/gnt-instance.rst
index 749efb65e41f48107d046004898b7dae1c5d96f0..1c55c7aab41f78893c2e63f45da87b2f5a3fee10 100644
--- a/man/gnt-instance.rst
+++ b/man/gnt-instance.rst
@@ -84,7 +84,7 @@ the resolver (e.g. in DNS or /etc/hosts, depending on your setup).
 Since the name check is used to compute the IP address, if you pass
 this option you must also pass the ``--no-ip-check`` option.
 
-If you don't wat the instance to automatically start after
+If you don't want the instance to automatically start after
 creation, this is possible via the ``--no-start`` option. This will
 leave the instance down until a subsequent **gnt-instance start**
 command.
@@ -258,7 +258,7 @@ cdrom\_disk\_type
 
     This parameter determines the way the cdroms disks are presented
     to the instance. The default behavior is to get the same value of
-    the eariler parameter (disk_type). The possible options are:
+    the earlier parameter (disk_type). The possible options are:
 
     - paravirtual
     - ide
@@ -509,7 +509,7 @@ mem\_path
 use\_chroot
     Valid for the KVM hypervisor.
 
-    This boolean option determines wether to run the KVM instance in a
+    This boolean option determines whether to run the KVM instance in a
     chroot directory.
 
     If it is set to ``true``, an empty directory is created before
@@ -715,7 +715,7 @@ hypervisor
 
 mac, ip, mode, link
     Specifications for the one NIC that will be created for the
-    instance. 'bridge' is also accepted as a backwards compatibile
+    instance. 'bridge' is also accepted as a backwards compatible
     key.
 
 nics
@@ -1253,10 +1253,10 @@ REPLACE-DISKS
 [\--disks *idx*] {*instance*}
 
 **replace-disks** [\--submit] [\--early-release] [\--ignore-ipolicy]
-{{-I\|\--iallocator} *name* \| \--node *node* } {*instance*}
+{{-I\|\--iallocator} *name* \| {{-n|\--new-secondary} *node* } {*instance*}
 
 **replace-disks** [\--submit] [\--early-release] [\--ignore-ipolicy]
-{\--auto} {*instance*}
+{-a\|\--auto} {*instance*}
 
 This command is a generalized form for replacing disks. It is
 currently only valid for the mirrored (DRBD) disk template.
@@ -1529,7 +1529,7 @@ viewed with the **gnt-cluster info** command).
 If the ``--cleanup`` option is passed, the operation changes from
 migration to attempting recovery from a failed previous migration.  In
 this mode, Ganeti checks if the instance runs on the correct node (and
-updates its configuration if not) and ensures the instances's disks
+updates its configuration if not) and ensures the instances' disks
 are configured correctly. In this mode, the ``--non-live`` option is
 ignored.
 
diff --git a/man/gnt-node.rst b/man/gnt-node.rst
index 8e0fd6740755eb9b382f26ff4d260ed674e8daec..7093b444cf826955d5ff544e5aed777f11c59a2a 100644
--- a/man/gnt-node.rst
+++ b/man/gnt-node.rst
@@ -220,7 +220,7 @@ listing fast if only fields from this set are selected), whereas the
 other fields are "live" fields and require a query to the cluster nodes.
 
 Depending on the virtualization type and implementation details, the
-``mtotal``, ``mnode`` and ``mfree`` fields may have slighly varying
+``mtotal``, ``mnode`` and ``mfree`` fields may have slightly varying
 meanings. For example, some solutions share the node memory with the
 pool of memory used for instances (KVM), whereas others have separate
 memory for the node and for the instances (Xen).
@@ -295,8 +295,8 @@ As for the **gnt-instance migrate** command, the options
 ``--no-live``, ``--migration-mode`` and ``--no-runtime-changes``
 can be given to influence the migration type.
 
-If ``--ignore-ipolicy`` is given any instance policy violations occuring
-during this operation are ignored.
+If ``--ignore-ipolicy`` is given any instance policy violations
+occurring during this operation are ignored.
 
 See **ganeti(7)** for a description of ``--submit`` and other common
 options.
@@ -575,7 +575,7 @@ POWER
 
 This command calls out to out-of-band management to change the power
 state of given node. With ``status`` you get the power status as reported
-by the out-of-band managment script.
+by the out-of-band management script.
 
 Note that this command will only work if the out-of-band functionality
 is configured and enabled on the cluster. If this is not the case,
diff --git a/man/hspace.rst b/man/hspace.rst
index b6b9d84004b78717be0547b23f212e3107c78848..1a3c064ad224fed8fabee1b22d01fcf3ba823acc 100644
--- a/man/hspace.rst
+++ b/man/hspace.rst
@@ -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