Automatic merge of trunk into multilib

This commit is contained in:
Thomas Trepl 2024-08-10 00:30:13 +02:00
commit 08dc6a9845
4 changed files with 6 additions and 6 deletions

View File

@ -174,7 +174,7 @@ cd build</userinput></screen>
<listitem>
<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
temporary packages be as close as possible to the final ones.

View File

@ -1 +1 @@
6.8.9
6.10.2

View File

@ -45,8 +45,8 @@
<emphasis role='blue'>G</emphasis>raphics support ---&gt;
&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;
# If [DRM] is selected as * or M, this must be selected:

View File

@ -31,8 +31,8 @@
<emphasis role='blue'>G</emphasis>raphics support ---&gt;
&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;
# If [DRM] is selected as * or M, this must be selected: