r5052 - in trunk/BOOK: . introduction/welcome pst/xml

randy at linuxfromscratch.org randy at linuxfromscratch.org
Sat Sep 10 15:53:01 PDT 2005


Author: randy
Date: 2005-09-10 16:52:52 -0600 (Sat, 10 Sep 2005)
New Revision: 5052

Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/pst/xml/docbook-xsl.xml
Log:
Updated to DocBook XSL Stylesheets-1.69.1

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2005-09-10 13:37:55 UTC (rev 5051)
+++ trunk/BOOK/general.ent	2005-09-10 22:52:52 UTC (rev 5052)
@@ -533,7 +533,7 @@
 
 <!-- Chapter 44 -->
 <!ENTITY DocBook-version              "4.4">
-<!ENTITY docbook-xsl-version          "1.68.1">
+<!ENTITY docbook-xsl-version          "1.69.1">
 
 <!-- Chapter 45 -->
 <!ENTITY a2ps-version                 "4.13b">

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2005-09-10 13:37:55 UTC (rev 5051)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2005-09-10 22:52:52 UTC (rev 5052)
@@ -45,6 +45,9 @@
       <para>September 10th, 2005</para>
       <itemizedlist>
         <listitem>
+          <para>[randy] - Updated to DocBook XSL Stylesheets-1.69.1.</para>
+        </listitem>
+        <listitem>
           <para>[igor] - Updated to RP-PPPoE-3.6.</para>
         </listitem>
         <listitem>

Modified: trunk/BOOK/pst/xml/docbook-xsl.xml
===================================================================
--- trunk/BOOK/pst/xml/docbook-xsl.xml	2005-09-10 13:37:55 UTC (rev 5051)
+++ trunk/BOOK/pst/xml/docbook-xsl.xml	2005-09-10 22:52:52 UTC (rev 5052)
@@ -6,10 +6,12 @@
 
   <!ENTITY docbook-xsl-download-http "http://prdownloads.sourceforge.net/docbook/docbook-xsl-&docbook-xsl-version;.tar.bz2">
   <!ENTITY docbook-xsl-download-ftp  " ">
-  <!ENTITY docbook-xsl-md5sum        "f4985efbc0f3411af8106928f8752fc5">
-  <!ENTITY docbook-xsl-size          "967 KB">
-  <!ENTITY docbook-xsl-buildsize     "26.4 MB">
-  <!ENTITY docbook-xsl-time          "0.01 SBU">
+  <!ENTITY docbook-xsl-md5sum        "6ebd29a67f2dcc3f2220f475ee6f6552">
+  <!ENTITY docbook-xsl-size          "1.0 MB">
+  <!ENTITY docbook-xsl-buildsize     "35.9 MB (includes installing optional documentation)">
+  <!ENTITY docbook-xsl-time          "less than 0.1 SBU">
+
+  <!ENTITY docbook-xsl-doc-download  "http://prdownloads.sourceforge.net/docbook/docbook-xsl-doc-&docbook-xsl-version;.tar.bz2">
 ]>
 
 <sect1 id="docbook-xsl"
@@ -57,41 +59,73 @@
       </listitem>
     </itemizedlist>
 
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Optional documentation: <ulink
+        url="&docbook-xsl-doc-download;"/></para>
+      </listitem>
+    </itemizedlist>
+
     <bridgehead renderas="sect3">DocBook XSL Stylesheets Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="libxslt"/></para>
+    <para><xref linkend="libxml2"/></para>
 
   </sect2>
 
   <sect2 role="installation">
     <title>Installation of DocBook XSL Stylesheets</title>
 
+    <para>If you downloaded the optional documentation tarball, unpack it
+    when you unpack the source tarball. The documentation tarball unpacks into
+    subdirectories of the source tree.</para>
+
     <para>Install <application>DocBook XSL Stylesheets</application>
-    by running the following commands as the <systemitem
-    class="username">root</systemitem> user:</para>
+    by running the following commands as the
+    <systemitem class="username">root</systemitem> user:</para>
 
