Adjust SGML ulink tags to the URL is always displayed in our printed docs.

20 files changed, 150 insertions, 165 deletions

diff --git a/doc/src/sgml/advanced.sgml b/doc/src/sgml/advanced.sgml
index 82d9e229b3..4f20dda2eb 100644
--- a/doc/src/sgml/advanced.sgml
+++ b/doc/src/sgml/advanced.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/advanced.sgml,v 1.47 2004/12/17 04:50:32 tgl Exp $
+$PostgreSQL: pgsql/doc/src/sgml/advanced.sgml,v 1.48 2005/03/31 03:54:37 momjian Exp $
 -->
 
  <chapter id="tutorial-advanced">
@@ -468,8 +468,8 @@ SELECT name, altitude
 
    <para>
     If you feel you need more introductory material, please visit the
-    <ulink url="http://www.postgresql.org">PostgreSQL web
-    site</ulink> for links to more resources.
+    PostgreSQL web site,
+    <ulink url="http://www.postgresql.org"></ulink>, for links to more resources.
    </para>
   </sect1>
  </chapter>
diff --git a/doc/src/sgml/biblio.sgml b/doc/src/sgml/biblio.sgml
index 4f642cf3f3..4a5ecbc71a 100644
--- a/doc/src/sgml/biblio.sgml
+++ b/doc/src/sgml/biblio.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/biblio.sgml,v 1.21 2005/02/21 02:21:00 neilc Exp $
+$PostgreSQL: pgsql/doc/src/sgml/biblio.sgml,v 1.22 2005/03/31 03:54:37 momjian Exp $
 -->
 
  <bibliography id="biblio">
@@ -13,10 +13,10 @@ $PostgreSQL: pgsql/doc/src/sgml/biblio.sgml,v 1.21 2005/02/21 02:21:00 neilc Exp
   <para>
    Some white papers and technical reports from the original
    <productname>POSTGRES</productname> development team
-   are available at
+   are available at the University of California, Berkeley, Computer Science
+    Department web site,
    <ulink url="http://s2k-ftp.CS.Berkeley.EDU:8000/postgres/papers/">
-    the University of California, Berkeley, Computer Science
-    Department web site</ulink>
+    </ulink>
   </para>
 
   <bibliodiv>
@@ -242,10 +242,9 @@ ssimkovi@ag.or.at
    </biblioentry>
 
   <biblioentry id="FONG">
-   <title><ulink
-   url="http://s2k-ftp.CS.Berkeley.EDU:8000/postgres/papers/UCB-MS-zfong.pdf">The
-   design and implementation of the
-   <productname>POSTGRES</productname> query optimizer</ulink></title>
+   <title>The design and implementation of the
+   <productname>POSTGRES</productname> query optimizer,
+   <ulink url="http://s2k-ftp.CS.Berkeley.EDU:8000/postgres/papers/UCB-MS-zfong.pdf"></ulink></title>
    <author>
     <firstname>Zelaine</firstname>
     <surname>Fong</surname>
@@ -305,7 +304,7 @@ ssimkovi@ag.or.at
 
    <biblioentry id="ROWE87">
    <biblioset relation="article">
-    <title><ulink url="http://s2k-ftp.CS.Berkeley.EDU:8000/postgres/papers/ERL-M87-13.pdf">The <productname>POSTGRES</productname> data model</ulink></title>
+    <title>The <productname>POSTGRES</productname> data model, <ulink url="http://s2k-ftp.CS.Berkeley.EDU:8000/postgres/papers/ERL-M87-13.pdf"></ulink></title>
     <titleabbrev>Rowe and Stonebraker, 1987</titleabbrev>
     <authorgroup>
      <author>
@@ -327,7 +326,7 @@ ssimkovi@ag.or.at
 
    <biblioentry id="SESHADRI95">
    <biblioset relation="article">
-    <title><ulink url="http://simon.cs.cornell.edu/home/praveen/papers/partindex.de95.ps.Z">Generalized Partial Indexes</ulink>
+    <title>Generalized Partial Indexes, <ulink url="http://simon.cs.cornell.edu/home/praveen/papers/partindex.de95.ps.Z"></ulink>
     </title>
     <titleabbrev>Seshardri, 1995</titleabbrev>
     <authorgroup>
@@ -357,7 +356,7 @@ ssimkovi@ag.or.at
 
    <biblioentry id="STON86">
    <biblioset relation="article">
-    <title><ulink url="http://s2k-ftp.CS.Berkeley.EDU:8000/postgres/papers/ERL-M85-95.pdf">The design of <productname>POSTGRES</productname></ulink></title>
+    <title>The design of <productname>POSTGRES</productname>, <ulink url="http://s2k-ftp.CS.Berkeley.EDU:8000/postgres/papers/ERL-M85-95.pdf"></ulink></title>
     <titleabbrev>Stonebraker and Rowe, 1986</titleabbrev>
     <authorgroup>
      <author>
@@ -405,7 +404,7 @@ ssimkovi@ag.or.at
 
    <biblioentry id="STON87b">
    <biblioset relation="article">
-    <title><ulink url="http://s2k-ftp.CS.Berkeley.EDU:8000/postgres/papers/ERL-M87-06.pdf">The design of the <productname>POSTGRES</productname> storage system</ulink></title>
+    <title>The design of the <productname>POSTGRES</productname> storage system, <ulink url="http://s2k-ftp.CS.Berkeley.EDU:8000/postgres/papers/ERL-M87-06.pdf"></ulink></title>
     <titleabbrev>Stonebraker, 1987</titleabbrev>
     <authorgroup>
      <author>
@@ -423,7 +422,7 @@ ssimkovi@ag.or.at
 
    <biblioentry id="STON89">
    <biblioset relation="article">
