Changeset 4e9c598


Ignore:
Timestamp:
08/25/2021 01:02:57 AM (13 months ago)
Author:
Ken Moffat <ken@…>
Branches:
11.0, 11.1, 11.2, lazarus, qt5new, trunk, upgradedb, xry111/intltool, xry111/soup3, xry111/test-20220226
Children:
b0a073b
Parents:
ba716181 (diff), 2edca105 (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:

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

Files:
6 edited

Legend:

Unmodified
Added
Removed
  • kde/kf5-apps/add-pkgs.xml

    rba716181 r4e9c598  
    2626  </para>
    2727
    28   <note>
    29     <para>
    30       Some packages, such as kde-baseapps, kde-runtime, and kmag listed in the
    31       link above are only for the older KDE4 and cannot be used with KF5.
    32     </para>
    33   </note>
    34 
    3528  <para>
    3629    Some additional packages worth mentioning are:
     
    4942    <listitem>
    5043      <para>Kaccessible: Integration of accessibility utilities.</para>
     44    </listitem>
     45    <listitem>
     46      <para>Kio-extras: various plugins for urls like <command>man://</command>
     47      or <command>smb://</command>.</para>
    5148    </listitem>
    5249    <listitem>
  • server/major/proftpd.xml

    rba716181 r4e9c598  
    3535    </para>
    3636
    37     &lfs101_checked;
     37    &lfs110_checked;
    3838
    3939    <bridgehead renderas="sect3">Package Information</bridgehead>
  • server/major/vsftpd.xml

    rba716181 r4e9c598  
    3636    </para>
    3737
    38     &lfs101_checked;
     38    &lfs110_checked;
    3939
    4040    <bridgehead renderas="sect3">Package Information</bridgehead>
     
    217217<screen role="root"><userinput>cat &gt;&gt; /etc/vsftpd.conf &lt;&lt; "EOF"
    218218<literal>background=YES
    219 listen=YES
    220219nopriv_user=vsftpd
    221220secure_chroot_dir=&vsftpd-empty;</literal>
  • x/dm/lxdm.xml

    rba716181 r4e9c598  
    3737    </para>
    3838
    39     &lfs101_checked;
     39    &lfs110_checked;
    4040
    4141    <bridgehead renderas="sect3">Package Information</bridgehead>
  • x/installing/x7driver-ati.xml

    rba716181 r4e9c598  
    4040      </para>
    4141
    42       &lfs101_checked;
     42      &lfs110_checked;
    4343
    4444      <note>
  • x/lib/imlib2.xml

    rba716181 r4e9c598  
    7777    </para>
    7878
     79    <bridgehead renderas="sect4">Recommended</bridgehead>
     80    <para role="recommended">
     81      <xref linkend="giflib"/>
     82    </para>
     83
    7984    <bridgehead renderas="sect4">Optional</bridgehead>
    8085    <para role="optional">
    8186      <xref linkend="libpng"/>,
    8287      <xref linkend="libjpeg"/>,
    83       <xref linkend="libtiff"/>,
    84       <xref linkend="giflib"/>, and
     88      <xref linkend="libtiff"/>, and
    8589      <ulink url="https://sourceforge.net/projects/mad">libid3tag</ulink>
    8690    </para>
Note: See TracChangeset for help on using the changeset viewer.