diff --git a/docs/formatnetwork.html.in b/docs/formatnetwork.html.in
index cbec7af59e..f9421c3f84 100644
--- a/docs/formatnetwork.html.in
+++ b/docs/formatnetwork.html.in
@@ -142,35 +142,6 @@
with the idiosyncrasies of the platform where libvirt is
running. Since 0.8.8
- ip
- The address attribute defines an IPv4 address in
- dotted-decimal format, or an IPv6 address in standard
- colon-separated hexadecimal format, that will be configured on
- the bridge
- device associated with the virtual network. To the guests this
- address will be their default route. For IPv4 addresses, the netmask
- attribute defines the significant bits of the network address,
- again specified in dotted-decimal format. For IPv6 addresses,
- and as an alternate method for IPv4 addresses, you can specify
- the significant bits of the network address with the prefix
- attribute, which is an integer (for example, netmask='255.255.255.0'
- could also be given as prefix='24'. The family
- attribute is used to specify the type of address - 'ipv4' or 'ipv6'; if no
- family is given, 'ipv4' is assumed. A network can have more than
- one of each family of address defined, but only a single address can have a
- dhcp or tftp element. Since 0.3.0;
- IPv6, multiple addresses on a single network, family, and
- prefix since 0.8.7
- tftpImmediately within
- the ip element there is an optional tftp
- element. The presence of this element and of its attribute
- root enables TFTP services. The attribute specifies
- the path to the root directory served via TFTP. tftp is not
- supported for IPv6 addresses, can only be specified on a single IPv4 address
- per network.
- Since 0.7.1
-
-
dns
The dns element of a network contains configuration information for the
virtual network's DNS server. Since 0.9.3
@@ -194,41 +165,78 @@
- dhcp
- Also within the ip element there is an
- optional dhcp element. The presence of this element
- enables DHCP services on the virtual network. It will further
- contain one or more range elements. The
- dhcp element is not supported for IPv6, and
- is only supported on a single IP address per network for IPv4.
- Since 0.3.0
-
- range
- The start and end attributes on the
- range element specify the boundaries of a pool of
- IPv4 addresses to be provided to DHCP clients. These two addresses
- must lie within the scope of the network defined on the parent
- ip element. Since 0.3.0
-
- host
- Within the dhcp element there may be zero or more
- host elements; these specify hosts which will be given
- names and predefined IP addresses by the built-in DHCP server. Any
- such element must specify the MAC address of the host to be assigned
- a given name (via the mac attribute), the IP to be
- assigned to that host (via the ip attribute), and the
- name to be given that host by the DHCP server (via the
- name attribute). Since 0.4.5
- bootpThe optional bootp
- element specifies BOOTP options to be provided by the DHCP server.
- Two attributes are supported: file is mandatory and
- gives the file to be used for the boot image; server is
- optional and gives the address of the TFTP server from which the boot
- image will be fetched. server defaults to the same host
- that runs the DHCP server, as is the case when the tftp
- element is used. The BOOTP options currently have to be the same
- for all address ranges and statically assigned addresses.Since 0.7.1 (server since 0.7.3).
+ ip
+ The address attribute defines an IPv4 address in
+ dotted-decimal format, or an IPv6 address in standard
+ colon-separated hexadecimal format, that will be configured on
+ the bridge
+ device associated with the virtual network. To the guests this
+ address will be their default route. For IPv4 addresses, the netmask
+ attribute defines the significant bits of the network address,
+ again specified in dotted-decimal format. For IPv6 addresses,
+ and as an alternate method for IPv4 addresses, you can specify
+ the significant bits of the network address with the prefix
+ attribute, which is an integer (for example, netmask='255.255.255.0'
+ could also be given as prefix='24'. The family
+ attribute is used to specify the type of address - 'ipv4' or 'ipv6'; if no
+ family is given, 'ipv4' is assumed. A network can have more than
+ one of each family of address defined, but only a single address can have a
+ dhcp or tftp element. Since 0.3.0;
+ IPv6, multiple addresses on a single network, family, and
+ prefix since 0.8.7
+
+ tftp- Immediately within
+ the
ip element there is an optional tftp
+ element. The presence of this element and of its attribute
+ root enables TFTP services. The attribute specifies
+ the path to the root directory served via TFTP. tftp is not
+ supported for IPv6 addresses, and can only be specified on a single IPv4 address
+ per network.
+ Since 0.7.1
+
+
+ dhcp- Also within the
ip element there is an
+ optional dhcp element. The presence of this element
+ enables DHCP services on the virtual network. It will further
+ contain one or more range elements. The
+ dhcp element is not supported for IPv6, and
+ is only supported on a single IP address per network for IPv4.
+ Since 0.3.0
+
+ range- The
start and end attributes on the
+ range element specify the boundaries of a pool of
+ IPv4 addresses to be provided to DHCP clients. These two addresses
+ must lie within the scope of the network defined on the parent
+ ip element. Since 0.3.0
+
+ host- Within the
dhcp element there may be zero or more
+ host elements; these specify hosts which will be given
+ names and predefined IP addresses by the built-in DHCP server. Any
+ such element must specify the MAC address of the host to be assigned
+ a given name (via the mac attribute), the IP to be
+ assigned to that host (via the ip attribute), and the
+ name to be given that host by the DHCP server (via the
+ name attribute). Since 0.4.5
+
+ bootp- The optional
bootp
+ element specifies BOOTP options to be provided by the DHCP server.
+ Two attributes are supported: file is mandatory and
+ gives the file to be used for the boot image; server is
+ optional and gives the address of the TFTP server from which the boot
+ image will be fetched. server defaults to the same host
+ that runs the DHCP server, as is the case when the tftp
+ element is used. The BOOTP options currently have to be the same
+ for all address ranges and statically assigned addresses.Since 0.7.1 (server since 0.7.3).
+
+
+
+