From: Peter Krempa <pkrempa@redhat.com>
Date: Mon, 21 Jul 2014 15:12:51 +0000 (+0200)
Subject: doc: Explicitly specify how to override spice channel mode
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=bbfc826787b6d3afade5dd130f40669a92189963;p=libvirt.git

doc: Explicitly specify how to override spice channel mode

Be more clear that the "<channel mode=" attribute overrides the default
set by "defaultMode".

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1033704
---

diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
index bb6f710692..89509592ea 100644
--- a/docs/formatdomain.html.in
+++ b/docs/formatdomain.html.in
@@ -4191,7 +4191,13 @@ qemu-kvm -net nic,model=? /dev/null
               configured, it can be desirable to restrict what
               channels can be run on each port.  This is achieved by
               adding one or more &lt;channel&gt; elements inside the
-              main &lt;graphics&gt; element. Valid channel names
+              main &lt;graphics&gt; element and setting the <code>mode</code>
+              attribute to either <code>secure</code> or <code>insecure</code>.
+              Setting the mode attribute overrides the default value as set
+              by the <code>defaultMode</code> attribute. (Note that specifying
+              <code>any</code> as mode discards the entry as the channel would
+              inherit the default mode anyways)
+              Valid channel names
               include <code>main</code>, <code>display</code>,
               <code>inputs</code>, <code>cursor</code>,
               <code>playback</code>, <code>record</code>