Author: pierre
Date: Fri Oct 14 09:16:34 2016
New Revision: 17881

Log:
Last round of option vs parameter fixes

Modified:
   trunk/BOOK/multimedia/audioutils/audacious.xml
   trunk/BOOK/multimedia/cdwriteutils/libisoburn.xml
   trunk/BOOK/multimedia/libdriv/libdv.xml
   trunk/BOOK/multimedia/libdriv/libvpx.xml
   trunk/BOOK/multimedia/libdriv/sbc.xml
   trunk/BOOK/multimedia/libdriv/xine-lib.xml
   trunk/BOOK/multimedia/videoutils/ffmpeg.xml
   trunk/BOOK/multimedia/videoutils/vlc.xml
   trunk/BOOK/networking/netutils/mod_dnssd.xml
   trunk/BOOK/pst/printing/gutenprint.xml
   trunk/BOOK/pst/sgml/opensp.xml
   trunk/BOOK/pst/typesetting/texlive.xml
   trunk/BOOK/pst/typesetting/xindy.xml
   trunk/BOOK/x/installing/xorg-server.xml
   trunk/BOOK/x/installing/xterm.xml
   trunk/BOOK/xsoft/other/xarchiver.xml

Modified: trunk/BOOK/multimedia/audioutils/audacious.xml
==============================================================================
--- trunk/BOOK/multimedia/audioutils/audacious.xml      Thu Oct 13 09:25:58 
2016        (r17880)
+++ trunk/BOOK/multimedia/audioutils/audacious.xml      Fri Oct 14 09:16:34 
2016        (r17881)
@@ -224,8 +224,7 @@
 
     <para>
       Install the required plugins package by unpacking the tarball, changing
-      into the newly created directory, and issuing the following
-      commands:
+      into the newly created directory, and issuing the following commands:
     </para>
 
 <screen><userinput>TPUT=/bin/true ./configure --prefix=/usr --disable-wavpack 
&amp;&amp;
@@ -260,11 +259,11 @@
     <para><parameter>--with-buildstamp</parameter>: This switch appends
     the given text to the version string.</para>
 
-    <para><option>--disable-gtk</option>: Use this to disable GTK+ 
support.</para>
-
-    <para><option>--disable-wavpack</option>: This otion is required
+    <para><parameter>--disable-wavpack</parameter>: This switch is required
     unless the optional WavPack package is installed.</para>
 
+    <para><option>--disable-gtk</option>: Use this to disable GTK+ 
support.</para>
+
     <para><option>--disable-mp3</option>: Use this for the plugins if you have
     not installed mpg123 and do not wish to play mp3 files.</para>
 

Modified: trunk/BOOK/multimedia/cdwriteutils/libisoburn.xml
==============================================================================
--- trunk/BOOK/multimedia/cdwriteutils/libisoburn.xml   Thu Oct 13 09:25:58 
2016        (r17880)
+++ trunk/BOOK/multimedia/cdwriteutils/libisoburn.xml   Fri Oct 14 09:16:34 
2016        (r17881)
@@ -142,7 +142,7 @@
       href="../../xincludes/static-libraries.xml"/>
 
     <para>
-      <option>--enable-pkg-check-modules</option>: Enable
+      <parameter>--enable-pkg-check-modules</parameter>: Enable
       <application>pkg-config</application> check for
       <application>libburn</application> and
       <application>libisofs</application>.

Modified: trunk/BOOK/multimedia/libdriv/libdv.xml
==============================================================================
--- trunk/BOOK/multimedia/libdriv/libdv.xml     Thu Oct 13 09:25:58 2016        
(r17880)
+++ trunk/BOOK/multimedia/libdriv/libdv.xml     Fri Oct 14 09:16:34 2016        
(r17881)
@@ -104,8 +104,8 @@
     current <application>linux</application> headers and would also need other
     obsolete dependencies.</para> <!-- gtk+-1.2, glib+-1.2 -->
 
-    <para><option>--disable-static</option>: This switch prevents the static
-    libraries being installed.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
+      href="../../xincludes/static-libraries.xml"/>
 
   </sect2>
 

Modified: trunk/BOOK/multimedia/libdriv/libvpx.xml
==============================================================================
--- trunk/BOOK/multimedia/libdriv/libvpx.xml    Thu Oct 13 09:25:58 2016        
(r17880)
+++ trunk/BOOK/multimedia/libdriv/libvpx.xml    Fri Oct 14 09:16:34 2016        
(r17881)
@@ -114,8 +114,8 @@
     <para><option>--disable-vp9</option>: This switch prevents building of VP9
     codec support.</para>
 
-    <para><option>--disable-static</option>: This switch prevents building of
-    static versions of libraries.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
+      href="../../xincludes/static-libraries.xml"/>
 
   </sect2>
 

