Commit 9b3b6845 authored by Iustin Pop's avatar Iustin Pop
Browse files

Merge branch 'devel-2.0' into devel-2.1



* devel-2.0:
  Three small typos in man pages

Conflicts:
	man/gnt-cluster.sgml (trivial)
Signed-off-by: default avatarIustin Pop <iustin@google.com>
Reviewed-by: default avatarMichael Hanselmann <hansmi@google.com>
Reviewed-by: default avatarGuido Trotter <ultrotter@google.com>
parents 433c63aa ba0b05fe
......@@ -194,7 +194,7 @@
<term>canceling</term>
<listitem>
<para>The jos is waiting for locks, but is has been
marked for cancelation. It will not transition to
marked for cancellation. It will not transition to
<emphasis>running</emphasis>, but to
<emphasis>canceled</emphasis>.
</para>
......
......@@ -326,7 +326,7 @@
<para>
The <option>--enabled-hypervisors</option> option allows you
to set the list of hypervisors that will be enabled for
this cluster. Instance hypervisors can only be choosen from
this cluster. Instance hypervisors can only be chosen from
the list of enabled hypervisors, and the first entry of this list
will be used by default. Currently, the following hypervisors are
available:
......
......@@ -1303,7 +1303,7 @@ instance5: 11225
<para>
Use the <option>--all</option> to get info about all instances,
rather than explicitely passing the ones you're interested in.
rather than explicitly passing the ones you're interested in.
</para>
</refsect3>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment