Re: [libvirt] [PATCH 2/3] re-indent network.rng following structural change

This commit is whitespace changes only, do avoid obscuring actual code changes.

--- docs/schemas/network.rng | 206 +++++++++++++++++++++++----------------------- 1 files changed, 103 insertions(+), 103 deletions(-) diff --git a/docs/schemas/network.rng b/docs/schemas/network.rng index d898b77..ca100b7 100644 --- a/docs/schemas/network.rng +++ b/docs/schemas/network.rng @@ -5,126 +5,126 @@ <ref name="network"/> </start> -<define name="network"> +<define name="network"> -<element name="network"> -<interleave> +<element name="network"> +<interleave> -<!-- The name of the network, used to refer to it through the API - and in virsh --> -<element name="name"> -<text/> -</element> - -<!--<uuid> element --> -<optional> -<element name="uuid"><text/></element> -</optional> - -<!--<bridge> element --> -<optional> -<!-- The name of the network to be set up; this will back - the network on the host --> -<element name="bridge"> -<optional> -<attribute name="name"> +<!-- The name of the network, used to refer to it through the API + and in virsh --> +<element name="name"> <text/> -</attribute> -</optional> +</element> -<optional> -<attribute name="stp"> -<choice> -<value>on</value> -<value>off</value> -</choice> -</attribute> -</optional> +<!--<uuid> element --> +<optional> +<element name="uuid"><text/></element> +</optional> -<optional> -<attribute name="delay"> -<data type="integer"/> -</attribute> -</optional> +<!--<bridge> element --> +<optional> +<!-- The name of the network to be set up; this will back + the network on the host --> +<element name="bridge"> +<optional> +<attribute name="name"> +<text/> +</attribute> +</optional> -</element> -</optional> +<optional> +<attribute name="stp"> +<choice> +<value>on</value> +<value>off</value> +</choice> +</attribute> +</optional> -<!--<forward> element --> -<optional> -<!-- The device through which the bridge is connected to the - rest of the network --> -<element name="forward"> -<optional> -<attribute name="dev"> -<text/> -</attribute> -</optional> +<optional> +<attribute name="delay"> +<data type="integer"/> +</attribute> +</optional> -<optional> -<attribute name="mode"> -<choice> -<value>nat</value> -<value>route</value> -</choice> -</attribute> -</optional> -</element> -</optional> +</element> +</optional> -<!--<domain> element --> -<optional> -<element name="domain"> -<attribute name="name"><text/></attribute> -</element> -</optional> +<!--<forward> element --> +<optional> +<!-- The device through which the bridge is connected to the + rest of the network --> +<element name="forward"> +<optional> +<attribute name="dev"> +<text/> +</attribute> +</optional> -<!--<ip> element --> -<optional> -<!-- The IP element sets up NAT'ing and an optional DHCP server - local to the host. --> -<!-- FIXME: address, netmask and the start and end of the ranges - are IP addresses, and should be validated as such in the scheme --> -<element name="ip"> -<optional> -<attribute name="address"><text/></attribute> -</optional> -<optional> -<attribute name="netmask"><text/></attribute> -</optional> -<optional> -<element name="tftp"> -<attribute name="root"><text/></attribute> -</element> -</optional> -<!-- Define the range(s) of IP addresses that the DHCP - server should hand out --> -<element name="dhcp"> -<zeroOrMore> -<element name="range"> -<attribute name="start"><text/></attribute> -<attribute name="end"><text/></attribute> +<optional> +<attribute name="mode"> +<choice> +<value>nat</value> +<value>route</value> +</choice> +</attribute> +</optional> </element> -</zeroOrMore> -<zeroOrMore> -<element name="host"> -<attribute name="mac"><text/></attribute> +</optional> + +<!--<domain> element --> +<optional> +<element name="domain"> <attribute name="name"><text/></attribute> -<attribute name="ip"><text/></attribute> </element> -</zeroOrMore> +</optional> + +<!--<ip> element --> <optional> -<element name="bootp"> -<attribute name="file"><text/></attribute> +<!-- The IP element sets up NAT'ing and an optional DHCP server + local to the host. --> +<!-- FIXME: address, netmask and the start and end of the ranges + are IP addresses, and should be validated as such in the scheme --> +<element name="ip"> +<optional> +<attribute name="address"><text/></attribute> +</optional> +<optional> +<attribute name="netmask"><text/></attribute> +</optional> <optional> -<attribute name="server"><text/></attribute> +<element name="tftp"> +<attribute name="root"><text/></attribute> +</element> </optional> +<!-- Define the range(s) of IP addresses that the DHCP + server should hand out --> +<element name="dhcp"> +<zeroOrMore> +<element name="range"> +<attribute name="start"><text/></attribute> +<attribute name="end"><text/></attribute> +</element> +</zeroOrMore> +<zeroOrMore> +<element name="host"> +<attribute name="mac"><text/></attribute> +<attribute name="name"><text/></attribute> +<attribute name="ip"><text/></attribute> +</element> +</zeroOrMore> +<optional> +<element name="bootp"> +<attribute name="file"><text/></attribute> +<optional> +<attribute name="server"><text/></attribute> +</optional> +</element> +</optional> +</element> </element> </optional> -</element> +</interleave> </element> -</optional> -</interleave> -</element> -</define> +</define> </grammar>