* Reworked the "Configuring the Network" section, added information

  regarding IPv6 support.
* Added a "Choosing a network mirror" section, added information
  regarding IPv6 connectivity of debian mirrors and information about 
  ftp.ipv6.debian.org and http.debian.net.

M    manual/debian/changelog
M    manual/en/using-d-i/modules/netcfg.xml
M    manual/en/using-d-i/modules/apt-setup.xml

2 files changed, 82 insertions, 11 deletions

diff --git a/en/using-d-i/modules/apt-setup.xml b/en/using-d-i/modules/apt-setup.xml
index 473e82287..e530efa5c 100644
--- a/en/using-d-i/modules/apt-setup.xml
+++ b/en/using-d-i/modules/apt-setup.xml
@@ -193,4 +193,41 @@ configured.
 
 </para>
 </sect4>
+
+<sect4 id="apt-setup-mirror-selection">
+<title>Choosing a network mirror</title>
+<para>
+
+If you have selected to use a network mirror during the installation
+(optional for CD/DVD installs, required for netboot images), you will be
+presented with a list of geographically nearby (and therefore hopefully
+fast) network mirrors, based upon your country selection earlier in the
+installation process.  Choosing the offered default is usually fine.
+
+</para><para>
+
+If your computer is on an IPv6-only network (which is probably not the case
+for the vast majority of users), using the default mirror for your country
+might not work.  All the mirrors in the list are reachable via IPv4, but
+only some of them can be used via IPv6.  As connectivity of individual
+mirrors can change over time, this information is not available in the
+installer.  If there is no IPv6 connectivity for the default mirror for your
+country, you can either try some of the other mirrors offered to you or
+choose the "enter information manually" option.  You can then specify
+<quote>ftp.ipv6.debian.org</quote> as the mirror name, which is an alias for
+a mirror available via IPv6, although it will probably not be the fastest
+possible one.
+
+</para><para>
+
+Another option when choosing to specify the mirror manually is to use
+<quote>http.debian.net</quote> as your mirror.
+<quote>http.debian.net</quote> is not a physical mirror but a mirror
+redirection service, i.e. it automatically refers your system to a
+real mirror near you in terms of network topology. It takes into account
+by which protocol you connect to it, i.e. if you use IPv6, it will
+refer you to an IPv6-capable mirror near you.
+
+</para>
+</sect4>    
    </sect3>
diff --git a/en/using-d-i/modules/netcfg.xml b/en/using-d-i/modules/netcfg.xml
index 314966888..426df3f39 100644
--- a/en/using-d-i/modules/netcfg.xml
+++ b/en/using-d-i/modules/netcfg.xml
@@ -15,19 +15,31 @@ installation is complete; see the <citerefentry>
 <refentrytitle>interfaces</refentrytitle> <manvolnum>5</manvolnum>
 </citerefentry> man page.
 
-</para><para>
+</para>
+
+<sect4 id="netcfg-automatic">
+<title>Automatic network configuration</title> 
+<para>
 
 By default, &d-i; tries to configure your computer's network
-automatically via DHCP. If the DHCP probe succeeds, you are done. If the
-probe fails, it may be caused by many factors ranging from unplugged
-network cable, to a misconfigured DHCP setup. Or maybe you don't have
-a DHCP server in your local network at all.  For further explanation,
-check the error messages on the fourth console.  In any case, you will
+automatically as far as possible.  If the automatic configuration
+fails, that may be caused by many factors ranging from an
+unplugged network cable to missing infrastructure for automatic
+configuration.  For further explanation in case of errors, check
+the error messages on the fourth console.  In any case, you will
 be asked if you want to retry, or if you want to perform a manual
-setup. DHCP servers are sometimes really slow in their responses, so
-if you are sure everything is in place, try again.
+setup.  Sometimes the network services used for autoconfiguration
+can be slow in their responses, so if you are sure everything is
+in place, simply start the autoconfiguration attempt again.
+If autoconfiguration fails repeatedly, you can instead choose
+the manual network setup.
 
-</para><para>
+</para>
+</sect4>
+
+<sect4 id="netcfg-manual">
+<title>Manual network configuration</title>
+<para>
 
 The manual network setup in turn asks you a number of questions about
 your network, notably
@@ -37,8 +49,8 @@ your network, notably
 <computeroutput>Name server addresses</computeroutput>, and a
 <computeroutput>Hostname</computeroutput>.
 Moreover, if you have a wireless network interface, you will be asked
-to provide your <computeroutput>Wireless ESSID</computeroutput> and
-a <computeroutput>WEP key</computeroutput> or
+to provide your <computeroutput>Wireless ESSID</computeroutput> 
+(<quote>wireless network name</quote>) and a <computeroutput>WEP key</computeroutput> or
 <computeroutput>WPA/WPA2 passphrase</computeroutput>.
 Fill in the answers from
 <xref linkend="needed-info"/>.
@@ -55,4 +67,26 @@ change them by editing <filename>/etc/network/interfaces</filename> once
 the system has been installed.
 
 </para></note>
+</sect4>
+
+<sect4 id="netcfg-ipv4-ipv6">
+<title>IPv4 and IPv6</title>
+<para>
+
+From &debian-gnu; 7.0 (<quote>Wheezy</quote>) onwards, &d-i; supports IPv6
+as well as the <quote>classic</quote> IPv4. All combinations of IPv4 and
+IPv6 (IPv4-only, IPv6-only and dual-stack configurations) are supported.
+
+</para><para>
+
+Autoconfiguration for IPv4 is done via DHCP (Dynamic Host Configuration
+Protocol).  Autoconfiguration for IPv6 supports stateless autoconfiguration
+using NDP (Neighbor Discovery Protocol, including recursive DNS server
+(RDNSS) assignment), stateful autoconfiguration via DHCPv6 and mixed
+stateless/stateful autoconfiguration (address configuration via NDP,
+additional parameters via DHCPv6).
+
+</para>
+</sect4>
+
    </sect3>