Changeset a2434bd4

Timestamp:

01/26/2023 11:30:14 PM (15 months ago)

Author:

Thomas Trepl <thomas@…>

Branches:

multilib

Children:

b697c87

Parents:

8495845 (diff), 59d90df (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Automatic merge of trunk into multilib

Files:

• chapter05/gcc-pass1.xml (modified) (1 diff)
• chapter08/systemd.xml (modified) (1 diff)

chapter05/gcc-pass1.xml

@@ -251 +251 @@
     in normal circumstances:</para>
 
+    <note>
+      <para>The command below shows an example of nested command substitution
+      using two methods: backquotes and a <literal>$()</literal> construct. 
+      It could be rewritten using the same method for both substitutions,
+      but is shown this way to demonstrate how they can be mixed.  Generally
+      the <literal>$()</literal> method is preferred.</para>
+    </note>
+
 <screen><userinput remap="install">cd ..
 cat gcc/limitx.h gcc/glimits.h gcc/limity.h > \

chapter08/systemd.xml

@@ -368 +368 @@
         libsystemd.so, libsystemd-shared-&systemd-version;.so (in /usr/lib/systemd),
         and libudev.so</seg>
-        <seg>/etc/binfmt.d, /etc/init.d, /etc/kernel, /etc/modules-load.d,both
+        <seg>/etc/binfmt.d, /etc/init.d, /etc/kernel, /etc/modules-load.d,
         /etc/sysctl.d, /etc/systemd, /etc/tmpfiles.d, /etc/udev,
         /etc/xdg/systemd, /usr/lib/systemd, /usr/lib/udev, /usr/include/systemd,