Changeset 08dc6a9

Timestamp:

08/09/2024 10:30:13 PM (8 weeks ago)

Author:

Thomas Trepl <thomas@…>

Branches:

multilib, xry111/multilib

Children:

54d46f7

Parents:

aa61690d (diff), a189579 (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)
• chapter10/kernel/kernel.version (modified) (1 diff)
• chapter10/kernel/systemd.xml (modified) (1 diff)
• chapter10/kernel/sysv.xml (modified) (1 diff)

chapter05/gcc-pass1.xml

@@ -175 +175 @@
           <para>Those switches allow GCC to compile programs with
            some hardening security features (more information on those in
-           the <xref linkend="pie-ssp-info"/> in chapter 8) by default. The
+           the <xref linkend="pie-ssp-info"/> in chapter 8) by default. They
            are not strictly needed at this stage, since the compiler will
            only produce temporary executables. But it is cleaner to have the

chapter10/kernel/kernel.version

@@ -1 @@
-6.8.9
+6.10.2

chapter10/kernel/systemd.xml

@@ -46 +46 @@
     &lt; /*/M&gt; <emphasis role='blue'>D</emphasis>irect Rendering Manager (XFree86 4.1.0 and higher DRI support) ---&gt;
                                                                       ...  [DRM]
-    # If [DRM] is selected as * or M, this must be selected:
-    [ /*]   <emphasis role='blue'>E</emphasis>nable legacy fbdev support for your modesetting driver
+      # If [DRM] is selected as * or M, this must be selected:
+      [ /*] <emphasis role='blue'>E</emphasis>nable legacy fbdev support for your modesetting driver
                                                       ...  [DRM_FBDEV_EMULATION]
     <emphasis role='blue'>C</emphasis>onsole display driver support ---&gt;

chapter10/kernel/sysv.xml

@@ -32 +32 @@
     &lt; /*/M&gt; <emphasis role='blue'>D</emphasis>irect Rendering Manager (XFree86 4.1.0 and higher DRI support) ---&gt;
                                                                       ...  [DRM]
-    # If [DRM] is selected as * or M, this must be selected:
-    [ /*]   <emphasis role='blue'>E</emphasis>nable legacy fbdev support for your modesetting driver
+      # If [DRM] is selected as * or M, this must be selected:
+      [ /*] <emphasis role='blue'>E</emphasis>nable legacy fbdev support for your modesetting driver
                                                       ...  [DRM_FBDEV_EMULATION]
     <emphasis role='blue'>C</emphasis>onsole display driver support ---&gt;