Author: fernando
Date: Mon Sep 29 03:41:34 2014
New Revision: 14416

Log:
Final fix of Poppler-0.26.5 page, hopefully.

Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/general/graphlib/poppler.xml

Modified: trunk/BOOK/general.ent
==============================================================================
--- trunk/BOOK/general.ent      Sun Sep 28 13:19:18 2014        (r14415)
+++ trunk/BOOK/general.ent      Mon Sep 29 03:41:34 2014        (r14416)
@@ -1,12 +1,12 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "28">                   <!-- Always 2 digits -->
+<!ENTITY day          "29">                   <!-- Always 2 digits -->
 <!ENTITY month        "09">                   <!-- Always 2 digits -->
 <!ENTITY year         "2014">
 <!ENTITY copyrightdate "2001-&year;">
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "September 28th, &year;">
+<!ENTITY releasedate  "September 29th, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
 <!ENTITY lfs-version  "development">          <!-- x.y|development] -->

Modified: trunk/BOOK/general/graphlib/poppler.xml
==============================================================================
--- trunk/BOOK/general/graphlib/poppler.xml     Sun Sep 28 13:19:18 2014        
(r14415)
+++ trunk/BOOK/general/graphlib/poppler.xml     Mon Sep 29 03:41:34 2014        
(r14416)
@@ -158,16 +158,23 @@
       <application>Qt4</application> and <application>Qt5</application>
       libraries, you need to run the install commands twice, because, although
       both are detected, only the wrapper for the the first
-      <application>Qt</application> version in the PATH is built. The
-      instructions are divided into four parts: first, build without
-      <application>Qt</application> or with <application>Qt4</application>;
-      second, build with <application>Qt4</application>; third, install the
-      common documents, and fourth, install the additional encoding data
-      package.
+      <application>Qt</application> version in the PATH is built.
     </para>
 
-<!-- ==== Without Qt or with Qt4 ====== -->
-    <bridgehead renderas="sect3">Without Qt or with Qt4</bridgehead>
+    <para>
+      The instructions are divided into four parts: first, build with
+      <application>Qt4 or 5</application> at <filename
+      class="directory">/user</filename>, without <application>Qt</application>
+      or with <application>Qt4</application> under <filename
+      class="directory">/opt</filename>; second, build with
+      <application>Qt5</application> under <filename
+      class="directory">/opt</filename>; third, install the common documents
+      (optional); and fourth, install the additional encoding data package.
+    </para>
+
+<!-- ==== With Qt4 or 5 at /user, without Qt or with Qt4 under /opt ====== -->
+    <bridgehead renderas="sect3">With Qt4 or 5 at /user, without Qt or with Qt4
+    under /opt</bridgehead>
 
     <para>
       Install <application>Poppler</application> by running the following
@@ -192,8 +199,8 @@
 
 <screen role="root"><userinput>make install</userinput></screen>
 
-<!-- ==== With Qt5 ====== -->
-    <bridgehead renderas="sect3">With Qt5</bridgehead>
+<!-- ==== With Qt5 under /opt ====== -->
+    <bridgehead renderas="sect3">With Qt5 under /opt </bridgehead>
 
     <para>
       Install <application>Poppler</application> by running the following
-- 
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