-    <title><ulink url="http://s2k-ftp.CS.Berkeley.EDU:8000/postgres/papers/ERL-M89-82.pdf">A commentary on the <productname>POSTGRES</productname> rules system</ulink></title>
+    <title>A commentary on the <productname>POSTGRES</productname> rules system, <ulink url="http://s2k-ftp.CS.Berkeley.EDU:8000/postgres/papers/ERL-M89-82.pdf"></ulink></title>
     <titleabbrev>Stonebraker et al, 1989</titleabbrev>
     <authorgroup>
      <author>
@@ -448,7 +447,7 @@ ssimkovi@ag.or.at
 
    <biblioentry id="STON89b">
    <biblioset relation="article">
-    <title><ulink url="http://s2k-ftp.CS.Berkeley.EDU:8000/postgres/papers/ERL-M89-17.pdf">The case for partial indexes</ulink></title>
+    <title>The case for partial indexes, <ulink url="http://s2k-ftp.CS.Berkeley.EDU:8000/postgres/papers/ERL-M89-17.pdf"></ulink></title>
     <titleabbrev>Stonebraker, M, 1989b</titleabbrev>
     <authorgroup>
      <author>
@@ -466,7 +465,7 @@ ssimkovi@ag.or.at
 
    <biblioentry id="STON90a">
    <biblioset relation="article">
-    <title><ulink url="http://s2k-ftp.CS.Berkeley.EDU:8000/postgres/papers/ERL-M90-34.pdf">The implementation of <productname>POSTGRES</productname></ulink></title>
+    <title>The implementation of <productname>POSTGRES</productname>, <ulink url="http://s2k-ftp.CS.Berkeley.EDU:8000/postgres/papers/ERL-M90-34.pdf"></ulink></title>
     <titleabbrev>Stonebraker, Rowe, Hirohama, 1990</titleabbrev>
     <authorgroup>
      <author>
@@ -494,7 +493,7 @@ ssimkovi@ag.or.at
 
    <biblioentry id="STON90b">
    <biblioset relation="article">
-    <title><ulink url="http://s2k-ftp.CS.Berkeley.EDU:8000/postgres/papers/ERL-M90-36.pdf">On Rules, Procedures, Caching and Views in Database Systems</ulink></title>
+    <title>On Rules, Procedures, Caching and Views in Database Systems, <ulink url="http://s2k-ftp.CS.Berkeley.EDU:8000/postgres/papers/ERL-M90-36.pdf"></ulink></title>
     <titleabbrev>Stonebraker et al, ACM, 1990</titleabbrev>
     <authorgroup>
      <author>
diff --git a/doc/src/sgml/client-auth.sgml b/doc/src/sgml/client-auth.sgml
index a77ef544aa..bc377d6a6e 100644
--- a/doc/src/sgml/client-auth.sgml
+++ b/doc/src/sgml/client-auth.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/client-auth.sgml,v 1.72 2005/01/28 22:38:37 tgl Exp $
+$PostgreSQL: pgsql/doc/src/sgml/client-auth.sgml,v 1.73 2005/03/31 03:54:37 momjian Exp $
 -->
 
 <chapter id="client-authentication">
@@ -615,10 +615,10 @@ local   db1,db2,@demodbs  all                         md5
     authentication system suitable for distributed computing over a public
     network. A description of the <productname>Kerberos</productname> system
     is far beyond the scope of this document; in full generality it can be
-    quite complex (yet powerful). The <ulink
-    url="http://www.nrl.navy.mil/CCS/people/kenh/kerberos-faq.html">Kerberos
-    <acronym>FAQ</></ulink> or <ulink url="ftp://athena-dist.mit.edu">MIT
-    Project Athena</ulink> can be a good starting point for exploration.
+    quite complex (yet powerful). The Kerberos <acronym>FAQ</>,
+    <ulink url="http://www.nrl.navy.mil/CCS/people/kenh/kerberos-faq.html"></ulink>, or 
+    MIT Project Athena, <ulink url="ftp://athena-dist.mit.edu"></ulink>,
+    can be a good starting point for exploration.
     Several sources for <productname>Kerberos</> distributions exist.
    </para>
 
@@ -690,7 +690,7 @@ local   db1,db2,@demodbs  all                         md5
 
    <para>
     If you use <application>mod_auth_kerb</application> from
-    <ulink url="http://modauthkerb.sf.net">http://modauthkerb.sf.net</ulink>
+    <ulink url="http://modauthkerb.sf.net"></ulink>
     and <application>mod_perl</application> on your
     <productname>Apache</productname> web server, you can use
     <literal>AuthType KerberosV5SaveCredentials</literal> with a
@@ -883,11 +883,10 @@ omicron       bryanh            guest1
     default PAM service name is <literal>postgresql</literal>. You can
     optionally supply your own service name after the <literal>pam</>
     key word in the file <filename>pg_hba.conf</filename>.
-    For more information about PAM, please read the <ulink
-    url="http://www.kernel.org/pub/linux/libs/pam/"><productname>Linux-PAM</>
-    Page</ulink> and the <ulink
-    url="http://www.sun.com/software/solaris/pam/"><systemitem
-    class="osname">Solaris</> PAM Page</ulink>.
+    For more information about PAM, please read the <productname>Linux-PAM</>
+    Page, <ulink url="http://www.kernel.org/pub/linux/libs/pam/"></ulink>,
+    and the <systemitem class="osname">Solaris</> PAM Page, <ulink
+    url="http://www.sun.com/software/solaris/pam/"></ulink>.
    </para>
   </sect2>
  </sect1>
diff --git a/doc/src/sgml/contacts.sgml b/doc/src/sgml/contacts.sgml
index b4a5c5fd0b..37eee739a3 100644
--- a/doc/src/sgml/contacts.sgml
+++ b/doc/src/sgml/contacts.sgml
@@ -13,23 +13,12 @@ and the mailing lists themselves.
 
 <para>
 Refer to the introduction in this manual or to the
