missed part of merge before

10 files changed, 378 insertions, 26 deletions

diff --git a/en/boot-installer/i386.xml b/en/boot-installer/i386.xml
index 261cb3066..1f38b7112 100644
--- a/en/boot-installer/i386.xml
+++ b/en/boot-installer/i386.xml
@@ -9,7 +9,7 @@
 <!--
 CD #1 of official Debian CD-ROM sets for &arch-title; will present a
 <prompt>boot:</prompt> prompt on most hardware. Press
-<keycap>F3</keycap> to see the list of kernel options available
+<keycap>F4</keycap> to see the list of kernel options available
 from which to boot. Just type your chosen flavor name (idepci,
 vanilla, compact, bf24) at the <prompt>boot:</prompt> prompt
 followed by &enterkey;.
diff --git a/en/boot-installer/trouble.xml b/en/boot-installer/trouble.xml
index 5591f5bb0..9f94ef49d 100644
--- a/en/boot-installer/trouble.xml
+++ b/en/boot-installer/trouble.xml
@@ -216,7 +216,7 @@ this information to the bug report.
 
 Other pertinent installation messages may be found in
 <filename>/var/log/</filename> during the
-installation, and <filename>/var/log/debian-installer/</filename>
+installation, and <filename>/var/log/installer/</filename>
 after the computer has been booted into the installed system.
 
 </para>
diff --git a/en/using-d-i/modules/apt-setup.xml b/en/using-d-i/modules/apt-setup.xml
new file mode 100644
index 000000000..cb37555b2
--- /dev/null
+++ b/en/using-d-i/modules/apt-setup.xml
@@ -0,0 +1,41 @@
+<!-- retain these comments for translator revision tracking -->
+<!-- $Id: $ -->
+
+   <sect3 id="apt-setup">
+   <title>Configuring apt</title>
+
+<para>
+
+The main means that people use to install packages on their system is
+via a program called <command>apt-get</command>, from the
+<classname>apt</classname> package.<footnote>
+
+<para>
+
+Note that the actual program that installs packages is called
+<command>dpkg</command>.  However, this program is more of a low-level
+tool.  <command>apt-get</command> is a higher-level tool as it will
+invoke <command>dpkg</command> as appropriate and also because it knows
+to install other packages which are required for the package you're
+trying to install, as well as how to retrieve the package from your
+CD, the network, or wherever.
+
+</para>
+</footnote>
+Other front-ends for package management, like <command>aptitude</command>
+and <command>synaptic</command> are also in use and depend on
+<command>apt-get</command>. These front-ends are recommended for new users,
+since they integrate some additional features (package searching and status checks)
+in a nice user interface.
+
+</para><para>
+
+<command>apt</command> must be configured so that it knows where to retrieve
+packages from. The installer largely takes care of this automatically based on
+what it knows about your installation medium. The results of this configuration
+are written to the file /etc/apt/sources.list, and you can examine and edit
+it to your liking after the install is complete.
+
+</para>
+
+   </sect3>
diff --git a/en/using-d-i/modules/base-installer.xml b/en/using-d-i/modules/base-installer.xml
index 741e7df5f..e9327eb43 100644
--- a/en/using-d-i/modules/base-installer.xml
+++ b/en/using-d-i/modules/base-installer.xml
@@ -7,9 +7,9 @@
 <para>
 
 During the Base installation, package unpacking and setup messages are
-redirected to <userinput>tty3</userinput>.  You can access this
+redirected to <userinput>tty4</userinput>.  You can access this
 terminal by pressing
-<keycombo><keycap>Left Alt</keycap><keycap>F3</keycap></keycombo>;
+<keycombo><keycap>Left Alt</keycap><keycap>F4</keycap></keycombo>;
 get back to the main installer process with
 <keycombo><keycap>Left Alt</keycap><keycap>F1</keycap></keycombo>.
 
@@ -17,7 +17,7 @@ get back to the main installer process with
 </para><para>
 
 The unpack/setup messages generated by the base installation are saved in
-<filename>/var/log/messages</filename> when the installation is
+<filename>/var/log/syslog</filename> when the installation is
 performed over a serial console.
 
 </para><para>
