mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-08-28 11:31:16 +00:00
formatnetwork.html.in: Kill useless spaces in <pre/>
The <pre/> 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 <pre/> because the content might not fix into it. Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
parent
b4d6b11139
commit
f31be1499b
@ -35,14 +35,14 @@
|
|||||||
</p>
|
</p>
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<network ipv6='yes' trustGuestRxFilters='no'>
|
<network ipv6='yes' trustGuestRxFilters='no'>
|
||||||
<name>default</name>
|
<name>default</name>
|
||||||
<uuid>3e3fce45-4f53-4fa7-bb32-11f34168b82b</uuid>
|
<uuid>3e3fce45-4f53-4fa7-bb32-11f34168b82b</uuid>
|
||||||
<metadata>
|
<metadata>
|
||||||
<app1:foo xmlns:app1="http://app1.org/app1/">..</app1:foo>
|
<app1:foo xmlns:app1="http://app1.org/app1/">..</app1:foo>
|
||||||
<app2:bar xmlns:app2="http://app1.org/app2/">..</app2:bar>
|
<app2:bar xmlns:app2="http://app1.org/app2/">..</app2:bar>
|
||||||
</metadata>
|
</metadata>
|
||||||
...</pre>
|
...</pre>
|
||||||
|
|
||||||
<dl>
|
<dl>
|
||||||
<dt><code>name</code></dt>
|
<dt><code>name</code></dt>
|
||||||
@ -91,11 +91,11 @@
|
|||||||
</p>
|
</p>
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
...
|
...
|
||||||
<bridge name="virbr0" stp="on" delay="5" macTableManager="libvirt"/>
|
<bridge name="virbr0" stp="on" delay="5" macTableManager="libvirt"/>
|
||||||
<domain name="example.com" localOnly="no"/>
|
<domain name="example.com" localOnly="no"/>
|
||||||
<forward mode="nat" dev="eth0"/>
|
<forward mode="nat" dev="eth0"/>
|
||||||
...</pre>
|
...</pre>
|
||||||
|
|
||||||
<dl>
|
<dl>
|
||||||
<dt><code>bridge</code></dt>
|
<dt><code>bridge</code></dt>
|
||||||
@ -815,18 +815,18 @@
|
|||||||
</p>
|
</p>
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
...
|
...
|
||||||
<ip address="192.168.122.1" netmask="255.255.255.0">
|
<ip address="192.168.122.1" netmask="255.255.255.0">
|
||||||
<dhcp>
|
<dhcp>
|
||||||
<range start="192.168.122.128" end="192.168.122.254" />
|
<range start="192.168.122.128" end="192.168.122.254" />
|
||||||
</dhcp>
|
</dhcp>
|
||||||
</ip>
|
</ip>
|
||||||
<route address="192.168.222.0" prefix="24" gateway="192.168.122.2" />
|
<route address="192.168.222.0" prefix="24" gateway="192.168.122.2" />
|
||||||
<ip family="ipv6" address="2001:db8:ca2:2::1" prefix="64" />
|
<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: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 family="ipv6" address="2001:db9:4:1::" prefix="64" gateway="2001:db8:ca2:2::3" metric='2'>
|
||||||
</route>
|
</route>
|
||||||
...
|
...
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
<h3><a name="elementsAddress">Addressing</a></h3>
|
<h3><a name="elementsAddress">Addressing</a></h3>
|
||||||
@ -841,30 +841,30 @@
|
|||||||
</p>
|
</p>
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
...
|
...
|
||||||
<mac address='00:16:3E:5D:C7:9E'/>
|
<mac address='00:16:3E:5D:C7:9E'/>
|
||||||
<domain name="example.com"/>
|
<domain name="example.com"/>
|
||||||
<dns>
|
<dns>
|
||||||
<txt name="example" value="example value" />
|
<txt name="example" value="example value" />
|
||||||
<forwarder addr="8.8.8.8"/>
|
<forwarder addr="8.8.8.8"/>
|
||||||
<forwarder domain='example.com' addr="8.8.4.4"/>
|
<forwarder domain='example.com' addr="8.8.4.4"/>
|
||||||
<forwarder domain='www.example.com'/>
|
<forwarder domain='www.example.com'/>
|
||||||
<srv service='name' protocol='tcp' domain='test-domain-name' target='.' port='1024' priority='10' weight='10'/>
|
<srv service='name' protocol='tcp' domain='test-domain-name' target='.' port='1024' priority='10' weight='10'/>
|
||||||
<host ip='192.168.122.2'>
|
<host ip='192.168.122.2'>
|
||||||
<hostname>myhost</hostname>
|
<hostname>myhost</hostname>
|
||||||
<hostname>myhostalias</hostname>
|
<hostname>myhostalias</hostname>
|
||||||
</host>
|
</host>
|
||||||
</dns>
|
</dns>
|
||||||
<ip address="192.168.122.1" netmask="255.255.255.0">
|
<ip address="192.168.122.1" netmask="255.255.255.0">
|
||||||
<dhcp>
|
<dhcp>
|
||||||
<range start="192.168.122.100" end="192.168.122.254" />
|
<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: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" />
|
<host mac="00:16:3e:3e:a9:1a" name="bar.example.com" ip="192.168.122.11" />
|
||||||
</dhcp>
|
</dhcp>
|
||||||
</ip>
|
</ip>
|
||||||
<ip family="ipv6" address="2001:db8:ca2:2::1" prefix="64" />
|
<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" />
|
<route family="ipv6" address="2001:db9:ca1:1::" prefix="64" gateway="2001:db8:ca2:2::2" />
|
||||||
</network></pre>
|
</pre>
|
||||||
|
|
||||||
<dl>
|
<dl>
|
||||||
<dt><code>mac</code></dt>
|
<dt><code>mac</code></dt>
|
||||||
@ -1074,17 +1074,17 @@
|
|||||||
</p>
|
</p>
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<network>
|
<network>
|
||||||
<name>default</name>
|
<name>default</name>
|
||||||
<bridge name="virbr0" />
|
<bridge name="virbr0" />
|
||||||
<forward mode="nat"/>
|
<forward mode="nat"/>
|
||||||
<ip address="192.168.122.1" netmask="255.255.255.0">
|
<ip address="192.168.122.1" netmask="255.255.255.0">
|
||||||
<dhcp>
|
<dhcp>
|
||||||
<range start="192.168.122.2" end="192.168.122.254" />
|
<range start="192.168.122.2" end="192.168.122.254" />
|
||||||
</dhcp>
|
</dhcp>
|
||||||
</ip>
|
</ip>
|
||||||
<ip family="ipv6" address="2001:db8:ca2:2::1" prefix="64" />
|
<ip family="ipv6" address="2001:db8:ca2:2::1" prefix="64" />
|
||||||
</network></pre>
|
</network></pre>
|
||||||
|
|
||||||
|
|
||||||
<p>
|
<p>
|
||||||
@ -1093,21 +1093,21 @@
|
|||||||
</p>
|
</p>
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<network>
|
<network>
|
||||||
<name>default6</name>
|
<name>default6</name>
|
||||||
<bridge name="virbr0" />
|
<bridge name="virbr0" />
|
||||||
<forward mode="nat"/>
|
<forward mode="nat"/>
|
||||||
<ip address="192.168.122.1" netmask="255.255.255.0">
|
<ip address="192.168.122.1" netmask="255.255.255.0">
|
||||||
<dhcp>
|
<dhcp>
|
||||||
<range start="192.168.122.2" end="192.168.122.254" />
|
<range start="192.168.122.2" end="192.168.122.254" />
|
||||||
</dhcp>
|
</dhcp>
|
||||||
</ip>
|
</ip>
|
||||||
<ip family="ipv6" address="2001:db8:ca2:2::1" prefix="64" >
|
<ip family="ipv6" address="2001:db8:ca2:2::1" prefix="64" >
|
||||||
<dhcp>
|
<dhcp>
|
||||||
<range start="2001:db8:ca2:2:1::10" end="2001:db8:ca2:2:1::ff" />
|
<range start="2001:db8:ca2:2:1::10" end="2001:db8:ca2:2:1::ff" />
|
||||||
</dhcp>
|
</dhcp>
|
||||||
</ip>
|
</ip>
|
||||||
</network></pre>
|
</network></pre>
|
||||||
|
|
||||||
<h3><a name="examplesRoute">Routed network config</a></h3>
|
<h3><a name="examplesRoute">Routed network config</a></h3>
|
||||||
|
|
||||||
@ -1121,17 +1121,17 @@
|
|||||||
</p>
|
</p>
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<network>
|
<network>
|
||||||
<name>local</name>
|
<name>local</name>
|
||||||
<bridge name="virbr1" />
|
<bridge name="virbr1" />
|
||||||
<forward mode="route" dev="eth1"/>
|
<forward mode="route" dev="eth1"/>
|
||||||
<ip address="192.168.122.1" netmask="255.255.255.0">
|
<ip address="192.168.122.1" netmask="255.255.255.0">
|
||||||
<dhcp>
|
<dhcp>
|
||||||
<range start="192.168.122.2" end="192.168.122.254" />
|
<range start="192.168.122.2" end="192.168.122.254" />
|
||||||
</dhcp>
|
</dhcp>
|
||||||
</ip>
|
</ip>
|
||||||
<ip family="ipv6" address="2001:db8:ca2:2::1" prefix="64" />
|
<ip family="ipv6" address="2001:db8:ca2:2::1" prefix="64" />
|
||||||
</network></pre>
|
</network></pre>
|
||||||
|
|
||||||
<p>
|
<p>
|
||||||
Below is another IPv6 variation. Instead of a dhcp range being
|
Below is another IPv6 variation. Instead of a dhcp range being
|
||||||
@ -1144,24 +1144,24 @@
|
|||||||
</p>
|
</p>
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<network>
|
<network>
|
||||||
<name>local6</name>
|
<name>local6</name>
|
||||||
<bridge name="virbr1" />
|
<bridge name="virbr1" />
|
||||||
<forward mode="route" dev="eth1"/>
|
<forward mode="route" dev="eth1"/>
|
||||||
<ip address="192.168.122.1" netmask="255.255.255.0">
|
<ip address="192.168.122.1" netmask="255.255.255.0">
|
||||||
<dhcp>
|
<dhcp>
|
||||||
<range start="192.168.122.2" end="192.168.122.254" />
|
<range start="192.168.122.2" end="192.168.122.254" />
|
||||||
</dhcp>
|
</dhcp>
|
||||||
</ip>
|
</ip>
|
||||||
<ip family="ipv6" address="2001:db8:ca2:2::1" prefix="64" >
|
<ip family="ipv6" address="2001:db8:ca2:2::1" prefix="64" >
|
||||||
<dhcp>
|
<dhcp>
|
||||||
<host name="paul" ip="2001:db8:ca2:2:3::1" />
|
<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: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: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" />
|
<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>
|
</dhcp>
|
||||||
</ip>
|
</ip>
|
||||||
</network></pre>
|
</network></pre>
|
||||||
|
|
||||||
<p>
|
<p>
|
||||||
Below is yet another IPv6 variation. This variation has only
|
Below is yet another IPv6 variation. This variation has only
|
||||||
@ -1176,19 +1176,19 @@
|
|||||||
</p>
|
</p>
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<network>
|
<network>
|
||||||
<name>net7</name>
|
<name>net7</name>
|
||||||
<bridge name="virbr7" />
|
<bridge name="virbr7" />
|
||||||
<forward mode="route"/>
|
<forward mode="route"/>
|
||||||
<ip family="ipv6" address="2001:db8:ca2:7::1" prefix="64" >
|
<ip family="ipv6" address="2001:db8:ca2:7::1" prefix="64" >
|
||||||
<dhcp>
|
<dhcp>
|
||||||
<range start="2001:db8:ca2:7::100" end="2001:db8:ca2::1ff" />
|
<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" />
|
<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>
|
</dhcp>
|
||||||
</ip>
|
</ip>
|
||||||
<route family="ipv6" address="2001:db8:ca2:8::" prefix="64" gateway="2001:db8:ca2:7::4" >
|
<route family="ipv6" address="2001:db8:ca2:8::" prefix="64" gateway="2001:db8:ca2:7::4" >
|
||||||
</route>
|
</route>
|
||||||
</network></pre>
|
</network></pre>
|
||||||
|
|
||||||
<h3><a name="examplesPrivate">Isolated network config</a></h3>
|
<h3><a name="examplesPrivate">Isolated network config</a></h3>
|
||||||
|
|
||||||
@ -1201,16 +1201,16 @@
|
|||||||
</p>
|
</p>
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<network>
|
<network>
|
||||||
<name>private</name>
|
<name>private</name>
|
||||||
<bridge name="virbr2" />
|
<bridge name="virbr2" />
|
||||||
<ip address="192.168.152.1" netmask="255.255.255.0">
|
<ip address="192.168.152.1" netmask="255.255.255.0">
|
||||||
<dhcp>
|
<dhcp>
|
||||||
<range start="192.168.152.2" end="192.168.152.254" />
|
<range start="192.168.152.2" end="192.168.152.254" />
|
||||||
</dhcp>
|
</dhcp>
|
||||||
</ip>
|
</ip>
|
||||||
<ip family="ipv6" address="2001:db8:ca2:3::1" prefix="64" />
|
<ip family="ipv6" address="2001:db8:ca2:3::1" prefix="64" />
|
||||||
</network></pre>
|
</network></pre>
|
||||||
|
|
||||||
<h3><a name="examplesPrivate6">Isolated IPv6 network config</a></h3>
|
<h3><a name="examplesPrivate6">Isolated IPv6 network config</a></h3>
|
||||||
|
|
||||||
@ -1224,18 +1224,18 @@
|
|||||||
</p>
|
</p>
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<network>
|
<network>
|
||||||
<name>sixnet</name>
|
<name>sixnet</name>
|
||||||
<bridge name="virbr6" />
|
<bridge name="virbr6" />
|
||||||
<ip family="ipv6" address="2001:db8:ca2:6::1" prefix="64" >
|
<ip family="ipv6" address="2001:db8:ca2:6::1" prefix="64" >
|
||||||
<dhcp>
|
<dhcp>
|
||||||
<host name="peter" ip="2001:db8:ca2:6:6::1" />
|
<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: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: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" />
|
<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>
|
</dhcp>
|
||||||
</ip>
|
</ip>
|
||||||
</network></pre>
|
</network></pre>
|
||||||
|
|
||||||
<h3><a name="examplesBridge">Using an existing host bridge</a></h3>
|
<h3><a name="examplesBridge">Using an existing host bridge</a></h3>
|
||||||
|
|
||||||
@ -1249,11 +1249,11 @@
|
|||||||
</p>
|
</p>
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<network>
|
<network>
|
||||||
<name>host-bridge</name>
|
<name>host-bridge</name>
|
||||||
<forward mode="bridge"/>
|
<forward mode="bridge"/>
|
||||||
<bridge name="br0"/>
|
<bridge name="br0"/>
|
||||||
</network></pre>
|
</network></pre>
|
||||||
|
|
||||||
<h3><a name="examplesDirect">Using a macvtap "direct" connection</a></h3>
|
<h3><a name="examplesDirect">Using a macvtap "direct" connection</a></h3>
|
||||||
|
|
||||||
@ -1279,16 +1279,16 @@
|
|||||||
</p>
|
</p>
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<network>
|
<network>
|
||||||
<name>direct-macvtap</name>
|
<name>direct-macvtap</name>
|
||||||
<forward mode="bridge">
|
<forward mode="bridge">
|
||||||
<interface dev="eth20"/>
|
<interface dev="eth20"/>
|
||||||
<interface dev="eth21"/>
|
<interface dev="eth21"/>
|
||||||
<interface dev="eth22"/>
|
<interface dev="eth22"/>
|
||||||
<interface dev="eth23"/>
|
<interface dev="eth23"/>
|
||||||
<interface dev="eth24"/>
|
<interface dev="eth24"/>
|
||||||
</forward>
|
</forward>
|
||||||
</network></pre>
|
</network></pre>
|
||||||
|
|
||||||
<h3><a name="examplesNoGateway">Network config with no gateway addresses</a></h3>
|
<h3><a name="examplesNoGateway">Network config with no gateway addresses</a></h3>
|
||||||
|
|
||||||
@ -1303,12 +1303,12 @@
|
|||||||
</p>
|
</p>
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<network ipv6='yes'>
|
<network ipv6='yes'>
|
||||||
<name>nogw</name>
|
<name>nogw</name>
|
||||||
<uuid>7a3b7497-1ec7-8aef-6d5c-38dff9109e93</uuid>
|
<uuid>7a3b7497-1ec7-8aef-6d5c-38dff9109e93</uuid>
|
||||||
<bridge name="virbr2" stp="on" delay="0" />
|
<bridge name="virbr2" stp="on" delay="0" />
|
||||||
<mac address='00:16:3E:5D:C7:9E'/>
|
<mac address='00:16:3E:5D:C7:9E'/>
|
||||||
</network></pre>
|
</network></pre>
|
||||||
|
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
Loading…
Reference in New Issue
Block a user