Author: dj
Date: Fri Jun 3 20:04:06 2016
New Revision: 17433
Log:
[systemd-merge] - Section II layout
Added:
trunk/BOOK/postlfs/security/liboauth.xml (contents, props changed)
- copied, changed from r17427,
branches/systemd/postlfs/security/liboauth.xml
Modified:
trunk/BOOK/lxde/desktop/lxde-common.xml
trunk/BOOK/lxde/desktop/lxsession.xml
trunk/BOOK/lxqt/desktop/lxqt-common.xml
trunk/BOOK/lxqt/desktop/post-install.xml
trunk/BOOK/multimedia/libdriv/pulseaudio.xml
trunk/BOOK/networking/netutils/networkmanager.xml
trunk/BOOK/packages.ent
trunk/BOOK/postlfs/config/config.xml
trunk/BOOK/postlfs/config/random.xml
trunk/BOOK/postlfs/security/consolekit.xml
trunk/BOOK/postlfs/security/security.xml
trunk/BOOK/x/dm/lxdm.xml
trunk/BOOK/x/dm/sddm.xml
trunk/BOOK/xfce/core/xfce4-session.xml
trunk/BOOK/xsoft/other/gparted.xml
Modified: trunk/BOOK/lxde/desktop/lxde-common.xml
==============================================================================
--- trunk/BOOK/lxde/desktop/lxde-common.xml Fri Jun 3 18:39:41 2016
(r17432)
+++ trunk/BOOK/lxde/desktop/lxde-common.xml Fri Jun 3 20:04:06 2016
(r17433)
@@ -74,7 +74,7 @@
<bridgehead renderas="sect4">Required</bridgehead>
<para role="required">
- <xref linkend="consolekit"/>,
+ <phrase revision="sysv"><xref linkend="consolekit"/>,</phrase>
<xref linkend="lxde-icon-theme"/>,
<xref linkend="lxpanel"/>,
<xref linkend="lxsession"/>,
@@ -91,7 +91,7 @@
<bridgehead renderas="sect4">Recommended Runtime Dependencies</bridgehead>
<para role="recommended">
- <xref linkend="consolekit"/> and
+ <phrase revision="sysv"><xref linkend="consolekit"/> and</phrase>
<xref linkend="dbus"/>
</para>
Modified: trunk/BOOK/lxde/desktop/lxsession.xml
==============================================================================
--- trunk/BOOK/lxde/desktop/lxsession.xml Fri Jun 3 18:39:41 2016
(r17432)
+++ trunk/BOOK/lxde/desktop/lxsession.xml Fri Jun 3 20:04:06 2016
(r17433)
@@ -70,8 +70,8 @@
</listitem>
</itemizedlist>
- <bridgehead renderas="sect3">Additional Downloads</bridgehead>
- <itemizedlist spacing="compact">
+ <bridgehead renderas="sect3" revision="sysv">Additional
Downloads</bridgehead>
+ <itemizedlist spacing="compact" revision="sysv">
<listitem>
<para>
Optional patch, which adds <quote>Hibernate</quote> and <quote>
@@ -94,8 +94,8 @@
<bridgehead renderas="sect4">Optional</bridgehead>
<para role="optional">
- <xref linkend="consolekit"/> (used at runtime by
- <command>lxsession-logout</command>),
+ <phrase revision="sysv"><xref linkend="consolekit"/> (used at runtime by
+ <command>lxsession-logout</command>),</phrase>
<xref linkend="gtk3"/>, and
<xref linkend="libxslt"/> with
<xref linkend="DocBook"/> and
@@ -110,12 +110,12 @@
<sect2 role="installation">
<title>Installation of LXSession</title>
- <para>
+ <para revision="sysv">
Optionally apply the following patch to be able to put your system
into <quote>Suspend</quote> or <quote>Hibernate</quote> state.
</para>
-<screen><userinput>patch -Np1 -i
../lxsession-&lxsession-version;-hibernate_consolekit-2.patch</userinput></screen>
+<screen revision="sysv"><userinput>patch -Np1 -i
../lxsession-&lxsession-version;-hibernate_consolekit-2.patch</userinput></screen>
<para>
Install <application>LXSession</application> by running the following
Modified: trunk/BOOK/lxqt/desktop/lxqt-common.xml
==============================================================================
--- trunk/BOOK/lxqt/desktop/lxqt-common.xml Fri Jun 3 18:39:41 2016
(r17432)
+++ trunk/BOOK/lxqt/desktop/lxqt-common.xml Fri Jun 3 20:04:06 2016
(r17433)
@@ -82,7 +82,7 @@
<bridgehead renderas="sect4">Recommended</bridgehead>
<para role="recommended">
- <xref linkend="consolekit"/> alone or with
+ <phrase revision="sysv"><xref linkend="consolekit"/> alone or
with</phrase>
<xref linkend="lxdm"/> or another Display Manager, e.g.
<xref linkend="sddm"/> (this has been
reported as the <quote>recommended <application>LXQt</application>
Modified: trunk/BOOK/lxqt/desktop/post-install.xml
==============================================================================
--- trunk/BOOK/lxqt/desktop/post-install.xml Fri Jun 3 18:39:41 2016
(r17432)
+++ trunk/BOOK/lxqt/desktop/post-install.xml Fri Jun 3 20:04:06 2016
(r17433)
@@ -37,7 +37,7 @@
<bridgehead renderas="sect4">Recommended</bridgehead>
<para role="recommended">
- <xref linkend="consolekit"/> alone or with
+ <phrase revision="sysv"><xref linkend="consolekit"/> alone or
with</phrase>
<xref linkend="sddm"/> (this has been
reported as the <quote>recommended <application>LXQt</application>
display manager</quote>) or another Display Manager, e.g.
Modified: trunk/BOOK/multimedia/libdriv/pulseaudio.xml
==============================================================================
--- trunk/BOOK/multimedia/libdriv/pulseaudio.xml Fri Jun 3 18:39:41
2016 (r17432)
+++ trunk/BOOK/multimedia/libdriv/pulseaudio.xml Fri Jun 3 20:04:06
2016 (r17433)
@@ -99,7 +99,7 @@
<xref linkend="avahi"/>,
<xref linkend="bluez"/> (runtime),
<xref linkend="check"/>,
- <xref linkend="consolekit"/> (runtime),
+ <phrase revision="sysv"><xref linkend="consolekit"/> (runtime),</phrase>
<xref linkend="GConf"/>,
<xref linkend="gtk3"/>,
<xref linkend="libsamplerate"/>,
Modified: trunk/BOOK/networking/netutils/networkmanager.xml
==============================================================================
--- trunk/BOOK/networking/netutils/networkmanager.xml Fri Jun 3 18:39:41
2016 (r17432)
+++ trunk/BOOK/networking/netutils/networkmanager.xml Fri Jun 3 20:04:06
2016 (r17433)
@@ -88,7 +88,7 @@
<bridgehead renderas="sect4">Recommended</bridgehead>
<para role="recommended">
- <xref linkend="consolekit"/>,
+ <phrase revision="sysv"><xref linkend="consolekit"/>,</phrase>
<xref linkend="dhcpcd"/> or
<xref linkend="dhcp"/> (client only),
<xref linkend="gobject-introspection"/>,
Modified: trunk/BOOK/packages.ent
==============================================================================
--- trunk/BOOK/packages.ent Fri Jun 3 18:39:41 2016 (r17432)
+++ trunk/BOOK/packages.ent Fri Jun 3 20:04:06 2016 (r17433)
@@ -18,6 +18,7 @@
<!ENTITY haveged-version "1.9.1">
<!ENTITY iptables-version "1.6.0">
<!ENTITY libcap-version "2.25">
+<!ENTITY liboauth-version "1.0.3">
<!ENTITY linux-pam-version "1.3.0">
<!ENTITY linux-pam-docs-version "1.2.0">
<!ENTITY libpwquality-version "1.3.0">
Modified: trunk/BOOK/postlfs/config/config.xml
==============================================================================
--- trunk/BOOK/postlfs/config/config.xml Fri Jun 3 18:39:41 2016
(r17432)
+++ trunk/BOOK/postlfs/config/config.xml Fri Jun 3 20:04:06 2016
(r17433)
@@ -40,7 +40,7 @@
<xref linkend="postlfs-config-vimrc"/>.</para>
<para> The remaining topics, <xref linkend="postlfs-config-logon"/>,
- <xref linkend="postlfs-config-random"/>,
+ <phrase revision="sysv"><xref linkend="postlfs-config-random"/>,</phrase>
<xref linkend="autofs"/>, and
<xref linkend="postlfs-config-netfs"/> are then addressed, in that order.
They
don't have much interaction with the other topics in this chapter.</para>
@@ -53,7 +53,10 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="profile.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="vimrc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="logon.xml"/>
+
+ <!-- sysv only -->
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="random.xml"/>
+
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
href="lsb-release.xml"/>
</chapter>
Modified: trunk/BOOK/postlfs/config/random.xml
==============================================================================
--- trunk/BOOK/postlfs/config/random.xml Fri Jun 3 18:39:41 2016
(r17432)
+++ trunk/BOOK/postlfs/config/random.xml Fri Jun 3 20:04:06 2016
(r17433)
@@ -5,7 +5,7 @@
%general-entities;
]>
-<sect1 id="postlfs-config-random" xreflabel="Random number generation">
+<sect1 id="postlfs-config-random" xreflabel="Random number generation"
revision="sysv">
<?dbhtml filename="random.html"?>
<sect1info>
@@ -33,8 +33,7 @@
start-ups.</para>
<para>Install the <filename>/etc/rc.d/init.d/random</filename> init script
- included with the <xref linkend="bootscripts" revision="sysv"/>
- <xref linkend="systemd-units" revision="systemd"/> package.</para>
+ included with the <xref linkend="bootscripts"/> package.</para>
<screen role="root"><userinput>make install-random</userinput></screen>
Modified: trunk/BOOK/postlfs/security/consolekit.xml
==============================================================================
--- trunk/BOOK/postlfs/security/consolekit.xml Fri Jun 3 18:39:41 2016
(r17432)
+++ trunk/BOOK/postlfs/security/consolekit.xml Fri Jun 3 20:04:06 2016
(r17433)
@@ -12,7 +12,7 @@
<!ENTITY consolekit-time "0.2 SBU">
]>
-<sect1 id="consolekit" xreflabel="ConsoleKit2-&consolekit-version;">
+<sect1 id="consolekit" xreflabel="ConsoleKit2-&consolekit-version;"
revision="sysv">
<?dbhtml filename="consolekit.html"?>
<sect1info>
Copied and modified: trunk/BOOK/postlfs/security/liboauth.xml (from r17427,
branches/systemd/postlfs/security/liboauth.xml)
==============================================================================
--- branches/systemd/postlfs/security/liboauth.xml Thu Jun 2 13:29:29
2016 (r17427, copy source)
+++ trunk/BOOK/postlfs/security/liboauth.xml Fri Jun 3 20:04:06 2016
(r17433)
@@ -12,7 +12,7 @@
<!ENTITY liboauth-time "less than 0.1 SBU">
]>
-<sect1 id="liboauth" xreflabel="liboauth-&liboauth-version;">
+<sect1 id="liboauth" xreflabel="liboauth-&liboauth-version;"
revision="systemd">
<?dbhtml filename="liboauth.html"?>
<sect1info>
@@ -37,7 +37,7 @@
as well as perform HTTP requests.
</para>
- &lfs77_checked;
+ <!-- &lfs77_checked; -->
<bridgehead renderas="sect3">Package Information</bridgehead>
<itemizedlist spacing="compact">
Modified: trunk/BOOK/postlfs/security/security.xml
==============================================================================
--- trunk/BOOK/postlfs/security/security.xml Fri Jun 3 18:39:41 2016
(r17432)
+++ trunk/BOOK/postlfs/security/security.xml Fri Jun 3 20:04:06 2016
(r17433)
@@ -42,7 +42,10 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
href="vulnerabilities.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="cacerts.xml"/>
+
+ <!-- sysv only -->
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
href="consolekit.xml"/>
+
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="cracklib.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
href="cyrus-sasl.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="gnupg2.xml"/>
@@ -53,6 +56,10 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
href="firewalling.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="libcap.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="linux-pam.xml"/>
+
+ <!-- systemd only -->
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="liboauth.xml"/>
+
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
href="libpwquality.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="mitkrb.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="nettle.xml"/>
Modified: trunk/BOOK/x/dm/lxdm.xml
==============================================================================
--- trunk/BOOK/x/dm/lxdm.xml Fri Jun 3 18:39:41 2016 (r17432)
+++ trunk/BOOK/x/dm/lxdm.xml Fri Jun 3 20:04:06 2016 (r17433)
@@ -88,7 +88,7 @@
<bridgehead renderas="sect4">Recommended</bridgehead>
<para role="recommended">
- <xref linkend="consolekit"/> and
+ <phrase revision="sysv"><xref linkend="consolekit"/> and</phrase>
<xref linkend="linux-pam"/>
</para>
Modified: trunk/BOOK/x/dm/sddm.xml
==============================================================================
--- trunk/BOOK/x/dm/sddm.xml Fri Jun 3 18:39:41 2016 (r17432)
+++ trunk/BOOK/x/dm/sddm.xml Fri Jun 3 20:04:06 2016 (r17433)
@@ -94,8 +94,8 @@
(for the man pages)
</para>
- <bridgehead renderas="sect4">Runtime Dependencies</bridgehead>
- <para role="required">
+ <bridgehead renderas="sect4" revision="sysv">Runtime
Dependencies</bridgehead>
+ <para role="required" revision="sysv">
<xref linkend="consolekit"/>
</para>
Modified: trunk/BOOK/xfce/core/xfce4-session.xml
==============================================================================
--- trunk/BOOK/xfce/core/xfce4-session.xml Fri Jun 3 18:39:41 2016
(r17432)
+++ trunk/BOOK/xfce/core/xfce4-session.xml Fri Jun 3 20:04:06 2016
(r17433)
@@ -143,7 +143,7 @@
<para>
There are several optional run time dependencies for
<application>Xfce4</application>:
- <xref linkend="consolekit"/>,
+ <phrase revision="sysv"><xref linkend="consolekit"/>,</phrase>
<xref linkend="dbus"/>,
<xref linkend="gnupg2"/>,
<xref linkend="hicolor-icon-theme"/> and
Modified: trunk/BOOK/xsoft/other/gparted.xml
==============================================================================
--- trunk/BOOK/xsoft/other/gparted.xml Fri Jun 3 18:39:41 2016 (r17432)
+++ trunk/BOOK/xsoft/other/gparted.xml Fri Jun 3 20:04:06 2016 (r17433)
@@ -185,7 +185,7 @@
</sect3>
- <sect3 role="pkexec">
+ <sect3 role="pkexec" revision="sysv">
<title>pkexec</title>
<para>
To optionally use <application>pkexec</application>, you need <xref
--
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
