- Javier spotted an empty para; this is probably what I originally intended to write there...

- Fix minor errors spotted by Javier and Holger; with thanks

2 files changed, 18 insertions, 4 deletions

diff --git a/en/boot-installer/parameters.xml b/en/boot-installer/parameters.xml
index 7d458f50d..582bd1f22 100644
--- a/en/boot-installer/parameters.xml
+++ b/en/boot-installer/parameters.xml
@@ -206,14 +206,13 @@ one device.
 </varlistentry>
 
 <varlistentry>
-<term>debian-installer/framebuffer</term>
+<term>debian-installer/framebuffer (fb)</term>
 <listitem><para>
 
 Some architectures use the kernel framebuffer to offer installation in
 a number of languages. If framebuffer causes a problem on your system
 you can disable the feature by the parameter
-<userinput>debian-installer/framebuffer=false</userinput>, or
-<userinput>fb=false</userinput> for short. Problem symptoms are error messages
+<userinput>fb=false</userinput>. Problem symptoms are error messages
 about bterm or bogl, a blank screen, or a freeze within a few minutes after
 starting the install.
 
diff --git a/en/using-d-i/modules/pkgsel.xml b/en/using-d-i/modules/pkgsel.xml
index 3cfa99f56..afa177f55 100644
--- a/en/using-d-i/modules/pkgsel.xml
+++ b/en/using-d-i/modules/pkgsel.xml
@@ -70,7 +70,7 @@ File server: <classname>samba</classname>, <classname>nfs</classname>;
 Mail server: <classname>exim4</classname>, <classname>spamassassin</classname>,
 <classname>uw-imap</classname>;
 Print server: <classname>cups</classname>;
-SQL server: <classname>postgresql</classname>;
+SQL database: <classname>postgresql</classname>;
 Web server: <classname>apache</classname>.
 
 </para></note>
@@ -89,6 +89,21 @@ to toggle selection of a task.
 </para></note>
 <para>
 
+You should be aware that especially the Desktop task is very large.
+Especially when installing from a normal CD-ROM in combination with a
+mirror for packages not on the CD-ROM, the installer may want to retrieve
+a lot of packages over the network. If you have a relatively slow
+Internet connection, this can take a long time. There is no option to
+cancel the installation of packages once it has started.
+
+</para><para>
+
+Even when packages are included on the CD-ROM, the installer may still
+retrieve them from the mirror if the version available on the mirror is
+more recent than the one included on the CD-ROM. If you are installing
+the stable distribution, this can happen after a point release (an update
+of the original stable release); if you are installing the testing
+distribution this will happen if you are using an older image.
 
 </para><para>