diff --git a/en/using-d-i/modules/clock-setup.xml b/en/using-d-i/modules/clock-setup.xml
new file mode 100644
index 000000000..d73b9b37d
--- /dev/null
+++ b/en/using-d-i/modules/clock-setup.xml
@@ -0,0 +1,34 @@
+<!-- retain these comments for translator revision tracking -->
+<!-- $Id: $ -->
+
+   <sect3 id="clock-setup">
+   <title>Configuring the Clock</title>
+
+<para>
+
+The installer might ask you if the computer's clock is set to UTC. Normally
+this question is avoided if possible and the installer tries to work out
+whether the clock is set to UTC based on things like what other operating
+systems are installed. 
+
+</para><para>
+
+In expert mode you will always be able to choose
+whether or not the clock is set to UTC.
+<phrase arch="m68k;powerpc">Macintosh hardware clocks are normally
+set to local time. If you want to dual-boot, select local time instead of
+GMT.</phrase>
+<phrase arch="i386">Systems that (also) run Dos or Windows are normally
+set to local time. If you want to dual-boot, select local time
+instead of GMT.</phrase>
+
+</para><para>
+
+Note that the installer does not currently allow you to actually set the
+time in the computer's clock. You can set the clock to the current time
+after you have installed, if it is incorrect or if it was previously not
+set to UTC.
+
+</para>
+
+   </sect3>
diff --git a/en/using-d-i/modules/pkgsel.xml b/en/using-d-i/modules/pkgsel.xml
new file mode 100644
index 000000000..9b6e5b809
--- /dev/null
+++ b/en/using-d-i/modules/pkgsel.xml
@@ -0,0 +1,161 @@
+<!-- retain these comments for translator revision tracking -->
+<!-- $Id: $ -->
+
+   <sect3 id="pkgsel">
+   <title>Selecting and Installing Software</title>
+
+<para>
+
+During the installation process, you are given the opportunity to select
+additional software to install. Rather than picking individual software
+packages from the &num-of-distrib-pkgs; available packages, this stage of
+the installation process focuses on selecting and installing predefined
+collections of software to quickly set up your computer to perform various
+tasks.
+
+</para><para>
+
+So, you have the ability to choose <emphasis>tasks</emphasis> first,
+and then add on more individual packages later.  These tasks loosely
+represent a number of different jobs or things you want to do with
+your computer, such as <quote>Desktop environment</quote>,
+<quote>Web server</quote>, or <quote>Print server</quote><footnote>
+
+<para>
+
+You should know that to present this list, the installer is merely
+invoking the <command>tasksel</command> program. It can be
+run at any time after installation to install (or remove) more
+packages, or you can use a more fine-grained tool such as <command>aptitude</command>.
+If you are looking for a specific single package, after
+installation is complete, simply run <userinput>aptitude install
+<replaceable>package</replaceable></userinput>, where
+<replaceable>package</replaceable> is the name of the package you are
+looking for.
+
+</para>
+
+</footnote>. <xref linkend="tasksel-size-list"/> lists the space
+requirements for the available tasks.
+
+</para><para>
+
+Once you've selected your tasks, select
+<guibutton>Ok</guibutton>. At this point,
+<command>aptitude</command> will install the packages you've
+selected.
+
+<note><para>
+
+In the standard user interface of the installer, you can use the space bar
+to toggle selection of a task.
+
+</para></note>
+
+<note><para>
+
+Note that some tasks may be pre-selected based on the characteristics of the
+computer you are installing. If you disagree with these selections you can
+un-select the tasks. You can even opt to install no tasks at all at this point.
+
+</para></note>
+
+</para><para>
+
+Each package you selected with <command>tasksel</command> is downloaded,
+unpacked and then installed in turn by the <command>apt-get</command> and
+<command>dpkg</command> programs. If a particular program needs more
+information from the user, it will prompt you during this process.
+
+</para>
+ <sect4 id="config-mta">
+ <title>Configuring Your Mail Transport Agent</title>
+
+<para>
+
+Today, email is a very important part of many people's life, so it's
+no surprise Debian lets you configure your mail system right as a part
+of the installation process. The standard mail transport agent in
+Debian is <command>exim4</command>, which is relatively small,
+flexible, and easy to learn.
+
+</para><para>
+
+You may ask if this is needed even if your computer is not connected
+to any network. The short answer is: Yes. The longer explanation: Some
+system utilities (like <command>cron</command>,
+<command>quota</command>, <command>aide</command>, &hellip;) may send
+you important notices via email.
+
+</para><para>
+
+So on the first screen you will be presented with several common mail
+scenarios. Choose the one that most closely resembles your needs:
+
+</para>
+
+<variablelist>
+<varlistentry>
+<term>internet site</term>
+<listitem><para>
+
+Your system is connected to a network and your mail is sent and
+received directly using SMTP. On the following screens you will be
+asked a few basic questions, like your machine's mail name, or a list of
+domains for which you accept or relay mail.
+
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term>mail sent by smarthost</term>
+<listitem><para>
+
+In this scenario is your outgoing mail forwarded to another machine,
+called a <quote>smarthost</quote>, which does the actual job for
+you. Smarthost also usually stores incoming mail addressed to your
+computer, so you don't need to be permanently online. That also means
+you have to download your mail from the smarthost via programs like
+fetchmail. This option is suitable for dial-up users.
+
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term>local delivery only</term>
+<listitem><para>
+
+Your system is not on a network and mail is sent or received only
+between local users. Even if you don't plan to send any messages, this
+option is highly recommended, because some system utilities may send
+you various alerts from time to time (e.g. beloved <quote>Disk quota
+exceeded</quote>). This option is also convenient for new users,
+because it doesn't ask any further questions.
+
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term>no configuration at this time</term>
+<listitem><para>
+
+Choose this if you are absolutely convinced you know what you are
+doing. This will leave you with an unconfigured mail system &mdash;
+until you configure it, you won't be able to send or receive any mail
+and you may miss some important messages from your system utilities.
+
+</para></listitem>
+</varlistentry>
+</variablelist>
+
+<para>
+
+If none of these scenarios suits your needs, or if you need a finer
+setup, you will need to edit configuration files under the
+<filename>/etc/exim4</filename> directory after the installation is
+complete. More information about <command>exim4</command> may be found
+under <filename>/usr/share/doc/exim4</filename>.
+
+</para>
+ </sect4>
+   </sect3>
diff --git a/en/using-d-i/modules/save-logs.xml b/en/using-d-i/modules/save-logs.xml
index 788b90935..a930db4fa 100644
--- a/en/using-d-i/modules/save-logs.xml
+++ b/en/using-d-i/modules/save-logs.xml
@@ -8,7 +8,7 @@
 
 If the installation is successful, the logfiles created during
 the installation process will be automatically saved to
