From: Michal Privoznik Date: Fri, 11 Nov 2016 22:40:27 +0000 (+0100) Subject: formatnetwork.html.in: Kill useless spaces in 
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=f31be1499b37fdcacb7bf272d97b92a34e3a0c5c;p=libvirt.git

formatnetwork.html.in: Kill useless spaces in 

The 
 section is rendered as-is on the page. That is, if all
the lines are prefixed with 4 spaces the rendered page will also
have them. Problem is if we put a box around such 
 because
the content might not fix into it.

Signed-off-by: Michal Privoznik 
---

diff --git a/docs/formatnetwork.html.in b/docs/formatnetwork.html.in
index 13ca32de97..4fc779c265 100644
--- a/docs/formatnetwork.html.in
+++ b/docs/formatnetwork.html.in
@@ -35,14 +35,14 @@
     

 
     
-      <network ipv6='yes' trustGuestRxFilters='no'>
-        <name>default</name>
-        <uuid>3e3fce45-4f53-4fa7-bb32-11f34168b82b</uuid>
-        <metadata>
-          <app1:foo xmlns:app1="http://app1.org/app1/">..</app1:foo>
-          <app2:bar xmlns:app2="http://app1.org/app2/">..</app2:bar>
-        </metadata>
-        ...

+<network ipv6='yes' trustGuestRxFilters='no'>
+  <name>default</name>
+  <uuid>3e3fce45-4f53-4fa7-bb32-11f34168b82b</uuid>
+  <metadata>
+    <app1:foo xmlns:app1="http://app1.org/app1/">..</app1:foo>
+    <app2:bar xmlns:app2="http://app1.org/app2/">..</app2:bar>
+  </metadata>
+  ...

 
     

       
name

@@ -91,11 +91,11 @@
     

 
     
-        ...
-        <bridge name="virbr0" stp="on" delay="5" macTableManager="libvirt"/>
-        <domain name="example.com" localOnly="no"/>
-        <forward mode="nat" dev="eth0"/>
-        ...

+...
+<bridge name="virbr0" stp="on" delay="5" macTableManager="libvirt"/>
+<domain name="example.com" localOnly="no"/>
+<forward mode="nat" dev="eth0"/>
+...

 
     

       
bridge

@@ -815,18 +815,18 @@
     

 
     
-      ...
-        <ip address="192.168.122.1" netmask="255.255.255.0">
-          <dhcp>
-            <range start="192.168.122.128" end="192.168.122.254" />
-          </dhcp>
-        </ip>
-        <route address="192.168.222.0" prefix="24" gateway="192.168.122.2" />
-        <ip family="ipv6" address="2001:db8:ca2:2::1" prefix="64" />
-        <route family="ipv6" address="2001:db8:ca2:3::" prefix="64" gateway="2001:db8:ca2:2::2"/>
-        <route family="ipv6" address="2001:db9:4:1::" prefix="64" gateway="2001:db8:ca2:2::3" metric='2'>
-        </route>
-      ...
+...
+  <ip address="192.168.122.1" netmask="255.255.255.0">
+    <dhcp>
+      <range start="192.168.122.128" end="192.168.122.254" />
+    </dhcp>
+  </ip>
+  <route address="192.168.222.0" prefix="24" gateway="192.168.122.2" />
+  <ip family="ipv6" address="2001:db8:ca2:2::1" prefix="64" />
+  <route family="ipv6" address="2001:db8:ca2:3::" prefix="64" gateway="2001:db8:ca2:2::2"/>
+  <route family="ipv6" address="2001:db9:4:1::" prefix="64" gateway="2001:db8:ca2:2::3" metric='2'>
+  </route>
+...
     

 
     
Addressing

@@ -841,30 +841,30 @@
     

 
     
