summaryrefslogtreecommitdiff
path: root/en
diff options
context:
space:
mode:
authorluca <luca.mo@tiscali.it>2018-10-25 22:06:51 +0200
committerluca <luca.mo@tiscali.it>2018-10-25 22:06:51 +0200
commiteda256dd2b3d70b84c8c533af9eee4c871e42541 (patch)
tree9392d3ae14608d60ebf02c610f7ce8ce55a3070c /en
parent07a2a560dee41f3dea3f5c68162e44ff0fa2f3a3 (diff)
parent3d41c07b49f236501a7462da693eccf22b1dfa6e (diff)
downloadinstallation-guide-eda256dd2b3d70b84c8c533af9eee4c871e42541.zip
Merge branch 'master' of salsa.debian.org:installer-team/installation-guide
Diffstat (limited to 'en')
-rw-r--r--en/appendix/chroot-install.xml11
-rw-r--r--en/welcome/what-is-debian-installer.xml2
2 files changed, 7 insertions, 6 deletions
diff --git a/en/appendix/chroot-install.xml b/en/appendix/chroot-install.xml
index fa3beba5d..6dd075af2 100644
--- a/en/appendix/chroot-install.xml
+++ b/en/appendix/chroot-install.xml
@@ -407,17 +407,18 @@ Here are some simple examples from
# available.
######################################################################
-# We always want the loopback interface.
+# The loopback interface isn't really required any longer, but can be used
+# if needed.
#
-auto lo
-iface lo inet loopback
+# auto lo
+# iface lo inet loopback
# To use dhcp:
#
# auto eth0
# iface eth0 inet dhcp
-# An example static IP setup: (broadcast and gateway are optional)
+# An example static IP setup: (network, broadcast and gateway are optional)
#
# auto eth0
# iface eth0 inet static
@@ -438,7 +439,7 @@ Enter your nameserver(s) and search directives in
A simple example <filename>/etc/resolv.conf</filename>:
<informalexample><screen>
-search hqdom.local
+search example.com
nameserver 10.1.1.36
nameserver 192.168.9.100
</screen></informalexample>
diff --git a/en/welcome/what-is-debian-installer.xml b/en/welcome/what-is-debian-installer.xml
index 7473ace0f..5d9ba1276 100644
--- a/en/welcome/what-is-debian-installer.xml
+++ b/en/welcome/what-is-debian-installer.xml
@@ -18,7 +18,7 @@ Also available are an expert mode that allows to control every aspect of
the installation and an advanced feature to perform automated installations.
The installed system can be used as is or further customized.
The installation can be performed from a multitude of sources: USB,
-CD/DVD/Blue Ray or the network.
+CD/DVD/Blu-Ray or the network.
The installer supports localized installations in more than 80 languages.
</para><para>