Index: general/graphlib/imlib/imlib-intro.xml
===================================================================
--- general/graphlib/imlib/imlib-intro.xml	(revision b9139e21657c6df260ad0ee47143be50a4b6cf0c)
+++ general/graphlib/imlib/imlib-intro.xml	(revision c94bd46f91480f768b57290fed29aa4279580a10)
@@ -2,5 +2,6 @@
 <title>Introduction to imlib</title>
 
-<screen>Download location (FTP):        <ulink url= "&imlib-download-ftp;"/>
+<screen>Download location (HTTP):       <ulink url="&imlib-download-http;"/>
+Download location (FTP):        <ulink url= "&imlib-download-ftp;"/>
 Version used:                   &imlib-version;
 Package size:                   &imlib-size;
Index: general/graphlib/imlib/imlib.ent
===================================================================
--- general/graphlib/imlib/imlib.ent	(revision b9139e21657c6df260ad0ee47143be50a4b6cf0c)
+++ general/graphlib/imlib/imlib.ent	(revision c94bd46f91480f768b57290fed29aa4279580a10)
@@ -7,4 +7,5 @@
 <!ENTITY imlib-buildsize "8.6 MB">
 <!ENTITY imlib-version "1.9.14">
+<!ENTITY imlib-download-http "">
 <!ENTITY imlib-download-ftp "ftp://ftp.gnome.org/pub/GNOME/stable/sources/imlib/imlib-1.9.14.tar.gz">
 <!ENTITY imlib-size "736 KB">
Index: general/graphlib/lcms/lcms-intro.xml
===================================================================
--- general/graphlib/lcms/lcms-intro.xml	(revision b9139e21657c6df260ad0ee47143be50a4b6cf0c)
+++ general/graphlib/lcms/lcms-intro.xml	(revision c94bd46f91480f768b57290fed29aa4279580a10)
@@ -2,5 +2,6 @@
 <title>Introduction to lcms</title>
 
-<screen>Download location:              <ulink url="&lcms-download;"/>
+<screen>Download location (HTTP):       <ulink url="&lcms-download-http;"/>
+Download location (FTP):        <ulink url="&lcms-download-ftp;"/>
 Version used:                   &lcms-version;
 Package size:                   &lcms-size;
Index: general/graphlib/lcms/lcms.ent
===================================================================
--- general/graphlib/lcms/lcms.ent	(revision b9139e21657c6df260ad0ee47143be50a4b6cf0c)
+++ general/graphlib/lcms/lcms.ent	(revision c94bd46f91480f768b57290fed29aa4279580a10)
@@ -7,4 +7,5 @@
 <!ENTITY lcms-buildsize "3.7 MB">
 <!ENTITY lcms-version "1.08">
-<!ENTITY lcms-download "http://www.littlecms.com/lcms-1.08.tar.gz">
+<!ENTITY lcms-download-http "http://www.littlecms.com/lcms-1.08.tar.gz">
+<!ENTITY lcms-download-ftp "">
 <!ENTITY lcms-size "158 KB">
Index: general/graphlib/libjpeg/libjpeg-intro.xml
===================================================================
--- general/graphlib/libjpeg/libjpeg-intro.xml	(revision b9139e21657c6df260ad0ee47143be50a4b6cf0c)
+++ general/graphlib/libjpeg/libjpeg-intro.xml	(revision c94bd46f91480f768b57290fed29aa4279580a10)
@@ -2,5 +2,6 @@
 <title>Introduction to libjpeg</title>
 
-<screen>Download location:              <ulink url="&libjpeg-download;"/>
+<screen>Download location (HTTP):       <ulink url="&libjpeg-download-http;"/>
+Download location (FTP):        <ulink url="&libjpeg-download-ftp;"/>
 Version used:                   &libjpeg-version;
 Package size:                   &libjpeg-size;
Index: general/graphlib/libjpeg/libjpeg.ent
===================================================================
--- general/graphlib/libjpeg/libjpeg.ent	(revision b9139e21657c6df260ad0ee47143be50a4b6cf0c)
+++ general/graphlib/libjpeg/libjpeg.ent	(revision c94bd46f91480f768b57290fed29aa4279580a10)
@@ -7,4 +7,5 @@
 <!ENTITY libjpeg-buildsize "3.7 MB">
 <!ENTITY libjpeg-version "6b">
