From 3df04a7f7f1d426632658bfe0be0c22d33f85c9f Mon Sep 17 00:00:00 2001
From: Larry Lawrence <larry@linuxfromscratch.org>
Date: Sat, 3 Aug 2002 20:27:18 +0000
Subject: [PATCH] basicnet and connect ent updates

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@53 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 basicnet/textweb/links/links-intro.xml | 3 ++-
 basicnet/textweb/links/links.ent       | 3 ++-
 basicnet/textweb/lynx/lynx-intro.xml   | 3 ++-
 basicnet/textweb/lynx/lynx.ent         | 3 ++-
 connect/dhcp/dhcpcd/dhcpcd-intro.xml   | 3 ++-
 connect/dhcp/dhcpcd/dhcpcd.ent         | 3 ++-
 connect/dialup/ppp/ppp-intro.xml       | 3 ++-
 connect/dialup/ppp/ppp.ent             | 3 ++-
 connect/dialup/wvdial/wvdial-intro.xml | 3 ++-
 connect/dialup/wvdial/wvdial.ent       | 3 ++-
 introduction/welcome/changelog.xml     | 2 +-
 11 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/basicnet/textweb/links/links-intro.xml b/basicnet/textweb/links/links-intro.xml
index ff66d888e2..44e3105597 100644
--- a/basicnet/textweb/links/links-intro.xml
+++ b/basicnet/textweb/links/links-intro.xml
@@ -1,7 +1,8 @@
 <sect2>
 <title>Introduction to links</title>
 
-<screen>Download location:              &links-download;
+<screen>Download location (HTTP):       <ulink url="&links-download-http;"/>
+Download location (FTP):        <ulink url="&links-download-ftp;"/>
 Version used:                   &links-version;
 Package size:                   &links-size;
 Estimated Disk space required:  &links-buildsize;</screen>
diff --git a/basicnet/textweb/links/links.ent b/basicnet/textweb/links/links.ent
index 980b944b83..22b4cc0c29 100644
--- a/basicnet/textweb/links/links.ent
+++ b/basicnet/textweb/links/links.ent
@@ -5,5 +5,6 @@
 <!ENTITY links-config SYSTEM "links-config.xml">
 <!ENTITY links-buildsize "4.3 MB">
 <!ENTITY links-version "0.97">
-<!ENTITY links-download "http://artax.karlin.mff.cuni.cz/~mikulas/links/download/links-0.97.tar.gz">
+<!ENTITY links-download-http "http://artax.karlin.mff.cuni.cz/~mikulas/links/download/links-0.97.tar.gz">
+<!ENTITY links-download-ftp "">
 <!ENTITY links-size "518 KB">
diff --git a/basicnet/textweb/lynx/lynx-intro.xml b/basicnet/textweb/lynx/lynx-intro.xml
index 06be59febe..bf20137b8f 100644
--- a/basicnet/textweb/lynx/lynx-intro.xml
+++ b/basicnet/textweb/lynx/lynx-intro.xml
@@ -1,7 +1,8 @@
 <sect2>
 <title>Introduction to lynx</title>
 
-<screen>Download location:              &lynx-download;
+<screen>Download location (HTTP):       <ulink url="&lynx-download-http;"/>
+Download location (FTP):        <ulink url="&lynx-download-ftp;"/>
 Version used:                   &lynx-version;
 Package size:                   &lynx-size;
 Estimated Disk space required:  &lynx-buildsize;</screen>
diff --git a/basicnet/textweb/lynx/lynx.ent b/basicnet/textweb/lynx/lynx.ent
index 01d54dbbf8..cc4d7abf55 100644
--- a/basicnet/textweb/lynx/lynx.ent
+++ b/basicnet/textweb/lynx/lynx.ent
@@ -6,5 +6,6 @@
 <!ENTITY lynx-config SYSTEM "lynx-config.xml">
 <!ENTITY lynx-buildsize "16 MB">
 <!ENTITY lynx-version "2.8.4">
-<!ENTITY lynx-download "http://lynx.isc.org/release/lynx2.8.4.tar.bz2">
+<!ENTITY lynx-download-http "http://lynx.isc.org/release/lynx2.8.4.tar.bz2">
+<!ENTITY lynx-download-ftp "">
 <!ENTITY lynx-size "1.9 MB">
diff --git a/connect/dhcp/dhcpcd/dhcpcd-intro.xml b/connect/dhcp/dhcpcd/dhcpcd-intro.xml
index 76835f10fe..01fe61bf26 100644
--- a/connect/dhcp/dhcpcd/dhcpcd-intro.xml
+++ b/connect/dhcp/dhcpcd/dhcpcd-intro.xml
@@ -1,7 +1,8 @@
 <sect2>
 <title>Introduction to dhcpcd</title>
 