Modified: trunk/BOOK/multimedia/libdriv/sbc.xml
==============================================================================
--- trunk/BOOK/multimedia/libdriv/sbc.xml       Thu Oct 13 09:25:58 2016        
(r17880)
+++ trunk/BOOK/multimedia/libdriv/sbc.xml       Fri Oct 14 09:16:34 2016        
(r17881)
@@ -107,10 +107,11 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
 
-    <para><option>--disable-tester</option> This disables
+    <para>
+      <parameter>--disable-tester</parameter>: This disables
       the SBC tester. Remove it if you have installed
-      the optional <application>libsndfile</application>
-      package.</para>
+      <xref linkend="libsndfile"/>.
+    </para>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
       href="../../xincludes/static-libraries.xml"/>

Modified: trunk/BOOK/multimedia/libdriv/xine-lib.xml
==============================================================================
--- trunk/BOOK/multimedia/libdriv/xine-lib.xml  Thu Oct 13 09:25:58 2016        
(r17880)
+++ trunk/BOOK/multimedia/libdriv/xine-lib.xml  Fri Oct 14 09:16:34 2016        
(r17881)
@@ -195,7 +195,7 @@
     </para>
 
     <para>
-      <parameter>--docdir=/usr/share/xine-lib-&xine-lib-version;</parameter>:
+      
<parameter>--docdir=/usr/share/doc/xine-lib-&xine-lib-version;</parameter>:
       This switch causes the documentation to be installed into a versioned
       directory instead of the default <filename
       class="directory">/usr/share/doc/xine-lib</filename>.

Modified: trunk/BOOK/multimedia/videoutils/ffmpeg.xml
==============================================================================
--- trunk/BOOK/multimedia/videoutils/ffmpeg.xml Thu Oct 13 09:25:58 2016        
(r17880)
+++ trunk/BOOK/multimedia/videoutils/ffmpeg.xml Fri Oct 14 09:16:34 2016        
(r17881)
@@ -317,7 +317,7 @@
     </para>
 
     <para>
-      <option>--enable-libfreetype</option>: Enables
+      <parameter>--enable-libfreetype</parameter>: Enables
       <application>Freetype</application> support.
     </para>
 

Modified: trunk/BOOK/multimedia/videoutils/vlc.xml
==============================================================================
--- trunk/BOOK/multimedia/videoutils/vlc.xml    Thu Oct 13 09:25:58 2016        
(r17880)
+++ trunk/BOOK/multimedia/videoutils/vlc.xml    Fri Oct 14 09:16:34 2016        
(r17881)
@@ -275,7 +275,7 @@
     </para>
 
     <para>
-      <option>--disable-atmo</option>: This switch disables
+      <parameter>--disable-atmo</parameter>: This switch disables
       trying to build AtmoLight (homemade Philips Ambilight clone).
     </para>
 

Modified: trunk/BOOK/networking/netutils/mod_dnssd.xml
==============================================================================
--- trunk/BOOK/networking/netutils/mod_dnssd.xml        Thu Oct 13 09:25:58 
2016        (r17880)
+++ trunk/BOOK/networking/netutils/mod_dnssd.xml        Fri Oct 14 09:16:34 
2016        (r17881)
@@ -127,7 +127,7 @@
     </para>
 
     <para>
-      <option>--disable-lynx</option>: This parameter turns off
+      <parameter>--disable-lynx</parameter>: This parameter turns off
       <application>Lynx</application> usage for documentation generation.
       Remove it if you have <application>Lynx</application> installed.
     </para>

Modified: trunk/BOOK/pst/printing/gutenprint.xml
==============================================================================
--- trunk/BOOK/pst/printing/gutenprint.xml      Thu Oct 13 09:25:58 2016        
(r17880)
+++ trunk/BOOK/pst/printing/gutenprint.xml      Fri Oct 14 09:16:34 2016        
(r17881)
@@ -133,7 +133,7 @@
     and perhaps 'run-testdither', it's 'run-weavetest' which takes most of the 
time -->
     <para>To test the results, issue: <command>make check</command>.  The 
tests 
     take a very long time and use a lot of disk space but reports vary 
