diff options
| -rw-r--r-- | chapter01/changelog.xml | 7 | ||||
| -rw-r--r-- | chapter06/config-keyboard.xml | 31 | ||||
| -rw-r--r-- | chapter06/create-password.xml | 4 | ||||
| -rw-r--r-- | entities/dejagnu.ent | 3 | ||||
| -rw-r--r-- | entities/expect.ent | 3 | ||||
| -rw-r--r-- | entities/tcl.ent | 3 |
6 files changed, 24 insertions, 27 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 186d313ec..baaea2060 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -74,6 +74,13 @@ </itemizedlist> </para></listitem> +<listitem><para>May 12th, 2003 [winkie]: Applied "Configuring system +components" patch to polish the text. Closes bug #510.</para></listitem> + +<listitem><para>May 13th, 2003 [gerard]: Chapter 06: Removed TCL, Expect +and DejaGNU. Nothing uses this once past GCC in chapter 6. The versions +in /stage1/bin do the job just fine.</para></listitem> + <listitem><para>May 13th, 2003 [winkie]: Chapter 06 - Installing Shadow: touch the /usr/bin/passwd file before installation. Not doing so results in Shadow thinking passwd will be in /bin/passwd.</para></listitem> diff --git a/chapter06/config-keyboard.xml b/chapter06/config-keyboard.xml index 3d5e8212b..c020719e4 100644 --- a/chapter06/config-keyboard.xml +++ b/chapter06/config-keyboard.xml @@ -1,27 +1,26 @@ <sect2><title>Configuring your keyboard</title> -<para>Nothing is more annoying than using Linux with a wrong keymap loaded -for your keyboard. If you have a default US keyboard, you can skip this -section. The US keymap file is the default if you don't change it.</para> +<para>Few things are more annoying than using Linux while a wrong keymap +for your keyboard is loaded. If you have a standard US keyboard, however, you +can skip this section, as the US keymap is the default as long as you don't +change it.</para> -<para>To set the default keymap file, create the +<para>To change the default keymap, create the <filename class="symlink">/usr/share/kbd/keymaps/defkeymap.map.gz</filename> -symlink by running the following commands:</para> +symlink by running the following command:</para> -<para><screen><userinput>ln -s <path/to/keymap> /usr/share/kbd/keymaps/defkeymap.map.gz</userinput></screen></para> +<para><screen><userinput>ln -s path/to/keymap /usr/share/kbd/keymaps/defkeymap.map.gz</userinput></screen></para> -<para>Replace <path/to/keymap> with the your keyboard's map file. For -example, if you have a Dutch keyboard, you would run:</para> +<para>Of course, replace <filename>path/to/keymap</filename> with the path and +name of your keyboard's map file. For example, if you have a Dutch keyboard, +you would use <filename>i386/qwerty/nl.map.gz</filename>.</para> -<para><screen><userinput>ln -s i386/qwerty/nl.map.gz /usr/share/kbd/keymaps/defkeymap.map.gz</userinput></screen></para> +<para>Another way to set your keyboard's layout is to compile the keymap +into the kernel. This ensures that your keyboard will always work as expected, +even when you boot into maintenance mode (by passing `init=/bin/sh' to the +kernel), as then the bootscript that normally sets up your keymap isn't run.</para> -<para>A second option to configure your keyboard's layout is to compile -the keymap directly into the kernel. This will make sure that your -keyboard always works as expected, even when you have booted into -maintenance mode (by passing `init=/bin/sh' to the kernel), in which case -the bootscript that normally sets up your keymap isn't run.</para> - -<para>Run the following command to patch the correct keymap into the +<para>Run the following command to patch the current default keymap into the kernel source. You will have to repeat this command whenever you unpack a new kernel:</para> diff --git a/chapter06/create-password.xml b/chapter06/create-password.xml index d8e182d5f..2aa706013 100644 --- a/chapter06/create-password.xml +++ b/chapter06/create-password.xml @@ -1,7 +1,7 @@ <sect2> -<title>Creating root password</title> +<title>Setting the root password</title> -<para>Choose a password for user root and create it by running the following +<para>Choose a password for user root and set it by running the following command:</para> <para><screen><userinput>passwd root</userinput></screen></para> diff --git a/entities/dejagnu.ent b/entities/dejagnu.ent index 2bd9a5615..12950e9c8 100644 --- a/entities/dejagnu.ent +++ b/entities/dejagnu.ent @@ -3,9 +3,6 @@ <!ENTITY c5-dejagnu SYSTEM "../chapter05/dejagnu.xml"> <!ENTITY c5-dejagnu-inst SYSTEM "../chapter05/dejagnu-inst.xml"> -<!ENTITY c6-dejagnu SYSTEM "../chapter06/dejagnu.xml"> -<!ENTITY c6-dejagnu-inst SYSTEM "../chapter06/dejagnu-inst.xml"> - <!ENTITY aa-dejagnu SYSTEM "../appendixa/dejagnu.xml"> <!ENTITY aa-dejagnu-shortdesc SYSTEM "../appendixa/dejagnu-shortdesc.xml"> <!ENTITY aa-dejagnu-desc SYSTEM "../appendixa/dejagnu-desc.xml"> diff --git a/entities/expect.ent b/entities/expect.ent index 39c36d7d8..ab1612969 100644 --- a/entities/expect.ent +++ b/entities/expect.ent @@ -4,9 +4,6 @@ <!ENTITY c5-expect SYSTEM "../chapter05/expect.xml"> <!ENTITY c5-expect-inst SYSTEM "../chapter05/expect-inst.xml"> -<!ENTITY c6-expect SYSTEM "../chapter06/expect.xml"> -<!ENTITY c6-expect-inst SYSTEM "../chapter06/expect-inst.xml"> - <!ENTITY aa-expect SYSTEM "../appendixa/expect.xml"> <!ENTITY aa-expect-shortdesc SYSTEM "../appendixa/expect-shortdesc.xml"> <!ENTITY aa-expect-desc SYSTEM "../appendixa/expect-desc.xml"> diff --git a/entities/tcl.ent b/entities/tcl.ent index 8719709e2..207592861 100644 --- a/entities/tcl.ent +++ b/entities/tcl.ent @@ -3,9 +3,6 @@ <!ENTITY c5-tcl SYSTEM "../chapter05/tcl.xml"> <!ENTITY c5-tcl-inst SYSTEM "../chapter05/tcl-inst.xml"> -<!ENTITY c6-tcl SYSTEM "../chapter06/tcl.xml"> -<!ENTITY c6-tcl-inst SYSTEM "../chapter06/tcl-inst.xml"> - <!ENTITY aa-tcl SYSTEM "../appendixa/tcl.xml"> <!ENTITY aa-tcl-shortdesc SYSTEM "../appendixa/tcl-shortdesc.xml"> <!ENTITY aa-tcl-desc SYSTEM "../appendixa/tcl-desc.xml"> |