[blfs-book] r11051 - in trunk/BOOK/general: genlib genutils sysutils

randy at higgs.linuxfromscratch.org randy at higgs.linuxfromscratch.org
Sun Mar 3 09:01:06 PST 2013


Author: randy
Date: Sun Mar  3 09:01:06 2013
New Revision: 11051

Log:
Minor cleanup and tweaks to various packages

Modified:
   trunk/BOOK/general/genlib/libdbusmenuqt.xml
   trunk/BOOK/general/genlib/libksba.xml
   trunk/BOOK/general/genutils/pinentry.xml
   trunk/BOOK/general/sysutils/lm_sensors.xml

Modified: trunk/BOOK/general/genlib/libdbusmenuqt.xml
==============================================================================
--- trunk/BOOK/general/genlib/libdbusmenuqt.xml	Sun Mar  3 08:59:09 2013	(r11050)
+++ trunk/BOOK/general/genlib/libdbusmenuqt.xml	Sun Mar  3 09:01:06 2013	(r11051)
@@ -74,7 +74,7 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-    <ulink url="http://qjson.sourceforge.net/">Qjson</ulink> (for building the test suite) and
+    <ulink url="http://qjson.sourceforge.net/">QJson</ulink> (for building the test suite) and
     <xref linkend="doxygen"/> (for building the API documentation)
     </para>
 
@@ -96,7 +96,7 @@
 make</userinput></screen>
 
     <para>To test the results
-    (<ulink url="http://qjson.sourceforge.net/">Qjson</ulink> must be installed),
+    (<ulink url="http://qjson.sourceforge.net/">QJson</ulink> must be installed),
     issue: <command>make check</command>.</para>
 
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>

Modified: trunk/BOOK/general/genlib/libksba.xml
==============================================================================
--- trunk/BOOK/general/genlib/libksba.xml	Sun Mar  3 08:59:09 2013	(r11050)
+++ trunk/BOOK/general/genlib/libksba.xml	Sun Mar  3 09:01:06 2013	(r11051)
@@ -86,9 +86,7 @@
     must have <xref linkend="texlive"/> installed,
     then issue the following commands:</para>
 
-<screen><userinput>tex --output-directory=doc ksba.texi &&
-dvips -o doc/ksba.ps doc/ksba.dvi    &&
-make -C doc pdf html</userinput></screen>
+<screen><userinput>make -C doc ps pdf html</userinput></screen>
 
     <para>To test the results, issue: <command>make check</command>.</para>
 

Modified: trunk/BOOK/general/genutils/pinentry.xml
==============================================================================
--- trunk/BOOK/general/genutils/pinentry.xml	Sun Mar  3 08:59:09 2013	(r11050)
+++ trunk/BOOK/general/genutils/pinentry.xml	Sun Mar  3 09:01:06 2013	(r11051)
@@ -40,7 +40,7 @@
     environments, including interfaces designed for
     <application>Ncurses</application> (text-based),
     <application>Gtk+</application>, <application>Gtk+-2</application>,
-    and <application>Qt-3</application>.</para>
+    <application>Qt-3</application>, and <application>Qt-4</application>.</para>
 
     &lfs72_checked;
 
@@ -93,10 +93,7 @@
     <para>Install <application>PIN-Entry</application> by running the following
     commands:</para>
 
-<screen><userinput>./configure --prefix=/usr \
-            --disable-pinentry-gtk           \
-            --disable-pinentry-gtk2          \
-            --disable-pinentry-qt            &&
+<screen><userinput>./configure --prefix=/usr &&
 make &&
 
 makeinfo --html --no-split -o doc/pinentry_nochunks.html doc/pinentry.texi &&
@@ -129,15 +126,15 @@
 
   </sect2>
 
-  <sect2 role="commands">
+  <!-- <sect2 role="commands">
     <title>Command Explanations</title>
 
-    <para><parameter>--disable-...</parameter>: These three parameters are used
+    <para><parameter>-disable-...</parameter>: These three parameters are used
     to fix a problem with the <command>configure</command> script if the
     optional dependencies are not installed. If the dependencies are installed,
     these parameters may be omitted.</para>
 
-  </sect2>
+  </sect2> -->
 
   <sect2 role="content">
     <title>Contents</title>
