diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/formatdomain.html.in | 9 | ||||
| -rw-r--r-- | docs/schemas/domaincommon.rng | 29 | ||||
| -rw-r--r-- | docs/schemas/network.rng | 2 | ||||
| -rw-r--r-- | docs/schemas/networkcommon.rng | 2 |
4 files changed, 7 insertions, 35 deletions
diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 0c3343e288..1d69ca6556 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -4371,12 +4371,9 @@ qemu-kvm -net nic,model=? /dev/null <p> <span class="since">Since 1.2.12</span> route elements can also be added - to define the network routes to use for the network device. This element - has a <code>family</code> attribute set either to <code>ipv4</code> or - <code>ipv6</code>, a mandatory <code>via</code> attribute defining the - IP address to route throught and optional <code>address</code> and <code>prefix</code> - attributes defining the target network range. If those aren't given, then - a default route will be set. + to define the network routes to use for the network device. The attributes + of this element are described in the documentation for the <code>route</code> + element in <a href="formatnetwork.html#elementsStaticroute">network definitions</a>. This is only used by the LXC driver. </p> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 85b3709759..af7abd2e08 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -2330,9 +2330,7 @@ </element> </zeroOrMore> <zeroOrMore> - <element name="route"> - <ref name="route"/> - </element> + <ref name="route"/> </zeroOrMore> <optional> <element name="script"> @@ -3602,27 +3600,6 @@ </element> </define> - <define name="route"> - <interleave> - <attribute name="family"> - <ref name="addr-family"/> - </attribute> - <attribute name="via"> - <ref name="ipAddr"/> - </attribute> - <optional> - <attribute name="address"> - <ref name="ipAddr"/> - </attribute> - </optional> - <optional> - <attribute name="prefix"> - <ref name="ipPrefix"/> - </attribute> - </optional> - </interleave> - </define> - <define name="hostdev"> <element name="hostdev"> <interleave> @@ -3859,9 +3836,7 @@ </element> </zeroOrMore> <zeroOrMore> - <element name="route"> - <ref name="route"/> - </element> + <ref name="route"/> </zeroOrMore> </interleave> </define> diff --git a/docs/schemas/network.rng b/docs/schemas/network.rng index 63d81c133a..a6b8cb2be7 100644 --- a/docs/schemas/network.rng +++ b/docs/schemas/network.rng @@ -371,7 +371,7 @@ </zeroOrMore> <!-- <route> element --> <zeroOrMore> - <ref name="routex"/> + <ref name="route"/> </zeroOrMore> </interleave> </element> diff --git a/docs/schemas/networkcommon.rng b/docs/schemas/networkcommon.rng index cbcae91f01..162ea3d4d9 100644 --- a/docs/schemas/networkcommon.rng +++ b/docs/schemas/networkcommon.rng @@ -228,7 +228,7 @@ <!-- The (static) route element specifies a network address and gateway address to access that network. Both the network address and the gateway address must be specified. --> - <define name='routex'> + <define name='route'> <element name="route"> <optional> <attribute name="family"><ref name="addr-family"/></attribute> |