Merge branch 'master' of salsa.debian.org:installer-team/installation-guide

2 files changed, 16 insertions, 20 deletions

diff --git a/en/using-d-i/modules/apt-setup.xml b/en/using-d-i/modules/apt-setup.xml
index b6397a213..fe9151b21 100644
--- a/en/using-d-i/modules/apt-setup.xml
+++ b/en/using-d-i/modules/apt-setup.xml
@@ -190,17 +190,23 @@ configured.
 <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.
+Unless you chose not to use a network mirror, you will be presented
+with a list of network mirrors based upon your country selection
+earlier in the installation process. Choosing the offered default is
+usually fine.
+
+</para><para>
+
+The offered default is deb.debian.org, which is not a mirror itself but
+will redirect to a mirror that should be up-to-date and fast. These
+mirrors support TLS (https protocol) and IPv6. This service is
+maintained by the Debian System Administration (DSA) team.
 
 </para><para>
 
 A mirror can also be specified by hand by choosing <quote>enter information
 manually</quote> . You can then specify a mirror host name and an optional
-port number. As of Wheezy, that actually has to be a URL base, i.e. when
+port number. This actually has to be a URL base, i.e. when
 specifying an IPv6 address, one has to add square brackets around it, for
 instance <quote>[2001:db8::1]</quote>.
 
@@ -218,16 +224,6 @@ choose the <quote>enter information manually</quote> option.  You can then speci
 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>httpredir.debian.org</quote> as your mirror.
-<quote>httpredir.debian.org</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/mdcfg.xml b/en/using-d-i/modules/partman-md.xml
index 8d2854ff3..9dffad9f8 100644
--- a/en/using-d-i/modules/mdcfg.xml
+++ b/en/using-d-i/modules/partman-md.xml
@@ -1,7 +1,7 @@
 <!-- retain these comments for translator revision tracking -->
 <!-- $Id$ -->
 
-   <sect3 id="mdcfg">
+   <sect3 id="partman-md">
    <title>Configuring Multidisk Devices (Software RAID)</title>
 <para>
 
@@ -11,7 +11,7 @@ To be honest, you can construct an MD device even from partitions
 residing on single physical drive, but that won't give any benefits.
 
 </para></footnote> in your computer, you can use
-<command>mdcfg</command> to set up your drives for increased
+<command>partman-md</command> to set up your drives for increased
 performance and/or better reliability of your data. The result is
 called <firstterm>Multidisk Device</firstterm> (or after its most
 famous variant <firstterm>software RAID</firstterm>).
@@ -228,7 +228,7 @@ Next, you should choose <guimenuitem>Configure software
 RAID</guimenuitem> from the main <command>partman</command> menu.
 (The menu will only appear after you mark at least one partition for
 use as <guimenuitem>physical volume for RAID</guimenuitem>.)
-On the first screen of <command>mdcfg</command> simply select
+On the first screen of <command>partman-md</command> simply select
 <guimenuitem>Create MD device</guimenuitem>. You will be presented with
 a list of supported types of MD devices, from which you should choose
 one (e.g. RAID1). What follows depends on the type of MD you selected.
@@ -292,7 +292,7 @@ and use the other three partitions (2 active and 1 spare) for RAID1
 </para><para>
 
 After you set up MD devices to your liking, you can
-<guimenuitem>Finish</guimenuitem> <command>mdcfg</command> to return
+<guimenuitem>Finish</guimenuitem> <command>partman-md</command> to return
 back to the <command>partman</command> to create filesystems on your
 new MD devices and assign them the usual attributes like mountpoints.