-<!ENTITY libjpeg-download "ftp://ftp.uu.net/graphics/jpeg/jpegsrc.v6b.tar.gz">
+<!ENTITY libjpeg-download-http "">
+<!ENTITY libjpeg-download-ftp "ftp://ftp.uu.net/graphics/jpeg/jpegsrc.v6b.tar.gz">
 <!ENTITY libjpeg-size "599 KB">
Index: general/graphlib/libmng/libmng-intro.xml
===================================================================
--- general/graphlib/libmng/libmng-intro.xml	(revision b9139e21657c6df260ad0ee47143be50a4b6cf0c)
+++ general/graphlib/libmng/libmng-intro.xml	(revision c94bd46f91480f768b57290fed29aa4279580a10)
@@ -2,5 +2,6 @@
 <title>Introduction to libmng</title>
 
-<screen>Download location:              &libmng-download;
+<screen>Download location (HTTP):       <ulink url="&libmng-download-http;"/>
+Download location (FTP):        <ulink url="&libmng-download-ftp;"/>
 Version used:                   &libmng-version;
 Package size:                   &libmng-size;
Index: general/graphlib/libmng/libmng.ent
===================================================================
--- general/graphlib/libmng/libmng.ent	(revision b9139e21657c6df260ad0ee47143be50a4b6cf0c)
+++ general/graphlib/libmng/libmng.ent	(revision c94bd46f91480f768b57290fed29aa4279580a10)
@@ -7,4 +7,5 @@
 <!ENTITY libmng-buildsize "4.6 MB">
 <!ENTITY libmng-version "1.0.3">
-<!ENTITY libmng-download "http://www.libmng.com/download/libmng-1.0.3.tar.gz">
+<!ENTITY libmng-download-http "http://www.libmng.com/download/libmng-1.0.3.tar.gz">
+<!ENTITY libmng-download-ftp "">
 <!ENTITY libmng-size "516 KB">
Index: general/graphlib/libpng/libpng-intro.xml
===================================================================
--- general/graphlib/libpng/libpng-intro.xml	(revision b9139e21657c6df260ad0ee47143be50a4b6cf0c)
+++ general/graphlib/libpng/libpng-intro.xml	(revision c94bd46f91480f768b57290fed29aa4279580a10)
@@ -2,6 +2,6 @@
 <title>Introduction to libpng</title>
 
-<screen>Download location - HTTP:       <ulink url="&libpng-download;"/>
-Download location - FTP:	<ulink url="&libpng-download-ftp;"/>
+<screen>Download location (HTTP):       <ulink url="&libpng-download-http;"/>
+Download location (FTP):	<ulink url="&libpng-download-ftp;"/>
 Version used:                   &libpng-version;
 Package size:                   &libpng-size;
Index: general/graphlib/libpng/libpng.ent
===================================================================
--- general/graphlib/libpng/libpng.ent	(revision b9139e21657c6df260ad0ee47143be50a4b6cf0c)
+++ general/graphlib/libpng/libpng.ent	(revision c94bd46f91480f768b57290fed29aa4279580a10)
@@ -7,5 +7,5 @@
 <!ENTITY libpng-buildsize "3.5 MB">
 <!ENTITY libpng-version "1.2.3">
-<!ENTITY libpng-download "http://www.libpng.org/pub/png/src/libpng-1.2.3.tar.gz">
+<!ENTITY libpng-download-http "http://www.libpng.org/pub/png/src/libpng-1.2.3.tar.gz">
 <!ENTITY libpng-download-ftp "ftp://swrinde.nde.swri.edu/pub/png/src/libpng-1.2.3.tar.gz">
 <!ENTITY libpng-size "481 KB">
Index: general/graphlib/libtiff/libtiff-intro.xml
===================================================================
--- general/graphlib/libtiff/libtiff-intro.xml	(revision b9139e21657c6df260ad0ee47143be50a4b6cf0c)
+++ general/graphlib/libtiff/libtiff-intro.xml	(revision c94bd46f91480f768b57290fed29aa4279580a10)
@@ -2,5 +2,6 @@
 <title>Introduction to libtiff</title>
 