substantially.
-    When last tested (version 5.2.11, BLFS-7.8, using -j2 needed 154 SBU and 
8.6 GB
+    When last tested (version 5.2.11, BLFS-7.8, using -j2) needed 154 SBU and 
8.6 GB
     to complete the tests.</para>
 
     <para>Now, as the <systemitem class="username">root</systemitem> 
user:</para>
@@ -156,8 +156,8 @@
     directory structure instead of
     <filename class='directory'>/usr/share/gutenprint/doc</filename>.</para>
 
-    <para><option>--disable-static</option>: This switch prevents the static
-    libraries being installed.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
+      href="../../xincludes/static-libraries.xml"/>
 
     <!-- redundant, only applies to cups < 1.2.0 : cups-5.0 gives a version of 
1.5.0
     FIXME - delete this on next version upgrade

Modified: trunk/BOOK/pst/sgml/opensp.xml
==============================================================================
--- trunk/BOOK/pst/sgml/opensp.xml      Thu Oct 13 09:25:58 2016        (r17880)
+++ trunk/BOOK/pst/sgml/opensp.xml      Fri Oct 14 09:16:34 2016        (r17881)
@@ -116,17 +116,21 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
 
-    <para><parameter>sed -i 's/32,/253,/...unicode.syn}</parameter>:
+    <para><command>sed -i 's/32,/253,/...unicode.syn}</command>:
     These seds prevent some annoying messages that may otherwise appear
     while running <command>openjade</command>.</para>
 
-    <para><parameter>--disable-static</parameter>: This switch prevents
-    the building of the static library.</para>
-    <!-- Why don't we want the static library? -->
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
+      href="../../xincludes/static-libraries.xml"/>
 
     <para><parameter>--enable-http</parameter>: This switch adds support
     for HTTP.</para>
 
+    <para><parameter>--disable-doc-build</parameter>: This switch prevents the
+    <command>configure</command> script checking if you have
+    <application>xmlto</application> installed. If you have
+    <application>xmlto</application>, you can remove this option.</para>
+
     <para><parameter>--enable-default-catalog=/etc/sgml/catalog</parameter>:
     This switch sets the path to the centralized catalog.</para>
 
@@ -136,11 +140,6 @@
     <para><option>--enable-xml-messages</option>: This switch adds
     support for XML Formatted Messages.</para>
 
-    <para><option>--disable-doc-build</option>: This switch prevents the
-    <command>configure</command> script checking if you have
-    <application>xmlto</application> installed. If you have
-    <application>xmlto</application>, you can remove this option.</para>
-
     <para><command>make
     pkgdatadir=/usr/share/sgml/OpenSP-&opensp-version;</command>: This sets the
     pkgdatadir variable in the <filename>Makefile</filename> from

Modified: trunk/BOOK/pst/typesetting/texlive.xml
==============================================================================
--- trunk/BOOK/pst/typesetting/texlive.xml      Thu Oct 13 09:25:58 2016        
(r17880)
+++ trunk/BOOK/pst/typesetting/texlive.xml      Fri Oct 14 09:16:34 2016        
(r17881)
@@ -254,7 +254,7 @@
     <title>Command Explanations</title>
 
     <para>
-      <parameter>patch -Np1 -i 
../texlive-&texlive-version;-source...</parameter>:
+      <command>patch -Np1 -i ../texlive-&texlive-version;-source...</command>:
       This fixes a segfault in upmendex which was corrected after the source 
was
       released and is included in the binary installer.
     </para>
@@ -282,21 +282,21 @@
     </para>
 
     <para>
-      <parameter>make texlinks</parameter> : this runs the texlinks.sh script
+      <command>make texlinks</command> : this runs the texlinks.sh script
       to create symbolic links from formats to engines.  In
       practice, several of the targets such as <command>xetex</command> are now
       separate binaries and for these it will report "file already exists".
     </para>
 
     <para>
-      <parameter>tar -xf texlive-&texmf-version;-texmf.tar.xz -C 
/opt/texlive/&texlive-year; --strip-components=1</parameter>:
+      <command>tar -xf texlive-&texmf-version;-texmf.tar.xz -C 
/opt/texlive/&texlive-year; --strip-components=1</command>:
       the tarball contains the files for the texmf-dist directory, and because
       of its size we do not want to waste time and space untarring it and then
       copying the files.
     </para>
 
     <para>
-      <parameter>patch -Np1 -i 
/sources/texlive-&texlive-version;-texmf...</parameter>:
+      <command>patch -Np1 -i 
/sources/texlive-&texlive-version;-texmf...</command>:
       This fixes various problems in epstopdf which were found after the source
       was released and are included in the binary installer.  Because this is
       applied to the installated texmf (to minimise disk space) it is necessary
@@ -304,8 +304,8 @@
     </para>
 
     <para>
-      <parameter>install -v -m644 ../texk/tests/TeXLive/*
-      /opt/texlive/&texlive-year;/tlpkg/TeXLive/</parameter>: This puts the 
perl
+      <command>install -v -m644 ../texk/tests/TeXLive/*
+      /opt/texlive/&texlive-year;/tlpkg/TeXLive/</command>: This puts the perl
       modules <filename>TLConfig.pm</filename> and 
<filename>TLUtils.pm</filename>
       into the directory where the binary installer puts them - it is at the
       start of the perl @INC@ PATH within texlive when installed using the 
above
@@ -313,17 +313,17 @@
     </para>
 
     <para>
-      <parameter>mktexlsr</parameter>: Create an <filename>ls-R</filename> file
+      <command>mktexlsr</command>: Create an <filename>ls-R</filename> file
       which lists what was installed - this is used by kpathsea to find files.
     </para>
 
     <para>
-      <parameter>fmtutil-sys --all</parameter>: This initialises the TeX 
formats,
+      <command>fmtutil-sys --all</command>: This initialises the TeX formats,
       Metafont bases and Metapost mems.
     </para>
 
     <para>
-      <parameter>mtxrun --generate</parameter>: This initialise the ConTeXt 
system.
+      <command>mtxrun --generate</command>: This initialise the ConTeXt system.
     </para>
 
   </sect2>

Modified: trunk/BOOK/pst/typesetting/xindy.xml
==============================================================================
--- trunk/BOOK/pst/typesetting/xindy.xml        Thu Oct 13 09:25:58 2016        
(r17880)
+++ trunk/BOOK/pst/typesetting/xindy.xml        Fri Oct 14 09:16:34 2016        
(r17881)
@@ -134,7 +134,7 @@
     <title>Command Explanations</title>
 
     <para>
-      <parameter>sed -i "s/ grep -v '^;'/ awk NF/" ...</parameter>: The build
+      <command>sed -i "s/ grep -v '^;'/ awk NF/" ...</command>: The build
       sorts files in latin{1..3} encodings to create latin.xdy, and unicode
       versions of these to create utf8.xdy after using
       <command>grep -v '^;'</command> to remove blank lines. With
@@ -144,7 +144,7 @@
     </para>
 
     <para>
-      <parameter>patch -Np1 -i 
../xindy-&xindy-version;-upstream_fixes-1.patch</parameter>:
+      <command>patch -Np1 -i 
../xindy-&xindy-version;-upstream_fixes-1.patch</command>:
       <application>Xindy</application> is now maintained at CTAN. This patch
       updates the source to match what is used for the &texlive-year; texlive
       binary version ( but ignoring changes which were only made to allow for
@@ -159,7 +159,7 @@
     headers from <xref linkend="texlive"/> will be found.</para>
 
     <para>
-      <parameter>make LC_ALL=POSIX</parameter>: with the current version of
+      <command>make LC_ALL=POSIX</command>: with the current version of
       <application>coreutils</application> it is essential to build
       <application>xindy</application> in the POSIX (or C) locale because in a
       UTF-8 locale the file <filename>latin.xdy</filename> will contain only a

Modified: trunk/BOOK/x/installing/xorg-server.xml
==============================================================================
--- trunk/BOOK/x/installing/xorg-server.xml     Thu Oct 13 09:25:58 2016        
(r17880)
+++ trunk/BOOK/x/installing/xorg-server.xml     Fri Oct 14 09:16:34 2016        
(r17881)
@@ -206,7 +206,7 @@
     </para>
 
     <para revision="systemd">
-      <parameter>--disable-systemd-logind --enable-install-setuid</parameter>:
+      <option>--disable-systemd-logind --enable-install-setuid</option>:
       These switches disable systemd-logind integration and restore the setuid
       bit to the Xorg executable, allowing Xorg Server to work
       without having the systemd PAM module installed and set up.

Modified: trunk/BOOK/x/installing/xterm.xml
==============================================================================
--- trunk/BOOK/x/installing/xterm.xml   Thu Oct 13 09:25:58 2016        (r17880)
+++ trunk/BOOK/x/installing/xterm.xml   Fri Oct 14 09:16:34 2016        (r17881)
@@ -107,7 +107,7 @@
     description so that the Backspace key is expected to send the character
     with ASCII code 127. This is done for consistency with the Linux 
console.</para>
 
-    <para><parameter>TERMINFO=/usr/share/terminfo</parameter>: This ensures
+    <para><envar>TERMINFO=/usr/share/terminfo</envar>: This ensures
     that the <command>xterm</command> terminfo files are installed to the
     system terminfo database.</para>
 

Modified: trunk/BOOK/xsoft/other/xarchiver.xml
==============================================================================
--- trunk/BOOK/xsoft/other/xarchiver.xml        Thu Oct 13 09:25:58 2016        
(r17880)
+++ trunk/BOOK/xsoft/other/xarchiver.xml        Fri Oct 14 09:16:34 2016        
(r17881)
@@ -159,7 +159,7 @@
     </para>
 
     <para>
-      <parameter>---disable-gtk3</parameter>: This switch allows building
+      <parameter>--disable-gtk3</parameter>: This switch allows building
       against GTK+2. Default is <parameter>--enable-gtk3</parameter>. Remove it
       or replace it, if you wish to build against GTK+3.
     </para>
-- 
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