Author: bdubbs
Date: Sat Sep 22 16:32:07 2018
New Revision: 20524
Log:
Convert internal like to external links for BLFS packages not in
the Basic book.
Reorder some chapters.
Merge System V and systemd sections so both are always displayed
with proper attribution for system type.
Modified:
branches/basic/admin.xml
branches/basic/general/genlib/libtasn1.xml
branches/basic/general/genlib/libusb.xml
branches/basic/general/genlib/popt.xml
branches/basic/general/prog/python2.xml
branches/basic/general/sysutils/cpio.xml
branches/basic/general/sysutils/fcron.xml
branches/basic/general/sysutils/gpm.xml
branches/basic/general/sysutils/logrotate.xml
branches/basic/general/sysutils/pciutils.xml
branches/basic/general/sysutils/usbutils.xml
branches/basic/introduction/important/starting.xml
branches/basic/libraries.xml
branches/basic/lwp-protocol-https.xml
branches/basic/networking/connect/dhcpcd.xml
branches/basic/networking/netlibs/libnl.xml
branches/basic/networking/netlibs/libnsl.xml
branches/basic/networking/netlibs/libtirpc.xml
branches/basic/networking/netprogs/ntp.xml
branches/basic/networking/netprogs/rsync.xml
branches/basic/networking/netprogs/wpa_supplicant.xml
branches/basic/networking/netutils/bind-utils.xml
branches/basic/postlfs/filesystems/parted.xml
branches/basic/postlfs/security/p11-kit.xml
branches/basic/server/databases/db.xml
branches/basic/server/mail/postfix.xml
Modified: branches/basic/admin.xml
==============================================================================
--- branches/basic/admin.xml Sat Sep 22 14:46:42 2018 (r20523)
+++ branches/basic/admin.xml Sat Sep 22 16:32:07 2018 (r20524)
@@ -19,34 +19,22 @@
<para>These programs are useful for system administration on most
systems.</para>
+ <xi:include xmlns:xi="&xinclude;" href="networking/netutils/bind-utils.xml"/>
+ <xi:include xmlns:xi="&xinclude;" href="networking/connect/dhcpcd.xml"/>
<xi:include xmlns:xi="&xinclude;" href="general/sysutils/fcron.xml"/>
<xi:include xmlns:xi="&xinclude;" href="general/sysutils/gpm.xml"/>
- <xi:include xmlns:xi="&xinclude;" href="general/sysutils/logrotate.xml"/>
<xi:include xmlns:xi="&xinclude;" href="general/sysutils/hdparm.xml"/>
- <xi:include xmlns:xi="&xinclude;" href="general/sysutils/pciutils.xml"/>
- <xi:include xmlns:xi="&xinclude;" href="general/sysutils/usbutils.xml"/>
- <xi:include xmlns:xi="&xinclude;" href="networking/connect/dhcpcd.xml"/>
- <xi:include xmlns:xi="&xinclude;" href="networking/netutils/bind-utils.xml"/>
+ <xi:include xmlns:xi="&xinclude;" href="general/sysutils/lm_sensors.xml"/>
+ <xi:include xmlns:xi="&xinclude;" href="general/sysutils/logrotate.xml"/>
<xi:include xmlns:xi="&xinclude;" href="networking/netprogs/net-tools.xml"/>
<xi:include xmlns:xi="&xinclude;" href="networking/netprogs/ntp.xml"/>
+ <xi:include xmlns:xi="&xinclude;" href="general/sysutils/pciutils.xml"/>
+ <xi:include xmlns:xi="&xinclude;" href="server/mail/postfix.xml"/>
<xi:include xmlns:xi="&xinclude;" href="networking/netprogs/rsync.xml"/>
+ <xi:include xmlns:xi="&xinclude;" href="networking/netutils/traceroute.xml"/>
+ <xi:include xmlns:xi="&xinclude;" href="general/sysutils/usbutils.xml"/>
<xi:include xmlns:xi="&xinclude;"
href="networking/netprogs/wireless-tools.xml"/>
<xi:include xmlns:xi="&xinclude;"
href="networking/netprogs/wpa_supplicant.xml"/>
- <xi:include xmlns:xi="&xinclude;" href="networking/netutils/traceroute.xml"/>
- <xi:include xmlns:xi="&xinclude;" href="server/mail/postfix.xml"/>
-
-<!--
-
- net-tools-cvs_20101030
- ntp-4.2.8p12
- rsync-3.1.3
- wireless tools-29
- wpa_supplicant-2.6
- traceroute-2.1.0
- postfix-3.3.1
-
-
--->
</chapter>
Modified: branches/basic/general/genlib/libtasn1.xml
==============================================================================
--- branches/basic/general/genlib/libtasn1.xml Sat Sep 22 14:46:42 2018
(r20523)
+++ branches/basic/general/genlib/libtasn1.xml Sat Sep 22 16:32:07 2018
(r20524)
@@ -74,15 +74,15 @@
<bridgehead renderas="sect4">Required</bridgehead>
<para role="required">
-<!-- <xref linkend="six"/> -->
+ <xref linkend="six"/>
</para>
-<!--
+
<bridgehead renderas="sect4">Optional</bridgehead>
<para role="optional">
- <xref linkend="gtk-doc"/> and
- <xref linkend="valgrind"/>
+ <ulink url="&blfs-book;general/gtk-doc.html">gtk-doc</ulink> and
+ <ulink url="&blfs-book;general/valgrind.html">valgrind</ulink>
</para>
--->
+
<para condition="html" role="usernotes">User Notes:
<ulink url="&blfs-wiki;/libtasn1"/>
</para>
Modified: branches/basic/general/genlib/libusb.xml
==============================================================================
--- branches/basic/general/genlib/libusb.xml Sat Sep 22 14:46:42 2018
(r20523)
+++ branches/basic/general/genlib/libusb.xml Sat Sep 22 16:32:07 2018
(r20524)
@@ -71,12 +71,12 @@
</itemizedlist>
<bridgehead renderas="sect3">libusb Dependencies</bridgehead>
-<!--
+
<bridgehead renderas="sect4">Optional</bridgehead>
<para role="optional">
- <xref linkend="doxygen"/>
+ <ulink url="&blfs-book;general/doxygen.html">doxygen</ulink>
</para>
--->
+
<para condition="html" role="usernotes">User Notes:
<ulink url="&blfs-wiki;/libusb"/>
</para>
@@ -155,12 +155,12 @@
<indexterm zone="libusb libusb-kernel">
<primary sortas="d-USB-device-filesystem">Support for Host-side
USB</primary>
</indexterm>
-<!--
+
<para>
- For more details on setting up USB devices, see <xref
- linkend="usb-device-issues"/>.
+ For more details on setting up USB devices, see
+ <xref linkend="usb-device-issues"/>.
</para>
--->
+
</sect2>
<sect2 role="content">
Modified: branches/basic/general/genlib/popt.xml
==============================================================================
--- branches/basic/general/genlib/popt.xml Sat Sep 22 14:46:42 2018
(r20523)
+++ branches/basic/general/genlib/popt.xml Sat Sep 22 16:32:07 2018
(r20524)
@@ -70,10 +70,11 @@
<screen><userinput>./configure --prefix=/usr --disable-static &&
make</userinput></screen>
-<!--
- <para>If you have <xref linkend="doxygen"/> installed and wish to build
+
+ <para>If you have <ulink
url="&blfs-book;general/doxygen.html">doxygen</ulink>
+ installed and wish to build
the API documentation, issue <command>doxygen</command>.</para>
--->
+
<para>To test the results, issue:<command>make check</command>.</para>
<para>Now, as the <systemitem class="username">root</systemitem>
user:</para>
Modified: branches/basic/general/prog/python2.xml
==============================================================================
--- branches/basic/general/prog/python2.xml Sat Sep 22 14:46:42 2018
(r20523)
+++ branches/basic/general/prog/python2.xml Sat Sep 22 16:32:07 2018
(r20524)
@@ -89,19 +89,19 @@
</itemizedlist>
<bridgehead renderas="sect3">Python 2 Dependencies</bridgehead>
-<!--
+
<bridgehead renderas="sect4">Optional</bridgehead>
<para role="optional">
- <xref linkend="bluez"/> and
- <xref linkend="valgrind"/>
+ <ulink url="&blfs-book;general/bluez.html">bluez</ulink> and
+ <ulink url="&blfs-book;general/valgrind.html">valgrind</ulink>
</para>
<bridgehead renderas="sect4">Optional (For Additional Modules)</bridgehead>
<para role="optional">
- <xref linkend="sqlite"/> and
- <xref linkend="tk"/>
+ <ulink url="&blfs-book;server/sqlite.html">sqlite</ulink> and
+ <ulink url="&blfs-book;general/tk.html">tk</ulink>
</para>
--->
+
<para condition="html" role="usernotes">
User Notes: <ulink url="&blfs-wiki;/Python"/>
</para>
Modified: branches/basic/general/sysutils/cpio.xml
==============================================================================
--- branches/basic/general/sysutils/cpio.xml Sat Sep 22 14:46:42 2018
(r20523)
+++ branches/basic/general/sysutils/cpio.xml Sat Sep 22 16:32:07 2018
(r20524)
@@ -57,12 +57,13 @@
</itemizedlist>
<bridgehead renderas="sect3">CPIO Dependencies</bridgehead>
-<!--
+
<bridgehead renderas="sect4">Optional</bridgehead>
<para role="optional">
- <xref linkend="texlive"/> (or <xref linkend="tl-installer"/>)
+ <ulink url="&blfs-book;pst/texlive.html">texlive</ulink>
+ (or <ulink url="&blfs-book;pst/tl-installer.html">tl-installer</ulink>
</para>
--->
+
<para condition="html" role="usernotes">User Notes:
<ulink url="&blfs-wiki;/cpio"/></para>
Modified: branches/basic/general/sysutils/fcron.xml
==============================================================================
--- branches/basic/general/sysutils/fcron.xml Sat Sep 22 14:46:42 2018
(r20523)
+++ branches/basic/general/sysutils/fcron.xml Sat Sep 22 16:32:07 2018
(r20524)
@@ -13,7 +13,7 @@
<!ENTITY fcron-time "0.1 SBU">
]>
-<sect1 id="fcron" xreflabel="Fcron-&fcron-version;">
+<sect1 id="fcron" xreflabel="fcron-&fcron-version;">
<?dbhtml filename="fcron.html"?>
<sect1info>
@@ -57,27 +57,18 @@
<para>Estimated build time: &fcron-time;</para>
</listitem>
</itemizedlist>
-<!--
- <bridgehead renderas="sect3">Additional Downloads</bridgehead>
- <itemizedlist spacing="compact">
- <listitem>
- <para>
- Required patch:
- <ulink
url="&patch-root;/fcron-&fcron-version;-sendmail_upstream-1.patch"/>
- </para>
- </listitem>
- </itemizedlist>
--->
+
<bridgehead renderas="sect3">Fcron Dependencies</bridgehead>
-<!--
+
<bridgehead renderas="sect4">Optional</bridgehead>
- <para role="optional">An <xref linkend="server-mail"/>,
- <ulink url="../postlfs/editors.html">text editor</ulink> (default is
- <command>vi</command> from the <xref linkend="vim"/> package),
- <xref linkend="linux-pam"/>, and
- <xref linkend="docbook-utils"/>
+ <para role="optional">
+ A mail server such as <xref linkend="postfix"/>,
+ A text editor
+ (default is <command>vi</command> from the vim package),
+ <ulink url="&blfs-book;/postlfs/linux-pam.html">linux-pam</ulink>, and
+ <ulink
url="&blfs-book;/postlfs/pst/docbook-utils.html">docbook-utils</ulink>
</para>
--->
+
<para condition="html" role="usernotes">User Notes:
<ulink url="&blfs-wiki;/fcron"/></para>
@@ -86,19 +77,20 @@
<sect2 role="installation">
<title>Installation of Fcron</title>
- <para id="fcron-syslog" revision="sysv"><application>Fcron</application>
+ <para id="fcron-syslog"> For System V versions of LFS,
+ <application>fcron</application>
uses the cron facility of <command>syslog</command> to log all messages.
Since LFS does not set up this facility in
<filename>/etc/syslog.conf</filename>, it needs to be done prior to
- installing <application>Fcron</application>. This command will append the
+ installing <application>fcron</application>. This command will append the
necessary line to the current <filename>/etc/syslog.conf</filename>
(perform as the <systemitem class='username'>root</systemitem>
user):</para>
- <indexterm zone="fcron fcron-syslog" revision="sysv">
+ <indexterm zone="fcron fcron-syslog">
<primary sortas="e-etc-syslog.conf">/etc/syslog.conf</primary>
</indexterm>
-<screen role="root" revision="sysv"><userinput>cat >> /etc/syslog.conf
<< "EOF"
+<screen role="root"><userinput>cat >> /etc/syslog.conf << "EOF"
<literal># Begin fcron addition to /etc/syslog.conf
cron.* -/var/log/cron.log
@@ -106,14 +98,14 @@
# End fcron addition</literal>
EOF</userinput></screen>
- <para revision="sysv">The configuration file has been modified, so
reloading
+ <para>The configuration file has been modified, so reloading
the <command>sysklogd</command> daemon will activate the changes (again as
the <systemitem class='username'>root</systemitem> user).</para>
-<screen role="root" revision="sysv"><userinput>/etc/rc.d/init.d/sysklogd
reload</userinput></screen>
+<screen role="root"><userinput>/etc/rc.d/init.d/sysklogd
reload</userinput></screen>
<para>For security reasons, an unprivileged user and group for
- <application>Fcron</application> should be created (perform as the
+ <application>fcron</application> should be created (perform as the
<systemitem class='username'>root</systemitem> user):</para>
<screen role="root"><userinput>groupadd -g 22 fcron &&
@@ -122,7 +114,9 @@
<para>Install <application>Fcron</application> by running the following
commands:</para>
-<screen revision="sysv"><userinput>./configure --prefix=/usr \
+ <para>For System V based systems:</para>
+
+<screen><userinput>./configure --prefix=/usr \
--sysconfdir=/etc \
--localstatedir=/var \
--without-sendmail \
@@ -130,7 +124,9 @@
--with-systemdsystemunitdir=no &&
make</userinput></screen>
-<screen revision="systemd"><userinput>./configure --prefix=/usr \
+ <para>For systemd based systems:</para>
+
+<screen><userinput>./configure --prefix=/usr \
--sysconfdir=/etc \
--localstatedir=/var \
--without-sendmail \
@@ -149,13 +145,11 @@
<sect2 role="commands">
<title>Command Explanations</title>
-<!--
- <para><command>autoconf</command>: This command is required to rebuild
- <filename>configure</filename> using the fixed input file.</para>-->
<para><parameter>--without-sendmail</parameter>: By default,
- <application>Fcron</application> will attempt to use the
- <command>sendmail</command> command from an <!--<xref
linkend="server-mail"/>-->
+ <application>fcron</application> will attempt to use the
+ <command>sendmail</command> command from a mail server sucj as the
+ <xref linkend="postfix"/>
package to email you the results of the <command>fcron</command> script.
This switch is used to disable default email notification. Omit the switch
to enable the default. Alternatively, you can use the
@@ -165,17 +159,21 @@
<para><parameter>--with-boot-install=no</parameter>: This prevents
installation of the bootscript included with the package.</para>
- <para
revision="sysv"><parameter>--with-systemdsystemunitdir=no</parameter>:
+ <para><parameter>--with-systemdsystemunitdir=no</parameter>:
This prevents building the <application>systemd</application> units, which
are not needed for a <application>SYS V</application> system.</para>
<para><option>--with-editor=<replaceable></path/to/editor></replaceable></option>:
This switch allows you to set the default text editor.</para>
-
<para><option>--with-dsssl-dir=<replaceable></path/to/dsssl-stylesheets></replaceable></option>:
- May be used if you have <!--<xref linkend="docbook-utils"/>--> installed.
+ <para>
+
<option>--with-dsssl-dir=<replaceable></path/to/dsssl-stylesheets></replaceable></option>:
+ May be used if you have
+ <ulink
url="&blfs-book;/postlfs/pst/docbook-utils.html">docbook-utils</ulink>
+ installed.
Currently, the dsssl stylesheets are located at
- <filename
class="directory">/usr/share/sgml/docbook/dsssl-stylesheets-1.79</filename>.</para>
+ <filename
class="directory">/usr/share/sgml/docbook/dsssl-stylesheets-1.79</filename>.
+ </para>
</sect2>
@@ -233,23 +231,22 @@
</sect3>
<sect3 id="fcron-init">
- <title><phrase revision="sysv">Boot Script</phrase>
- <phrase revision="systemd">Systemd Unit</phrase></title>
+ <title>Boot Script or Systemd Unit</title>
- <para revision="sysv">Install the
+ <para>For System V bases systems, install the
<filename>/etc/rc.d/init.d/fcron</filename> init script from the
<xref linkend="bootscripts"/> package.</para>
- <para revision="systemd">Enable <application>fcron</application> to start
+<screen role="root"><userinput>make install-fcron</userinput></screen>
+
+ <para>For systemd based systems, enable <application>fcron</application>
to start
at boot using the previously installed systemd unit.</para>
<indexterm zone="fcron fcron-init">
<primary sortas="f-fcron">fcron</primary>
</indexterm>
-<screen role="root" revision="sysv"><userinput>make
install-fcron</userinput></screen>
-
-<screen role="root" revision="systemd"><userinput>systemctl enable
fcron</userinput></screen>
+<screen role="root"><userinput>systemctl enable fcron</userinput></screen>
</sect3>
Modified: branches/basic/general/sysutils/gpm.xml
==============================================================================
--- branches/basic/general/sysutils/gpm.xml Sat Sep 22 14:46:42 2018
(r20523)
+++ branches/basic/general/sysutils/gpm.xml Sat Sep 22 16:32:07 2018
(r20524)
@@ -129,20 +129,21 @@
<title>Configuring GPM</title>
<sect3 id="gpm-init">
- <title><phrase revision="sysv">Boot Script</phrase>
- <phrase revision="systemd">Systemd Unit</phrase></title>
+ <title>Boot Script or Systemd Unit</title>
<indexterm zone="gpm gpm-init">
<primary sortas="f-gpm-init">gpm</primary>
</indexterm>
- <para revision="sysv">Install the
- <filename>/etc/rc.d/init.d/gpm</filename> init script included in the
- <xref linkend="bootscripts"/> package.</para>
-
- <para revision="systemd">
- To start the <command>gpm</command> daemon at boot,
- install the systemd unit from the <xref linkend="systemd-units"/>
+ <para>
+ For System V based systems, install the
+ <filename>/etc/rc.d/init.d/gpm</filename> init script included in the
+ <xref linkend="bootscripts"/> package.
+ </para>
+
+ <para>
+ For systemd based systems, to start the <command>gpm</command> daemon
+ at boot, install the systemd unit from the <xref
linkend="systemd-units"/>
package by running the following command as the
<systemitem class="username">root</systemitem> user:
</para>
@@ -158,12 +159,12 @@
<filename>~/.gpm-root</filename>: The default and individual user
<command>gpm-root</command> configuration files.</para>
- <para revision="sysv"><filename>/etc/sysconfig/mouse</filename>:
+ <para><filename>/etc/sysconfig/mouse</filename> (System V only):
This file contains the name of your mouse device and the protocol
it uses. To create this file, run the following as the
<systemitem class="username">root</systemitem> user:</para>
-<screen role="root" revision="sysv"><userinput>cat > /etc/sysconfig/mouse
<< "EOF"
+<screen role="root"><userinput>cat > /etc/sysconfig/mouse << "EOF"
<literal># Begin /etc/sysconfig/mouse
MDEVICE="<replaceable><yourdevice></replaceable>"
@@ -181,7 +182,7 @@
<primary sortas="e-etc-gpm-root.conf">/etc/gpm-root.conf</primary>
</indexterm>
- <indexterm zone="gpm gpm-config" revision="sysv">
+ <indexterm zone="gpm gpm-config">
<primary sortas="e-etc-sysconfig-mouse">/etc/sysconfig/mouse</primary>
</indexterm>
@@ -190,14 +191,14 @@
<sect3>
<title>Configuration Information</title>
- <para revision="sysv">Examples of values to set <envar>MDEVICE</envar>,
+ <para>System V:Examples of values to set <envar>MDEVICE</envar>,
<envar>PROTOCOL</envar>, and <envar>GPMOPTS</envar> to are:</para>
-<screen revision="sysv"><literal>MDEVICE="/dev/input/mice"
+<screen><literal>MDEVICE="/dev/input/mice"
PROTOCOL="imps2"
GPMOPTS=""</literal></screen>
- <para revision="sysv">A list of which protocol values are known can be
+ <para>A list of which protocol values are known can be
found by running
<command>gpm -m <replaceable>[device]</replaceable> -t -help</command>.
The <envar>MDEVICE</envar> setting depends on which type of mouse you
@@ -207,8 +208,8 @@
<envar>GPMOPTS</envar> is the 'catch all' for any additional options that
are needed for your hardware.</para>
- <para revision="systemd">
- <application>GPM</application> is by default started with
+ <para>
+ systemd: <application>GPM</application> is by default started with
the following parameters:
<parameter>-m /dev/input/mice -t imps2</parameter>. If the
mentioned parameters don't suit your needs, you can override
@@ -216,7 +217,7 @@
the <systemitem class="username">root</systemitem> user:
</para>
-<screen role="root" revision="systemd"><userinput>install -v -dm755
/etc/systemd/system/gpm.service.d
+<screen role="root"><userinput>install -v -dm755
/etc/systemd/system/gpm.service.d
echo "ExecStart=/usr/sbin/gpm <list of parameters>" >
/etc/systemd/system/gpm.service.d/99-user.conf</userinput></screen>
</sect3>
Modified: branches/basic/general/sysutils/logrotate.xml
==============================================================================
--- branches/basic/general/sysutils/logrotate.xml Sat Sep 22 14:46:42
2018 (r20523)
+++ branches/basic/general/sysutils/logrotate.xml Sat Sep 22 16:32:07
2018 (r20524)
@@ -81,12 +81,12 @@
<para role="recommended">
<xref role="runtime" linkend="fcron"/> (runtime)
</para>
-<!--
+
<bridgehead renderas="sect4">Optional</bridgehead>
<para role="optional">
- An <xref role="runtime" linkend="server-mail"/> (runtime)
+ A mail seerver such as <xref role="runtime" linkend="postfix"/> (runtime)
</para>
--->
+
<para condition="html" role="usernotes">User Notes:
<ulink url="&blfs-wiki;/logrotate"/>
</para>
Modified: branches/basic/general/sysutils/pciutils.xml
==============================================================================
--- branches/basic/general/sysutils/pciutils.xml Sat Sep 22 14:46:42
2018 (r20523)
+++ branches/basic/general/sysutils/pciutils.xml Sat Sep 22 16:32:07
2018 (r20524)
@@ -128,8 +128,10 @@
updated. To get a current version of this file, run
<command>update-pciids</command> as the <systemitem
class="username">root</systemitem> user. This program requires the
- <xref linkend="which"/> script or program to find <!--<xref
linkend="curl"/>,
- <xref linkend="lynx"/>--> or <xref linkend="wget"/> which are used to
+ <xref linkend="which"/> script or program to find
+ <ulink url="&blfs-book;basicnet/curl.html">curl</ulink>,
+ <ulink url="&blfs-book;basicnet/lynx.html">lynx</ulink> or
+ <xref linkend="wget"/> which are used to
download the most current file, and then replace the existing file in
<filename class="directory">/usr/share/hwdata</filename>.
</para>
@@ -234,8 +236,7 @@
<listitem>
<para>
fetches the current version of the PCI ID list. Requires
- <!-- <xref linkend="curl"/>, <xref linkend="lynx"/> or-->
- <xref linkend="wget"/>.
+ curl, lynx, or wget.
</para>
<indexterm zone="pciutils update-pciids">
<primary sortas="b-update-pciids">update-pciids</primary>
Modified: branches/basic/general/sysutils/usbutils.xml
==============================================================================
--- branches/basic/general/sysutils/usbutils.xml Sat Sep 22 14:46:42
2018 (r20523)
+++ branches/basic/general/sysutils/usbutils.xml Sat Sep 22 16:32:07
2018 (r20524)
@@ -126,30 +126,20 @@
</para>
</sect2>
-<!-- No longer needed
- <sect2 role="commands">
- <title>Command Explanations</title>
- <para>
- <command>sed ... lsusb.py</command>: Instructs lsusb.py where to search
- <filename>usb.ids</filename>.
- </para>
-
- </sect2>
--->
<sect2 role="configuration">
<title>Configuring USB Utils</title>
- <para revision="sysv">
+ <para>
The <filename>usb.ids</filename> data file is constantly being updated.
- To get a current version of this file, using <xref linkend="wget"/>,
- periodically run again, as the
+ For System V based systems, get a current version of this file, using
+ <xref linkend="wget"/>, periodically run, as the
<systemitem class="username">root</systemitem> user:
</para>
-<screen role="root" revision="sysv"><userinput>wget
http://www.linux-usb.org/usb.ids -O
/usr/share/hwdata/usb.ids</userinput></screen>
+<screen role="root"><userinput>wget http://www.linux-usb.org/usb.ids -O
/usr/share/hwdata/usb.ids</userinput></screen>
- <para revision="sysv">
+ <para>
You may wish to add an entry to
<systemitem class="username">root</systemitem>'s (or any other user who
has
write privilege to <filename
class="directory">/usr/share/hwdata</filename>)
@@ -157,14 +147,14 @@
periodically.
</para>
- <para revision="systemd">
- You should update the <filename>/usr/share/hwdata/usb.ids</filename> file
- periodically. Execute the following commands, as the
+ <para>
+ For systemd based systems,
+ execute the following commands, as the
<systemitem class="username">root</systemitem> user, to create a systemd
timer to update it weekly on Sundays at 3:00 A.M. (local time):
</para>
-<screen role="root" revision="systemd"><userinput>cat >
/lib/systemd/system/update-usbids.service << "EOF" &&
+<screen role="root"><userinput>cat >
/lib/systemd/system/update-usbids.service << "EOF" &&
<literal>[Unit]
Description=Update usb.ids file
Documentation=man:lusub(8)
Modified: branches/basic/introduction/important/starting.xml
==============================================================================
--- branches/basic/introduction/important/starting.xml Sat Sep 22 14:46:42
2018 (r20523)
+++ branches/basic/introduction/important/starting.xml Sat Sep 22 16:32:07
2018 (r20524)
@@ -76,7 +76,7 @@
<title>Working in a partial BLFS environment</title>
<para>
- When you initially boot into LFS, you have all the interal tools to build
+ When you initially boot into LFS, you have all the internal tools to
build
additional packages. Unfortunately, the user environment is quite sparse.
There are a couple of ways to improve this:
</para>
Modified: branches/basic/libraries.xml
==============================================================================
--- branches/basic/libraries.xml Sat Sep 22 14:46:42 2018 (r20523)
+++ branches/basic/libraries.xml Sat Sep 22 16:32:07 2018 (r20524)
@@ -17,21 +17,22 @@
<title>Libraries</title>
- <para>These libraries support programs in this book.</para>
+ <para>These libraries support programs in this book. If desired
+ they can be built in the order presented below.</para>
- <xi:include xmlns:xi="&xinclude;" href="general/genlib/libtasn1.xml"/>
- <xi:include xmlns:xi="&xinclude;" href="postlfs/security/p11-kit.xml"/>
- <xi:include xmlns:xi="&xinclude;" href="general/genlib/popt.xml"/>
- <xi:include xmlns:xi="&xinclude;" href="general/genlib/libusb.xml"/>
<xi:include xmlns:xi="&xinclude;" href="networking/netlibs/libnl.xml"/>
- <xi:include xmlns:xi="&xinclude;" href="networking/netlibs/libnsl.xml"/>
<xi:include xmlns:xi="&xinclude;" href="networking/netlibs/libtirpc.xml"/>
+ <xi:include xmlns:xi="&xinclude;" href="general/genlib/libusb.xml"/>
+ <xi:include xmlns:xi="&xinclude;" href="general/genlib/popt.xml"/>
<xi:include xmlns:xi="&xinclude;"
href="networking/netlibs/rpcsvc-proto.xml"/>
+ <xi:include xmlns:xi="&xinclude;" href="networking/netlibs/libnsl.xml"/>
<xi:include xmlns:xi="&xinclude;" href="lwp-protocol-https.xml"/>
<sect1 id="pymods" xreflabel="six-&six-version; (Python Module)">
<title>six-&six-version; (Python Module)</title>
<xi:include xmlns:xi="&xinclude;" href="general/prog/six.xml"/>
</sect1>
+ <xi:include xmlns:xi="&xinclude;" href="general/genlib/libtasn1.xml"/>
+ <xi:include xmlns:xi="&xinclude;" href="postlfs/security/p11-kit.xml"/>
<!--
LWP::Protocol::https-6.07 (Perl Module)
Modified: branches/basic/lwp-protocol-https.xml
==============================================================================
--- branches/basic/lwp-protocol-https.xml Sat Sep 22 14:46:42 2018
(r20523)
+++ branches/basic/lwp-protocol-https.xml Sat Sep 22 16:32:07 2018
(r20524)
@@ -4,6 +4,7 @@
<!ENTITY % general-entities SYSTEM "general.ent">
%general-entities;
+ <!ENTITY perl_authors "https://www.cpan.org/authors";>
<!ENTITY LWP-Protocol-https-download-http
"&perl_authors;/id/O/OA/OALDERS/LWP-Protocol-https-&LWP-Protocol-https-version;.tar.gz">
<!ENTITY LWP-Protocol-https-md5sum "b8943dfb7d187af63c36fc18ab15947d">
]>
@@ -31,6 +32,19 @@
<primary sortas="a-LWP-Protocol-https">LWP::Protocol::https</primary>
</indexterm>
+ <itemizedlist spacing="compact">
+ <listitem>
+ <para>
+ Download (HTTP): <ulink
url="&perl_authors;/id/O/OA/OALDERS/LWP-Protocol-https-&LWP-Protocol-https-version;.tar.gz"/>
+ </para>
+ </listitem>
+ </itemizedlist>
+
+ <note>
+ <para>Explicit download of this package is not necessary when using
+ auto installation instructions.</para>
+ </note>
+
<para>LWP::Protocol::https provides https support for
LWP::UserAgent (i.e. for LWP). This module uses
<xref linkend="perl-auto-install"/>:.</para>
@@ -43,11 +57,11 @@
xreflabel="auto installation instructions">
<title>Auto Installation of Perl Modules.</title>
- <para>Install Perl modules using the
- <command>cpan</command> shell <command>install</command> command. The
- command automatically downloads the source from the CPAN archive, extracts
- it, runs the compilation, testing and installation commands mentioned
- above.
+ <para>
+ Install Perl modules using the <command>cpan</command> shell
+ <command>install</command> command. The command automatically downloads
+ the source from the CPAN archive, extracts it, runs the compilation,
+ testing and installation commands mentioned above.
</para>
<para>The first time you run <command>cpan</command>, you'll be prompted
Modified: branches/basic/networking/connect/dhcpcd.xml
==============================================================================
--- branches/basic/networking/connect/dhcpcd.xml Sat Sep 22 14:46:42
2018 (r20523)
+++ branches/basic/networking/connect/dhcpcd.xml Sat Sep 22 16:32:07
2018 (r20524)
@@ -60,12 +60,12 @@
</itemizedlist>
<bridgehead renderas="sect3">dhcpcd Dependencies</bridgehead>
-<!--
+
<bridgehead renderas="sect4">Optional</bridgehead>
<para role="optional">
- <xref linkend="llvm"/> (with Clang)
+ <ulink url="&blfs-book;general/llvm.html">llvm</ulink> (with Clang)
</para>
--->
+
<para condition="html" role="usernotes">User Notes:
<ulink url="&blfs-wiki;/dhcpcd"/></para>
@@ -206,12 +206,12 @@
</indexterm>
</sect3>
- <sect3 id="dhcpcd-init2" revision="sysv">
- <title>Configuration Information: fixed ip</title>
+ <sect3 id="dhcpcd-init2">
+ <title>Configuration Information: fixed ip (System V versions of
LFS)</title>
<para id="dhcpcd-config4">Although not usual, it is possible that you
need
- to configure <application>dhcpcd</application> to use a fixed ip. Here,
- we give an example. As the
+ to configure <application>dhcpcd</application> to use a fixed ip. Here
+ we give an example for the System V versions of LFS. As the
<systemitem class="username">root</systemitem> user create the
<filename>/etc/sysconfig/ifconfig.eth0</filename> configuration file
using the following commands. Adjust appropriately for additional
@@ -242,8 +242,8 @@
</sect3>
- <sect3 id="dhcpcd-init3" revision="systemd">
- <title>General Configuration Information</title>
+ <sect3 id="dhcpcd-init3">
+ <title>General Configuration Information for systemd versions of
LFS</title>
<para>
If you want to configure network interfaces at boot using
Modified: branches/basic/networking/netlibs/libnl.xml
==============================================================================
--- branches/basic/networking/netlibs/libnl.xml Sat Sep 22 14:46:42 2018
(r20523)
+++ branches/basic/networking/netlibs/libnl.xml Sat Sep 22 16:32:07 2018
(r20524)
@@ -99,14 +99,7 @@
</para>
</listitem>
</itemizedlist>
-<!--
- <bridgehead renderas="sect3">libnl Dependencies</bridgehead>
- <bridgehead renderas="sect4">Optional</bridgehead>
- <para role="optional">
- <xref linkend="check"/> (for tests)
- </para>
--->
<para condition="html" role="usernotes">User Notes:
<ulink url="&blfs-wiki;/libnl"/>
</para>
Modified: branches/basic/networking/netlibs/libnsl.xml
==============================================================================
--- branches/basic/networking/netlibs/libnsl.xml Sat Sep 22 14:46:42
2018 (r20523)
+++ branches/basic/networking/netlibs/libnsl.xml Sat Sep 22 16:32:07
2018 (r20524)
@@ -71,26 +71,12 @@
</listitem>
</itemizedlist>
-<!--
- Not needed. I fixed the url.
-
- <note>
- <para>
- The <application>libnsl</application> source tarball shown above
- downloads with the correct name, libnsl-&libnsl-version;.tar.gz, if
- using a standard web browser. If you prefer to use a command line
- program such as wget, you normally would obtain
&libnsl-version;.tar.gz.
- To obtain this package with the proper filename, run:
-
-<screen><userinput>wget -c
https://github.com/thkukuk/libnsl/archive/v1.2.0.tar.gz -O
libnsl-&libnsl-version;.tar.gz</userinput></screen>
- </para>
- </note>
--->
<bridgehead renderas="sect3">libnsl Dependencies</bridgehead>
<bridgehead renderas="sect4">Required</bridgehead>
<para role="required">
- <xref linkend="rpcsvc-proto"/> and <xref linkend="libtirpc"/>
+ <xref linkend="rpcsvc-proto"/> and
+ <xref linkend="libtirpc"/>
</para>
<para condition="html" role="usernotes">User Notes:
Modified: branches/basic/networking/netlibs/libtirpc.xml
==============================================================================
--- branches/basic/networking/netlibs/libtirpc.xml Sat Sep 22 14:46:42
2018 (r20523)
+++ branches/basic/networking/netlibs/libtirpc.xml Sat Sep 22 16:32:07
2018 (r20524)
@@ -73,12 +73,13 @@
</itemizedlist>
<bridgehead renderas="sect3">libtirpc Dependencies</bridgehead>
-<!--
+
<bridgehead renderas="sect4">Optional</bridgehead>
<para role="optional">
- <xref linkend="mitkrb"/> for the GSSAPI
+ <ulink url="&blfs-book;postlfs/mitkrb.html">MIT Kerberos</ulink>
+ for the GSSAPI
</para>
--->
+
<para condition="html" role="usernotes">User Notes:
<ulink url="&blfs-wiki;/libtirpc"/>
</para>
@@ -86,10 +87,12 @@
<sect2 role="installation">
<title>Installation of libtirpc</title>
-<!--
+
<note><para>If updating this package, you will also need to update
- any existing version of <xref linkend='rpcbind'/></para></note>
--->
+ any existing version of
+ <ulink url="&blfs-book;basicnet/rpcbind..html">rpcbind</ulink>
+ </para></note>
+
<screen><userinput>./configure --prefix=/usr
\
--sysconfdir=/etc \
@@ -116,13 +119,15 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
href="../../xincludes/static-libraries.xml"/>
-<!--
+
<para>
<parameter>- -disable-gssapi</parameter>: This switch is needed if
no GSSAPI is installed. Remove this switch if you have one
- installed (for example <xref linkend="mitkrb"/>) and you wish to use it.
+ installed
+ (for example <ulink url="&blfs-book;postlfs/mitkrb.html">MIT
Kerberos</ulink>)
+ and you wish to use it.
</para>
--->
+
<para>
<command>mv -v /usr/lib/libtirpc.so.* ...</command>: Move shared
libraries into /lib so they are available before /usr is mounted.
Modified: branches/basic/networking/netprogs/ntp.xml
==============================================================================
--- branches/basic/networking/netprogs/ntp.xml Sat Sep 22 14:46:42 2018
(r20523)
+++ branches/basic/networking/netprogs/ntp.xml Sat Sep 22 16:32:07 2018
(r20524)
@@ -77,8 +77,8 @@
-->
<bridgehead renderas="sect4">Optional</bridgehead>
<para role="optional">
-<!-- <xref linkend="libcap-pam"/>,
- <xref linkend="libevent"/>, -->
+ <ulink url="&blfs-book;postlfs/libcap.html">libcap with PAM</ulink>,
+ <ulink url="&blfs-book;basicnet/libevent.html">libevent</ulink>,
<ulink url="http://www.thrysoee.dk/editline/";>libedit</ulink>, and
<ulink url="https://www.gnu.org/software/autogen/";>libopts from
AutoGen</ulink>
</para>
@@ -241,18 +241,18 @@
and update the time each time <command>ntpd</command> is
scheduled.</para>
<para>If you choose Option one, then install the
- <phrase revision="sysv"><filename>/etc/rc.d/init.d/ntp</filename>
- init script</phrase>
- <phrase revision="systemd"><filename>ntpd.service</filename>
unit</phrase>
+ <filename>/etc/rc.d/init.d/ntp</filename>
+ init script (System V based systems) or the
+ <filename>ntpd.service</filename> unit (systemd based systems)
included in the
- <xref linkend="bootscripts" revision="sysv"/>
- <xref linkend="systemd-units" revision="systemd"/> package.</para>
+ <xref linkend="bootscripts"/> or
+ <xref linkend="systemd-units"/> packages respectively.</para>
- <indexterm zone="ntp ntp-init" revision="sysv">
+ <indexterm zone="ntp ntp-init">
<primary sortas="f-ntp">ntp</primary>
</indexterm>
- <indexterm zone="ntp ntp-init" revision="systemd">
+ <indexterm zone="ntp ntp-init">
<primary sortas="f-ntpd">ntpd.service</primary>
</indexterm>
@@ -264,15 +264,14 @@
<screen><literal>ntpd -q</literal></screen>
- <para revision="sysv">Execute the following command if you would like to
+ <para>For System V systems, execute the following command if you would
like to
set the hardware clock to the current system time at shutdown and
reboot:</para>
-<screen role="root" revision="sysv"><userinput>ln -v -sf ../init.d/setclock
/etc/rc.d/rc0.d/K46setclock &&
+<screen role="root"><userinput>ln -v -sf ../init.d/setclock
/etc/rc.d/rc0.d/K46setclock &&
ln -v -sf ../init.d/setclock /etc/rc.d/rc6.d/K46setclock</userinput></screen>
- <para revision="sysv">The other way around is already set up by
- LFS.</para>
+ <para>The other way around is already set up by LFS.</para>
</sect3>
Modified: branches/basic/networking/netprogs/rsync.xml
==============================================================================
--- branches/basic/networking/netprogs/rsync.xml Sat Sep 22 14:46:42
2018 (r20523)
+++ branches/basic/networking/netprogs/rsync.xml Sat Sep 22 16:32:07
2018 (r20524)
@@ -88,10 +88,12 @@
<screen><userinput>./configure --prefix=/usr --without-included-zlib &&
make</userinput></screen>
-<!--
- <para>If you have <xref linkend="doxygen"/> installed and wish to
+
+ <para>If you have
+ <ulink url="&blfs-book;general/doxygen.html">doxygen</ulink>
+ installed and wish to
build HTML API documentation, issue <command>doxygen</command>.</para>
--->
+
<para>To test the results, issue: <command>make check</command>.</para>
<para>Now, as the <systemitem class="username">root</systemitem>
user:</para>
@@ -164,35 +166,33 @@
</sect3>
<sect3 id="rsync-init">
- <title><phrase revision="sysv">Boot Script</phrase>
- <phrase revision="systemd">Systemd Unit</phrase></title>
+ <title>Boot Script or Systemd Unit</title>
<para>Note that you only want to start the
<application>rsync</application> server if you want to provide an
<application>rsync</application> archive on your local machine.
- You don't need this <phrase revision="sysv">script</phrase>
- <phrase revision="systemd">unit</phrase> to run the
+ You don't need this script or unit to run the
<application>rsync</application> client.</para>
<para>Install the
- <phrase revision="sysv"><filename>/etc/rc.d/init.d/rsyncd</filename> init
- script</phrase>
- <phrase revision="systemd"><filename>rsyncd.service</filename>
- unit</phrase> included in the
- <xref linkend="bootscripts" revision="sysv"/>
- <xref linkend="systemd-units" revision="systemd"/> package.</para>
+ <filename>/etc/rc.d/init.d/rsyncd</filename> init script (for
+ System V bades systems) or the <filename>rsyncd.service</filename>
+ unit (for systemd based systems) included in the
+ <xref linkend="bootscripts"/>
+ <xref linkend="systemd-units"/> packages respectively.</para>
<screen role="root"><userinput>make install-rsyncd</userinput></screen>
- <note revision="systemd">
- <para>This package comes with two types of units: A service file and a
+ <note>
+ <para>For systemd use, this package comes with two types of units:
+ A service file and a
socket file. The service file will start rsync daemon once at boot
and it will keep running until the system shuts down. The socket file
- will make systemd listen on rsync port (Default 873, needs to be
+ will make systemd listen on the rsync port (Default 873, needs to be
edited for anything else) and will start rsync daemon when something
tries to connect to that port and stop the daemon when the connection
is terminated. This is called socket activation and is analogous to
- using <application>{,x}inetd</application> on a SysVinit based
+ using <application>{,x}inetd</application> on a System V based
system.</para>
Modified: branches/basic/networking/netprogs/wpa_supplicant.xml
==============================================================================
--- branches/basic/networking/netprogs/wpa_supplicant.xml Sat Sep 22
14:46:42 2018 (r20523)
+++ branches/basic/networking/netprogs/wpa_supplicant.xml Sat Sep 22
16:32:07 2018 (r20524)
@@ -92,14 +92,14 @@
<para role="recommended">
<xref linkend="libnl"/>
</para>
-<!--
+
<bridgehead renderas="sect4">Optional</bridgehead>
<para role="optional">
- <xref linkend="dbus"/>,
- <xref linkend="libxml2"/>, and
- <xref linkend="qt5"/>
+ <ulink url="&blfs-book;general/dbus.html">D-Bus</ulink>,
+ <ulink url="&blfs-book;general/libxml2.html">libxml2</ulink>, and
+ <ulink url="&blfs-book;x/qt5.html">qt5</ulink>
</para>
--->
+
<para condition="html" role="usernotes">User Notes:
<ulink url="&blfs-wiki;/wpa_supplicant"/>
</para>
@@ -174,15 +174,16 @@
CONFIG_WPS=y
CFLAGS += -I/usr/include/libnl3</literal>
EOF</userinput></screen>
-<!--
+
<para>
If you wish to use <application>WPA Supplicant</application> with
- <xref linkend="NetworkManager"/>, make sure that you have installed
- <xref linkend="dbus"/> and <xref linkend="libxml2"/>, then add the
+ <ulink
url="&blfs-book;basicnet/networkmanager.html">NetworkManager</ulink>,
+ make sure that you have installed
+ D-Bus and libxml2, then add the
following options to the <application>WPA Supplicant</application>
build configuration file by running the following command:
</para>
--->
+
<screen><userinput>cat >> wpa_supplicant/.config << "EOF"
<literal>CONFIG_CTRL_IFACE_DBUS=y
CONFIG_CTRL_IFACE_DBUS_NEW=y
@@ -197,16 +198,16 @@
<screen><userinput>patch -p1 -i
../wpa_supplicant-&wpa_supplicant-version;-upstream_fixes-2.patch &&
cd wpa_supplicant &&
make BINDIR=/sbin LIBDIR=/lib</userinput></screen>
-<!--
+
<para>
- If you have installed <xref linkend="qt5"/> and wish to build
+ If you have installed qt5 and wish to build
the <application>WPA Supplicant</application> GUI program, run
the following commands:
</para>
<note><para>The following directory name is labelled qt4, but
- is compatible with <xref linkend="qt5"/>.</para></note>
--->
+ is compatible with qt5.</para></note>
+
<screen><userinput>pushd wpa_gui-qt4 &&
qmake wpa_gui.pro &&
make &&
Modified: branches/basic/networking/netutils/bind-utils.xml
==============================================================================
--- branches/basic/networking/netutils/bind-utils.xml Sat Sep 22 14:46:42
2018 (r20523)
+++ branches/basic/networking/netutils/bind-utils.xml Sat Sep 22 16:32:07
2018 (r20524)
@@ -31,7 +31,9 @@
<para><application>BIND Utilities</application> is not a separate
package, it is a collection of the client side programs that are included
- with <!--<xref linkend="bind"/>-->. The <application>BIND</application>
+ with
+ <ulink url="&blfs-book;server/bind.html">bind</ulink>.
+ The <application>BIND</application>
package includes the client side programs <command>nslookup</command>,
<command>dig</command> and <command>host</command>. If you install
<application>BIND</application> server, these programs will be installed
@@ -64,13 +66,13 @@
</itemizedlist>
<bridgehead renderas="sect3">BIND Utilities Dependencies</bridgehead>
-<!--
+
<bridgehead renderas="sect4">Optional</bridgehead>
<para role="optional">
- <xref linkend="libcap-pam"/> and
- <xref linkend="libxml2"/>
+ <ulink url="&blfs-book;postlfs/libcap.html">libcap with PAM</ulink>
+ <ulink url="&blfs-book;general/libxml2.html">libxml2</ulink>
</para>
--->
+
<para condition="html" role="usernotes">User Notes:
<ulink url="&blfs-wiki;/bind-utils"/></para>
@@ -126,7 +128,8 @@
<bridgehead renderas="sect3">Short Descriptions</bridgehead>
- <para>See the program descriptions in the <!-- <xref linkend="bind"/> -->
+ <para>See the program descriptions in the
+ <ulink url="&blfs-book;server/bind.html">bind</ulink>
section.</para>
</sect2>
Modified: branches/basic/postlfs/filesystems/parted.xml
==============================================================================
--- branches/basic/postlfs/filesystems/parted.xml Sat Sep 22 14:46:42
2018 (r20523)
+++ branches/basic/postlfs/filesystems/parted.xml Sat Sep 22 16:32:07
2018 (r20524)
@@ -69,19 +69,17 @@
</itemizedlist>
<bridgehead renderas="sect3">Parted Dependencies</bridgehead>
-<!--
- <bridgehead renderas="sect4">Recommended</bridgehead>
- <para role="recommended">
- <xref linkend="lvm2"/> (device-mapper, required if building
- <application>udisks</application>)
- </para>
<bridgehead renderas="sect4">Optional</bridgehead>
<para role="optional">
- <xref linkend="pth"/> and
- <xref linkend="texlive"/> (or <xref linkend="tl-installer"/>)
+ <ulink url="&blfs-book;postlfs/lvm2.html">LVM2</ulink>
+ (needed for device-mapper, required if building
+ <application>udisks</application>),
+ <ulink url="&blfs-book;general/pth.html">pth</ulink>, and
+ <ulink url="&blfs-book;pst/texlive.html">texlive</ulink>
+ (or <ulink url="&blfs-book;pst/tl-installer.html">tl-installer</ulink>
</para>
--->
+
<para condition="html" role="usernotes">
User Notes: <ulink url="&blfs-wiki;/parted"/>
</para>
@@ -110,11 +108,6 @@
makeinfo --html -o doc/html doc/parted.texi &&
makeinfo --plaintext -o doc/parted.txt doc/parted.texi</userinput></screen>
-<!--
- <para>If you have <xref linkend="texlive"/> installed and wish to create
- PDF and Postcript documentation issue the following commands:</para>
--->
-
<screen><userinput>texi2pdf -o doc/parted.pdf doc/parted.texi
&&
texi2dvi -o doc/parted.dvi doc/parted.texi &&
dvips -o doc/parted.ps doc/parted.dvi</userinput></screen>
Modified: branches/basic/postlfs/security/p11-kit.xml
==============================================================================
--- branches/basic/postlfs/security/p11-kit.xml Sat Sep 22 14:46:42 2018
(r20523)
+++ branches/basic/postlfs/security/p11-kit.xml Sat Sep 22 16:32:07 2018
(r20524)
@@ -80,9 +80,9 @@
<bridgehead renderas="sect4">Optional</bridgehead>
<para role="optional">
<xref linkend="make-ca"/> (runtime),
- <!-- <xref linkend="nss"/> (runtime),
- <xref linkend="gtk-doc"/> and
- <xref linkend="libxslt"/>-->
+ <ulink url="&blfs-book;postlfs/nss.html">nss</ulink> (runtime),
+ <ulink url="&blfs-book;general/gtk-doc.html">gtk-doc</ulink> and
+ <ulink url="&blfs-book;general/libxslt.html">libxslt</ulink>
</para>
<para condition="html" role="usernotes">User Notes:
@@ -132,8 +132,9 @@
<para>
<option>--enable-doc</option>: Use this switch if you have installed
- <!-- <xref linkend="gtk-doc"/> and <xref linkend="libxslt"/> -->and wish
to
- rebuild the documentation and generate manual pages.
+ <ulink url="&blfs-book;general/gtk-doc.html">gtk-doc</ulink> and
+ <ulink url="&blfs-book;general/libxslt.html">libxslt</ulink>
+ and wish to rebuild the documentation and generate manual pages.
</para>
</sect2>
Modified: branches/basic/server/databases/db.xml
==============================================================================
--- branches/basic/server/databases/db.xml Sat Sep 22 14:46:42 2018
(r20523)
+++ branches/basic/server/databases/db.xml Sat Sep 22 16:32:07 2018
(r20524)
@@ -71,18 +71,17 @@
</itemizedlist>
<bridgehead renderas="sect3">Berkeley DB Dependencies</bridgehead>
-<!--
+
<bridgehead renderas="sect4">Optional</bridgehead>
<para role="optional">
- <xref linkend="tcl"/> and
- <xref linkend="sharutils"/> (for the <command>uudecode</command> command)
--->
- <!--,
+ <ulink url="&blfs-book;general/tcl.html">tcl</ulink> and
+ <ulink url="&blfs-book;general/sharutils.html">sharutils</ulink>
+ (for the <command>uudecode</command> command)
+ </para>
+ <!--
<xref linkend="openjdk"/> or <xref linkend="java"/>, and
-- - This is currently broken, removed for now. - -
- <xref linkend="sharutils"/> (for the <command>uudecode</command> command
- - Java bindings are required) -->
-<!-- </para> -->
+ This is currently broken, removed for now.
+ Java bindings are required) -->
<para condition="html" role="usernotes">
User Notes: <ulink url="&blfs-wiki;/db"/>
Modified: branches/basic/server/mail/postfix.xml
==============================================================================
--- branches/basic/server/mail/postfix.xml Sat Sep 22 14:46:42 2018
(r20523)
+++ branches/basic/server/mail/postfix.xml Sat Sep 22 16:32:07 2018
(r20524)
@@ -78,22 +78,24 @@
<bridgehead renderas="sect4">Recommended</bridgehead>
<para role="recommended">
<xref linkend="db"/>,
- <!--<xref linkend="cyrus-sasl"/>, and-->
<xref linkend="libnsl"/>
</para>
-<!--
+
<bridgehead renderas="sect4">Optional</bridgehead>
<para role="optional">
- <xref linkend="icu"/> for Email Address Internationalization (SMTPUTF8)
support,
- <xref linkend="mariadb"/> or <ulink
url="http://www.mysql.com/";>MySQL</ulink>,
- <xref linkend="openldap"/>,
- <xref linkend="pcre"/>,
- <xref linkend="postgresql"/>,
- <xref linkend="sqlite"/>, and
+ <ulink url="&blfs-book;postlfs/libcap.html">cyrus-sasl</ulink>,
+ <ulink url="&blfs-book;general/icu.html">icu</ulink>
+ for Email Address Internationalization (SMTPUTF8) support,
+ <ulink url="&blfs-book;server/mariadb.html">mariadb</ulink> or
+ <ulink url="http://www.mysql.com/";>MySQL</ulink>,
+ <ulink url="&blfs-book;server/openldap.html">openldap</ulink>,
+ <ulink url="&blfs-book;general/pcre.html">pcre</ulink>,
+ <ulink url="&blfs-book;server/postgresql.html">postgresql</ulink>,
+ <ulink url="&blfs-book;server/sqlite.html">sqlite</ulink>, and
<ulink url="http://cr.yp.to/cdb.html";>CDB</ulink> or
<ulink url="http://www.corpit.ru/mjt/tinycdb.html";>TinyCDB</ulink>
</para>
--->
+
<para>
Note that <application>SQLite</application>,
<application>MySQL</application>, <application>PostgreSQL</application>
@@ -409,17 +411,16 @@
</sect3>
<sect3 id="postfix-init">
- <title><phrase revision="sysv">Boot Script</phrase>
- <phrase revision="systemd">Systemd Unit</phrase></title>
+ <title>Boot Script or Systemd Unit</title>
<para>
To automate the running of Postfix at startup, install the
- <phrase revision="sysv"><filename>/etc/rc.d/init.d/postfix</filename>
- init script</phrase>
- <phrase revision="systemd"><filename>postfix.service</filename>
- unit</phrase> included in the
- <xref linkend="bootscripts" revision="sysv"/>
- <xref linkend="systemd-units" revision="systemd"/> package.
+ <filename>/etc/rc.d/init.d/postfix</filename>
+ init script (for System V based systems) or
+ <filename>postfix.service</filename> unit (for systemd based systems)
+ included in the
+ <xref linkend="bootscripts"/> or
+ <xref linkend="systemd-units"/> packages respectively.
</para>
<indexterm zone="postfix postfix-init">
--
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