-<ulink url="http://www.postgresql.org"><productname>PostgreSQL</productname> web page</ulink>
- for subscription information to the no-cost mailing lists.
+<productname>PostgreSQL</productname> web page,
+<ulink url="http://www.postgresql.org"></ulink>,
+for subscription information to the no-cost mailing lists.
 </para>
 
 <sect1 id="people">
 <title>People</title>
 -->
-
-<para>
-<itemizedlist mark="bullet" spacing="compact">
-<listitem>
-<para>
-<ulink url="lockhart@fourpalms.org">Thomas Lockhart</ulink>
- works on SQL standards compliance and documentation.
-</para>
-</listitem>
-</itemizedlist>
-</para>
-
 </appendix>
diff --git a/doc/src/sgml/cvs.sgml b/doc/src/sgml/cvs.sgml
index a72293932c..8549c68276 100644
--- a/doc/src/sgml/cvs.sgml
+++ b/doc/src/sgml/cvs.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/cvs.sgml,v 1.31 2005/01/22 22:06:17 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/cvs.sgml,v 1.32 2005/03/31 03:54:37 momjian Exp $
 -->
 
 <appendix id="cvs">
@@ -52,7 +52,7 @@ $PostgreSQL: pgsql/doc/src/sgml/cvs.sgml,v 1.31 2005/01/22 22:06:17 momjian Exp
     <para>
      You will need a local copy of <productname>CVS</productname>
      (Concurrent Version Control System), which you can get from
-     <ulink url="http://www.cvshome.org/">http://www.cvshome.org/</ulink>
+     <ulink url="http://www.cvshome.org/"></ulink>
      (the official site with the latest version) or any GNU software
      archive site (often somewhat outdated). We recommend version 1.10
      or newer. Many systems have a recent version of
@@ -167,7 +167,7 @@ $ chmod -R go-w pgsql
    For more info consult the manual that comes with
    <productname>CVS</productname>, or see the online
    documentation at
-   <ulink url="http://www.cvshome.org/">http://www.cvshome.org/</ulink>.
+   <ulink url="http://www.cvshome.org/"></ulink>.
   </para>
  </sect1>
 
@@ -299,7 +299,7 @@ cvs commit
    <productname>CVSup</productname> was developed by
    John Polstra (<email>jdp@polstra.com</email>) to
    distribute CVS repositories and other file trees for
-   <ulink url="http://www.freebsd.org">the FreeBSD project</ulink>.
+   the FreeBSD project, <ulink url="http://www.freebsd.org"></ulink>.
   </para>
 
   <para>
@@ -449,7 +449,8 @@ CVSROOT/loginfo*
 
    <para>
     The following is a suggested <productname>CVSup</productname> config file from
-    <ulink url="ftp://ftp.postgresql.org/pub/CVSup/README.cvsup">the <productname>PostgreSQL</> ftp site</ulink>
+    the <productname>PostgreSQL</> ftp site, 
+    <ulink url="ftp://ftp.postgresql.org/pub/CVSup/README.cvsup"></ulink>,
     which will fetch the current snapshot only:
 
     <programlisting>
@@ -498,7 +499,8 @@ pgsql
      You can use pre-built binaries
      if you have a platform for which binaries
      are posted on
-     <ulink url="ftp://ftp.postgresql.org/pub">the <productname>PostgreSQL</productname> ftp site</ulink>,
+     the <productname>PostgreSQL</productname> ftp site,
+     <ulink url="ftp://ftp.postgresql.org/pub"></ulink>,
      or if you are running FreeBSD, for which
      <productname>CVSup</productname> is available as a port.
 
@@ -539,7 +541,8 @@ pgsql
       <step performance="optional">
        <para>
 	If you have another platform, check for and download the appropriate binary from
-	<ulink url="ftp://ftp.postgresql.org/pub">the <productname>PostgreSQL</productname> ftp site</ulink>.
+	the <productname>PostgreSQL</productname> ftp site, 
+        <ulink url="ftp://ftp.postgresql.org/pub"></ulink>.
        </para>
       </step>
      </substeps>
@@ -621,12 +624,12 @@ $ which cvsup
       <step>
        <para>
 	Pick up the <productname>Modula-3</productname>
-	distribution from
-	<ulink url="http://m3.polymtl.ca/m3">Polytechnique Montréal</ulink>,
+	distribution from Polytechnique Montréal,
+        <ulink url="http://m3.polymtl.ca/m3"></ulink>,
 	who are actively maintaining the code base originally developed by
-	<ulink
-	 url="http://www.research.digital.com/SRC/modula-3/html/home.html">the DEC Systems Research Center</ulink>.
-       The <productname>PM3</productname> <productname>RPM</productname> distribution is roughly
+	the DEC Systems Research Center, <ulink
+	url="http://www.research.digital.com/SRC/modula-3/html/home.html"></ulink>.
+        The <productname>PM3</productname> <productname>RPM</productname> distribution is roughly
 	30MB compressed. At the time of writing, the 1.1.10-1 release
 	installed cleanly on RH-5.2, whereas the 1.1.11-1 release is
 	apparently built for another release (RH-6.0?) and does not run on RH-5.2.
@@ -761,8 +764,8 @@ If you are on a T1 or better, you should probably delete the
 As shown, it will get the repository (RCS) files.  If you uncomment
 the line containing "tag=." then it will instead check out the
 latest version of each file.  There's a bunch more information about
-what you can do in
-<ulink url="http://www.freebsd.org/handbook/cvsup.html">the CVSup Handbook</ulink>.
+what you can do in the CVSup Handbook, 
+<ulink url="http://www.freebsd.org/handbook/cvsup.html"></ulink>.
 
 There is one other thing I want to send you, but not tonight.  I
 discovered the hard way that you need a malloc package that is
diff --git a/doc/src/sgml/dfunc.sgml b/doc/src/sgml/dfunc.sgml
index 2c1a2771e5..2edcb3c546 100644
--- a/doc/src/sgml/dfunc.sgml
+++ b/doc/src/sgml/dfunc.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/dfunc.sgml,v 1.29 2005/01/22 22:56:35 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/dfunc.sgml,v 1.30 2005/03/31 03:54:37 momjian Exp $
 -->
 
 <sect2 id="dfunc">
