r4741 - in trunk/BOOK: introduction/welcome postlfs/security x/lib

randy at linuxfromscratch.org randy at linuxfromscratch.org
Wed Jul 20 07:40:02 PDT 2005


Author: randy
Date: 2005-07-20 08:40:00 -0600 (Wed, 20 Jul 2005)
New Revision: 4741

Modified:
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/postlfs/security/stunnel.xml
   trunk/BOOK/x/lib/qt.xml
Log:
Fixed tagging, indentation and typos in Qt instructions

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2005-07-20 06:01:17 UTC (rev 4740)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2005-07-20 14:40:00 UTC (rev 4741)
@@ -24,10 +24,10 @@
 
   <itemizedlist>
     
-	<listitem>
-		<para>July 20th 2005 [tushar]: For qt, replace cp by install
-		to allow installation even if the libraries are in use.</para>
-	</listitem>
+    <listitem>
+      <para>July 20th 2005 [tushar]: For qt, replace cp by install
+      to allow installation even if the libraries are in use.</para>
+    </listitem>
 
     <listitem>
       <para>July 19th 2005 [randy]: Updated to Doxygen-1.4.3.</para>

Modified: trunk/BOOK/postlfs/security/stunnel.xml
===================================================================
--- trunk/BOOK/postlfs/security/stunnel.xml	2005-07-20 06:01:17 UTC (rev 4740)
+++ trunk/BOOK/postlfs/security/stunnel.xml	2005-07-20 14:40:00 UTC (rev 4741)
@@ -5,7 +5,7 @@
   %general-entities;
 
   <!-- <!ENTITY stunnel-download-http "http://www.stunnel.org/download/stunnel/src/stunnel-&stunnel-version;.tar.gz"> -->
-  <!ENTITY stunnel-download-http " ">
+  <!ENTITY stunnel-download-http "http://www.stunnel.org/download/stunnel/src/stunnel-&stunnel-version;.tar.gz">
   <!ENTITY stunnel-download-ftp  "ftp://stunnel.mirt.net/stunnel/stunnel-&stunnel-version;.tar.gz">
   <!ENTITY stunnel-md5sum        "2077669b04c36e4c0baa68348e8860a7">
   <!ENTITY stunnel-size          "484 KB">

Modified: trunk/BOOK/x/lib/qt.xml
===================================================================
--- trunk/BOOK/x/lib/qt.xml	2005-07-20 06:01:17 UTC (rev 4740)
+++ trunk/BOOK/x/lib/qt.xml	2005-07-20 14:40:00 UTC (rev 4741)
@@ -116,17 +116,19 @@
       This is the method that most commercial distributions use.</para>
 
       <note>
-		<para>The installation incorrectly uses cp to install the files.
-		This causes problems if the <application>Qt</application> libraries
-		are already in use (e.g. you are logged in into your
-		<application>KDE</application> desktop environment). To avoid problems,
-		"cp -f" is replaced by "install" in <filename>qmake.conf</filename>.</para>
+        <para>The installation incorrectly uses <command>cp</command> to
+        install the files. This causes problems if the
+        <application>Qt</application> libraries are already in use (e.g.,
+        you are logged into your <application>KDE</application> desktop
+        environment). To avoid problems, <command>cp -f</command> is
+        replaced by <command>install</command> in
+        <filename>qmake.conf</filename>.</para>
       </note>
 
 <screen><userinput>sed -i -e 's:$(QTDIR)/include:&/qt:' \
        -e 's:$(QTDIR)/lib:&/qt:' \
        -e "s:cp -f:install:" \
-       mkspecs/linux*/qmake.conf   &&
+    mkspecs/linux*/qmake.conf &&
 bash
 export PATH=$PWD/bin:$PATH &&
 export LD_LIBRARY_PATH=$PWD/lib:$LD_LIBRARY_PATH &&
@@ -157,7 +159,8 @@
       developers. It has the advantage of keeping all the package files
       consolidated in a dedicated directory hierarchy. By using this method,
       an update can be made without overwriting a previous installation and
-      users can easily revert to a previous version by changing one symbolic link.</para>
+      users can easily revert to a previous version by changing one symbolic
+      link.</para>
 
       <para>The <application>Qt</application> developers use a default location
       of <filename class='directory'>/usr/local/qt/</filename>, however this
@@ -271,7 +274,7 @@
       <filename>/etc/profile</filename> file.</para>
 
       <para>For Method 1 (This is optional, only set this if an application is
-		unable to find the installed libraries):</para>
+      unable to find the installed libraries):</para>
 
 <screen><literal>export QTDIR=/usr</literal></screen>
 




More information about the blfs-book mailing list