Automatic merge of trunk into multilib

This commit is contained in:
Thomas Trepl (Moody) 2021-09-02 00:54:17 +02:00
commit 89773145de
3 changed files with 29 additions and 17 deletions

View File

@ -20,19 +20,22 @@
<itemizedlist>
<listitem><para>A text mode browser such as <ulink
url='&blfs-book;basicnet/lynx.html'>Lynx</ulink>
<listitem><para>A text mode browser such as <ulink revision="sysv"
url='&blfs-book;basicnet/lynx.html'>Lynx</ulink><ulink revision="systemd"
url='&blfs-systemd-book;basicnet/lynx.html'>Lynx</ulink>
will allow you to easily view the BLFS book in one virtual terminal, while
building packages in another.</para></listitem>
<listitem><para>The
<ulink url='&blfs-book;postlfs/make-ca.html'>make-ca</ulink> package
<listitem><para>The <ulink revision="sysv"
url='&blfs-book;postlfs/make-ca.html'>make-ca</ulink><ulink revision="systemd"
url='&blfs-systemd-book;postlfs/make-ca.html'>make-ca</ulink> package
will allow you to set up local trusted anchor certificates, allowing
the system to verify SSL certificates provided by remote servers (for
example, a website using HTTPS).</para></listitem>
<listitem><para>The <ulink
url='&blfs-book;general/gpm.html'>GPM</ulink> package will allow
<listitem><para>The <ulink revision="sysv"
url='&blfs-book;general/gpm.html'>GPM</ulink><ulink revision="systemd"
url='&blfs-systemd-book;general/gpm.html'>GPM</ulink> package will allow
you to perform copy/paste actions in your virtual
terminals.</para></listitem>
@ -44,23 +47,29 @@
url='&blfs-book;basicnet/dhcp.html'>dhcp</ulink> may be
useful.</para></listitem>
<listitem><para>Installing <ulink
url='&blfs-book;postlfs/sudo.html'>sudo</ulink> may be useful for
<listitem><para>Installing <ulink revision="sysv"
url='&blfs-book;postlfs/sudo.html'>sudo</ulink><ulink revision="systemd"
url='&blfs-systemd-book;postlfs/sudo.html'>sudo</ulink> may be useful for
building packages as a non-root user and easily installing the resulting
packages in your new system.</para></listitem>
<listitem><para>If you want to access your new system from a remote system
within a comfortable GUI environment, install <ulink
url='&blfs-book;postlfs/openssh.html'>openssh</ulink>.
within a comfortable GUI environment, install <ulink revision="sysv"
url='&blfs-book;postlfs/openssh.html'>openssh</ulink><ulink revision="systemd"
url='&blfs-systemd-book;postlfs/openssh.html'>openssh</ulink>.
</para></listitem>
<listitem><para>To make fetching files over the internet easier, install
<ulink url='&blfs-book;basicnet/wget.html'>wget</ulink>.
<ulink
revision="sysv" url='&blfs-book;basicnet/wget.html'>wget</ulink><ulink
revision="systemd" url='&blfs-systemd-book;basicnet/wget.html'>wget</ulink>.
</para></listitem>
<listitem><para>To connect to a wireless access point for networking,
install
<ulink url='&blfs-book;basicnet/wpa_supplicant.html'>wpa_supplicant</ulink>.
install <ulink revision="sysv"
url='&blfs-book;basicnet/wpa_supplicant.html'>wpa_supplicant</ulink><ulink
revision="systemd"
url='&blfs-systemd-book;basicnet/wpa_supplicant.html'>wpa_supplicant</ulink>.
</para></listitem>
<listitem><para>Finally, a review of the following configuration files

View File

@ -57,7 +57,9 @@
<para>The Beyond Linux From Scratch book covers installation
procedures for a wide range of software beyond the scope of the LFS
Book. The BLFS project is located at <ulink url="&blfs-book;"/>.</para>
Book. The BLFS project is located at <ulink revision="sysv"
url="&blfs-book;"/><ulink revision="systemd" url="&blfs-systemd-book;"/>.
</para>
</listitem>
<listitem>

View File

@ -17,12 +17,13 @@
Change to x.y for release but not -rc releases -->
<!ENTITY generic-version "development"> <!-- Use "development" or "x.y[-pre{x}]" -->
<!ENTITY short-versiond "systemd">
<!ENTITY short-versiond "systemd"> <!--Change to stable-systemd for release -->
<!ENTITY generic-versiond "systemd">
<!ENTITY lfs-root "https://www.linuxfromscratch.org/">
<!ENTITY blfs-root "&lfs-root;blfs/">
<!ENTITY blfs-book "&blfs-root;view/&short-version;/">
<!ENTITY blfs-systemd-book "&blfs-root;view/&short-versiond;/">
<!ENTITY faq-root "&lfs-root;faq/">
<!ENTITY hints-root "&lfs-root;hints/downloads/files/">
<!ENTITY hints-index "&lfs-root;hints/list.html">