@@ -276,8 +276,9 @@ gcc -shared -o foo.so foo.o
  <tip>
   <para>
    If this is too complicated for you, you should consider using
-   <ulink url="http://www.gnu.org/software/libtool/"><productname>GNU
-   Libtool</productname></ulink>, which hides the platform differences
+   <productname>GNU Libtool</productname>,
+   <ulink url="http://www.gnu.org/software/libtool/"></ulink>,
+   which hides the platform differences
    behind a uniform interface.
   </para>
  </tip>
diff --git a/doc/src/sgml/docguide.sgml b/doc/src/sgml/docguide.sgml
index c6a51cf946..734da61604 100644
--- a/doc/src/sgml/docguide.sgml
+++ b/doc/src/sgml/docguide.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/docguide.sgml,v 1.53 2005/02/19 04:39:52 momjian Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/docguide.sgml,v 1.54 2005/03/31 03:54:38 momjian Exp $ -->
 
 <appendix id="docguide">
  <title>Documentation</title>
@@ -60,15 +60,17 @@
    structure and content of a technical document without worrying
    about presentation details.  A document style defines how that
    content is rendered into one of several final forms.  DocBook is
-   maintained by the <ulink
-   url="http://www.oasis-open.org">OASIS</ulink> group.  The <ulink
-   url="http://www.oasis-open.org/docbook">official DocBook
-   site</ulink> has good introductory and reference documentation and
+   maintained by the OASIS group, <ulink
+   url="http://www.oasis-open.org"></ulink>.  The official DocBook
+   site, <ulink url="http://www.oasis-open.org/docbook"></ulink>,
+   has good introductory and reference documentation and
    a complete O'Reilly book for your online reading pleasure.  The
+   NewbieDoc Docbook Guide,
    <ulink url="http://newbiedoc.sourceforge.net/metadoc/docbook-guide.html">
-   NewbieDoc Docbook Guide</ulink> is very helpful for beginners.
-   The <ulink url="http://www.freebsd.org/docproj/docproj.html">FreeBSD
-   Documentation Project</ulink> also uses DocBook and has some good
+   </ulink>, is very helpful for beginners.
+   The FreeBSD Documentation Project, 
+   <ulink url="http://www.freebsd.org/docproj/docproj.html"></ulink>,
+   also uses DocBook and has some good
    information, including a number of style guidelines that might be
    worth considering.
   </para>
@@ -84,7 +86,7 @@
 
    <variablelist>
     <varlistentry>
-     <term><ulink url="http://www.oasis-open.org/docbook/sgml/">DocBook DTD</ulink></term>
+     <term>DocBook DTD, <ulink url="http://www.oasis-open.org/docbook/sgml/"></ulink></term>
      <listitem>
       <para>
        This is the definition of DocBook itself.  We currently use
@@ -96,7 +98,7 @@
     </varlistentry>
 
     <varlistentry>
-     <term><ulink url="http://www.oasis-open.org/cover/ISOEnts.zip">ISO 8879 character entities</ulink></term>
+     <term>ISO 8879 character entities, <ulink url="http://www.oasis-open.org/cover/ISOEnts.zip"></ulink></term>
      <listitem>
       <para>
        These are required by DocBook but are distributed separately
@@ -106,7 +108,7 @@
     </varlistentry>
 
     <varlistentry>
-     <term><ulink url="http://openjade.sourceforge.net">OpenJade</ulink></term>
+     <term>OpenJade, <ulink url="http://openjade.sourceforge.net"></ulink></term>
      <listitem>
       <para>
        This is the base package of <acronym>SGML</acronym> processing.
@@ -121,7 +123,7 @@
     </varlistentry>
 
     <varlistentry>
-     <term><ulink url="http://docbook.sourceforge.net/projects/dsssl/index.html">DocBook DSSSL Stylesheets</ulink></term>
+     <term>DocBook DSSSL Stylesheets, <ulink url="http://docbook.sourceforge.net/projects/dsssl/index.html"></ulink></term>
      <listitem>
       <para>
        These contain the processing instructions for converting the
@@ -132,7 +134,7 @@
     </varlistentry>
 
     <varlistentry>
-     <term><ulink url="http://docbook2x.sourceforge.net">DocBook2X tools</ulink></term>
+     <term>DocBook2X tools, <ulink url="http://docbook2x.sourceforge.net"></ulink></term>
      <listitem>
       <para>
        This optional package is used to create man pages.  It has a
@@ -143,7 +145,7 @@
     </varlistentry>
 
     <varlistentry>
-     <term><ulink url="http://jadetex.sourceforge.net">JadeTeX</ulink></term>
+     <term>JadeTeX, <ulink url="http://jadetex.sourceforge.net"></ulink></term>
      <listitem>
       <para>
        If you want to, you can also install
@@ -238,9 +240,8 @@ CATALOG "/usr/local/share/sgml/docbook/4.2/docbook.cat"
 
    <para>
     More information about the FreeBSD documentation tools can be
-    found in the <ulink
-    url="http://www.freebsd.org/doc/en_US.ISO8859-1/books/fdp-primer/tools.html">FreeBSD
-    Documentation Project's instructions</ulink>.
+    found in the FreeBSD Documentation Project's instructions,
+    <ulink url="http://www.freebsd.org/doc/en_US.ISO8859-1/books/fdp-primer/tools.html"></ulink>.
    </para>
   </sect2>
 
@@ -334,9 +335,8 @@ CATALOG "dsssl/catalog"
     <procedure>
      <step>
       <para>
-       Obtain the <ulink
-       url="http://www.docbook.org/sgml/4.2/docbook-4.2.zip">DocBook
-       V4.2</ulink> distribution.
+       Obtain the DocBook V4.2 distribution,<ulink
+       url="http://www.docbook.org/sgml/4.2/docbook-4.2.zip"></ulink>.
       </para>
      </step>
 