@@ -149,7 +146,7 @@
 
       <seglistitem>
         <seg>pinentry, pinentry-curses, pinentry-gtk, pinentry-gtk-2,
-        and pinentry-qt</seg>
+        pinentry-qt, and pinentry-qt4</seg>
         <seg>None</seg>
         <seg>/usr/share/doc/pinentry-&pinentry-version;</seg>
       </seglistitem>
@@ -207,13 +204,24 @@
       <varlistentry id="pinentry-qt">
         <term><command>pinentry-qt</command></term>
         <listitem>
-          <para> is a <application>Qt</application> GUI
+          <para> is a <application>Qt-3</application> GUI
           <application>PIN-Entry</application> program.</para>
           <indexterm zone="pinentry pinentry-qt">
             <primary sortas="b-pinentry-qt">pinentry-qt</primary>
           </indexterm>
         </listitem>
       </varlistentry>
+
+      <varlistentry id="pinentry-qt4">
+        <term><command>pinentry-qt4</command></term>
+        <listitem>
+          <para> is a <application>Qt-4</application> GUI
+          <application>PIN-Entry</application> program.</para>
+          <indexterm zone="pinentry pinentry-qt4">
+            <primary sortas="b-pinentry-qt4">pinentry-qt4</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
 
     </variablelist>
 

Modified: trunk/BOOK/general/sysutils/lm_sensors.xml
==============================================================================
--- trunk/BOOK/general/sysutils/lm_sensors.xml	Sun Mar  3 08:59:09 2013	(r11050)
+++ trunk/BOOK/general/sysutils/lm_sensors.xml	Sun Mar  3 09:01:06 2013	(r11051)
@@ -29,10 +29,10 @@
   </indexterm>
 
   <sect2 role="package">
-    <title>Introduction to Lm Sensors</title>
+    <title>Introduction to lm_sensors</title>
 
     <para>
-      The <application>Lm Sensors</application> package provides user-space
+      The <application>lm_sensors</application> package provides user-space
       support for the hardware monitoring drivers in the Linux kernel.
       This is useful for monitoring the temperature of the CPU and adjusting the
       performance of some hardware (such as cooling fans).
@@ -74,7 +74,7 @@
       </listitem>
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Lm Sensors Dependencies</bridgehead>
+    <bridgehead renderas="sect3">lm_sensors Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
@@ -83,7 +83,8 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <ulink url="http://oss.oetiker.ch/rrdtool/">RRDtool</ulink>
+      <ulink url="http://oss.oetiker.ch/rrdtool/">RRDtool (required to build the
+      <command>sensord</command> program)</ulink>
     </para>
 
     <para condition="html" role="usernotes">
@@ -133,14 +134,15 @@
   </sect2>
 
   <sect2 role="installation">
-    <title>Installation of Lm Sensors</title>
+    <title>Installation of lm_sensors</title>
 
     <para>
-      Install <application>Lm Sensors</application> by running the following
+      Install <application>lm_sensors</application> by running the following
       commands:
     </para>
 
-<screen><userinput>make PREFIX=/usr BUILD_STATIC_LIB=0 \
+<screen><userinput>make PREFIX=/usr        \
+     BUILD_STATIC_LIB=0 \
      MANDIR=/usr/share/man</userinput></screen>
 
     <para>
@@ -151,10 +153,12 @@
       Now, as the <systemitem class="username">root</systemitem> user:
     </para>
 
-<screen role="root"><userinput>make PREFIX=/usr BUILD_STATIC_LIB=0 \
+<screen role="root"><userinput>make PREFIX=/usr        \
+     BUILD_STATIC_LIB=0 \
      MANDIR=/usr/share/man install &&
