Automatic merge of trunk into multilib

chapter02/stages.xml

@@ -71,8 +71,7 @@
         <para>A few operations, from <quote>Changing Ownership</quote> to
         <quote>Entering the Chroot Environment</quote> must be done as the
         <systemitem class="username">root</systemitem> user, with the LFS
-        environment variable set for the
+        environment variable set for the &root; user.</para>
-        <systemitem class="username">root</systemitem>user.</para>
       </listitem>
 
       <listitem>

chapter04/addinguser.xml

@@ -89,8 +89,8 @@ esac</userinput></screen>
 <screen arch="ml_all" ><userinput>chown -v lfs $LFS/{lib32,libx32}</userinput></screen>
 
   <note><para>In some host systems, the following command does not complete
-  properly and suspends the login to the lfs user to the background.  If the
+  properly and suspends the login to the &lfs-user; user to the background.
-  prompt "lfs:~$" does not appear immediately, entering the
+  If the prompt "lfs:~$" does not appear immediately, entering the
   <command>fg</command> command will fix the issue.</para></note>
 
   <para>Next, login as user <systemitem class="username">lfs</systemitem>.

chapter07/cleanup.xml

@@ -159,9 +159,9 @@ tar -cJpf $HOME/lfs-temp-tools-&version;.tar.xz .</userinput></screen>
      restore when they don't need to. -->
 
     <warning><para>The following commands are extremely dangerous.  If
-    you run <command>rm -rf ./*</command> as the root user and you
+    you run <command>rm -rf ./*</command> as the &root; user and you
     do not change to the $LFS directory or the <envar>LFS</envar>
-    environment variable is not set for the root user, it will destroy
+    environment variable is not set for the &root; user, it will destroy
     your entire host system.  YOU ARE WARNED.</para></warning>
 
 <screen role="nodump"><computeroutput>cd $LFS

chapter07/introduction.xml

@@ -25,7 +25,7 @@
   <para>Until <xref linkend="ch-tools-chroot"/>, the commands must be
   run as <systemitem class="username">root</systemitem>, with the
   <envar>LFS</envar> variable set. After entering chroot, all commands
-  are run as root, fortunately without access to the OS of the computer
+  are run as &root;, fortunately without access to the OS of the computer
   you built LFS on. Be careful anyway, as it is easy to destroy the whole
   LFS system with badly formed commands.</para>
 

chapter08/bash.xml

@@ -73,7 +73,7 @@
 
 <screen><userinput remap="test">chown -Rv tester .</userinput></screen>
 
-    <para>The testsuite of the package is designed to be run as a non-root
+    <para>The testsuite of the package is designed to be run as a non-&root;
     user that owns the terminal connected to standard input.  To satisfy the
     requirement, spawn a new pseudo terminal using
     <application>Expect</application> and run the tests as the <systemitem

chapter08/coreutils.xml

@@ -124,8 +124,8 @@ FORCE_UNSAFE_CONFIGURE=1 ./configure \
 
 <screen><userinput remap="test">echo "dummy:x:102:tester" &gt;&gt; /etc/group</userinput></screen>
 
-    <para>Fix some of the permissions so that the non-root user can compile and
+    <para>Fix some of the permissions so that the non-&root; user can
-    run the tests:</para>
+    compile and run the tests:</para>
 
 <screen><userinput remap="test">chown -Rv tester . </userinput></screen>
 

chapter08/python.xml

@@ -109,6 +109,27 @@
     -i /usr/lib/python3.10/site-packages/pip/_internal/cli/req_command.py
 </userinput></screen>
 
+    <important>
+      <para>
+        In LFS and BLFS we normally build and install Python modules with the
+        <command>pip3</command> command.  Please take care that the
+        <command>pip3 install</command> commands in both the books should be
+        run as the &root; user unless it's for a Python virtual environment.
+        Running a <command>pip3 install</command> as a non-&root; user may seem
+        to work fine, but it will cause the installed module to be inaccessible
+        by other users.
+      </para>
+
+      <para>
+        <command>pip3 install</command> will not reinstall an already installed
+        module by default.  For using the <command>pip3 install</command>
+        command to upgrade a module (for example, from meson-0.61.3 to
+        meson-0.62.0), insert the option <parameter>--upgrade</parameter> into
+        the command line.  If it's really necessary to downgrade a module or
+        reinstall the same version for some reason, insert 
+        <parameter>--force-reinstall</parameter> into the command line.
+      </para>
+    </important>
 
     <para>If desired, install the preformatted documentation:</para>
 

chapter08/util-linux.xml

@@ -84,7 +84,7 @@
 
 <screen><userinput remap="make">make</userinput></screen>
 
-    <para>If desired, run the test suite as a non-root user:</para>
+    <para>If desired, run the test suite as a non-&root; user:</para>
 
     <warning><para>Running the test suite as the
     <systemitem class="username">root</systemitem> user can be harmful to

chapter10/kernel.xml

@@ -280,8 +280,8 @@ File systems  --->
     <caution>
       <para>If the host system has a separate /boot partition, the files copied
       below should go there. The easiest way to do that is to bind /boot on the
-      host (outside chroot) to /mnt/lfs/boot before proceeding.  As the root
+      host (outside chroot) to /mnt/lfs/boot before proceeding.  As the
-      user in the <emphasis>host system</emphasis>:</para>
+      &root; user in the <emphasis>host system</emphasis>:</para>
 
 <screen role="nodump"><userinput>mount --bind /boot /mnt/lfs/boot</userinput></screen>
     </caution>

chapter11/reboot.xml

@@ -46,8 +46,8 @@
 
     <listitem><para>Installing <ulink
     url='&blfs-book;postlfs/sudo.html'>sudo</ulink> may be useful for
-    building packages as a non-root user and easily installing the resulting
+    building packages as a non-&root; user and easily installing the
-    packages in your new system.</para></listitem>
+    resulting packages in your new system.</para></listitem>
 
     <listitem><para>If you want to access your new system from a remote system
     within a comfortable GUI environment, install <ulink

general.ent

@@ -112,6 +112,9 @@
 <!ENTITY savannah-nongnu "https://savannah.nongnu.org">
 <!ENTITY github          "https://github.com">
 
+<!ENTITY root            "<systemitem class='username'>root</systemitem>">
+<!ENTITY lfs-user        "<systemitem class='username'>lfs</systemitem>">
+
 <!ENTITY % packages-entities SYSTEM "packages.ent">
 %packages-entities;