Changeset f7841987

Timestamp:

10/12/2016 12:23:02 PM (8 years ago)

Author:

Pierre Labastie <pieere@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

0b7a940

Parents:

48b417ab

Message:

Another run of parameter vs option fixes

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@17877 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:

• networking/mailnews/mutt.xml (modified) (1 diff)
• networking/netlibs/libpcap.xml (modified) (1 diff)
• networking/netprogs/ntp.xml (modified) (1 diff)
• networking/netprogs/samba.xml (modified) (1 diff)
• networking/textweb/w3m.xml (modified) (1 diff)
• server/mail/dovecot.xml (modified) (1 diff)
• server/major/apache.xml (modified) (1 diff)
• server/other/openldap.xml (modified) (1 diff)
• x/installing/x7app.xml (modified) (1 diff)
• x/installing/x7lib.xml (modified) (2 diffs)
• x/lib/clutter.xml (modified) (2 diffs)
• x/lib/cogl.xml (modified) (2 diffs)
• x/lib/colord-gtk.xml (modified) (1 diff)
• x/lib/freeglut.xml (modified) (1 diff)
• x/lib/gtk+3.xml (modified) (1 diff)

networking/mailnews/mutt.xml

@@ -218 +218 @@
     </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>

networking/netlibs/libpcap.xml

@@ -134 +134 @@
     <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

networking/netprogs/ntp.xml

@@ -127 +127 @@
     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>

networking/netprogs/samba.xml

@@ -199 +199 @@
 
     <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>
-
-    <para revision="sysv"><option>--without-ad-dc</option>: Disable Active
-    Directory Domain Controller functionality. See <ulink
+    <application>systemd</application> integration, since it is not built
+    in the SYS V version of LFS/BLFS.</para>
+
+    <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

networking/textweb/w3m.xml

@@ -136 +136 @@
     <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>
 

server/mail/dovecot.xml

@@ -153 +153 @@
       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

server/major/apache.xml

@@ -195 +195 @@
 
     <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>
 

server/other/openldap.xml

@@ -184 +184 @@
             --enable-slapd        \
             --enable-modules      \
+            --enable-rlookups     \
             --enable-backends=mod \
             --disable-ndb         \

x/installing/x7app.xml

@@ -306 +306 @@
 
     <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

x/installing/x7lib.xml

@@ -292 +292 @@
     </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
@@ -300 +297 @@
     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>
 

x/lib/clutter.xml

@@ -175 +175 @@
 
     <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.
@@ -181 +182 @@
 
     <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

x/lib/cogl.xml

@@ -159 +159 @@
 
     <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.
@@ -165 +165 @@
 
     <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

x/lib/colord-gtk.xml

@@ -132 +132 @@
 
     <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.

x/lib/freeglut.xml

@@ -128 +128 @@
     <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>
 

x/lib/gtk+3.xml

@@ -209 +209 @@
 
     <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>