-<filename>/var/log/debian-installer/</filename> on your new
+<filename>/var/log/installer/</filename> on your new
 Debian system.
 
 </para><para>
diff --git a/en/using-d-i/modules/tzsetup.xml b/en/using-d-i/modules/tzsetup.xml
new file mode 100644
index 000000000..d19108424
--- /dev/null
+++ b/en/using-d-i/modules/tzsetup.xml
@@ -0,0 +1,16 @@
+<!-- retain these comments for translator revision tracking -->
+<!-- $Id: $ -->
+
+   <sect3 id="tzsetup">
+   <title>Configuring Your Time Zone</title>
+
+<para>
+
+Depending on the location selected at the beginning of the installation
+process, you might be shown a list of timezones relevant for that location.
+If your location has only one time zone, you will not be asked anything and
+the system will assume that time zone.
+
+</para>
+
+   </sect3>
diff --git a/en/using-d-i/modules/user-setup.xml b/en/using-d-i/modules/user-setup.xml
new file mode 100644
index 000000000..d207b5c75
--- /dev/null
+++ b/en/using-d-i/modules/user-setup.xml
@@ -0,0 +1,69 @@
+<!-- retain these comments for translator revision tracking -->
+<!-- $Id: $ -->
+
+   <sect3 id="user-setup">
+   <title>Setting Up Users And Passwords</title>
+
+    <sect4 id="user-setup-root">
+    <title>Set the Root Password</title>
+
+<para>
+
+The <emphasis>root</emphasis> account is also called the
+<emphasis>super-user</emphasis>; it is a login that bypasses all
+security protection on your system. The root account should only be
+used to perform system administration, and only used for as short
+a time as possible.
+
+</para><para>
+
+Any password you create should contain at least 6 characters, and
+should contain both upper- and lower-case characters, as well as
+punctuation characters.  Take extra care when setting your root
+password, since it is such a powerful account.  Avoid dictionary
+words or use of any personal information which could be guessed.
+
+</para><para>
+
+If anyone ever tells you they need your root password, be extremely
+wary. You should normally never give your root password out, unless you
+are administering a machine with more than one system administrator.
+
+</para>
+   </sect4>
+
+   <sect4 id="make-normal-user">
+   <title>Create an Ordinary User</title>
+
+<para>
+
+The system will ask you whether you wish to create an ordinary user
+account at this point.  This account should be your main personal
+log-in.  You should <emphasis>not</emphasis> use the root account for
+daily use or as your personal login.
+
+</para><para>
+
+Why not?  Well, one reason to avoid using root's privileges is that it
+is very easy to do irreparable damage as root.  Another reason is that
+you might be tricked into running a <emphasis>Trojan-horse</emphasis>
+program &mdash; that is a program that takes advantage of your
+super-user powers to compromise the security of your system behind
+your back. Any good book on Unix system administration will cover this
+topic in more detail &mdash; consider reading one if it is new to you.
+
+</para><para>
+
+You will first be prompted for the user's full name. Then you'll be asked
+for a name for the user account; generally your first name or something
+similar will suffice and indeed will be the default. Finally, you will be
+prompted for a password for this account.
+
+</para><para>
+
+If at any point after installation you would like to create another
+account, use the <command>adduser</command> command.
+
+</para>
+    </sect4>
+   </sect3>
diff --git a/en/using-d-i/using-d-i.xml b/en/using-d-i/using-d-i.xml
index 95fa6b10f..97e142b84 100644
--- a/en/using-d-i/using-d-i.xml
+++ b/en/using-d-i/using-d-i.xml
@@ -81,22 +81,22 @@ ssh session to view the logs described below.
 
 </para><para>
 
