Author: pierre
Date: Wed Oct 12 05:23:02 2016
New Revision: 17877

Log:
Another run of parameter vs option fixes

Modified:
   trunk/BOOK/networking/mailnews/mutt.xml
   trunk/BOOK/networking/netlibs/libpcap.xml
   trunk/BOOK/networking/netprogs/ntp.xml
   trunk/BOOK/networking/netprogs/samba.xml
   trunk/BOOK/networking/textweb/w3m.xml
   trunk/BOOK/server/mail/dovecot.xml
   trunk/BOOK/server/major/apache.xml
   trunk/BOOK/server/other/openldap.xml
   trunk/BOOK/x/installing/x7app.xml
   trunk/BOOK/x/installing/x7lib.xml
   trunk/BOOK/x/lib/clutter.xml
   trunk/BOOK/x/lib/cogl.xml
   trunk/BOOK/x/lib/colord-gtk.xml
   trunk/BOOK/x/lib/freeglut.xml
   trunk/BOOK/x/lib/gtk+3.xml

Modified: trunk/BOOK/networking/mailnews/mutt.xml
==============================================================================
--- trunk/BOOK/networking/mailnews/mutt.xml     Tue Oct 11 17:43:33 2016        
(r17876)
+++ trunk/BOOK/networking/mailnews/mutt.xml     Wed Oct 12 05:23:02 2016        
(r17877)
@@ -217,9 +217,11 @@
     <para><option>\-\-with-slang</option>: Use <application>S-Lang
     </application> instead of <application>Ncurses</application>.</para> -->
 
-    <para><parameter>test -s doc/manual.txt || mv -v 
doc/manual.txt{.shipped,}</parameter>:
-    if the text manual is now empty (<application>libxslt</application> is 
installed,
-    but without any of the specified text browsers), restore it from the 
copy.</para>
+    <para><command>test -s doc/manual.txt || mv -v doc/manual.txt{.shipped,}
+      </command>:
+    if the text manual is now empty (<application>libxslt</application> is
+    installed, but without any of the specified text browsers), restore it
+    from the copy.</para>
 
   </sect2>
 

Modified: trunk/BOOK/networking/netlibs/libpcap.xml
==============================================================================
--- trunk/BOOK/networking/netlibs/libpcap.xml   Tue Oct 11 17:43:33 2016        
(r17876)
+++ trunk/BOOK/networking/netlibs/libpcap.xml   Wed Oct 12 05:23:02 2016        
(r17877)
@@ -133,7 +133,7 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
 
-    <para><parameter>--enable-bluetooth=no</parameter>: Necessary, if the
+    <para><option>--enable-bluetooth=no</option>: Necessary, if the
     recommended patch is not applied, because since 1.6.1 this application
     needs a fix, in order to build with
     <application>bluez-5.21</application>.</para>

Modified: trunk/BOOK/networking/netprogs/ntp.xml
==============================================================================
--- trunk/BOOK/networking/netprogs/ntp.xml      Tue Oct 11 17:43:33 2016        
(r17876)
+++ trunk/BOOK/networking/netprogs/ntp.xml      Wed Oct 12 05:23:02 2016        
(r17877)
@@ -126,9 +126,9 @@
     <para><parameter>--enable-linuxcaps</parameter>: ntpd is run as user
     ntp, so use Linux capabilities for non-root clock control.</para>
 
-    <para><option>--with-lineeditlibs=readline</option>: This option enables
-    <application>Readline</application> support for <command>ntpdc</command>
-    and <command>ntpq</command> programs. If omitted,
+    <para><parameter>--with-lineeditlibs=readline</parameter>: This switch
+    enables <application>Readline</application> support for
+    <command>ntpdc</command> and <command>ntpq</command> programs. If omitted,
     <application>libedit</application> will be used if installed, otherwise no
     readline capabilites will be compiled.</para>
 

Modified: trunk/BOOK/networking/netprogs/samba.xml
==============================================================================
--- trunk/BOOK/networking/netprogs/samba.xml    Tue Oct 11 17:43:33 2016        
(r17876)
+++ trunk/BOOK/networking/netprogs/samba.xml    Wed Oct 12 05:23:02 2016        
(r17877)
@@ -198,12 +198,11 @@
     a manner compliant with the Filesystem Hierarchy Standard (FHS).</para>
 
     <para revision="sysv"><parameter>--without-systemd</parameter>: Disable
-    <application>systemd</application> integration, which is not part of
-    LFS/BLFS. If you use <application>systemd</application>, replace by
-    <parameter>--with-systemd</parameter>.</para>
+    <application>systemd</application> integration, since it is not built
+    in the SYS V version of LFS/BLFS.</para>
 
-    <para revision="sysv"><option>--without-ad-dc</option>: Disable Active
-    Directory Domain Controller functionality. See <ulink
+    <para revision="sysv"><parameter>--without-ad-dc</parameter>: Disable
+    Active Directory Domain Controller functionality. See <ulink
     
