summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrans Pop <elendil@planet.nl>2007-02-28 15:08:57 +0000
committerFrans Pop <elendil@planet.nl>2007-02-28 15:08:57 +0000
commitd2512e4a19aa0a957af173e9faa2d81cfa03f193 (patch)
tree38b25e7ce229e2a282c9a56fed685dd65d75d15d
parent1227fcaaa02f8f88d7096976f92d317351664a8e (diff)
downloadinstallation-guide-d2512e4a19aa0a957af173e9faa2d81cfa03f193.zip
- document how to select the ftp protocol during mirror selection
- document how to install from CD/DVD only (and not use a network mirror)
-rw-r--r--debian/changelog8
-rw-r--r--en/appendix/preseed.xml4
2 files changed, 8 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog
index da557dd3c..d189d48a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,6 +27,9 @@ installation-guide (2007xxxx) UNRELEASED; urgency=low
- as exim no longer asks any questions during installations, there is no
real need to document it anymore
- add link to Philip Hand's website as it contains many creative examples
+ - document how to select the ftp protocol during mirror selection
+ - document how to install from CD/DVD only (and not use a network mirror)
+ * Update base/standard system and task sizes.
[ Joey Hess ]
* Document debian-installer/allow_unauthenticated.
@@ -35,10 +38,7 @@ installation-guide (2007xxxx) UNRELEASED; urgency=low
* Update mac68k installation after notes from Finn Thain, upstream mac68k
kernel hacker.
- [ Frans Pop ]
- * Update base/standard system and task sizes.
-
- -- Frans Pop <fjp@debian.org> Tue, 27 Feb 2007 22:21:24 +0100
+ -- Frans Pop <fjp@debian.org> Wed, 28 Feb 2007 16:05:56 +0100
installation-guide (20070122) unstable; urgency=low
diff --git a/en/appendix/preseed.xml b/en/appendix/preseed.xml
index 6991f33dc..ad28addb8 100644
--- a/en/appendix/preseed.xml
+++ b/en/appendix/preseed.xml
@@ -837,6 +837,8 @@ same as <classname>mirror/suite</classname>.
</para>
<informalexample role="example"><screen>
+# If you select ftp, the mirror/country string does not need to be set.
+#d-i mirror/protocol string ftp
d-i mirror/country string enter information manually
d-i mirror/http/hostname string &archive-mirror;
d-i mirror/http/directory string /debian
@@ -1042,6 +1044,8 @@ earlier questions. You can optionally add other (local) repositories.
# You can choose to install non-free and contrib software.
#d-i apt-setup/non-free boolean true
#d-i apt-setup/contrib boolean true
+# Uncomment this if you don't want to use a network mirror.
+#d-i apt-setup/use_mirror boolean false
# Uncomment this to avoid adding security sources, or
# add a hostname to use a different server than security.debian.org.
#d-i apt-setup/security_host string