-        ...
-        <mac address='00:16:3E:5D:C7:9E'/>
-        <domain name="example.com"/>
-        <dns>
-          <txt name="example" value="example value" />
-          <forwarder addr="8.8.8.8"/>
-          <forwarder domain='example.com' addr="8.8.4.4"/>
-          <forwarder domain='www.example.com'/>
-          <srv service='name' protocol='tcp' domain='test-domain-name' target='.' port='1024' priority='10' weight='10'/>
-          <host ip='192.168.122.2'>
-            <hostname>myhost</hostname>
-            <hostname>myhostalias</hostname>
-          </host>
-        </dns>
-        <ip address="192.168.122.1" netmask="255.255.255.0">
-          <dhcp>
-            <range start="192.168.122.100" end="192.168.122.254" />
-            <host mac="00:16:3e:77:e2:ed" name="foo.example.com" ip="192.168.122.10" />
-            <host mac="00:16:3e:3e:a9:1a" name="bar.example.com" ip="192.168.122.11" />
-          </dhcp>
-        </ip>
-        <ip family="ipv6" address="2001:db8:ca2:2::1" prefix="64" />
-        <route family="ipv6" address="2001:db9:ca1:1::" prefix="64" gateway="2001:db8:ca2:2::2" />
-      </network>

+...
+<mac address='00:16:3E:5D:C7:9E'/>
+<domain name="example.com"/>
+<dns>
+  <txt name="example" value="example value" />
+  <forwarder addr="8.8.8.8"/>
+  <forwarder domain='example.com' addr="8.8.4.4"/>
+  <forwarder domain='www.example.com'/>
+  <srv service='name' protocol='tcp' domain='test-domain-name' target='.' port='1024' priority='10' weight='10'/>
+  <host ip='192.168.122.2'>
+    <hostname>myhost</hostname>
+    <hostname>myhostalias</hostname>
+  </host>
+</dns>
+<ip address="192.168.122.1" netmask="255.255.255.0">
+  <dhcp>
+    <range start="192.168.122.100" end="192.168.122.254" />
+    <host mac="00:16:3e:77:e2:ed" name="foo.example.com" ip="192.168.122.10" />
+    <host mac="00:16:3e:3e:a9:1a" name="bar.example.com" ip="192.168.122.11" />
+  </dhcp>
+</ip>
+<ip family="ipv6" address="2001:db8:ca2:2::1" prefix="64" />
+<route family="ipv6" address="2001:db9:ca1:1::" prefix="64" gateway="2001:db8:ca2:2::2" />
+

 
     

       
mac

@@ -1074,17 +1074,17 @@
     

 
     
-      <network>
-        <name>default</name>
-        <bridge name="virbr0" />
-        <forward mode="nat"/>
-        <ip address="192.168.122.1" netmask="255.255.255.0">
-          <dhcp>
-            <range start="192.168.122.2" end="192.168.122.254" />
-          </dhcp>
-        </ip>
-        <ip family="ipv6" address="2001:db8:ca2:2::1" prefix="64" />
-      </network>

+<network>
+  <name>default</name>
+  <bridge name="virbr0" />
+  <forward mode="nat"/>
+  <ip address="192.168.122.1" netmask="255.255.255.0">
+    <dhcp>
+      <range start="192.168.122.2" end="192.168.122.254" />
+    </dhcp>
+  </ip>
+  <ip family="ipv6" address="2001:db8:ca2:2::1" prefix="64" />
+</network>

@@ -1093,21 +1093,21 @@ 

-      <network>
-        <name>default6</name>
-        <bridge name="virbr0" />
-        <forward mode="nat"/>
-        <ip address="192.168.122.1" netmask="255.255.255.0">
-          <dhcp>
-            <range start="192.168.122.2" end="192.168.122.254" />
-          </dhcp>
-        </ip>
-        <ip family="ipv6" address="2001:db8:ca2:2::1" prefix="64" >
-          <dhcp>
-            <range start="2001:db8:ca2:2:1::10" end="2001:db8:ca2:2:1::ff" />
-          </dhcp>
-        </ip>
-      </network>
+<network> + <name>default6</name> + <bridge name="virbr0" /> + <forward mode="nat"/> + <ip address="192.168.122.1" netmask="255.255.255.0"> + <dhcp> + <range start="192.168.122.2" end="192.168.122.254" /> + </dhcp> + </ip> + <ip family="ipv6" address="2001:db8:ca2:2::1" prefix="64" > + <dhcp> + <range start="2001:db8:ca2:2:1::10" end="2001:db8:ca2:2:1::ff" /> + </dhcp> + </ip> +</network>

Routed network config

@@ -1121,17 +1121,17 @@ 

