diff options
| -rw-r--r-- | chapter05/binutils-pass1.xml | 3 | ||||
| -rw-r--r-- | chapter06/m4.xml | 3 | ||||
| -rw-r--r-- | chapter06/man-db.xml | 6 | ||||
| -rw-r--r-- | chapter06/shadow.xml | 6 | ||||
| -rw-r--r-- | chapter06/udev.xml | 10 | ||||
| -rw-r--r-- | chapter07/inputrc.xml | 6 | ||||
| -rw-r--r-- | chapter08/fstab.xml | 14 |
7 files changed, 28 insertions, 20 deletions
diff --git a/chapter05/binutils-pass1.xml b/chapter05/binutils-pass1.xml index b5c4687a5..4a4565e72 100644 --- a/chapter05/binutils-pass1.xml +++ b/chapter05/binutils-pass1.xml @@ -59,7 +59,8 @@ cd ../binutils-build</userinput></screen> <para>Now prepare Binutils for compilation:</para> -<screen><userinput>CC="gcc -B/usr/bin/" ../binutils-&binutils-version;/configure --prefix=/tools --disable-nls</userinput></screen> +<screen><userinput>CC="gcc -B/usr/bin/" ../binutils-&binutils-version;/configure \ + --prefix=/tools --disable-nls</userinput></screen> <variablelist> <title>The meaning of the configure options:</title> diff --git a/chapter06/m4.xml b/chapter06/m4.xml index a5127583e..4a66b0c1e 100644 --- a/chapter06/m4.xml +++ b/chapter06/m4.xml @@ -69,7 +69,8 @@ <?dbhtml list-presentation="table"?> <varlistentry id="m4"> - <term><command>m4</command></term> + <!-- Don't remove the extra space, it prevet a FOP warning. --> + <term><command>m4 </command></term> <listitem> <para>copies the given files while expanding the macros that they contain. These macros are either built-in or user-defined and can diff --git a/chapter06/man-db.xml b/chapter06/man-db.xml index 8025f8469..800729a2f 100644 --- a/chapter06/man-db.xml +++ b/chapter06/man-db.xml @@ -163,8 +163,12 @@ install -m755 convert-mans /usr/bin</userinput></screen> <!-- Origin: man-db-2.4.3/src/encodings.c --> <table> <title>Expected character encoding of manual pages</title> + <?dbfo table-width="50%" ?> - <tgroup cols="2"> + <tgroup cols="2" align="center"> + + <colspec colnum="1" colwidth="2in"/> + <colspec colnum="2" colwidth="2in"/> <thead> <row> diff --git a/chapter06/shadow.xml b/chapter06/shadow.xml index 4ea7d8f79..91f614110 100644 --- a/chapter06/shadow.xml +++ b/chapter06/shadow.xml @@ -51,7 +51,8 @@ <para>Prepare Shadow for compilation:</para> -<screen><userinput>./configure --libdir=/lib --sysconfdir=/etc --enable-shared --without-selinux</userinput></screen> +<screen><userinput>./configure --libdir=/lib --sysconfdir=/etc --enable-shared \ + --without-selinux</userinput></screen> <variablelist> <title>The meaning of the configure options:</title> @@ -108,7 +109,8 @@ convert-mans UTF-8 ISO-8859-9 man/tr/*.?</userinput></screen> <note> <para>If you built Shadow with Cracklib support, run the following:</para> -<screen role="nodump"><userinput>sed -i 's@DICTPATH.*@DICTPATH\t/lib/cracklib/pw_dict@' etc/login.defs</userinput></screen> +<screen role="nodump"><userinput>sed -i 's@DICTPATH.*@DICTPATH\t/lib/cracklib/pw_dict@' \ + etc/login.defs</userinput></screen> </note> <para>Compile the package:</para> diff --git a/chapter06/udev.xml b/chapter06/udev.xml index d31ccae74..70da75ca7 100644 --- a/chapter06/udev.xml +++ b/chapter06/udev.xml @@ -54,8 +54,9 @@ ln -sv /proc/kcore /lib/udev/devices/core</userinput></screen> <para>Compile the package:</para> <screen><userinput>make EXTRAS="extras/ata_id extras/cdrom_id extras/edd_id \ - extras/firmware extras/floppy extras/path_id extras/rule_generator \ - extras/scsi_id extras/usb_id extras/volume_id"</userinput></screen> + extras/firmware extras/floppy extras/path_id \ + extras/rule_generator extras/scsi_id extras/usb_id \ + extras/volume_id"</userinput></screen> <variablelist> <title>The meaning of the make option:</title> @@ -80,8 +81,9 @@ ln -sv /proc/kcore /lib/udev/devices/core</userinput></screen> <screen><userinput>make DESTDIR=/ \ EXTRAS="extras/ata_id extras/cdrom_id extras/edd_id \ - extras/firmware extras/floppy extras/path_id extras/rule_generator \ - extras/scsi_id extras/usb_id extras/volume_id" install</userinput></screen> + extras/firmware extras/floppy extras/path_id \ + extras/rule_generator extras/scsi_id \ + extras/usb_id extras/volume_id" install</userinput></screen> <variablelist> <title>The meaning of the make parameter:</title> diff --git a/chapter07/inputrc.xml b/chapter07/inputrc.xml index dc928bfe9..45a102ea3 100644 --- a/chapter07/inputrc.xml +++ b/chapter07/inputrc.xml @@ -53,10 +53,8 @@ set output-meta On # none, visible or audible set bell-style none -# All of the following map the escape sequence of the -# value contained inside the 1st argument to the -# readline specific functions - +# All of the following map the escape sequence of the value +# contained in the 1st argument to the readline specific functions "\eOd": backward-word "\eOc": forward-word diff --git a/chapter08/fstab.xml b/chapter08/fstab.xml index 29eaa329b..21af0750c 100644 --- a/chapter08/fstab.xml +++ b/chapter08/fstab.xml @@ -61,16 +61,16 @@ EOF</userinput></screen> relevant character set definition (found under File systems -> Native Language Support) has been compiled into the kernel or built as a module. The <quote>codepage</quote> option is also needed for - vfat and smbfs filesystems. It - should be set to the codepage number used under MS-DOS in your country. E.g., - in order to mount USB flash drives, a ru_RU.KOI8-R user would need the - following line in <filename>/etc/fstab</filename>:</para> + vfat and smbfs filesystems. It should be set to the codepage number used + under MS-DOS in your country. E.g., in order to mount USB flash drives, a + ru_RU.KOI8-R user would need the following in the options portion of its + mount line in <filename>/etc/fstab</filename>:</para> -<screen>/dev/sda1 /media/flash vfat noauto,user,quiet,showexec,iocharset=koi8r,codepage=866 0 0</screen> +<screen>noauto,user,quiet,showexec,iocharset=koi8r,codepage=866</screen> - <para>The corresponding line for ru_RU.UTF-8 users is:</para> + <para>The corresponding options fragment for ru_RU.UTF-8 users is:</para> -<screen>/dev/sda1 /media/flash vfat noauto,user,quiet,showexec,iocharset=utf8,codepage=866 0 0</screen> +<screen>noauto,user,quiet,showexec,iocharset=utf8,codepage=866</screen> <note> <para>In the latter case, the kernel emits the following message:</para> |