-Error messages are redirected to the third console.
+Error messages and logs are redirected to the fourth console.
 You can access this console by
-pressing <keycombo><keycap>Left Alt</keycap><keycap>F3</keycap></keycombo>
+pressing <keycombo><keycap>Left Alt</keycap><keycap>F4</keycap></keycombo>
 (hold the left <keycap>Alt</keycap> key while pressing the
-<keycap>F3</keycap> function key); get back to
+<keycap>F4</keycap> function key); get back to
 the main installer process with
 <keycombo><keycap>Left Alt</keycap><keycap>F1</keycap></keycombo>.
 
 </para><para>
 
 These messages can also be found in
-<filename>/var/log/messages</filename>.  After installation, this log
-is copied to <filename>/var/log/debian-installer/messages</filename> on your
+<filename>/var/log/syslog</filename>.  After installation, this log
+is copied to <filename>/var/log/installer/syslog</filename> on your
 new system. Other installation messages may be found in
 <filename>/var/log/</filename> during the
-installation, and <filename>/var/log/debian-installer/</filename>
+installation, and <filename>/var/log/debian/</filename>
 after the computer has been booted into the installed system.
 
 </para>
@@ -306,6 +306,30 @@ newer motherboards.
 </para></listitem>
 </varlistentry>
 <varlistentry>
+	
+<term>tzsetup</term><listitem><para>
+
+Selects the time zone, based on the location selected earlier
+		
+</para></listitem>
+</varlistentry>
+<varlistentry>
+
+<term>clock-setup</term><listitem><para>
+
+Determines whether the clock is set to UTC or not.
+
+</para></listitem>
+</varlistentry>
+<varlistentry>
+	
+<term>user-setup</term><listitem><para>
+
+Sets up the root password, and adds a non-root user.
+
+</para></listitem>
+</varlistentry>
+<varlistentry>
 
 <term>base-installer</term><listitem><para>
 
@@ -315,7 +339,24 @@ the computer to operate under Linux when rebooted.
 </para></listitem>
 </varlistentry>
 <varlistentry>
+	
+<term>apt-setup</term><listitem><para>
 
+Configures apt, mostly automatically, based on what media the installer is
+running from.
+
+</para></listitem>
+</varlistentry>
+<varlistentry>
+	
+<term>pkgsel</term><listitem><para>
+
+Uses tasksel to select and install additional software.
+
+</para></listitem>
+</varlistentry>
+<varlistentry>
+	
 <term>os-prober</term><listitem><para>
 
 Detects currently installed operating systems on the computer and
@@ -330,20 +371,10 @@ which operating system to start.
 
 <term>bootloader-installer</term><listitem><para>
 
-Installs a boot loader program on the hard disk, which is necessary
-for the computer to start up using Linux without using a floppy or
-CD-ROM.  Many boot loaders allow the user to choose an alternate
-operating system each time the computer boots.
-
-</para></listitem>
-</varlistentry>
-<varlistentry>
-
-<term>base-config</term><listitem><para>
-
-Provides dialogs for setting up the base system packages according
-to user preferences. This is normally done after rebooting the
-computer; it is the <quote>first run</quote> of the new Debian system.
+The various bootloader installers each install a boot loader program on the
+hard disk, which is necessary for the computer to start up using Linux
+without using a floppy or CD-ROM.  Many boot loaders allow the user to
+choose an alternate operating system each time the computer boots.
 
 </para></listitem>
 </varlistentry>