-      <network>
-        <name>local</name>
-        <bridge name="virbr1" />
-        <forward mode="route" dev="eth1"/>
-        <ip address="192.168.122.1" netmask="255.255.255.0">
-          <dhcp>
-            <range start="192.168.122.2" end="192.168.122.254" />
-          </dhcp>
-        </ip>
-        <ip family="ipv6" address="2001:db8:ca2:2::1" prefix="64" />
-      </network>
+<network> + <name>local</name> + <bridge name="virbr1" /> + <forward mode="route" dev="eth1"/> + <ip address="192.168.122.1" netmask="255.255.255.0"> + <dhcp> + <range start="192.168.122.2" end="192.168.122.254" /> + </dhcp> + </ip> + <ip family="ipv6" address="2001:db8:ca2:2::1" prefix="64" /> +</network>

Below is another IPv6 variation. Instead of a dhcp range being @@ -1144,24 +1144,24 @@ 

-      <network>
-        <name>local6</name>
-        <bridge name="virbr1" />
-        <forward mode="route" dev="eth1"/>
-        <ip address="192.168.122.1" netmask="255.255.255.0">
-          <dhcp>
-            <range start="192.168.122.2" end="192.168.122.254" />
-          </dhcp>
-        </ip>
-        <ip family="ipv6" address="2001:db8:ca2:2::1" prefix="64" >
-          <dhcp>
-            <host name="paul"   ip="2001:db8:ca2:2:3::1" />
-            <host id="0:1:0:1:18:aa:62:fe:0:16:3e:44:55:66"    ip="2001:db8:ca2:2:3::2" />
-            <host id="0:3:0:1:0:16:3e:11:22:33" name="ralph"  ip="2001:db8:ca2:2:3::3" />
-            <host id="0:4:7e:7d:f0:7d:a8:bc:c5:d2:13:32:11:ed:16:ea:84:63" name="badbob" ip="2001:db8:ca2:2:3::4" />
-          </dhcp>
-        </ip>
-      </network>
+<network> + <name>local6</name> + <bridge name="virbr1" /> + <forward mode="route" dev="eth1"/> + <ip address="192.168.122.1" netmask="255.255.255.0"> + <dhcp> + <range start="192.168.122.2" end="192.168.122.254" /> + </dhcp> + </ip> + <ip family="ipv6" address="2001:db8:ca2:2::1" prefix="64" > + <dhcp> + <host name="paul" ip="2001:db8:ca2:2:3::1" /> + <host id="0:1:0:1:18:aa:62:fe:0:16:3e:44:55:66" ip="2001:db8:ca2:2:3::2" /> + <host id="0:3:0:1:0:16:3e:11:22:33" name="ralph" ip="2001:db8:ca2:2:3::3" /> + <host id="0:4:7e:7d:f0:7d:a8:bc:c5:d2:13:32:11:ed:16:ea:84:63" name="badbob" ip="2001:db8:ca2:2:3::4" /> + </dhcp> + </ip> +</network>

Below is yet another IPv6 variation. This variation has only @@ -1176,19 +1176,19 @@ 

-      <network>
-        <name>net7</name>
-        <bridge name="virbr7" />
-        <forward mode="route"/>
-        <ip family="ipv6" address="2001:db8:ca2:7::1" prefix="64" >
-          <dhcp>
-            <range start="2001:db8:ca2:7::100" end="2001:db8:ca2::1ff" />
-            <host id="0:4:7e:7d:f0:7d:a8:bc:c5:d2:13:32:11:ed:16:ea:84:63" name="lucas" ip="2001:db8:ca2:2:3::4" />
-          </dhcp>
-        </ip>
-        <route family="ipv6" address="2001:db8:ca2:8::" prefix="64" gateway="2001:db8:ca2:7::4" >
-        </route>
-      </network>
+<network> + <name>net7</name> + <bridge name="virbr7" /> + <forward mode="route"/> + <ip family="ipv6" address="2001:db8:ca2:7::1" prefix="64" > + <dhcp> + <range start="2001:db8:ca2:7::100" end="2001:db8:ca2::1ff" /> + <host id="0:4:7e:7d:f0:7d:a8:bc:c5:d2:13:32:11:ed:16:ea:84:63" name="lucas" ip="2001:db8:ca2:2:3::4" /> + </dhcp> + </ip> + <route family="ipv6" address="2001:db8:ca2:8::" prefix="64" gateway="2001:db8:ca2:7::4" > + </route> +</network>