-<screen>Download location:              <ulink url="&libtiff-download;"/>
+<screen>Download location (HTTP):       <ulink url="&libtiff-download-http;"/>
+Download location (FTP):        <ulink url="&libtiff-download-ftp;"/>
 Version used:                   &libtiff-version;
 Package size:                   &libtiff-size;
Index: general/graphlib/libtiff/libtiff.ent
===================================================================
--- general/graphlib/libtiff/libtiff.ent	(revision b9139e21657c6df260ad0ee47143be50a4b6cf0c)
+++ general/graphlib/libtiff/libtiff.ent	(revision c94bd46f91480f768b57290fed29aa4279580a10)
@@ -7,4 +7,5 @@
 <!ENTITY libtiff-buildsize "5.9 MB">
 <!ENTITY libtiff-version "3.5.7">
-<!ENTITY libtiff-download "ftp://ftp.remotesensing.org/pub/libtiff/tiff-v3.5.7.tar.gz">
+<!ENTITY libtiff-download-http "">
+<!ENTITY libtiff-download-ftp "ftp://ftp.remotesensing.org/pub/libtiff/tiff-v3.5.7.tar.gz">
 <!ENTITY libtiff-size "928 KB">
Index: general/graphlib/libungif/libungif-intro.xml
===================================================================
--- general/graphlib/libungif/libungif-intro.xml	(revision b9139e21657c6df260ad0ee47143be50a4b6cf0c)
+++ general/graphlib/libungif/libungif-intro.xml	(revision c94bd46f91480f768b57290fed29aa4279580a10)
@@ -2,5 +2,6 @@
 <title>Introduction to libungif</title>
 
-<screen>Download location:              <ulink url="&libungif-download;"/>
+<screen>Download location (HTTP):       <ulink url="&libungif-download-http;"/>
+Download location (FTP):        <ulink url="&libungif-download-ftp;"/>
 Version used:                   &libungif-version;
 Package size:                   &libungif-size;
Index: general/graphlib/libungif/libungif.ent
===================================================================
--- general/graphlib/libungif/libungif.ent	(revision b9139e21657c6df260ad0ee47143be50a4b6cf0c)
+++ general/graphlib/libungif/libungif.ent	(revision c94bd46f91480f768b57290fed29aa4279580a10)
@@ -6,4 +6,5 @@
 <!ENTITY libungif-buildsize "3.1 MB">
 <!ENTITY libungif-version "4.1.0b1">
-<!ENTITY libungif-download "http://www.linuxpackages.net/packages/Slackware-8/robert/libungif-4.1.0b1/source/libungif-4.1.0b1.tar.gz">
+<!ENTITY libungif-download-http "http://www.linuxpackages.net/packages/Slackware-8/robert/libungif-4.1.0b1/source/libungif-4.1.0b1.tar.gz">
+<!ENTITY libungif-download-ftp "">
 <!ENTITY libungif-size "343 KB">
Index: index.xml
===================================================================
--- index.xml	(revision b9139e21657c6df260ad0ee47143be50a4b6cf0c)
+++ index.xml	(revision c94bd46f91480f768b57290fed29aa4279580a10)
@@ -3,6 +3,6 @@
 			"/usr/share/docbook/docbookx.dtd" [
 
-<!ENTITY version "20020802">
-<!ENTITY releasedate "August 2nd, 2002">
+<!ENTITY version "20020803">
+<!ENTITY releasedate "August 3rd, 2002">
 
 <!ENTITY % book SYSTEM "book/book.ent">
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision b9139e21657c6df260ad0ee47143be50a4b6cf0c)
+++ introduction/welcome/changelog.xml	(revision c94bd46f91480f768b57290fed29aa4279580a10)
@@ -11,8 +11,12 @@
 <itemizedlist>
 
+<listitem><para>August 3rd, 2002 [larry]: Graphics Libraries: update ent
+and intro files to new format.</para></listitem>
+
 <listitem><para>August 2nd, 2002 [larry]:  Basic Net: added wget-1.8.2,
 procmail-3.22.  Removed chmod 755 from OpenSSH. Modified Imlib for
 consistency. Imlib, GTK+, GTK2+ and Pango modified to install
-configuration files in /etc rather than /usr/etc.</para></listitem>
+configuration files in /etc rather than /usr/etc. General Libraries:
+update ent and intro files to new format.</para></listitem>
 
 <listitem><para>July 31st, 2002 [larry]:  General Libraries: upgraded