-mkdir -pv /usr/share/doc/lm_sensors-&lm_sensors-version; &&
-cp -rfv doc/* /usr/share/doc/lm_sensors-&lm_sensors-version;</userinput></screen>
+install -v -m755 -d /usr/share/doc/lm_sensors-&lm_sensors-version; &&
+cp -rv              README INSTALL doc/* \
+                    /usr/share/doc/lm_sensors-&lm_sensors-version;</userinput></screen>
   </sect2>
 
   <sect2 role="commands">
@@ -162,13 +166,14 @@
 
     <para>
       <parameter>BUILD_STATIC_LIB=0</parameter>: This parameter disables
-      compiling and installing the static version of libsensors.
+      compiling and installing the static version of
+      <filename class="libraryfile">libsensors</filename>.
     </para>
 
     <para>
       <parameter>PROG_EXTRA=sensord</parameter>: This parameter enables
-      compiling sensord, a daemon that can monitor your system at regular
-      intervals. Compiling <command>sensord</command> requires
+      compiling <command>sensord</command>, a daemon that can monitor your
+      system at regular intervals. Compiling <command>sensord</command> requires
       <ulink url="http://oss.oetiker.ch/rrdtool/">RRDtool</ulink>. Compiling
       RRDtool 1.4.6 requires a sed: <command>sed -i '/ sv_undef/d'
       bindings/perl-shared/RRDs.xs</command>.
@@ -196,17 +201,17 @@
     <sect3><title>Configuration Information</title>
 
       <para>
-        To find out what hardware sensors your system has, as the
-        <systemitem class="username">root</systemitem> user:
+        To find out what hardware sensors your system has, issue the following
+        command as the <systemitem class="username">root</systemitem> user:
       </para>
 
 <screen role="root"><userinput>sensors-detect</userinput></screen>
 
       <para>
-        Hopefully it will load the appropriate modules and give you a summary
-        at the end. Now you know what is needed you can recompile your kernel
-        and just enable the options you need (ie, don't enable the modules you
-        can't use).
+        The appropriate modules should have been loaded and a summary is
+        displayed at the end. Now you know what is needed and you can recompile
+        your kernel to enable just the options you need (i.e., don't enable the
+        modules you cannot use).
       </para>
 
     </sect3>
@@ -223,9 +228,8 @@
 
       <seglistitem>
         <seg>
-          fancontrol, isadump, isaset, pwmconfig,
-          sensors, sensors-conf-convert and
-          sensors-detect
+          fancontrol, isadump, isaset, pwmconfig, sensors, sensors-conf-convert,
+          sensors-detect, and optionally, sensord
         </seg>
         <seg>
           libsensors.so
@@ -246,10 +250,10 @@
         <term><command>fancontrol</command></term>
         <listitem>
           <para>
-            is a shell script for use with lm_sensors. It reads its
-            configuration from a file, then calculates fan speeds from
-            temperatures and sets the corresponding PWM outputs to the computed
-            values.
+            is a shell script for use with <application>lm_sensors</application>.
+            It reads its configuration from a file<!--what file?-->, then
+            calculates fan speeds from temperatures and sets the corresponding
+            PWM outputs to the computed values.
           </para>
           <indexterm zone="lm_sensors fancontrol">
             <primary sortas="b-fancontrol">fancontrol</primary>
@@ -314,7 +318,8 @@
         <term><command>sensors-conf-convert</command></term>
         <listitem>
           <para>
-            is a Perl script to convert lm-sensors version 2 configuration files
+            is a <application>Perl</application> script to convert
+            <application>lm-sensors</application> version 2 configuration files
             to work with version 3.
           </para>
           <indexterm zone="lm_sensors sensors-conf-convert">
@@ -327,10 +332,11 @@
         <term><command>sensors-detect</command></term>
         <listitem>
           <para>
-            is a Perl script that will walk you through the process of scanning
-            your system for various hardware monitoring chips, or sensors,
-            supported by libsensors(3), or more generally by the lm_sensors
-            tool suite.
+            is a <application>Perl</application> script that will walk you
+            through the process of scanning your system for various hardware
+            monitoring chips (sensors) supported by
+            <filename class="libraryfile">libsensors</filename>, or more
+            generally by the <application>lm_sensors</application> tool suite.
           </para>
           <indexterm zone="lm_sensors sensors-detect">
             <primary sortas="b-sensors-detect">sensors-detect</primary>
@@ -342,7 +348,7 @@
         <term><filename class="libraryfile">libsensors.so</filename></term>
         <listitem>
           <para>
-            contains the lm_sensors API functions.
+            contains the <application>lm_sensors</application> API functions.
           </para>
           <indexterm zone="lm_sensors libsensors">
             <primary sortas="c-libsensors">libsensors.so</primary>



More information about the blfs-book mailing list