@@ -377,9 +377,9 @@ CATALOG "docbook-4.2/docbook.cat"
 
      <step>
       <para>
-       Download the <ulink
-       url="http://www.oasis-open.org/cover/ISOEnts.zip">ISO 8879
-       character entities</ulink> archive, unpack it, and put the
+       Download the ISO 8879
+       character entities archive, <ulink
+       url="http://www.oasis-open.org/cover/ISOEnts.zip"></ulink>, unpack it, and put the
        files in the same directory you put the DocBook files in.
 <screen>
 <prompt>$ </prompt><userinput>cd /usr/local/share/sgml/docbook-4.2</userinput>
@@ -452,8 +452,8 @@ CATALOG "docbook-dsssl-1.<replaceable>xx</>/catalog
      <productname>minitoc</productname>,
      <productname>url</productname> and
      <productname>ot2enc</productname>.  All of these can be found on
-     your friendly neighborhood <ulink
-     url="http://www.ctan.org"><acronym>CTAN</acronym></ulink> site.
+     your friendly neighborhood <acronym>CTAN site</acronym>, <ulink
+     url="http://www.ctan.org"></ulink>.
      The installation of the <application>TeX</application> base
      system is far beyond the scope of this introduction.  Binary
      packages should be available for any system that can run
@@ -931,9 +931,9 @@ gmake man.tar.gz
      When properly configured, it will allow you to use
      <application>Emacs</application> to insert tags and check markup
      consistency.  You could use it for <acronym>HTML</acronym> as
-     well.  Check the <ulink
-     url="http://www.lysator.liu.se/projects/about_psgml.html">PSGML
-     web site</ulink> for downloads, installation instructions, and
+     well.  Check the PSGML web site, <ulink
+     url="http://www.lysator.liu.se/projects/about_psgml.html"></ulink>,
+     for downloads, installation instructions, and
      detailed documentation.
     </para>
 
@@ -1051,10 +1051,9 @@ End:
     </para>
 
     <para>
-     Norm Walsh offers a major <ulink
-     url="http://nwalsh.com/emacs/docbookide/index.html">mode
-     specifically for DocBook</ulink> which also has font-lock and a
-     number of features to reduce typing.
+     Norm Walsh offers a major mode specifically for DocBook,
+     <ulink url="http://nwalsh.com/emacs/docbookide/index.html"></ulink>, 
+     which also has font-lock and a number of features to reduce typing.
     </para>
    </sect2>
 
diff --git a/doc/src/sgml/external-projects.sgml b/doc/src/sgml/external-projects.sgml
index 90c3a95f5e..1280ede69b 100644
--- a/doc/src/sgml/external-projects.sgml
+++ b/doc/src/sgml/external-projects.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/external-projects.sgml,v 1.7 2004/12/29 23:36:46 tgl Exp $
+$PostgreSQL: pgsql/doc/src/sgml/external-projects.sgml,v 1.8 2005/03/31 03:54:38 momjian Exp $
 -->
 
  <appendix id="external-projects">
@@ -21,11 +21,10 @@ $PostgreSQL: pgsql/doc/src/sgml/external-projects.sgml,v 1.7 2004/12/29 23:36:46
 
   <para>
    Many <productname>PostgreSQL</productname>-related projects are
-   hosted at either
-   <productname>GBorg</> at <ulink
-   url="http://gborg.postgresql.org">http://gborg.postgresql.org</ulink>
+   hosted at either <productname>GBorg</> at <ulink
+   url="http://gborg.postgresql.org"></ulink>
    or <productname>pgFoundry</> at <ulink
-   url="http://pgfoundry.org">http://pgfoundry.org</ulink>.
+   url="http://pgfoundry.org"></ulink>.
    There are other
    <productname>PostgreSQL</productname>-related projects that are hosted
    elsewhere, but you will have to do an Internet search to find them.
@@ -150,9 +149,9 @@ $PostgreSQL: pgsql/doc/src/sgml/external-projects.sgml,v 1.7 2004/12/29 23:36:46
 
    All of these can be found at 
    <productname>GBorg</> (<ulink
-   url="http://gborg.postgresql.org">http://gborg.postgresql.org</ulink>)
+   url="http://gborg.postgresql.org"></ulink>)
    or <productname>pgFoundry</> (<ulink
-   url="http://pgfoundry.org">http://pgfoundry.org</ulink>).
+   url="http://pgfoundry.org"></ulink>).
    </para>
 
  </sect1>
diff --git a/doc/src/sgml/geqo.sgml b/doc/src/sgml/geqo.sgml
index cf13cf66f0..3597d93a0b 100644
--- a/doc/src/sgml/geqo.sgml
+++ b/doc/src/sgml/geqo.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/geqo.sgml,v 1.29 2005/02/21 02:21:00 neilc Exp $
+$PostgreSQL: pgsql/doc/src/sgml/geqo.sgml,v 1.30 2005/03/31 03:54:38 momjian Exp $
 Genetic Optimizer
 -->
 
@@ -286,16 +286,16 @@ Genetic Optimizer
    <itemizedlist>
     <listitem>
      <para>
-      <ulink url="http://surf.de.uu.net/encore/www/">The Hitch-Hiker's
-      Guide to Evolutionary Computation</ulink> (FAQ for <ulink
-      url="news://comp.ai.genetic">comp.ai.genetic</ulink>)
+      The Hitch-Hiker's Guide to Evolutionary Computation,
+      <ulink url="http://surf.de.uu.net/encore/www/"></ulink>, (FAQ for <ulink
+      url="news://comp.ai.genetic"></ulink>)
      </para>
     </listitem>
    
     <listitem>
      <para>
-      <ulink url="http://www.red3d.com/cwr/evolve.html">Evolutionary
-       Computation and its application to art and design</ulink> by
+      Evolutionary Computation and its application to art and design,
+      <ulink url="http://www.red3d.com/cwr/evolve.html"></ulink>, by
       Craig Reynolds
      </para>
     </listitem>
