Merge branch 'trunk' of git.linuxfromscratch.org:lfs into trunk

chapter08/gawk.xml

@@ -46,7 +46,7 @@
 
     <para>Now fix a programming error identified upstream:</para>
 
-<screen><userinput remap="pre">sed -i -i '241i UPREF(m);' interpret.h</userinput></screen>
+<screen><userinput remap="pre">sed -i '241i UPREF(m);' interpret.h</userinput></screen>
 
     <para>Prepare Gawk for compilation:</para>
 

chapter11/afterlfs.xml

@@ -39,8 +39,8 @@
         <ulink url="&blfs-book;xfce/xfce.html">XFCE</ulink>,
         <ulink url="&blfs-book;kde/kde.html">KDE</ulink>, or
         <ulink url="&blfs-book;gnome/gnome.html">Gnome</ulink>
-        based on the 
+        based on a basic
-        <ulink url="&blfs-book;x/installing.html">X Window graphical environment</ulink>
+        <ulink url="&blfs-book;x/installing.html">graphical environment</ulink>
         and several graphical based applications such as the
         <ulink url="&blfs-book;xsoft/firefox.html">Firefox web browser</ulink>,
         <ulink url="&blfs-book;xsoft/thunderbird.html">Thunderbird email client</ulink>,
@@ -54,7 +54,7 @@
      <para>
         In addition to the above, there is a set of applications that are
         suitable for all systems for system management. These applications are
-        all in the full BLFS book. Not
+        all in the BLFS book. Not
         all packages are needed in all environments. For example
         <ulink url="&blfs-book;basicnet/dhcpcd.html">dhcpcd</ulink>,
         is not appropriate for a server and
@@ -68,7 +68,7 @@
   </sect2>
 
   <sect2>
-  <title>Working in a partial BLFS environment</title>
+  <title>Working in a basic LFS environment</title>
 
     <para>
       When you initially boot into LFS, you have all the internal tools to build
@@ -91,7 +91,7 @@
        In order to properly build packages in chroot, you will also need to
        remember to mount the virtual file systems if they are not already
        mounted. One way to do this is to create a script on the
-       <command>HOST</command> system:
+       <emphasis role="bold">HOST</emphasis> system:
     </para>
 
 <screen><command>cat &gt; ~/mount-virt.sh &lt;&lt; "EOF"
@@ -147,7 +147,7 @@ EOF</command></screen>
 
     <para>
         The script can be run with <command>bash ~/mount-virt.sh</command> as
-        either a regular user (recommended) or as root. If run as a regular
+        either a regular user (recommended) or as &root;. If run as a regular
         user, sudo is required on the host system.
     </para>
 
@@ -198,32 +198,61 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin /bin/bash - -login'</command></screen>
   <title>Work from the LFS command line</title>
 
     <para>
-       This method requiures installing 
+       This method requires installing
+        <ulink url="&blfs-book;general/libtasn1.html">libtasn1</ulink>,
+        <ulink url="&blfs-book;postlfs/p11-kit.html">p11-kit</ulink>,
         <ulink url="&blfs-book;postlfs/make-ca.html">make-ca</ulink>,
         <ulink url="&blfs-book;basicnet/wget.html">wget</ulink>,
         <ulink url="&blfs-book;general/gpm.html">gpm</ulink>, and
-        <ulink url="&blfs-book;basicnet/links">links</ulink>
+        <ulink url="&blfs-book;basicnet/links.html">links</ulink>
+        (or <ulink url="&blfs-book;basicnet/lynx.html">lynx</ulink>)
        in chroot and then rebooting into the new LFS system. At this
        point the default system has six virtual consoles. Switching
-       consoles is as easy as using the Alt-Fn key combinations where Fn is
+       consoles is as easy as using the
-       between F1 and F6.  The Alt-LeftArrow and Alt-RightArrow key
+       <keycombo>
+         <keycap>Alt</keycap>
+         <keycap>Fx</keycap>
+       </keycombo>
+       key combinations where <keycap>Fx</keycap> is
+       between <keycap>F1</keycap> and <keycap>F6</keycap>.
+       The
+       <keycombo>
+         <keycap>Alt</keycap>
+         <keycap function='left'/>
+       </keycombo>
+       and
+       <keycombo>
+         <keycap>Alt</keycap>
+         <keycap function='right'/>
+       </keycombo>
        combinations also will change the console.
      </para>
 
      <para>
        At this point you can log into two different virtual consoles and run
-       the links browser in one console and bash in the other. GPM then allows
+       the links or lynx browser in one console and bash in the other. GPM
-       copying commands from the browser with the left mouse button, switching
+       then allows copying commands from the browser with the left mouse
-       consoles, and pasting into the other console.
+       button, switching consoles, and pasting into the other console.
       </para>
 
       <note>
         <para>
           As a side note, switching of virtual consoles can also be done from
-          an X Window instance with the Ctrl-Alt-Fn key combination, but the
+          an X Window instance with the
-          mouse copy operation does not work between the graphical interface
+          <keycombo>
-          and a virtual console. You can return to the X Window display with
+            <keycap>Ctrl</keycap>
-          the Ctrl-Alt-Fn conbination where Fn is usually F7.
+            <keycap>Alt</keycap>
+            <keycap>Fx</keycap>
+          </keycombo>
+          key combination, but the mouse copy operation does not work
+          between the graphical interface and a virtual console. You can
+          return to the X Window display with the
+          <keycombo>
+            <keycap>Ctrl</keycap>
+            <keycap>Alt</keycap>
+            <keycap>Fx</keycap>
+          </keycombo>
+          combination, where <keycap>Fx</keycap> may be <keycap>F7</keycap>.
         </para>
       </note>