cvs commit: BLFS/BOOK/pst/xml/docbook docbook-intro.xml

igor at linuxfromscratch.org igor at linuxfromscratch.org
Sat Apr 17 08:57:02 PDT 2004


igor        04/04/17 09:57:02

  Modified:    BOOK/gnome gnome-intro.xml
               BOOK/gnome/lib/gtk-doc gtk-doc-desc.xml gtk-doc-intro.xml
               BOOK/pst/sgml/openjade openjade-config.xml openjade-exp.xml
                        openjade-inst.xml
               BOOK/pst/sgml/opensp opensp-inst.xml
               BOOK/pst/sgml/sgml-common sgml-common-inst.xml
               BOOK/pst/xml/docbook docbook-intro.xml
  Log:
  gtk-doc corrections
  
  Revision  Changes    Path
  1.22      +18 -11    BLFS/BOOK/gnome/gnome-intro.xml
  
  Index: gnome-intro.xml
  ===================================================================
  RCS file: /home/cvsroot/BLFS/BOOK/gnome/gnome-intro.xml,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- gnome-intro.xml	13 Apr 2004 19:04:43 -0000	1.21
  +++ gnome-intro.xml	17 Apr 2004 15:57:01 -0000	1.22
  @@ -15,21 +15,23 @@
   of our first goals in this installation is to protect your previously
   installed software, especially if you are testing
   <application><acronym>GNOME</acronym></application> on your machine.
  -<application><acronym>GNOME</acronym></application>-&gnome-version; packages utilize the --prefix= option for configure, so we will
  +<application><acronym>GNOME</acronym></application>-&gnome-version;
  +packages utilize the <parameter>--prefix=option</parameter> for
  +<command>configure</command>, so we will
   use that and an Environment variable (<envar>GNOME_PREFIX</envar>) to add flexibility to 
   the install.</para>
   
   <para>To install 
   <application><acronym>GNOME</acronym></application> as a desktop
   alternative, it is recommended that
  -you install with --prefix=/usr. If you are not sure that you are going
  +you install with <parameter>--prefix=/usr</parameter>. If you are not sure that you are going
   to keep <application><acronym>GNOME</acronym></application> on your
   installation, you may install with 
  ---prefix=/opt/gnome-&gnome-version;.  Setting the Environment variable and the
  +<parameter>--prefix=/opt/gnome-&gnome-version;</parameter>.  Setting the Environment variable and the
   additional edits required by the second option are covered on the
   pre-installation page. Since
   <application><acronym>GNOME</acronym></application> has matured,
  -installing with --prefix=/usr is the preferable approach.</para>
  +installing with <parameter>--prefix=/usr</parameter> is the preferable approach.</para>
   
   <para>If you choose the second option, removal of
   <application><acronym>GNOME</acronym></application>-&gnome-version; is as easy
  @@ -76,13 +78,18 @@
   
   <para><application><acronym>GNOME</acronym></application>-&gnome-version; dependencies</para>
   <para>Required</para>
  -<para><xref linkend="xfree86"/>, <xref linkend="GTK2"/>, <xref
  -linkend="libpng"/>,
  -<xref linkend="libjpeg"/>, <xref linkend="libtiff"/> and <xref
  -linkend="popt"/></para>
  +<para>
  +<xref linkend="GTK2"/> and
  +<xref linkend="popt"/>
  +</para>
   <para>Optional</para>
  -<para><xref linkend="libxml2"/>, <xref linkend="libxslt"/>, <xref
  -linkend="DocBook"/>,
  -<xref linkend="docbook-xsl"/> and <xref linkend="fam"/></para>
  +<para>
  +<xref linkend="libxml2"/>,
  +<xref linkend="libxslt"/>,
  +<xref linkend="DocBook"/>,
  +<xref linkend="docbook-xsl"/> and
  +<xref linkend="fam"/>
  +<!-- mozilla -->
  +</para>
   
   </partintro>
  
  
  
  1.7       +4 -5      BLFS/BOOK/gnome/lib/gtk-doc/gtk-doc-desc.xml
  
  Index: gtk-doc-desc.xml
  ===================================================================
  RCS file: /home/cvsroot/BLFS/BOOK/gnome/lib/gtk-doc/gtk-doc-desc.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- gtk-doc-desc.xml	3 Oct 2003 16:43:09 -0000	1.6
  +++ gtk-doc-desc.xml	17 Apr 2004 15:57:01 -0000	1.7
  @@ -8,18 +8,17 @@
   <command>gtkdoc-mkman</command>,
   <command>gtkdoc-mktmpl</command>,
   <command>gtkdoc-scan</command>,
  -<command>gtkdoc-scangobj</command> and
  -<command>gtkdoc-scanobj</command>.</para>
  +<command>gtkdoc-scangobj</command>,
  +<command>gtkdoc-scanobj</command> and
  +<command>gtkdocize</command>.
  +</para>
   
   </sect2>
   
   <sect2><title>Description</title>
   
  -
   <para>These are all <application>Perl</application> scripts used by
   <filename>Makefile</filename> scripts to generate
   documentation for the package.</para>
   
  -
   </sect2>
  -
  
  
  
  1.18      +11 -5     BLFS/BOOK/gnome/lib/gtk-doc/gtk-doc-intro.xml
  
  Index: gtk-doc-intro.xml
  ===================================================================
  RCS file: /home/cvsroot/BLFS/BOOK/gnome/lib/gtk-doc/gtk-doc-intro.xml,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- gtk-doc-intro.xml	10 Nov 2003 18:04:01 -0000	1.17
  +++ gtk-doc-intro.xml	17 Apr 2004 15:57:01 -0000	1.18
  @@ -31,11 +31,17 @@
   
   <sect3><title><application><application><acronym>GTK</acronym>-Doc</application></application> dependencies</title>
   <sect4><title>Required</title>
  -<para><xref linkend="openjade"/>, <xref linkend="libxslt"/>, <xref
  -linkend="DocBook"/>, <xref linkend="docbook-xsl"/>
  -<xref linkend="sgml-dtd-3"/>, <xref linkend="sgml-dtd"/> and <xref
  -linkend="docbook-dsssl"/></para></sect4>
  +<para>
  +<xref linkend="openjade"/>,
  +<xref linkend="libxslt"/>,
  +<xref linkend="DocBook"/> and
  +<xref linkend="docbook-xsl"/>
  +<!--
  +<xref linkend="sgml-dtd-3"/>,
  +<xref linkend="sgml-dtd"/> and
  +<xref linkend="docbook-dsssl"/>
  +-->
  +</para></sect4>
   </sect3>
  -
   
   </sect2>
  
  
  
  1.2       +1 -2      BLFS/BOOK/pst/sgml/openjade/openjade-config.xml
  
  Index: openjade-config.xml
  ===================================================================
  RCS file: /home/cvsroot/BLFS/BOOK/pst/sgml/openjade/openjade-config.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- openjade-config.xml	4 Oct 2003 08:01:45 -0000	1.1
  +++ openjade-config.xml	17 Apr 2004 15:57:01 -0000	1.2
  @@ -5,7 +5,7 @@
   
   <screen><userinput><command>echo "SYSTEM \"/usr/share/docbook/docbookx.dtd\" \
   \"/usr/share/xml/docbook/xml-dtd-&DocBook-version;/docbookx.dtd\"" >> \
  -/usr/share/sgml/openjade-&openjade-version;/catalog</command></userinput></screen>
  +    /usr/share/sgml/openjade-&openjade-version;/catalog</command></userinput></screen>
   <para>This configuration is only necessary if you intend to use
   <application>OpenJade</application> to process the
   <acronym>BLFS</acronym> <acronym>XML</acronym> files through
  @@ -14,4 +14,3 @@
   </sect3>
   
   </sect2>
  -
  
  
  
  1.2       +3 -4      BLFS/BOOK/pst/sgml/openjade/openjade-exp.xml
  
  Index: openjade-exp.xml
  ===================================================================
  RCS file: /home/cvsroot/BLFS/BOOK/pst/sgml/openjade/openjade-exp.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- openjade-exp.xml	4 Oct 2003 08:01:45 -0000	1.1
  +++ openjade-exp.xml	17 Apr 2004 15:57:01 -0000	1.2
  @@ -17,12 +17,11 @@
   <filename>/usr/share/sgml/openjade-&openjade-version;</filename> instead of 
   <filename class="directory">/usr/share</filename>.</para>
   
  -<para><screen>ln -sf openjade /usr/bin/jade
  +<para><screen><command>ln -sf openjade /usr/bin/jade
   ln -sf libogrove.so /usr/lib/libgrove.so
   ln -sf libospgrove.so /usr/lib/libspgrove.so
  -ln -sf libostyle.so /usr/lib/libstyle.so</screen>
  -These commands create the Jade equivlents of OpenJade executables and
  +ln -sf libostyle.so /usr/lib/libstyle.so</command></screen>
  +These commands create the Jade equivalents of OpenJade executables and
   libraries.</para>
   
   </sect2>
  -
  
  
  
  1.2       +7 -7      BLFS/BOOK/pst/sgml/openjade/openjade-inst.xml
  
  Index: openjade-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/BLFS/BOOK/pst/sgml/openjade/openjade-inst.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- openjade-inst.xml	4 Oct 2003 08:01:45 -0000	1.1
  +++ openjade-inst.xml	17 Apr 2004 15:57:01 -0000	1.2
  @@ -4,9 +4,9 @@
   <para>Install <application>OpenJade</application> by running the following commands:</para>
   
   <screen><userinput><command>./configure --prefix=/usr --enable-http --disable-static \
  ---enable-default-catalog=/etc/sgml/catalog \
  ---enable-default-search-path=/usr/share/sgml \
  ---datadir=/usr/share/sgml/openjade-&openjade-version; &&
  +    --enable-default-catalog=/etc/sgml/catalog \
  +    --enable-default-search-path=/usr/share/sgml \
  +    --datadir=/usr/share/sgml/openjade-&openjade-version; &&
   make &&
   make install &&
   ln -sf openjade /usr/bin/jade &&
  @@ -15,10 +15,10 @@
   ln -sf libostyle.so /usr/lib/libstyle.so &&
   install -m644 dsssl/catalog /usr/share/sgml/openjade-&openjade-version;/ &&
   install -m644 dsssl/*.dtd dsssl/*.dsl dsssl/*.sgm \
  -/usr/share/sgml/openjade-&openjade-version; &&
  +    /usr/share/sgml/openjade-&openjade-version; &&
   install-catalog --add /etc/sgml/openjade-&openjade-version;.cat \
  -/usr/share/sgml/openjade-&openjade-version;/catalog &&
  -install-catalog --add /etc/sgml/sgml-docbook.cat /etc/sgml/openjade-&openjade-version;.cat</command></userinput></screen>
  +    /usr/share/sgml/openjade-&openjade-version;/catalog &&
  +install-catalog --add /etc/sgml/sgml-docbook.cat \
  +    /etc/sgml/openjade-&openjade-version;.cat</command></userinput></screen>
   
   </sect2>
  -
  
  
  
  1.5       +6 -6      BLFS/BOOK/pst/sgml/opensp/opensp-inst.xml
  
  Index: opensp-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/BLFS/BOOK/pst/sgml/opensp/opensp-inst.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- opensp-inst.xml	17 Nov 2003 23:56:40 -0000	1.4
  +++ opensp-inst.xml	17 Apr 2004 15:57:02 -0000	1.5
  @@ -9,8 +9,8 @@
   <para>Install <application>OpenSP</application> by running the following commands:</para>
   
   <screen><userinput><command>./configure --prefix=/usr --disable-static --enable-http \
  ---enable-default-catalog=/etc/sgml/catalog \
  ---enable-default-search-path=/usr/share/sgml &&
  +    --enable-default-catalog=/etc/sgml/catalog \
  +    --enable-default-search-path=/usr/share/sgml &&
   make pkgdatadir=/usr/share/sgml/OpenSP-&opensp-version; &&
   make pkgdatadir=/usr/share/sgml/OpenSP-&opensp-version; install &&
   ln -sf onsgmls /usr/bin/nsgmls &&
  @@ -22,15 +22,15 @@
   ln -sf osx /usr/bin/sgml2xml &&
   ln -sf libosp.so /usr/lib/libsp.so &&
   install-catalog --add /etc/sgml/OpenSP-&opensp-version;.cat \
  -/usr/share/sgml/OpenSP-&opensp-version;/catalog &&
  +    /usr/share/sgml/OpenSP-&opensp-version;/catalog &&
   install-catalog --add /etc/sgml/sgml-docbook.cat \
  -/etc/sgml/OpenSP-&opensp-version;.cat</command></userinput></screen>
  +    /etc/sgml/OpenSP-&opensp-version;.cat</command></userinput></screen>
   
   <tip><title>Update hint</title>
   <para>Remove the above catalog items prior to upgrading with:
   <screen><command>install-catalog --remove /etc/sgml/OpenSP-<replaceable>[version]</replaceable>.cat \
  -/usr/share/sgml/OpenSP-<replaceable>[version]</replaceable>/catalog &&
  +    /usr/share/sgml/OpenSP-<replaceable>[version]</replaceable>/catalog &&
   install-catalog --remove /etc/sgml/sgml-docbook.cat \
  -/etc/sgml/OpenSP-<replaceable>[version]</replaceable>.cat</command></screen></para></tip>
  +    /etc/sgml/OpenSP-<replaceable>[version]</replaceable>.cat</command></screen></para></tip>
   
   </sect2>
  
  
  
  1.7       +1 -1      BLFS/BOOK/pst/sgml/sgml-common/sgml-common-inst.xml
  
  Index: sgml-common-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/BLFS/BOOK/pst/sgml/sgml-common/sgml-common-inst.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- sgml-common-inst.xml	20 Dec 2003 06:06:30 -0000	1.6
  +++ sgml-common-inst.xml	17 Apr 2004 15:57:02 -0000	1.7
  @@ -15,7 +15,7 @@
   <para>Install <application><acronym>SGML</acronym> Common</application> by 
   running the following commands:</para>
   
  -<screen><userinput><command>./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man &&
  +<screen><userinput><command>./configure --prefix=/usr --sysconfdir=/etc &&
   make &&
   make install &&
   install-catalog --add /etc/sgml/sgml-ent.cat \
  
  
  
  1.2       +1 -1      BLFS/BOOK/pst/xml/docbook/docbook-intro.xml
  
  Index: docbook-intro.xml
  ===================================================================
  RCS file: /home/cvsroot/BLFS/BOOK/pst/xml/docbook/docbook-intro.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- docbook-intro.xml	4 Oct 2003 08:23:20 -0000	1.1
  +++ docbook-intro.xml	17 Apr 2004 15:57:02 -0000	1.2
  @@ -17,7 +17,7 @@
   
   <sect3><title><application>DocBook <acronym>XML</acronym> <acronym>DTD</acronym></application> &DocBook-version; dependencies</title>
   <sect4><title>Required</title>
  -<para><xref linkend="libxml2"/> and <xref linkend="unzip"/></para></sect4>
  +<para><xref linkend="libxml2"/></para></sect4>
   </sect3>
   
   </sect2>
  
  
  



More information about the blfs-book mailing list