diff --git a/doc/src/sgml/gist.sgml b/doc/src/sgml/gist.sgml
index 584b7be5d8..d9ea80a836 100644
--- a/doc/src/sgml/gist.sgml
+++ b/doc/src/sgml/gist.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/gist.sgml,v 1.15 2005/01/08 22:13:25 tgl Exp $
+$PostgreSQL: pgsql/doc/src/sgml/gist.sgml,v 1.16 2005/03/31 03:54:38 momjian Exp $
 -->
 
 <chapter id="GiST">
@@ -30,12 +30,11 @@ $PostgreSQL: pgsql/doc/src/sgml/gist.sgml,v 1.15 2005/01/08 22:13:25 tgl Exp $
  </para>
 
   <para>
-    Some of the information here is derived from <ulink
-    url="http://gist.cs.berkeley.edu/">the University of California at
-    Berkeley's GiST Indexing Project web site</ulink> and Marcel Kornacker's
-    thesis, 
-    <ulink url="http://citeseer.nj.nec.com/448594.html">Access Methods for
-    Next-Generation Database Systems</ulink>.   The <acronym>GiST</acronym>
+    Some of the information here is derived from the University of California at
+    Berkeley's GiST Indexing Project web site, <ulink
+    url="http://gist.cs.berkeley.edu/"></ulink>, and Marcel Kornacker's
+    thesis, Access Methods for Next-Generation Database Systems,
+    <ulink url="http://citeseer.nj.nec.com/448594.html"></ulink>.   The <acronym>GiST</acronym>
     implementation in <productname>PostgreSQL</productname> is primarily
     maintained by Teodor Sigaev and Oleg Bartunov, and there is more
     information on their website: <ulink
diff --git a/doc/src/sgml/history.sgml b/doc/src/sgml/history.sgml
index be84418c7d..2b7d5f439c 100644
--- a/doc/src/sgml/history.sgml
+++ b/doc/src/sgml/history.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/history.sgml,v 1.24 2005/01/08 01:44:05 tgl Exp $
+$PostgreSQL: pgsql/doc/src/sgml/history.sgml,v 1.25 2005/03/31 03:54:38 momjian Exp $
 -->
 
 <sect1 id="history">
@@ -65,15 +65,15 @@ $PostgreSQL: pgsql/doc/src/sgml/history.sgml,v 1.24 2005/01/08 01:44:05 tgl Exp
    database, and several geographic information systems.
    <productname>POSTGRES</productname> has also been used as an
    educational tool at several universities.  Finally, Illustra
-   Information Technologies (later merged into <ulink
-   url="http://www.informix.com/"><productname>Informix</productname></ulink>,
-   which is now owned by <ulink
-   url="http://www.ibm.com/">IBM</ulink>.)  picked up the code and
+   Information Technologies (later merged into 
+   <productname>Informix</productname>, <ulink
+   url="http://www.informix.com/"></ulink>,
+   which is now owned by IBM, <ulink
+   url="http://www.ibm.com/"></ulink>.)  picked up the code and
    commercialized it.  In late 1992,
    <productname>POSTGRES</productname> became the primary data manager
-   for the <ulink
-   url="http://meteora.ucsd.edu/s2k/s2k_home.html">Sequoia
-   2000</ulink> scientific computing project.
+   for the Sequoia 2000 scientific computing project, 
+   <ulink url="http://meteora.ucsd.edu/s2k/s2k_home.html"></ulink>.
   </para>
 
   <para>
diff --git a/doc/src/sgml/info.sgml b/doc/src/sgml/info.sgml
index 684a1db017..aa60b5e973 100644
--- a/doc/src/sgml/info.sgml
+++ b/doc/src/sgml/info.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/info.sgml,v 1.21 2003/11/29 19:51:37 pgsql Exp $
+$PostgreSQL: pgsql/doc/src/sgml/info.sgml,v 1.22 2005/03/31 03:54:38 momjian Exp $
 -->
 
 <sect1 id="resources">
@@ -34,9 +34,9 @@ $PostgreSQL: pgsql/doc/src/sgml/info.sgml,v 1.21 2003/11/29 19:51:37 pgsql Exp $
     <term>Web Site</term>
     <listitem>
      <para>
-      The <ulink
-      url="http://www.postgresql.org"><productname>PostgreSQL</productname>
-      web site</ulink> carries details on the latest release and other
+      The <productname>PostgreSQL</productname> web site,
+      <ulink url="http://www.postgresql.org"></ulink>,
+      carries details on the latest release and other
       information to make your work or play with
       <productname>PostgreSQL</productname> more productive.
      </para>
diff --git a/doc/src/sgml/installation.sgml b/doc/src/sgml/installation.sgml
index 867e74596d..3472aeedca 100644
--- a/doc/src/sgml/installation.sgml
+++ b/doc/src/sgml/installation.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/installation.sgml,v 1.229 2005/01/23 00:30:18 momjian Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/installation.sgml,v 1.230 2005/03/31 03:54:38 momjian Exp $ -->
 
 <chapter id="installation">
  <title><![%standalone-include[<productname>PostgreSQL</>]]>
@@ -248,7 +248,7 @@ su - postgres
       systems have this built-in (e.g., <systemitem
       class="osname">Linux</>, <systemitem class="osname">NetBSD</>,
       <systemitem class="osname">Solaris</>), for other systems you
-      can download an add-on package from here: <ulink
+      can download an add-on package from <ulink
       url="http://developer.postgresql.org/~petere/bsd-gettext/"></ulink>.
       If you are using the <application>Gettext</> implementation in
       the <acronym>GNU</acronym> C library then you will additionally
@@ -1460,8 +1460,9 @@ kill `cat /usr/local/pgsql/data/postmaster.pid`
    platform generally means that <productname>PostgreSQL</> builds and
    installs according to these instructions and that the regression
    tests pass.  <quote>Build farm</quote> entries refer to builds