-<screen role="root"><userinput>install -v -d -m755 /usr/share/xml/docbook/xsl-stylesheets-&docbook-xsl-version; &&
-install -v -d -m755 /etc/xml &&
-chown -R root:root . &&
-cp -v -af INSTALL VERSION common eclipse extensions fo html htmlhelp \
-    images javahelp lib manpages params profiling template xhtml \
-    /usr/share/xml/docbook/xsl-stylesheets-&docbook-xsl-version; &&
-install -v -d -m755 /usr/share/doc/xml &&
-cp -v -af doc/* /usr/share/doc/xml &&
-cd /usr/share/xml/docbook/xsl-stylesheets-&docbook-xsl-version; &&
-sh INSTALL</userinput></screen>
+<screen role="root"><userinput>install -v -m755 -d /usr/share/xml/docbook/xsl-stylesheets-&docbook-xsl-version; &&
+cp -v -R VERSION common eclipse extensions fo html \
+         htmlhelp images javahelp lib manpages params \
+         profiling slides template website xhtml \
+    /usr/share/xml/docbook/xsl-stylesheets-&docbook-xsl-version;</userinput></screen>
 
-    <para>Create (or append to) and populate the XML catalog files using the
-    following commands as the <systemitem class="username">root</systemitem>
-    user:</para>
+    <para>If you downloaded the optional documentation tarball, install the
+    documentation by issuing the following commands as the
+    <systemitem class="username">root</systemitem> user:</para>
 
-<screen role="root"><userinput>if [ ! -f /etc/xml/catalog ]; then
+<screen role="root"><userinput>install -v -m755 -d /usr/share/doc/docbook-xsl-&docbook-xsl-version; &&
+cp -v -R doc/* /usr/share/doc/docbook-xsl-&docbook-xsl-version;</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring DocBook XSL Stylesheets</title>
+
+    <sect3 id="docbook-xsl-config">
+      <title>Config Files</title>
+
+      <para><filename>/etc/xml/catalog</filename></para>
+
+      <indexterm zone="docbook-xsl docbook-xsl-config">
+        <primary sortas="e-etc-xml-catalog">/etc/xml/catalog</primary>
+      </indexterm>
+
+    </sect3>
+
+    <sect3>
+      <title>Configuration Information</title>
+
+      <para>Create (or append) and populate the XML catalog file using the
+      following commands as the <systemitem class="username">root</systemitem>
+      user:</para>
+
+<screen role="root"><userinput>if [ ! -d /etc/xml ]; then install -v -m755 -d /etc/xml; fi &&
+if [ ! -f /etc/xml/catalog ]; then
     xmlcatalog --noout --create /etc/xml/catalog
 fi &&
-if [ ! -f /etc/xml/docbook ]; then
-    xmlcatalog --noout --create /etc/xml/docbook
-fi &&
+
 xmlcatalog --noout --add "rewriteSystem" \
     "http://docbook.sourceforge.net/release/xsl/&docbook-xsl-version;" \
     "/usr/share/xml/docbook/xsl-stylesheets-&docbook-xsl-version;" \
@@ -107,46 +141,35 @@
 xmlcatalog --noout --add "rewriteURI" \
     "http://docbook.sourceforge.net/release/xsl/current" \
     "/usr/share/xml/docbook/xsl-stylesheets-&docbook-xsl-version;" \
-    /etc/xml/catalog &&
-xmlcatalog --noout --add "delegateSystem" \
+    /etc/xml/catalog</userinput></screen>
+
+      <para>If you will be using the stylesheets from this installation to
+      render the LFS and HLFS SVN books, then you need to create a symbolic
+      link to the stylesheets directory so that the image files will be
+      found. Create the link by issuing the following command as the
+      <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>ln -v -sf xsl-stylesheets-1.69.1 \
+    /usr/share/xml/docbook/xsl-stylesheets-current</userinput></screen>
+
+<!-- The following removed as recommended by Manuel
+
+if [ ! -f /etc/xml/catalog ]; then
+    xmlcatalog -\-noout -\-create /etc/xml/catalog
+fi &&
+
+xmlcatalog -\-noout -\-add "delegateSystem" \
     "http://docbook.sourceforge.net/release/xsl/" \
     "file:///etc/xml/docbook" \
     /etc/xml/catalog &&
-xmlcatalog --noout --add "delegateURI" \
+xmlcatalog -\-noout -\-add "delegateURI" \
     "http://docbook.sourceforge.net/release/xsl/" \
     "file:///etc/xml/docbook" \
     /etc/xml/catalog</userinput></screen>
 
-  </sect2>
+      <para>The system profile needs to be updated to utilize the new installed
+      catalog. This can be done with the following command:<para>
 
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><command>sh INSTALL</command>: This command creates a local
-    catalog for the XSL files.</para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring DocBook XSL Stylesheets</title>
-
-    <sect3 id="docbook-xsl-config">
-      <title>Config Files</title>
-
-      <para><filename>/etc/xml/catalog</filename></para>
-
-      <indexterm zone="docbook-xsl docbook-xsl-config">
-        <primary sortas="e-etc-xml-catalog">/etc/xml/catalog</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>The system profile needs to be updated to utilize the new
-      installed catalog. This can be done with the following command:</para>
-
 <screen role="root"><userinput>cat > /etc/profile.d/xsl.sh << "EOF"
 <literal># Set up Environment Variable for XSL Processing
 export XML_CATALOG_FILES="/usr/share/xml/docbook/\
@@ -163,11 +186,11 @@
       commands to suit your particular needs. Issue the commands as the
       <systemitem class="username">root</systemitem> user:</para>
 
-<screen role="root"><userinput>xmlcatalog --noout --add "rewriteSystem" \
+<screen role="root"><userinput>xmlcatalog -\-noout -\-add "rewriteSystem" \
     "http://docbook.sourceforge.net/release/xsl/1.67.2" \
     "/usr/share/xml/docbook/xsl-stylesheets-&docbook-xsl-version;" \
     /etc/xml/catalog &&
-xmlcatalog --noout --add "rewriteURI" \
+xmlcatalog -\-noout -\-add "rewriteURI" \
     "http://docbook.sourceforge.net/release/xsl/1.67.2" \
     "/usr/share/xml/docbook/xsl-stylesheets-&docbook-xsl-version;" \
     /etc/xml/catalog</userinput></screen>
@@ -176,27 +199,17 @@
       versioned directories and catalog entries made in the following
       form:</para>
 
-<screen role="root"><userinput>xmlcatalog --noout --add "rewriteSystem" \
+<screen role="root"><userinput>xmlcatalog -\-noout -\-add "rewriteSystem" \
     "http://docbook.sourceforge.net/release/xsl/<replaceable>[version]</replaceable>" \
     "/usr/share/xml/docbook/xsl-stylesheets-<replaceable>[version]</replaceable>" \
     /etc/xml/catalog &&
-xmlcatalog --noout --add "rewriteURI" \
+xmlcatalog -\-noout -\-add "rewriteURI" \
     "http://docbook.sourceforge.net/release/xsl/<replaceable>[version]</replaceable>" \
     "/usr/share/xml/docbook/xsl-stylesheets-<replaceable>[version]</replaceable>" \
     /etc/xml/catalog</userinput></screen>
 
-<!--
-The following is very specific to LFS 6.0, the first sentence for
-make and the remainder for 'make pdf', If it stays, it needs to be removed
-after BLFS 6.0
+-->
 
-<para>For LFS 6.0, version 1.65.1 of this package should be
-installed.  In addition, you need to make a symbolic link as described in the
-<filename>INSTALL</filename> file of LFS 6.0.</para>
-<screen><userinput><command>cd /usr/share/xml/docbook/ &&
-ln -s xsl-stylesheets-1.65.1 xsl-stylesheets-current</command></userinput></screen>
- -->
-
     </sect3>
 
   </sect2>
@@ -215,7 +228,7 @@
         <seg>None</seg>
         <seg>XSL style sheets for HTML and FO</seg>
         <seg>/usr/share/xml/docbook/xsl-stylesheets-&docbook-xsl-version; and
-        /usr/share/doc/xml</seg>
+        /usr/share/doc/docbook-xsl-&docbook-xsl-version;</seg>
       </seglistitem>
     </segmentedlist>
 




More information about the blfs-book mailing list