url="https://wiki.samba.org/index.php/Setup_a_Samba_Active_Directory_Domain_Controller";>
     Setup a Samba Active Directory Domain Controller</ulink> for detailed
     information.</para>

Modified: trunk/BOOK/networking/textweb/w3m.xml
==============================================================================
--- trunk/BOOK/networking/textweb/w3m.xml       Tue Oct 11 17:43:33 2016        
(r17876)
+++ trunk/BOOK/networking/textweb/w3m.xml       Wed Oct 12 05:23:02 2016        
(r17877)
@@ -135,8 +135,8 @@
     using <xref linkend="gtk2"/> as its image library. It has no impact if
     <xref linkend="gtk2"/> is not installed.</para>
 
-    <para><option>--sysconfdir=/etc</option>: This option puts the 
configuration
-    files in /etc.</para>
+    <para><parameter>--sysconfdir=/etc</parameter>: This option puts the
+    configuration files in /etc.</para>
   </sect2>
 
   <sect2 role="configuration">

Modified: trunk/BOOK/server/mail/dovecot.xml
==============================================================================
--- trunk/BOOK/server/mail/dovecot.xml  Tue Oct 11 17:43:33 2016        (r17876)
+++ trunk/BOOK/server/mail/dovecot.xml  Wed Oct 12 05:23:02 2016        (r17877)
@@ -152,7 +152,7 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
       href="../../xincludes/static-libraries.xml"/>
 
-    <para>
+    <para revision="systemd">
       <parameter>--with-systemdsystemunitdir=/lib/systemd/system</parameter>:
       This switch is used to set the correct installation directory for
       systemd units.

Modified: trunk/BOOK/server/major/apache.xml
==============================================================================
--- trunk/BOOK/server/major/apache.xml  Tue Oct 11 17:43:33 2016        (r17876)
+++ trunk/BOOK/server/major/apache.xml  Wed Oct 12 05:23:02 2016        (r17877)
@@ -194,9 +194,9 @@
     </para>
 
     <para>
-      <parameter>--enable-mpm-shared=all</parameter>: This switch ensures that 
all
-      MPM (Multi Processing Modules) are built as Dynamic Shared Objects 
(DSOs),
-      so the user can choose which one to use at runtime.
+      <parameter>--enable-mpms-shared=all</parameter>: This switch ensures that
+      all MPM (Multi Processing Modules) are built as Dynamic Shared Objects
+      (DSOs), so the user can choose which one to use at runtime.
     </para>
 
     <para>

Modified: trunk/BOOK/server/other/openldap.xml
==============================================================================
--- trunk/BOOK/server/other/openldap.xml        Tue Oct 11 17:43:33 2016        
(r17876)
+++ trunk/BOOK/server/other/openldap.xml        Wed Oct 12 05:23:02 2016        
(r17877)
@@ -183,6 +183,7 @@
             --enable-spasswd      \
             --enable-slapd        \
             --enable-modules      \
+            --enable-rlookups     \
             --enable-backends=mod \
             --disable-ndb         \
             --disable-sql         \

Modified: trunk/BOOK/x/installing/x7app.xml
==============================================================================
--- trunk/BOOK/x/installing/x7app.xml   Tue Oct 11 17:43:33 2016        (r17876)
+++ trunk/BOOK/x/installing/x7app.xml   Wed Oct 12 05:23:02 2016        (r17877)
@@ -305,8 +305,8 @@
     <title>Command Explanations</title>
 
     <para>
-      <parameter>sed -e 's/\$(CPP) \$(DEFS)/$(CPP) -P $(DEFS)/' -i
-      man/Makefile.in</parameter>: with <application>gcc-5</application> the
+      <command>sed -e 's/\$(CPP) \$(DEFS)/$(CPP) -P $(DEFS)/' -i
+      man/Makefile.in</command>: with <application>gcc-5</application> the
       behaviour of <command>cpp</command> was changed to emit line numbers.
       That results in unterminated <application>sed</application> commands in
       <filename>filenames.sed</filename>. Adding <literal>-P</literal> restores

Modified: trunk/BOOK/x/installing/x7lib.xml
==============================================================================
--- trunk/BOOK/x/installing/x7lib.xml   Tue Oct 11 17:43:33 2016        (r17876)
+++ trunk/BOOK/x/installing/x7lib.xml   Wed Oct 12 05:23:02 2016        (r17877)
@@ -291,14 +291,15 @@
       annoying and useless warnings from libtool.
     </para>
 
-    <para><parameter>--with-fop</parameter>: Use <xref linkend="fop"/> to
-    generate PDF documentation (only for the libXfont package).</para>
-
     <para><parameter>--disable-devel-docs</parameter>: Disable generation of
     text documentation in the libXfont package if
     <xref linkend="xmlto"/> is installed without a text browser. Omit
     this parameter (or the entire <command>case</command> statement) if a text
     browser is installed.</para>
