summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Thibault <sthibault@debian.org>2013-03-31 23:57:17 +0000
committerSamuel Thibault <sthibault@debian.org>2013-03-31 23:57:17 +0000
commit90879fb97a973998de8570aa02430afa90b5a313 (patch)
treecb3f111d9d7d4e36e6d0825a878b03a2002b4041
parentc52cb871fe3bd10e1ef615fb4395a1d68527b4a2 (diff)
downloadinstallation-guide-90879fb97a973998de8570aa02430afa90b5a313.zip
Document that IPv6 autoconfiguration is disabled along DHCP
-rw-r--r--debian/changelog1
-rw-r--r--en/boot-installer/parameters.xml16
2 files changed, 9 insertions, 8 deletions
diff --git a/debian/changelog b/debian/changelog
index 6ae1d3d11..afda2d8e9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ installation-guide (2013XXXX) UNRELEASED; urgency=low
[ Samuel Thibault ]
* Document IPv6 preseeding. Thanks Vincent McIntyre for the suggestion.
* Rename disable_dhcp into disable_autoconfig, the former is now deprecated.
+ * Document that IPv6 autoconfiguration is disabled along DHCP.
* Disable outdated Catalan and Finnish translations.
* Update installation sizes.
* Document that the mirror host name actually has to be a URL base for now.
diff --git a/en/boot-installer/parameters.xml b/en/boot-installer/parameters.xml
index 1c7ec8826..5d3ea47a0 100644
--- a/en/boot-installer/parameters.xml
+++ b/en/boot-installer/parameters.xml
@@ -287,16 +287,16 @@ designed for visually impaired users. Set the theme by booting with
<listitem><para>
By default, the &d-i; automatically probes for network configuration
-via DHCP. If the probe succeeds, you won't have a chance to review and
+via IPv6 autoconfiguration and DHCP. If the probe succeeds, you won't have a chance to review and
change the obtained settings. You can get to the manual network setup
-only in case the DHCP probe fails.
+only in case the automatic configuration fails.
</para><para>
-If you have a DHCP server on your local network, but want to avoid it
-because e.g. it gives wrong answers, you can use the parameter
-<userinput>netcfg/disable_autoconfig=true</userinput> to prevent configuring
-the network with DHCP and to enter the information manually.
+If you have an IPv6 router or a DHCP server on your local network, but want to avoid them
+because e.g. they give wrong answers, you can use the parameter
+<userinput>netcfg/disable_autoconfig=true</userinput> to prevent any automatic
+configuration of the network (neither v4 nor v6) and to enter the information manually.
</para></listitem>
</varlistentry>
@@ -519,8 +519,8 @@ Examples of optional components that may be useful are
<term>netcfg/disable_autoconfig</term>
<listitem><para>
-Set to <userinput>true</userinput> if you want to disable DHCP and instead
-force static network configuration.
+Set to <userinput>true</userinput> if you want to disable IPv6 autoconfiguration
+and DHCP and instead force static network configuration.
</para></listitem>
</varlistentry>