-   reported by the <ulink url="http://www.pgbuildfarm.org/">PostgreSQL
-   Build Farm</ulink>.  Platform entries that show an older version of
+   reported by the PostgreSQL Build Farm,
+   <ulink url="http://www.pgbuildfarm.org/"></ulink>.  
+   Platform entries that show an older version of
    PostgreSQL are those that did not receive explicit testing at the
    time of release of version &majorversion; but that we still
    expect to work.
diff --git a/doc/src/sgml/intro.sgml b/doc/src/sgml/intro.sgml
index cb89eee18d..9bfd167846 100644
--- a/doc/src/sgml/intro.sgml
+++ b/doc/src/sgml/intro.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/intro.sgml,v 1.27 2004/12/23 05:37:39 tgl Exp $
+$PostgreSQL: pgsql/doc/src/sgml/intro.sgml,v 1.28 2005/03/31 03:54:38 momjian Exp $
 -->
 
 <preface id="preface">
@@ -89,9 +89,9 @@ $PostgreSQL: pgsql/doc/src/sgml/intro.sgml,v 1.27 2004/12/23 05:37:39 tgl Exp $
   <para>
    <productname>PostgreSQL</productname> is an object-relational
    database management system (<acronym>ORDBMS</acronym>) based on
+   <productname>POSTGRES, Version 4.2</productname>,
    <ulink url="http://s2k-ftp.CS.Berkeley.EDU:8000/postgres/postgres.html">
-   <productname>POSTGRES, Version 4.2</productname></ulink>, developed
-   at the University of California at Berkeley Computer Science
+   </ulink>, developed at the University of California at Berkeley Computer Science
    Department.  POSTGRES pioneered many concepts that only became
    available in some commercial database systems much later.
   </para>
diff --git a/doc/src/sgml/nls.sgml b/doc/src/sgml/nls.sgml
index 55cd0f03ec..9442c4301b 100644
--- a/doc/src/sgml/nls.sgml
+++ b/doc/src/sgml/nls.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/nls.sgml,v 1.10 2004/11/15 06:32:14 neilc Exp $
+$PostgreSQL: pgsql/doc/src/sgml/nls.sgml,v 1.11 2005/03/31 03:54:38 momjian Exp $
 -->
 
 <chapter id="nls">
@@ -154,16 +154,16 @@ msgstr "another translated"
     If there are already some <filename>.po</filename> files, then
     someone has already done some translation work.  The files are
     named <filename><replaceable>language</replaceable>.po</filename>,
-    where <replaceable>language</replaceable> is the <ulink
-    url="http://lcweb.loc.gov/standards/iso639-2/englangn.html">ISO
-    639-1</ulink> two-letter language code (in lower case), e.g.,
+    where <replaceable>language</replaceable> is the ISO 639-1 two-letter language code,
+    (in lower case), <ulink url="http://lcweb.loc.gov/standards/iso639-2/englangn.html"></ulink>,
+    e.g.,
     <filename>fr.po</filename> for French.  If there is really a need
     for more than one translation effort per language then the files
     may also be named
     <filename><replaceable>language</replaceable>_<replaceable>region</replaceable>.po</filename>
-    where <replaceable>region</replaceable> is the <ulink
-    url="http://www.din.de/gremien/nas/nabd/iso3166ma/codlstp1/en_listp1.html">ISO
-    3166-1</ulink> two-letter country code (in upper case), e.g.,
+    where <replaceable>region</replaceable> is the ISO 3166-1 two-letter country code (in upper case),
+    <ulink url="http://www.din.de/gremien/nas/nabd/iso3166ma/codlstp1/en_listp1.html"></ulink>,
+    e.g.,
     <filename>pt_BR.po</filename> for Portuguese in Brazil.  If you
     find the language you wanted you can just start working on that
     file.
diff --git a/doc/src/sgml/plperl.sgml b/doc/src/sgml/plperl.sgml
index 554aa99d39..82d1eeadb0 100644
--- a/doc/src/sgml/plperl.sgml
+++ b/doc/src/sgml/plperl.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/plperl.sgml,v 2.37 2005/01/17 17:29:49 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/plperl.sgml,v 2.38 2005/03/31 03:54:38 momjian Exp $
 -->
 
  <chapter id="plperl">
@@ -15,8 +15,8 @@ $PostgreSQL: pgsql/doc/src/sgml/plperl.sgml,v 2.37 2005/01/17 17:29:49 momjian E
 
   <para>
    PL/Perl is a loadable procedural language that enables you to write
-   <productname>PostgreSQL</productname> functions in the <ulink
-   url="http://www.perl.com">Perl</ulink> programming language.
+   <productname>PostgreSQL</productname> functions in the Perl programming language,
+   <ulink url="http://www.perl.com"></ulink>.
   </para>
 
   <para>
@@ -200,11 +200,10 @@ SELECT * FROM perl_set();
   <para>
    Access to the database itself from your Perl function can be done
    via the function <function>spi_exec_query</function> described
-   below, or via an experimental module <ulink
-   url="http://www.cpan.org/modules/by-module/DBD/APILOS/"><literal>DBD::PgSPI</literal></ulink>
-   (also available at <ulink
-   url="http://www.cpan.org/SITES.html"><acronym>CPAN</> mirror
-   sites</ulink>).  This module makes available a
+   below, or via an experimental module <literal>DBD::PgSPI</literal>, 
+   <ulink url="http://www.cpan.org/modules/by-module/DBD/APILOS/"></ulink>,
+   (also available at <acronym>CPAN mirror sites</>, <ulink
+   url="http://www.cpan.org/SITES.html"></ulink>).  This module makes available a
    <acronym>DBI</>-compliant database-handle named
    <varname>$pg_dbh</varname> that can be used to perform queries with
    normal <acronym>DBI</>