-<screen>Download location:              &dhcpcd-download;
+<screen>Download location (HTTP):       <ulink url="&dhcpcd-download-http;"/>
+Download location (FTP):        <ulink url="&dhcpcd-download-ftp;"/>
 Version used:                   &dhcpcd-version;
 Package size:                   &dhcpcd-size;
 Estimated Disk space required:  &dhcpcd-buildsize;</screen>
diff --git a/connect/dhcp/dhcpcd/dhcpcd.ent b/connect/dhcp/dhcpcd/dhcpcd.ent
index 59c60332e3..43b549506c 100644
--- a/connect/dhcp/dhcpcd/dhcpcd.ent
+++ b/connect/dhcp/dhcpcd/dhcpcd.ent
@@ -8,5 +8,6 @@
 <!ENTITY dhcpcd-config SYSTEM "dhcpcd-config.xml">
 <!ENTITY dhcpcd-buildsize "728 KB">
 <!ENTITY dhcpcd-version "1.3.22-pl1">
-<!ENTITY dhcpcd-download "ftp://ftp.phystech.com/pub/dhcpcd-1.3.22-pl1.tar.gz">
+<!ENTITY dhcpcd-download-http "">
+<!ENTITY dhcpcd-download-ftp "ftp://ftp.phystech.com/pub/dhcpcd-1.3.22-pl1.tar.gz">
 <!ENTITY dhcpcd-size "131 KB">
diff --git a/connect/dialup/ppp/ppp-intro.xml b/connect/dialup/ppp/ppp-intro.xml
index 8b530ad438..7e4c76e5bb 100644
--- a/connect/dialup/ppp/ppp-intro.xml
+++ b/connect/dialup/ppp/ppp-intro.xml
@@ -1,7 +1,8 @@
 <sect2>
 <title>Introduction to ppp</title>
 
-<screen>Download location:              &ppp-download;
+<screen>Download location (HTTP):       <ulink url="&ppp-download-http;"/>
+Download location (FTP):        <ulink url="&ppp-download-ftp;"/>
 Version used:                   &ppp-version;
 Package size:                   &ppp-size;
 Estimated Disk space required:  &ppp-buildsize;</screen>
diff --git a/connect/dialup/ppp/ppp.ent b/connect/dialup/ppp/ppp.ent
index aa90a64d0c..d707225169 100644
--- a/connect/dialup/ppp/ppp.ent
+++ b/connect/dialup/ppp/ppp.ent
@@ -5,5 +5,6 @@
 <!ENTITY ppp-config SYSTEM "ppp-config.xml">
 <!ENTITY ppp-buildsize "4.1 MB">
 <!ENTITY ppp-version "2.4.1">
-<!ENTITY ppp-download "ftp://ftp.samba.org/pub/ppp/ppp-2.4.1.tar.gz">
+<!ENTITY ppp-download-http "">
+<!ENTITY ppp-download-ftp "ftp://ftp.samba.org/pub/ppp/ppp-2.4.1.tar.gz">
 <!ENTITY ppp-size "524 KB">
diff --git a/connect/dialup/wvdial/wvdial-intro.xml b/connect/dialup/wvdial/wvdial-intro.xml
index a9b72e35e0..dada91c642 100644
--- a/connect/dialup/wvdial/wvdial-intro.xml
+++ b/connect/dialup/wvdial/wvdial-intro.xml
@@ -1,7 +1,8 @@
 <sect2>
 <title>Introduction to wvdial</title>
 
-<screen>Download location:              &wvdial-download;
+<screen>Download location (HTTP):       <ulink url="&wvdial-download-http;"/>
+Download location (FTP):        <ulink url="&wvdial-download-ftp;"/>
 Version used:                   &wvdial-version;
 Package size:                   &wvdial-size;
 Estimated Disk space required:  &wvdial-buildsize;</screen>
diff --git a/connect/dialup/wvdial/wvdial.ent b/connect/dialup/wvdial/wvdial.ent
index 2b3e5e0e99..ccea9ecf27 100644
--- a/connect/dialup/wvdial/wvdial.ent
+++ b/connect/dialup/wvdial/wvdial.ent
@@ -5,5 +5,6 @@
 <!ENTITY wvdial-config SYSTEM "wvdial-config.xml">
 <!ENTITY wvdial-buildsize "2.5 MB">
 <!ENTITY wvdial-version "1.53">
-<!ENTITY wvdial-download "http://open.nit.ca/download/wvdial_1.53.tar.gz">
+<!ENTITY wvdial-download-http "http://open.nit.ca/download/wvdial_1.53.tar.gz">
+<!ENTITY wvdial-download-ftp "">
 <!ENTITY wvdial-size "66 KB">
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 7723d9796f..374c68793c 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -12,7 +12,7 @@ page in Chapter 1 for details on who wrote what.</para>
 
 <listitem><para>August 3rd, 2002 [larry]: Graphics Libraries: update ent
 and intro files to new format. System Utilities: update ent and intro
-files to new format.</para></listitem>
+files to new format. Text Web: 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