[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [PATCH 3/2] maint: extend xml quoting style to html docs



See the previous patch for rationale.  Done with:

$ find docs -name '*.html.in' | \
   xargs sed -i '/</ s/\([a-zA-Z0-9_]*=\)"\([^"]*\)"/\1'\''\2'\''/g'

* cfg.mk (sc_xml_quote_style): Extend the rule.
* docs/*.html.in: Fix fallout.
---

I'm not as worried about the overall html file being a consistent
style as I am the html-ized example texts.  The change was intentionally
limited to lines starting with '<', to minimize the size of the
diff, even if it did pick up a few changes that aren't user-visible.

 cfg.mk                               |    4 +
 docs/csharp.html.in                  |    2 +-
 docs/drvqemu.html.in                 |    4 +-
 docs/drvvbox.html.in                 |   12 ++--
 docs/drvxen.html.in                  |    4 +-
 docs/formatcaps.html.in              |   18 +++---
 docs/formatdomain.html.in            |  124 +++++++++++++++++-----------------
 docs/formatnetwork.html.in           |   74 ++++++++++----------
 docs/formatstorage.html.in           |   22 +++---
 docs/formatstorageencryption.html.in |    2 +-
 docs/news.html.in                    |    2 +-
 docs/storage.html.in                 |   34 +++++-----
 12 files changed, 153 insertions(+), 149 deletions(-)

diff --git a/cfg.mk b/cfg.mk
index 8591f12..c0d638b 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -425,6 +425,10 @@ sc_xml_quote_style:
 	in_vc_files='\.(rng|xml)$$'					\
 	halt='use name='\'val\'', not name="val", in xml'		\
 	  $(_sc_search_regexp)
+	@prohibit='<.*\b[-a-zA-Z0-9_]+="'				\
+	in_vc_files='\.html\.in$$'					\
+	halt='use name='\'val\'', not name="val", in html-ized xml'	\
+	  $(_sc_search_regexp)

 ctype_re = isalnum|isalpha|isascii|isblank|iscntrl|isdigit|isgraph|islower\
 |isprint|ispunct|isspace|isupper|isxdigit|tolower|toupper
diff --git a/docs/csharp.html.in b/docs/csharp.html.in
index 62da6a8..8d664e7 100644
--- a/docs/csharp.html.in
+++ b/docs/csharp.html.in
@@ -121,7 +121,7 @@ git clone git://libvirt.org/libvirt-csharp.git

     <p>
       The C# bindings are the work of Arnaud Champion
-      &lt;<a href="mailto:arnaud.champion AT devatom.fr">arnaud.champion AT devatom.fr</a>&gt;,
+      &lt;<a href='mailto:arnaud.champion AT devatom.fr'>arnaud.champion AT devatom.fr</a>&gt;,
       based upon the previous work of Jarom&iacute;r &#x010C;ervenka.
     </p>

diff --git a/docs/drvqemu.html.in b/docs/drvqemu.html.in
index 4da3817..97e1df5 100644
--- a/docs/drvqemu.html.in
+++ b/docs/drvqemu.html.in
@@ -553,9 +553,9 @@ $ virsh domxml-to-native qemu-argv demo.xml
   &lt;memory&gt;131072&lt;/memory&gt;
   &lt;vcpu&gt;1&lt;/vcpu&gt;
   &lt;os&gt;
-    &lt;type arch="i686"&gt;hvm&lt;/type&gt;
+    &lt;type arch='i686'&gt;hvm&lt;/type&gt;
   &lt;/os&gt;
-  &lt;clock sync="localtime"/&gt;
+  &lt;clock sync='localtime'/&gt;
   &lt;devices&gt;
     &lt;emulator&gt;/usr/bin/qemu-kvm&lt;/emulator&gt;
     &lt;disk type='file' device='disk'&gt;
diff --git a/docs/drvvbox.html.in b/docs/drvvbox.html.in
index db82d2a..4d3b551 100644
--- a/docs/drvvbox.html.in
+++ b/docs/drvvbox.html.in
@@ -100,14 +100,14 @@ vbox+ssh://user example com/session  (remote access, SSH tunnelled)
       &lt;target port='1'/&gt;
     &lt;/parallel&gt;

-    &lt;serial type="dev"&gt;
-      &lt;source path="/dev/ttyS0"/&gt;
-      &lt;target port="0"/&gt;
+    &lt;serial type='dev'&gt;
+      &lt;source path='/dev/ttyS0'/&gt;
+      &lt;target port='0'/&gt;
     &lt;/serial&gt;

-    &lt;serial type="pipe"&gt;
-      &lt;source path="/tmp/serial.txt"/&gt;
-      &lt;target port="1"/&gt;
+    &lt;serial type='pipe'&gt;
+      &lt;source path='/tmp/serial.txt'/&gt;
+      &lt;target port='1'/&gt;
     &lt;/serial&gt;

     &lt;hostdev mode='subsystem' type='usb'&gt;
diff --git a/docs/drvxen.html.in b/docs/drvxen.html.in
index 631f7ed..6d6a70a 100644
--- a/docs/drvxen.html.in
+++ b/docs/drvxen.html.in
@@ -247,7 +247,7 @@ vif = [ "mac=00:16:3e:60:36:ba,bridge=virbr0,script=vif-bridge,vifname=vif5.0" ]
     &lt;acpi/&gt;
     &lt;apic/&gt;
   &lt;/features&gt;
-  &lt;clock sync="localtime"/&gt;
+  &lt;clock sync='localtime'/&gt;
   &lt;devices&gt;
     &lt;emulator&gt;/usr/lib/xen/bin/qemu-dm&lt;/emulator&gt;
     &lt;interface type='bridge'&gt;
@@ -301,7 +301,7 @@ vif = [ "mac=00:16:3e:60:36:ba,bridge=virbr0,script=vif-bridge,vifname=vif5.0" ]
     &lt;acpi/&gt;
     &lt;apic/&gt;
   &lt;/features&gt;
-  &lt;clock sync="localtime"/&gt;
+  &lt;clock sync='localtime'/&gt;
   &lt;devices&gt;
     &lt;emulator&gt;/usr/lib/xen/bin/qemu-dm&lt;/emulator&gt;
     &lt;interface type='bridge'&gt;
diff --git a/docs/formatcaps.html.in b/docs/formatcaps.html.in
index 9d42426..0538eba 100644
--- a/docs/formatcaps.html.in
+++ b/docs/formatcaps.html.in
@@ -15,7 +15,7 @@ associated to the current connection. For example in the case of a 64 bits
 machine with hardware virtualization capabilities enabled in the chip and
 BIOS you will see</p>
         <pre>&lt;capabilities&gt;
-  <span style="color: #E50000">&lt;host&gt;
+  <span style='color: #E50000'>&lt;host&gt;
     &lt;cpu&gt;
       &lt;arch&gt;x86_64&lt;/arch&gt;
       &lt;features&gt;
@@ -23,8 +23,8 @@ BIOS you will see</p>
       &lt;/features&gt;
       &lt;model&gt;core2duo&lt;/model&gt;
       &lt;vendor&gt;Intel&lt;/vendor&gt;
-      &lt;topology sockets="1" cores="2" threads="1"/&gt;
-      &lt;feature name="lahf_lm"/&gt;
+      &lt;topology sockets='1' cores='2' threads='1'/&gt;
+      &lt;feature name='lahf_lm'/&gt;
       &lt;feature name='xtpr'/&gt;
       ...
     &lt;/cpu&gt;
@@ -36,11 +36,11 @@ BIOS you will see</p>
   &lt;/host&gt;</span>

   &lt;!-- xen-3.0-x86_64 --&gt;
-  <span style="color: #0000E5">&lt;guest&gt;
+  <span style='color: #0000E5'>&lt;guest&gt;
     &lt;os_type&gt;xen&lt;/os_type&gt;
-    &lt;arch name="x86_64"&gt;
+    &lt;arch name='x86_64'&gt;
       &lt;wordsize&gt;64&lt;/wordsize&gt;
-      &lt;domain type="xen"&gt;&lt;/domain&gt;
+      &lt;domain type='xen'&gt;&lt;/domain&gt;
       &lt;emulator&gt;/usr/lib64/xen/bin/qemu-dm&lt;/emulator&gt;
     &lt;/arch&gt;
     &lt;features&gt;
@@ -48,11 +48,11 @@ BIOS you will see</p>
   &lt;/guest&gt;</span>

   &lt;!-- hvm-3.0-x86_32 --&gt;
-  <span style="color: #00B200">&lt;guest&gt;
+  <span style='color: #00B200'>&lt;guest&gt;
     &lt;os_type&gt;hvm&lt;/os_type&gt;
-    &lt;arch name="i686"&gt;
+    &lt;arch name='i686'&gt;
       &lt;wordsize&gt;32&lt;/wordsize&gt;
-      &lt;domain type="xen"&gt;&lt;/domain&gt;
+      &lt;domain type='xen'&gt;&lt;/domain&gt;
       &lt;emulator&gt;/usr/lib/xen/bin/qemu-dm&lt;/emulator&gt;
       &lt;machine&gt;pc&lt;/machine&gt;
       &lt;machine&gt;isapc&lt;/machine&gt;
diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
index 204373e..2141de4 100644
--- a/docs/formatdomain.html.in
+++ b/docs/formatdomain.html.in
@@ -287,7 +287,7 @@
 <pre>
 &lt;domain&gt;
   ...
-  &lt;vcpu cpuset="1-4,^3,6" current="1"&gt;2&lt;/vcpu&gt;
+  &lt;vcpu cpuset='1-4,^3,6' current='1'&gt;2&lt;/vcpu&gt;
   ...
 &lt;/domain&gt;
 </pre>
@@ -316,10 +316,10 @@
 &lt;domain&gt;
   ...
   &lt;cputune&gt;
-    &lt;vcpupin vcpu="0" cpuset="1-4,^2"/&gt;
-    &lt;vcpupin vcpu="1" cpuset="0,1"/&gt;
-    &lt;vcpupin vcpu="2" cpuset="2,3"/&gt;
-    &lt;vcpupin vcpu="3" cpuset="0,4"/&gt;
+    &lt;vcpupin vcpu='0' cpuset='1-4,^2'/&gt;
+    &lt;vcpupin vcpu='1' cpuset='0,1'/&gt;
+    &lt;vcpupin vcpu='2' cpuset='2,3'/&gt;
+    &lt;vcpupin vcpu='3' cpuset='0,4'/&gt;
     &lt;shares&gt;2048&lt;/shares&gt;
     &lt;period&gt;1000000&lt;/period&gt;
     &lt;quota&gt;-1&lt;/quota&gt;
@@ -473,7 +473,7 @@
 &lt;domain&gt;
   ...
   &lt;numatune&gt;
-    &lt;memory mode="strict" nodeset="1-4,^3"/&gt;
+    &lt;memory mode='strict' nodeset='1-4,^3'/&gt;
   &lt;/numatune&gt;
   ...
 &lt;/domain&gt;
@@ -537,7 +537,7 @@
         the same host file system, which is why this tuning parameter
         is at the global domain level rather than associated with each
         guest disk device (contrast this to
-        the <a href="#elementsDisks"><code>&lt;iotune&gt;</code></a>
+        the <a href='#elementsDisks'><code>&lt;iotune&gt;</code></a>
         element which can apply to an
         individual <code>&lt;disk&gt;</code>).
         Each <code>device</code> element has two
@@ -798,11 +798,11 @@

 <pre>
   ...
-  &lt;clock offset="localtime"&gt;
-    &lt;timer name="rtc" tickpolicy="catchup" track="guest"&gt;
+  &lt;clock offset='localtime'&gt;
+    &lt;timer name='rtc' tickpolicy='catchup' track='guest'&gt;
       &lt;catchup threshold=123 slew=120 limit=10000/&gt;
     &lt;/timer&gt;
-    &lt;timer name="pit" tickpolicy="delay"/&gt;
+    &lt;timer name='pit' tickpolicy='delay'/&gt;
   &lt;/clock&gt;
   ...</pre>

@@ -946,7 +946,7 @@
   ...
   &lt;devices&gt;
     &lt;disk type='file' snapshot='external'&gt;
-      &lt;driver name="tap" type="aio" cache="default"/&gt;
+      &lt;driver name='tap' type='aio' cache='default'/&gt;
       &lt;source file='/var/lib/xen/images/fv0'/ startupPolicy='optional'&gt;
       &lt;target dev='hda' bus='ide'/&gt;
       &lt;iotune&gt;
@@ -965,21 +965,21 @@
     &lt;/disk&gt;
       ...
     &lt;disk type='network'&gt;
-      &lt;driver name="qemu" type="raw" io="threads" ioeventfd="on" event_idx="off"/&gt;
-      &lt;source protocol="sheepdog" name="image_name"&gt;
-        &lt;host name="hostname" port="7000"/&gt;
+      &lt;driver name='qemu' type='raw' io='threads' ioeventfd='on' event_idx='off'/&gt;
+      &lt;source protocol='sheepdog' name='image_name'&gt;
+        &lt;host name='hostname' port='7000'/&gt;
       &lt;/source&gt;
-      &lt;target dev="hdb" bus="ide"/&gt;
+      &lt;target dev='hdb' bus='ide'/&gt;
       &lt;boot order='1'/&gt;
       &lt;transient/&gt;
       &lt;address type='drive' controller='0' bus='1' unit='0'/&gt;
     &lt;/disk&gt;
     &lt;disk type='network'&gt;
-      &lt;driver name="qemu" type="raw"/&gt;
-      &lt;source protocol="rbd" name="image_name2"&gt;
-        &lt;host name="hostname" port="7000"/&gt;
+      &lt;driver name='qemu' type='raw'/&gt;
+      &lt;source protocol='rbd' name='image_name2'&gt;
+        &lt;host name='hostname' port='7000'/&gt;
       &lt;/source&gt;
-      &lt;target dev="hdd" bus="ide"/&gt;
+      &lt;target dev='hdd' bus='ide'/&gt;
       &lt;auth username='myuser'&gt;
         &lt;secret type='ceph' usage='mypassid'/&gt;
       &lt;/auth&gt;
@@ -1075,7 +1075,7 @@
       <dd>The optional <code>iotune</code> element provides the
         ability to provide additional per-device I/O tuning, with
         values that can vary for each device (contrast this to
-        the <a href="#elementsBlockTuning"><code>&lt;blkiotune&gt;</code></a>
+        the <a href='#elementsBlockTuning'><code>&lt;blkiotune&gt;</code></a>
         element, which applies globally to the domain).  Currently,
         the only tuning available is Block I/O throttling for qemu.
         This element has optional sub-elements; any sub-element not
@@ -1854,7 +1854,7 @@
     &lt;interface type='network'&gt;
       &lt;source network='default' portgroup='engineering'/&gt;
       &lt;target dev='vnet7'/&gt;
-      &lt;mac address="00:11:22:33:44:55"/&gt;
+      &lt;mac address='00:11:22:33:44:55'/&gt;
       &lt;virtualport type='802.1Qbg'&gt;
         &lt;parameters managerid='11' typeid='1193047' typeidversion='2' instanceid='09b11c53-8b5c-4eeb-8f00-d84eaa0aaa4f'/&gt;
       &lt;/virtualport&gt;
@@ -1894,7 +1894,7 @@
     &lt;interface type='bridge'&gt;
       &lt;source bridge='br0'/&gt;
       &lt;target dev='vnet7'/&gt;
-      &lt;mac address="00:11:22:33:44:55"/&gt;
+      &lt;mac address='00:11:22:33:44:55'/&gt;
     &lt;/interface&gt;
   &lt;/devices&gt;
   ...</pre>
@@ -1916,7 +1916,7 @@
     &lt;interface type='user'/&gt;
     ...
     &lt;interface type='user'&gt;
-      &lt;mac address="00:11:22:33:44:55"/&gt;
+      &lt;mac address='00:11:22:33:44:55'/&gt;
     &lt;/interface&gt;
   &lt;/devices&gt;
   ...</pre>
@@ -2045,8 +2045,8 @@
     ...
     &lt;interface type='direct'&gt;
       &lt;source dev='eth0.2' mode='vepa'/&gt;
-      &lt;virtualport type="802.1Qbg"&gt;
-        &lt;parameters managerid="11" typeid="1193047" typeidversion="2" instanceid="09b11c53-8b5c-4eeb-8f00-d84eaa0aaa4f"/&gt;
+      &lt;virtualport type='802.1Qbg'&gt;
+        &lt;parameters managerid='11' typeid='1193047' typeidversion='2' instanceid='09b11c53-8b5c-4eeb-8f00-d84eaa0aaa4f'/&gt;
       &lt;/virtualport&gt;
     &lt;/interface&gt;
   &lt;/devices&gt;
@@ -2925,9 +2925,9 @@ qemu-kvm -net nic,model=? /dev/null
 <pre>
   ...
   &lt;devices&gt;
-    &lt;serial type="file"&gt;
-      &lt;source path="/var/log/vm/vm-serial.log"/&gt;
-      &lt;target port="1"/&gt;
+    &lt;serial type='file'&gt;
+      &lt;source path='/var/log/vm/vm-serial.log'/&gt;
+      &lt;target port='1'/&gt;
     &lt;/serial&gt;
   &lt;/devices&gt;
   ...</pre>
@@ -2944,7 +2944,7 @@ qemu-kvm -net nic,model=? /dev/null
   ...
   &lt;devices&gt;
     &lt;serial type='vc'&gt;
-      &lt;target port="1"/&gt;
+      &lt;target port='1'/&gt;
     &lt;/serial&gt;
   &lt;/devices&gt;
   ...</pre>
@@ -2960,7 +2960,7 @@ qemu-kvm -net nic,model=? /dev/null
   ...
   &lt;devices&gt;
     &lt;serial type='null'&gt;
-      &lt;target port="1"/&gt;
+      &lt;target port='1'/&gt;
     &lt;/serial&gt;
   &lt;/devices&gt;
   ...</pre>
@@ -2976,9 +2976,9 @@ qemu-kvm -net nic,model=? /dev/null
 <pre>
   ...
   &lt;devices&gt;
-    &lt;serial type="pty"&gt;
-      &lt;source path="/dev/pts/3"/&gt;
-      &lt;target port="1"/&gt;
+    &lt;serial type='pty'&gt;
+      &lt;source path='/dev/pts/3'/&gt;
+      &lt;target port='1'/&gt;
     &lt;/serial&gt;
   &lt;/devices&gt;
   ...</pre>
@@ -3003,9 +3003,9 @@ qemu-kvm -net nic,model=? /dev/null
 <pre>
   ...
   &lt;devices&gt;
-    &lt;serial type="dev"&gt;
-      &lt;source path="/dev/ttyS0"/&gt;
-      &lt;target port="1"/&gt;
+    &lt;serial type='dev'&gt;
+      &lt;source path='/dev/ttyS0'/&gt;
+      &lt;target port='1'/&gt;
   &lt;/serial&gt;
   &lt;/devices&gt;
   ...</pre>
@@ -3020,9 +3020,9 @@ qemu-kvm -net nic,model=? /dev/null
 <pre>
   ...
   &lt;devices&gt;
-    &lt;serial type="pipe"&gt;
-      &lt;source path="/tmp/mypipe"/&gt;
-      &lt;target port="1"/&gt;
+    &lt;serial type='pipe'&gt;
+      &lt;source path='/tmp/mypipe'/&gt;
+      &lt;target port='1'/&gt;
     &lt;/serial&gt;
   &lt;/devices&gt;
   ...</pre>
@@ -3037,10 +3037,10 @@ qemu-kvm -net nic,model=? /dev/null
 <pre>
   ...
   &lt;devices&gt;
-    &lt;serial type="tcp"&gt;
-      &lt;source mode="connect" host="0.0.0.0" service="2445"/&gt;
-      &lt;protocol type="raw"/&gt;
-      &lt;target port="1"/&gt;
+    &lt;serial type='tcp'&gt;
+      &lt;source mode='connect' host='0.0.0.0' service='2445'/&gt;
+      &lt;protocol type='raw'/&gt;
+      &lt;target port='1'/&gt;
     &lt;/serial&gt;
   &lt;/devices&gt;
    ...</pre>
@@ -3052,10 +3052,10 @@ qemu-kvm -net nic,model=? /dev/null
 <pre>
   ...
   &lt;devices&gt;
-    &lt;serial type="tcp"&gt;
-      &lt;source mode="bind" host="127.0.0.1" service="2445"/&gt;
-      &lt;protocol type="raw"/&gt;
-      &lt;target port="1"/&gt;
+    &lt;serial type='tcp'&gt;
+      &lt;source mode='bind' host='127.0.0.1' service='2445'/&gt;
+      &lt;protocol type='raw'/&gt;
+      &lt;target port='1'/&gt;
     &lt;/serial&gt;
   &lt;/devices&gt;
   ...</pre>
@@ -3070,16 +3070,16 @@ qemu-kvm -net nic,model=? /dev/null
 <pre>
   ...
   &lt;devices&gt;
-    &lt;serial type="tcp"&gt;
-      &lt;source mode="connect" host="0.0.0.0" service="2445"/&gt;
-      &lt;protocol type="telnet"/&gt;
-      &lt;target port="1"/&gt;
+    &lt;serial type='tcp'&gt;
+      &lt;source mode='connect' host='0.0.0.0' service='2445'/&gt;
+      &lt;protocol type='telnet'/&gt;
+      &lt;target port='1'/&gt;
     &lt;/serial&gt;
     ...
-    &lt;serial type="tcp"&gt;
-      &lt;source mode="bind" host="127.0.0.1" service="2445"/&gt;
-      &lt;protocol type="telnet"/&gt;
-      &lt;target port="1"/&gt;
+    &lt;serial type='tcp'&gt;
+      &lt;source mode='bind' host='127.0.0.1' service='2445'/&gt;
+      &lt;protocol type='telnet'/&gt;
+      &lt;target port='1'/&gt;
     &lt;/serial&gt;
   &lt;/devices&gt;
   ...</pre>
@@ -3094,10 +3094,10 @@ qemu-kvm -net nic,model=? /dev/null
 <pre>
   ...
   &lt;devices&gt;
-    &lt;serial type="udp"&gt;
-      &lt;source mode="bind" host="0.0.0.0" service="2445"/&gt;
-      &lt;source mode="connect" host="0.0.0.0" service="2445"/&gt;
-      &lt;target port="1"/&gt;
+    &lt;serial type='udp'&gt;
+      &lt;source mode='bind' host='0.0.0.0' service='2445'/&gt;
+      &lt;source mode='connect' host='0.0.0.0' service='2445'/&gt;
+      &lt;target port='1'/&gt;
     &lt;/serial&gt;
   &lt;/devices&gt;
   ...</pre>
@@ -3112,9 +3112,9 @@ qemu-kvm -net nic,model=? /dev/null
 <pre>
   ...
   &lt;devices&gt;
-    &lt;serial type="unix"&gt;
-      &lt;source mode="bind" path="/tmp/foo"/&gt;
-      &lt;target port="1"/&gt;
+    &lt;serial type='unix'&gt;
+      &lt;source mode='bind' path='/tmp/foo'/&gt;
+      &lt;target port='1'/&gt;
     &lt;/serial&gt;
   &lt;/devices&gt;
   ...</pre>
diff --git a/docs/formatnetwork.html.in b/docs/formatnetwork.html.in
index 02302fa..8ec3c29 100644
--- a/docs/formatnetwork.html.in
+++ b/docs/formatnetwork.html.in
@@ -57,9 +57,9 @@

     <pre>
         ...
-        &lt;bridge name="virbr0" stp="on" delay="5"/&gt;
-        &lt;domain name="example.com"/&gt;
-        &lt;forward mode="nat" dev="eth0"/&gt;
+        &lt;bridge name='virbr0' stp='on' delay='5'/&gt;
+        &lt;domain name='example.com'/&gt;
+        &lt;forward mode='nat' dev='eth0'/&gt;
         ...</pre>

     <dl>
@@ -274,11 +274,11 @@
 <pre>
 ...
   &lt;forward mode='private'/&gt;
-    &lt;interface dev="eth20"/&gt;
-    &lt;interface dev="eth21"/&gt;
-    &lt;interface dev="eth22"/&gt;
-    &lt;interface dev="eth23"/&gt;
-    &lt;interface dev="eth24"/&gt;
+    &lt;interface dev='eth20'/&gt;
+    &lt;interface dev='eth21'/&gt;
+    &lt;interface dev='eth22'/&gt;
+    &lt;interface dev='eth23'/&gt;
+    &lt;interface dev='eth24'/&gt;
   &lt;/forward&gt;
   <b>&lt;portgroup name='engineering' default='yes'&gt;
     &lt;virtualport type='802.1Qbh'&gt;
@@ -342,21 +342,21 @@
     <pre>
         ...
         &lt;mac address='00:16:3E:5D:C7:9E'/&gt;
-        &lt;domain name="example.com"/&gt;
+        &lt;domain name='example.com'/&gt;
         &lt;dns&gt;
-          &lt;txt name="example" value="example value" /&gt;
+          &lt;txt name='example' value='example value' /&gt;
           &lt;host ip='192.168.122.2'&gt;
             &lt;hostname&gt;myhost&lt;/hostname&gt;
             &lt;hostname&gt;myhostalias&lt;/hostname&gt;
         &lt;/dns&gt;
-        &lt;ip address="192.168.122.1" netmask="255.255.255.0"&gt;
+        &lt;ip address='192.168.122.1' netmask='255.255.255.0'&gt;
           &lt;dhcp&gt;
-            &lt;range start="192.168.122.100" end="192.168.122.254" /&gt;
-            &lt;host mac="00:16:3e:77:e2:ed" name="foo.example.com" ip="192.168.122.10" /&gt;
-            &lt;host mac="00:16:3e:3e:a9:1a" name="bar.example.com" ip="192.168.122.11" /&gt;
+            &lt;range start='192.168.122.100' end='192.168.122.254' /&gt;
+            &lt;host mac='00:16:3e:77:e2:ed' name='foo.example.com' ip='192.168.122.10' /&gt;
+            &lt;host mac='00:16:3e:3e:a9:1a' name='bar.example.com' ip='192.168.122.11' /&gt;
           &lt;/dhcp&gt;
         &lt;/ip&gt;
-        &lt;ip family="ipv6" address="2001:db8:ca2:2::1" prefix="64" /&gt;
+        &lt;ip family='ipv6' address='2001:db8:ca2:2::1' prefix='64' /&gt;
       &lt;/network&gt;</pre>

     <dl>
@@ -489,14 +489,14 @@
     <pre>
       &lt;network&gt;
         &lt;name&gt;default&lt;/name&gt;
-        &lt;bridge name="virbr0" /&gt;
-        &lt;forward mode="nat"/&gt;
-        &lt;ip address="192.168.122.1" netmask="255.255.255.0"&gt;
+        &lt;bridge name='virbr0' /&gt;
+        &lt;forward mode='nat'/&gt;
+        &lt;ip address='192.168.122.1' netmask='255.255.255.0'&gt;
           &lt;dhcp&gt;
-            &lt;range start="192.168.122.2" end="192.168.122.254" /&gt;
+            &lt;range start='192.168.122.2' end='192.168.122.254' /&gt;
           &lt;/dhcp&gt;
         &lt;/ip&gt;
-        &lt;ip family="ipv6" address="2001:db8:ca2:2::1" prefix="64" /&gt;
+        &lt;ip family='ipv6' address='2001:db8:ca2:2::1' prefix='64' /&gt;
       &lt;/network&gt;</pre>

     <h3><a name="examplesRoute">Routed network config</a></h3>
@@ -513,14 +513,14 @@
     <pre>
       &lt;network&gt;
         &lt;name&gt;local&lt;/name&gt;
-        &lt;bridge name="virbr1" /&gt;
-        &lt;forward mode="route" dev="eth1"/&gt;
-        &lt;ip address="192.168.122.1" netmask="255.255.255.0"&gt;
+        &lt;bridge name='virbr1' /&gt;
+        &lt;forward mode='route' dev='eth1'/&gt;
+        &lt;ip address='192.168.122.1' netmask='255.255.255.0'&gt;
           &lt;dhcp&gt;
-            &lt;range start="192.168.122.2" end="192.168.122.254" /&gt;
+            &lt;range start='192.168.122.2' end='192.168.122.254' /&gt;
           &lt;/dhcp&gt;
         &lt;/ip&gt;
-        &lt;ip family="ipv6" address="2001:db8:ca2:2::1" prefix="64" /&gt;
+        &lt;ip family='ipv6' address='2001:db8:ca2:2::1' prefix='64' /&gt;
       &lt;/network&gt;</pre>

     <h3><a name="examplesPrivate">Isolated network config</a></h3>
@@ -536,13 +536,13 @@
     <pre>
       &lt;network&gt;
         &lt;name&gt;private&lt;/name&gt;
-        &lt;bridge name="virbr2" /&gt;
-        &lt;ip address="192.168.152.1" netmask="255.255.255.0"&gt;
+        &lt;bridge name='virbr2' /&gt;
+        &lt;ip address='192.168.152.1' netmask='255.255.255.0'&gt;
           &lt;dhcp&gt;
-            &lt;range start="192.168.152.2" end="192.168.152.254" /&gt;
+            &lt;range start='192.168.152.2' end='192.168.152.254' /&gt;
           &lt;/dhcp&gt;
         &lt;/ip&gt;
-        &lt;ip family="ipv6" address="2001:db8:ca2:3::1" prefix="64" /&gt;
+        &lt;ip family='ipv6' address='2001:db8:ca2:3::1' prefix='64' /&gt;
       &lt;/network&gt;</pre>

     <h3><a name="examplesBridge">Using an existing host bridge</a></h3>
@@ -559,8 +559,8 @@
     <pre>
       &lt;network&gt;
         &lt;name&gt;host-bridge&lt;/name&gt;
-        &lt;forward mode="bridge"/&gt;
-        &lt;bridge name="br0"/&gt;
+        &lt;forward mode='bridge'/&gt;
+        &lt;bridge name='br0'/&gt;
       &lt;/network&gt;</pre>

     <h3><a name="examplesDirect">Using a macvtap "direct" connection</a></h3>
@@ -589,12 +589,12 @@
     <pre>
       &lt;network&gt;
         &lt;name&gt;direct-macvtap&lt;/name&gt;
-        &lt;forward mode="bridge"&gt;
-          &lt;interface dev="eth20"/&gt;
-          &lt;interface dev="eth21"/&gt;
-          &lt;interface dev="eth22"/&gt;
-          &lt;interface dev="eth23"/&gt;
-          &lt;interface dev="eth24"/&gt;
+        &lt;forward mode='bridge'&gt;
+          &lt;interface dev='eth20'/&gt;
+          &lt;interface dev='eth21'/&gt;
+          &lt;interface dev='eth22'/&gt;
+          &lt;interface dev='eth23'/&gt;
+          &lt;interface dev='eth24'/&gt;
         &lt;/forward&gt;
       &lt;/network&gt;</pre>

diff --git a/docs/formatstorage.html.in b/docs/formatstorage.html.in
index f13ca6a..88f30cc 100644
--- a/docs/formatstorage.html.in
+++ b/docs/formatstorage.html.in
@@ -23,7 +23,7 @@
     <h3><a name="StoragePoolFirst">General metadata</a></h3>

     <pre>
-      &lt;pool type="iscsi"&gt;
+      &lt;pool type='iscsi'&gt;
         &lt;name&gt;virtimages&lt;/name&gt;
         &lt;uuid&gt;3e3fce45-4f53-4fa7-bb32-11f34168b82b&lt;/uuid&gt;
         &lt;allocation&gt;10000000&lt;/allocation&gt;
@@ -68,10 +68,10 @@
     <pre>
         ...
         &lt;source&gt;
-          &lt;host name="iscsi.example.com"/&gt;
-          &lt;device path="demo-target"/&gt;
-          &lt;vendor name="Acme"/&gt;
-          &lt;product name="model"/&gt;
+          &lt;host name='iscsi.example.com'/&gt;
+          &lt;device path='demo-target'/&gt;
+          &lt;vendor name='Acme'/&gt;
+          &lt;product name='model'/&gt;
         &lt;/source&gt;
         ...</pre>

@@ -212,7 +212,7 @@
         &lt;name&gt;sparse.img&lt;/name&gt;
         &lt;key&gt;/var/lib/xen/images/sparse.img&lt;/key&gt;
         &lt;allocation&gt;0&lt;/allocation&gt;
-        &lt;capacity unit="T"&gt;1&lt;/capacity&gt;
+        &lt;capacity unit='T'&gt;1&lt;/capacity&gt;
         ...</pre>

     <dl>
@@ -363,7 +363,7 @@
     <h3><a name="exampleFile">File based storage pool</a></h3>

     <pre>
-      &lt;pool type="dir"&gt;
+      &lt;pool type='dir'&gt;
         &lt;name&gt;virtimages&lt;/name&gt;
         &lt;target&gt;
           &lt;path&gt;/var/lib/virt/images&lt;/path&gt;
@@ -373,11 +373,11 @@
     <h3><a name="exampleISCSI">iSCSI based storage pool</a></h3>

     <pre>
-      &lt;pool type="iscsi"&gt;
+      &lt;pool type='iscsi'&gt;
         &lt;name&gt;virtimages&lt;/name&gt;
         &lt;source&gt;
-          &lt;host name="iscsi.example.com"/&gt;
-          &lt;device path="demo-target"/&gt;
+          &lt;host name='iscsi.example.com'/&gt;
+          &lt;device path='demo-target'/&gt;
         &lt;/source&gt;
         &lt;target&gt;
           &lt;path&gt;/dev/disk/by-path&lt;/path&gt;
@@ -390,7 +390,7 @@
       &lt;volume&gt;
         &lt;name&gt;sparse.img&lt;/name&gt;
         &lt;allocation&gt;0&lt;/allocation&gt;
-        &lt;capacity unit="T"&gt;1&lt;/capacity&gt;
+        &lt;capacity unit='T'&gt;1&lt;/capacity&gt;
         &lt;target&gt;
           &lt;path&gt;/var/lib/virt/images/sparse.img&lt;/path&gt;
           &lt;permissions&gt;
diff --git a/docs/formatstorageencryption.html.in b/docs/formatstorageencryption.html.in
index 9557a22..9a96763 100644
--- a/docs/formatstorageencryption.html.in
+++ b/docs/formatstorageencryption.html.in
@@ -33,7 +33,7 @@
     </p>
     <h3><a name="StorageEncryptionDefault">"default" format</a></h3>
     <p>
-      <code>&lt;encryption type="default"/&gt;</code> can be specified only
+      <code>&lt;encryption type='default'/&gt;</code> can be specified only
       when creating a volume.  If the volume is successfully created, the
       encryption formats, parameters and secrets will be auto-generated by
       libvirt and the attached <code>encryption</code> tag will be updated.
diff --git a/docs/news.html.in b/docs/news.html.in
index bf97e95..9af5041 100644
--- a/docs/news.html.in
+++ b/docs/news.html.in
@@ -3920,7 +3920,7 @@ and check the <a href="http://libvirt.org/git/?p=libvirt.git;a=log";>GIT log</a>
       Make checks for inactive QEMU guest more robust (Daniel P. Berrange),<br/>
       Improve some error messages about unsupported APIs/URIs (Daniel P. Berrange),<br/>
       Index hashes by UUID instead of name (Jiri Denemark),<br/>
-      Allow one-or-more &lt;boot dev="..."/&gt; entries (Philipp Hahn),<br/>
+      Allow one-or-more &lt;boot dev='...'/&gt; entries (Philipp Hahn),<br/>
       virsh: add --uuid option to vol-pool (Justin Clift),<br/>
       nwfilter: add XML attribute to control iptables state match (Stefan Berger),<br/>
       virsh: ensure persistence and autostart are shown for dominfo and pool-info (Justin Clift),<br/>
diff --git a/docs/storage.html.in b/docs/storage.html.in
index a9c7f1c..1890c82 100644
--- a/docs/storage.html.in
+++ b/docs/storage.html.in
@@ -46,7 +46,7 @@ libvirt.

     <h3>Example pool input definition</h3>
     <pre>
-      &lt;pool type="dir"&gt;
+      &lt;pool type='dir'&gt;
         &lt;name&gt;virtimages&lt;/name&gt;
         &lt;target&gt;
           &lt;path&gt;/var/lib/virt/images&lt;/path&gt;
@@ -98,10 +98,10 @@ libvirt.

     <h3>Example pool input</h3>
     <pre>
-      &lt;pool type="fs"&gt;
+      &lt;pool type='fs'&gt;
         &lt;name&gt;virtimages&lt;/name&gt;
         &lt;source&gt;
-          &lt;device path="/dev/VolGroup00/VirtImages"/&gt;
+          &lt;device path='/dev/VolGroup00/VirtImages'/&gt;
         &lt;/source&gt;
         &lt;target&gt;
           &lt;path&gt;/var/lib/virt/images&lt;/path&gt;
@@ -167,11 +167,11 @@ libvirt.

     <h3>Example pool input</h3>
     <pre>
-      &lt;pool type="netfs"&gt;
+      &lt;pool type='netfs'&gt;
         &lt;name&gt;virtimages&lt;/name&gt;
         &lt;source&gt;
-          &lt;host name="nfs.example.com"/&gt;
-          &lt;dir path="/var/lib/virt/images"/&gt;
+          &lt;host name='nfs.example.com'/&gt;
+          &lt;dir path='/var/lib/virt/images'/&gt;
         &lt;/source&gt;
         &lt;target&gt;
           &lt;path&gt;/var/lib/virt/images&lt;/path&gt;
@@ -208,12 +208,12 @@ libvirt.

     <h3>Example pool input</h3>
     <pre>
-      &lt;pool type="logical"&gt;
+      &lt;pool type='logical'&gt;
         &lt;name&gt;HostVG&lt;/name&gt;
         &lt;source&gt;
-          &lt;device path="/dev/sda1"/&gt;
-          &lt;device path="/dev/sdb1"/&gt;
-          &lt;device path="/dev/sdc1"/&gt;
+          &lt;device path='/dev/sda1'/&gt;
+          &lt;device path='/dev/sdb1'/&gt;
+          &lt;device path='/dev/sdc1'/&gt;
         &lt;/source&gt;
         &lt;target&gt;
           &lt;path&gt;/dev/HostVG&lt;/path&gt;
@@ -242,7 +242,7 @@ libvirt.

     <h3>Example pool input</h3>
     <pre>
-      &lt;pool type="disk"&gt;
+      &lt;pool type='disk'&gt;
         &lt;name&gt;sda&lt;/name&gt;
         &lt;source&gt;
           &lt;device path='/dev/sda'/&gt;
@@ -330,11 +330,11 @@ libvirt.

     <h3>Example pool input</h3>
     <pre>
-      &lt;pool type="iscsi"&gt;
+      &lt;pool type='iscsi'&gt;
         &lt;name&gt;virtimages&lt;/name&gt;
         &lt;source&gt;
-          &lt;host name="iscsi.example.com"/&gt;
-          &lt;device path="demo-target"/&gt;
+          &lt;host name='iscsi.example.com'/&gt;
+          &lt;device path='demo-target'/&gt;
         &lt;/source&gt;
         &lt;target&gt;
           &lt;path&gt;/dev/disk/by-path&lt;/path&gt;
@@ -363,10 +363,10 @@ libvirt.

     <h3>Example pool input</h3>
     <pre>
-      &lt;pool type="scsi"&gt;
+      &lt;pool type='scsi'&gt;
         &lt;name&gt;virtimages&lt;/name&gt;
         &lt;source&gt;
-          &lt;adapter name="host0"/&gt;
+          &lt;adapter name='host0'/&gt;
         &lt;/source&gt;
         &lt;target&gt;
           &lt;path&gt;/dev/disk/by-path&lt;/path&gt;
@@ -398,7 +398,7 @@ libvirt.

     <h3>Example pool input</h3>
     <pre>
-      &lt;pool type="mpath"&gt;
+      &lt;pool type='mpath'&gt;
         &lt;name&gt;virtimages&lt;/name&gt;
         &lt;target&gt;
           &lt;path&gt;/dev/mapper&lt;/path&gt;
-- 
1.7.7.3


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]