Revision 50c1e351

b/lib/client/gnt_instance.py
1600 1600
    [AUTO_REPLACE_OPT, DISKIDX_OPT, IALLOCATOR_OPT, EARLY_RELEASE_OPT,
1601 1601
     NEW_SECONDARY_OPT, ON_PRIMARY_OPT, ON_SECONDARY_OPT, SUBMIT_OPT,
1602 1602
     DRY_RUN_OPT, PRIORITY_OPT, IGNORE_IPOLICY_OPT],
1603
    "[-s|-p|-n NODE|-I NAME] <instance>",
1604
    "Replaces all disks for the instance"),
1603
    "[-s|-p|-a|-n NODE|-I NAME] <instance>",
1604
    "Replaces disks for the instance"),
1605 1605
  "modify": (
1606 1606
    SetInstanceParams, ARGS_ONE_INSTANCE,
1607 1607
    [BACKEND_OPT, DISK_OPT, FORCE_OPT, HVOPTS_OPT, NET_OPT, SUBMIT_OPT,
b/man/gnt-instance.rst
84 84
Since the name check is used to compute the IP address, if you pass
85 85
this option you must also pass the ``--no-ip-check`` option.
86 86

  
87
If you don't wat the instance to automatically start after
87
If you don't want the instance to automatically start after
88 88
creation, this is possible via the ``--no-start`` option. This will
89 89
leave the instance down until a subsequent **gnt-instance start**
90 90
command.
......
258 258

  
259 259
    This parameter determines the way the cdroms disks are presented
260 260
    to the instance. The default behavior is to get the same value of
261
    the eariler parameter (disk_type). The possible options are:
261
    the earlier parameter (disk_type). The possible options are:
262 262

  
263 263
    - paravirtual
264 264
    - ide
......
509 509
use\_chroot
510 510
    Valid for the KVM hypervisor.
511 511

  
512
    This boolean option determines wether to run the KVM instance in a
512
    This boolean option determines whether to run the KVM instance in a
513 513
    chroot directory.
514 514

  
515 515
    If it is set to ``true``, an empty directory is created before
......
715 715

  
716 716
mac, ip, mode, link
717 717
    Specifications for the one NIC that will be created for the
718
    instance. 'bridge' is also accepted as a backwards compatibile
718
    instance. 'bridge' is also accepted as a backwards compatible
719 719
    key.
720 720

  
721 721
nics
......
1253 1253
[\--disks *idx*] {*instance*}
1254 1254

  
1255 1255
**replace-disks** [\--submit] [\--early-release] [\--ignore-ipolicy]
1256
{{-I\|\--iallocator} *name* \| \--node *node* } {*instance*}
1256
{{-I\|\--iallocator} *name* \| {{-n|\--new-secondary} *node* } {*instance*}
1257 1257

  
1258 1258
**replace-disks** [\--submit] [\--early-release] [\--ignore-ipolicy]
1259
{\--auto} {*instance*}
1259
{-a\|\--auto} {*instance*}
1260 1260

  
1261 1261
This command is a generalized form for replacing disks. It is
1262 1262
currently only valid for the mirrored (DRBD) disk template.
......
1529 1529
If the ``--cleanup`` option is passed, the operation changes from
1530 1530
migration to attempting recovery from a failed previous migration.  In
1531 1531
this mode, Ganeti checks if the instance runs on the correct node (and
1532
updates its configuration if not) and ensures the instances's disks
1532
updates its configuration if not) and ensures the instances' disks
1533 1533
are configured correctly. In this mode, the ``--non-live`` option is
1534 1534
ignored.
1535 1535

  
b/man/gnt-node.rst
220 220
other fields are "live" fields and require a query to the cluster nodes.
221 221

  
222 222
Depending on the virtualization type and implementation details, the
223
``mtotal``, ``mnode`` and ``mfree`` fields may have slighly varying
223
``mtotal``, ``mnode`` and ``mfree`` fields may have slightly varying
224 224
meanings. For example, some solutions share the node memory with the
225 225
pool of memory used for instances (KVM), whereas others have separate
226 226
memory for the node and for the instances (Xen).
......
295 295
``--no-live``, ``--migration-mode`` and ``--no-runtime-changes``
296 296
can be given to influence the migration type.
297 297

  
298
If ``--ignore-ipolicy`` is given any instance policy violations occuring
299
during this operation are ignored.
298
If ``--ignore-ipolicy`` is given any instance policy violations
299
occurring during this operation are ignored.
300 300

  
301 301
See **ganeti(7)** for a description of ``--submit`` and other common
302 302
options.
......
575 575

  
576 576
This command calls out to out-of-band management to change the power
577 577
state of given node. With ``status`` you get the power status as reported
578
by the out-of-band managment script.
578
by the out-of-band management script.
579 579

  
580 580
Note that this command will only work if the out-of-band functionality
581 581
is configured and enabled on the cluster. If this is not the case,
b/man/hspace.rst
106 106

  
107 107
INI_MEM_OVERHEAD, FIN_MEM_OVERHEAD
108 108
  The initial and final memory overhead, i.e. memory used for the node
109
  itself and unacounted memory (e.g. due to hypervisor overhead).
109
  itself and unaccounted memory (e.g. due to hypervisor overhead).
110 110

  
111 111
INI_MEM_EFF, HTS_INI_MEM_EFF
112 112
  The initial and final memory efficiency, represented as instance

Also available in: Unified diff