Changeset 8977314


Ignore:
Timestamp:
09/01/2021 10:54:17 PM (5 months ago)
Author:
Thomas Trepl (Moody) <thomas@…>
Branches:
ml-11.0, multilib
Children:
185615a, f8265ff
Parents:
d2e7db4 (diff), 6711c422 (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:
3 edited

Legend:

Unmodified
Added
Removed
  • chapter11/reboot.xml

    rd2e7db4 r8977314  
    2121  <itemizedlist>
    2222
    23     <listitem><para>A text mode browser such as <ulink
    24     url='&blfs-book;basicnet/lynx.html'>Lynx</ulink>
     23    <listitem><para>A text mode browser such as <ulink revision="sysv"
     24    url='&blfs-book;basicnet/lynx.html'>Lynx</ulink><ulink revision="systemd"
     25    url='&blfs-systemd-book;basicnet/lynx.html'>Lynx</ulink>
    2526    will allow you to easily view the BLFS book in one virtual terminal, while
    2627    building packages in another.</para></listitem>
    2728
    28     <listitem><para>The
    29     <ulink url='&blfs-book;postlfs/make-ca.html'>make-ca</ulink> package
     29    <listitem><para>The <ulink revision="sysv"
     30    url='&blfs-book;postlfs/make-ca.html'>make-ca</ulink><ulink revision="systemd"
     31    url='&blfs-systemd-book;postlfs/make-ca.html'>make-ca</ulink> package
    3032    will allow you to set up local trusted anchor certificates, allowing
    3133    the system to verify SSL certificates provided by remote servers (for
    3234    example, a website using HTTPS).</para></listitem>
    3335
    34     <listitem><para>The <ulink
    35     url='&blfs-book;general/gpm.html'>GPM</ulink> package will allow
     36    <listitem><para>The <ulink revision="sysv"
     37    url='&blfs-book;general/gpm.html'>GPM</ulink><ulink revision="systemd"
     38    url='&blfs-systemd-book;general/gpm.html'>GPM</ulink> package will allow
    3639    you to perform copy/paste actions in your virtual
    3740    terminals.</para></listitem>
     
    4548    useful.</para></listitem>
    4649
    47     <listitem><para>Installing <ulink
    48     url='&blfs-book;postlfs/sudo.html'>sudo</ulink> may be useful for
     50    <listitem><para>Installing <ulink revision="sysv"
     51    url='&blfs-book;postlfs/sudo.html'>sudo</ulink><ulink revision="systemd"
     52    url='&blfs-systemd-book;postlfs/sudo.html'>sudo</ulink> may be useful for
    4953    building packages as a non-root user and easily installing the resulting
    50     packages in your new system.  </para></listitem>
     54    packages in your new system.</para></listitem>
    5155
    5256    <listitem><para>If you want to access your new system from a remote system
    53     within a comfortable GUI environment, install <ulink
    54     url='&blfs-book;postlfs/openssh.html'>openssh</ulink>.
     57    within a comfortable GUI environment, install <ulink revision="sysv"
     58    url='&blfs-book;postlfs/openssh.html'>openssh</ulink><ulink revision="systemd"
     59    url='&blfs-systemd-book;postlfs/openssh.html'>openssh</ulink>.
    5560    </para></listitem>
    5661
    5762    <listitem><para>To make fetching files over the internet easier, install
    58     <ulink url='&blfs-book;basicnet/wget.html'>wget</ulink>.
     63    <ulink
     64    revision="sysv" url='&blfs-book;basicnet/wget.html'>wget</ulink><ulink
     65    revision="systemd" url='&blfs-systemd-book;basicnet/wget.html'>wget</ulink>.
    5966    </para></listitem>
    6067
    6168    <listitem><para>To connect to a wireless access point for networking,
    62     install
    63     <ulink url='&blfs-book;basicnet/wpa_supplicant.html'>wpa_supplicant</ulink>.
     69    install <ulink revision="sysv"
     70    url='&blfs-book;basicnet/wpa_supplicant.html'>wpa_supplicant</ulink><ulink
     71    revision="systemd"
     72    url='&blfs-systemd-book;basicnet/wpa_supplicant.html'>wpa_supplicant</ulink>.
    6473    </para></listitem>
    6574
    6675    <listitem><para>Finally, a review of the following configuration files
    67     is also appropriate at this point.  </para>
     76    is also appropriate at this point.</para>
    6877
    6978      <itemizedlist>
  • chapter11/whatnow.xml

    rd2e7db4 r8977314  
    5858      <para>The Beyond Linux From Scratch book covers installation
    5959      procedures for a wide range of software beyond the scope of the LFS
    60       Book. The BLFS project is located at <ulink url="&blfs-book;"/>.</para>
     60      Book. The BLFS project is located at <ulink revision="sysv"
     61      url="&blfs-book;"/><ulink revision="systemd" url="&blfs-systemd-book;"/>.
     62      </para>
    6163    </listitem>
    6264
  • general.ent

    rd2e7db4 r8977314  
    1818<!ENTITY generic-version "development"> <!-- Use "development"  or "x.y[-pre{x}]" -->
    1919
    20 <!ENTITY short-versiond  "systemd">
     20<!ENTITY short-versiond  "systemd">  <!--Change to stable-systemd for release  -->
    2121<!ENTITY generic-versiond "systemd">
    2222
     
    2424<!ENTITY blfs-root       "&lfs-root;blfs/">
    2525<!ENTITY blfs-book       "&blfs-root;view/&short-version;/">
     26<!ENTITY blfs-systemd-book "&blfs-root;view/&short-versiond;/">
    2627<!ENTITY faq-root        "&lfs-root;faq/">
    2728<!ENTITY hints-root      "&lfs-root;hints/downloads/files/">
Note: See TracChangeset for help on using the changeset viewer.