Isolated network config

@@ -1201,16 +1201,16 @@ 

-      <network>
-        <name>private</name>
-        <bridge name="virbr2" />
-        <ip address="192.168.152.1" netmask="255.255.255.0">
-          <dhcp>
-            <range start="192.168.152.2" end="192.168.152.254" />
-          </dhcp>
-        </ip>
-        <ip family="ipv6" address="2001:db8:ca2:3::1" prefix="64" />
-      </network>
+<network> + <name>private</name> + <bridge name="virbr2" /> + <ip address="192.168.152.1" netmask="255.255.255.0"> + <dhcp> + <range start="192.168.152.2" end="192.168.152.254" /> + </dhcp> + </ip> + <ip family="ipv6" address="2001:db8:ca2:3::1" prefix="64" /> +</network>

Isolated IPv6 network config

@@ -1224,18 +1224,18 @@ 

-      <network>
-        <name>sixnet</name>
-        <bridge name="virbr6" />
-        <ip family="ipv6" address="2001:db8:ca2:6::1" prefix="64" >
-          <dhcp>
-            <host name="peter"   ip="2001:db8:ca2:6:6::1" />
-            <host id="0:1:0:1:18:aa:62:fe:0:16:3e:44:55:66" ip="2001:db8:ca2:6:6::2" />
-            <host id="0:3:0:1:0:16:3e:11:22:33" name="dariusz" ip="2001:db8:ca2:6:6::3" />
-            <host id="0:4:7e:7d:f0:7d:a8:bc:c5:d2:13:32:11:ed:16:ea:84:63" name="anita" ip="2001:db8:ca2:6:6::4" />
-          </dhcp>
-        </ip>
-      </network>
+<network> + <name>sixnet</name> + <bridge name="virbr6" /> + <ip family="ipv6" address="2001:db8:ca2:6::1" prefix="64" > + <dhcp> + <host name="peter" ip="2001:db8:ca2:6:6::1" /> + <host id="0:1:0:1:18:aa:62:fe:0:16:3e:44:55:66" ip="2001:db8:ca2:6:6::2" /> + <host id="0:3:0:1:0:16:3e:11:22:33" name="dariusz" ip="2001:db8:ca2:6:6::3" /> + <host id="0:4:7e:7d:f0:7d:a8:bc:c5:d2:13:32:11:ed:16:ea:84:63" name="anita" ip="2001:db8:ca2:6:6::4" /> + </dhcp> + </ip> +</network>

Using an existing host bridge

@@ -1249,11 +1249,11 @@ 

-      <network>
-        <name>host-bridge</name>
-        <forward mode="bridge"/>
-        <bridge name="br0"/>
-      </network>
+<network> + <name>host-bridge</name> + <forward mode="bridge"/> + <bridge name="br0"/> +</network>

Using a macvtap "direct" connection

@@ -1279,16 +1279,16 @@ 

-      <network>
-        <name>direct-macvtap</name>
-        <forward mode="bridge">
-          <interface dev="eth20"/>
-          <interface dev="eth21"/>
-          <interface dev="eth22"/>
-          <interface dev="eth23"/>
-          <interface dev="eth24"/>
-        </forward>
-      </network>
+<network> + <name>direct-macvtap</name> + <forward mode="bridge"> + <interface dev="eth20"/> + <interface dev="eth21"/> + <interface dev="eth22"/> + <interface dev="eth23"/> + <interface dev="eth24"/> + </forward> +</network>

Network config with no gateway addresses

@@ -1303,12 +1303,12 @@ 

-      <network ipv6='yes'>
-        <name>nogw</name>
-        <uuid>7a3b7497-1ec7-8aef-6d5c-38dff9109e93</uuid>
-        <bridge name="virbr2" stp="on" delay="0" />
-        <mac address='00:16:3E:5D:C7:9E'/>
-      </network>
+<network ipv6='yes'> + <name>nogw</name> + <uuid>7a3b7497-1ec7-8aef-6d5c-38dff9109e93</uuid> + <bridge name="virbr2" stp="on" delay="0" /> + <mac address='00:16:3E:5D:C7:9E'/> +</network>