+
+    <para><option>--with-fop</option>: Use <xref linkend="fop"/> to
+    generate PDF documentation (only for the libXfont package).</para>
+
   </sect2>
 
   <sect2 role="configuration">

Modified: trunk/BOOK/x/lib/clutter.xml
==============================================================================
--- trunk/BOOK/x/lib/clutter.xml        Tue Oct 11 17:43:33 2016        (r17876)
+++ trunk/BOOK/x/lib/clutter.xml        Wed Oct 12 05:23:02 2016        (r17877)
@@ -174,14 +174,17 @@
     </para>
 
     <para>
-      <parameter>--enable-evdev-input</parameter>: This switch enables
+      <parameter revision="systemd">--enable-evdev-input</parameter><option
+      revision="sysv">--enable-evdev-input</option>: This switch enables
       the experimental Evdev input backend which is required for
       <application>GNOME</application> Wayland support.
     </para>
 
     <para>
-      <parameter>--enable-wayland</parameter> and
-      <parameter>--enable-wayland-compositor</parameter>: These switches
+      <parameter revision="systemd">--enable-wayland</parameter><option
+      revision="sysv">--enable-wayland</option> and <parameter
+      revision="systemd">--enable-wayland-compositor</parameter><option
+      revision="sysv">--enable-wayland-compositor</option>: These switches
       enable the experimental <application>Wayland</application> API in
       <application>Clutter</application> which is required for
       <application>GNOME</application> Wayland support.

Modified: trunk/BOOK/x/lib/cogl.xml
==============================================================================
--- trunk/BOOK/x/lib/cogl.xml   Tue Oct 11 17:43:33 2016        (r17876)
+++ trunk/BOOK/x/lib/cogl.xml   Wed Oct 12 05:23:02 2016        (r17877)
@@ -158,13 +158,13 @@
     </para>
 
     <para>
-      <parameter>--enable-{kms,wayland,xlib}-egl-platform</parameter>: These
+      <option>--enable-{kms,wayland,xlib}-egl-platform</option>: These
       switches enable support for KMS, Wayland and Xlib EGL platforms. They
       are required for <application>GNOME</application> Wayland support.
     </para>
 
     <para>
-      <parameter>--enable-wayland-egl-server</parameter>: This switch
+      <option>--enable-wayland-egl-server</option>: This switch
       enables <application>Cogl</application>'s Wayland Server API
       which is required for <application>GNOME</application> Wayland
       support.

Modified: trunk/BOOK/x/lib/colord-gtk.xml
==============================================================================
--- trunk/BOOK/x/lib/colord-gtk.xml     Tue Oct 11 17:43:33 2016        (r17876)
+++ trunk/BOOK/x/lib/colord-gtk.xml     Wed Oct 12 05:23:02 2016        (r17877)
@@ -131,7 +131,7 @@
     <title>Command Explanations</title>
 
     <para>
-      <option>--enable-vala</option>: This switch enables
+      <parameter>--enable-vala</parameter>: This switch enables
       building of the Vala bindings. Remove if you don't
       have <xref linkend="vala"/> installed.
     </para>

Modified: trunk/BOOK/x/lib/freeglut.xml
==============================================================================
--- trunk/BOOK/x/lib/freeglut.xml       Tue Oct 11 17:43:33 2016        (r17876)
+++ trunk/BOOK/x/lib/freeglut.xml       Wed Oct 12 05:23:02 2016        (r17877)
@@ -127,9 +127,9 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
 
-    <para><parameter>-DFREEGLUT_BUILD_DEMOS=ON</parameter>: Build
-    optional demo programs.  Installation of the demo programs must
-    be done manually.  The demo programs are limited and
+    <para><parameter>-DFREEGLUT_BUILD_DEMOS=OFF</parameter>: Disable building
+    optional demo programs.  Note that if you choose to build them, their
+    installation must be done manually.  The demo programs are limited and
     installation is not recommended.</para>
 
     <para><parameter>-DFREEGLUT_BUILD_STATIC_LIBS=OFF</parameter>:

Modified: trunk/BOOK/x/lib/gtk+3.xml
==============================================================================
--- trunk/BOOK/x/lib/gtk+3.xml  Tue Oct 11 17:43:33 2016        (r17876)
+++ trunk/BOOK/x/lib/gtk+3.xml  Wed Oct 12 05:23:02 2016        (r17877)
@@ -208,10 +208,11 @@
     </para>
 
     <para>
-      <parameter>--{disable,enable}-wayland-backend</parameter>: This switch
-      disables or enables the Wayland GDK backend, which is required for
-      <application>GNOME</application> Wayland support. Remove it if you
-      have not installed <application>Wayland</application>.      
+      <parameter>--disable-wayland-backend</parameter>: This switch
+      disables the Wayland GDK backend. Remove it if you have installed
+      <xref linkend="wayland"/> and <xref linkend="wayland-protocols"/>
+      and you wish to build <application>GNOME</application> with Wayland
+      support.
     </para>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
-- 
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page

Reply via email to