diff --git a/doc/src/sgml/plpython.sgml b/doc/src/sgml/plpython.sgml
index 32fce8c4c6..172f735ea3 100644
--- a/doc/src/sgml/plpython.sgml
+++ b/doc/src/sgml/plpython.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/plpython.sgml,v 1.26 2004/12/30 21:45:36 tgl Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/plpython.sgml,v 1.27 2005/03/31 03:54:38 momjian Exp $ -->
 
 <chapter id="plpython">
  <title>PL/Python - Python Procedural Language</title>
@@ -9,7 +9,7 @@
  <para>
   The <application>PL/Python</application> procedural language allows
   <productname>PostgreSQL</productname> functions to be written in the
-  <ulink url="http://www.python.org">Python</ulink> language.
+  Python language,<ulink url="http://www.python.org"></ulink>.
  </para>
 
  <para>
diff --git a/doc/src/sgml/pltcl.sgml b/doc/src/sgml/pltcl.sgml
index 7cb60a3c58..75a4866fe6 100644
--- a/doc/src/sgml/pltcl.sgml
+++ b/doc/src/sgml/pltcl.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/pltcl.sgml,v 2.35 2005/03/13 09:36:30 neilc Exp $
+$PostgreSQL: pgsql/doc/src/sgml/pltcl.sgml,v 2.36 2005/03/31 03:54:38 momjian Exp $
 -->
 
  <chapter id="pltcl">
@@ -16,8 +16,8 @@ $PostgreSQL: pgsql/doc/src/sgml/pltcl.sgml,v 2.35 2005/03/13 09:36:30 neilc Exp
   <para>
    PL/Tcl is a loadable procedural language for the
    <productname>PostgreSQL</productname> database system
-   that enables the <ulink url="http://www.tcl.tk/">Tcl</ulink>
-   language to be used to write functions and
+   that enables the Tcl language, <ulink url="http://www.tcl.tk/"></ulink>,
+   to be used to write functions and
    trigger procedures.
   </para>
 
diff --git a/doc/src/sgml/problems.sgml b/doc/src/sgml/problems.sgml
index 4a75f8602b..e324f912f1 100644
--- a/doc/src/sgml/problems.sgml
+++ b/doc/src/sgml/problems.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/problems.sgml,v 2.22 2005/03/25 01:01:14 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/problems.sgml,v 2.23 2005/03/31 03:54:38 momjian Exp $
 -->
 
 <sect1 id="bug-reporting">
@@ -266,9 +266,8 @@ $PostgreSQL: pgsql/doc/src/sgml/problems.sgml,v 2.22 2005/03/25 01:01:14 momjian
    It is better to report everything the first time than us having to squeeze the
    facts out of you. On the other hand, if your input files are huge, it is
    fair to ask first whether somebody is interested in looking into it.  Here is
-   an article, <ulink url="http://www.chiark.greenend.org.uk/~sgtatham/bugs.html">
-   http://www.chiark.greenend.org.uk/~sgtatham/bugs.html</ulink>, that outlines
-   some more tips on reporting bugs.
+   an article, <ulink url="http://www.chiark.greenend.org.uk/~sgtatham/bugs.html"></ulink>, 
+   that outlines some more tips on reporting bugs.
   </para>
 
   <para>
@@ -306,8 +305,8 @@ $PostgreSQL: pgsql/doc/src/sgml/problems.sgml,v 2.22 2005/03/25 01:01:14 momjian
 
   <para> 
    Another method is to fill in the bug report web-form available
-   at the project's web site
-   <ulink url="http://www.postgresql.org/">http://www.postgresql.org/</ulink>.
+   at the project's web site,
+   <ulink url="http://www.postgresql.org/"></ulink>.
    Entering a bug report this way causes it to be mailed to the
    <email>pgsql-bugs@postgresql.org</email> mailing list.
   </para>
diff --git a/doc/src/sgml/release.sgml b/doc/src/sgml/release.sgml
index 5d646bdcb3..62c13ddf77 100644
--- a/doc/src/sgml/release.sgml
+++ b/doc/src/sgml/release.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/release.sgml,v 1.328 2005/02/10 04:52:31 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/release.sgml,v 1.329 2005/03/31 03:54:38 momjian Exp $
 -->
 
 <appendix id="release">
@@ -106,8 +106,7 @@ typedefs (Michael)</para></listitem>
         <productname>PostgreSQL</productname>. A separate installer
         project has been created to ease installation on
         <productname>Windows</> &mdash; see <ulink
-        url="http://www.postgresql.org/ftp/win32/">
-        http://www.postgresql.org/ftp/win32/</ulink>.
+        url="http://www.postgresql.org/ftp/win32/"></ulink>.
        </para>
 
        <para>
@@ -428,7 +427,7 @@ typedefs (Michael)</para></listitem>
       <para>
       The JDBC client interface has been removed from the core
       distribution, and is now hosted at <ulink url=
-      "http://jdbc.postgresql.org">http://jdbc.postgresql.org</ulink>.
+      "http://jdbc.postgresql.org"></ulink>.
       </para>
      </listitem>
 
@@ -436,7 +435,7 @@ typedefs (Michael)</para></listitem>
       <para>
       The Tcl client interface has also been removed. There are several
       Tcl interfaces now hosted at <ulink url=
-      "http://gborg.postgresql.org">http://gborg.postgresql.org</ulink>.
+      "http://gborg.postgresql.org"></ulink>.
       </para>
      </listitem>
 
@@ -5463,8 +5462,7 @@ operations on bytea columns (Joe)</para></listitem>
     application examines the system catalogs, additional changes will
     be required due to the introduction of schemas in 7.3; for more
     information, see: <ulink
-    url="http://developer.postgresql.org/~momjian/upgrade_tips_7.3">
-    http://developer.postgresql.org/~momjian/upgrade_tips_7.3</>.
+    url="http://developer.postgresql.org/~momjian/upgrade_tips_7.3"></>.
    </para>
 
    <para>