We don't put URL's in ulink's because the URL is always generated, but

we can put words in ulink and the URL will still be printed.

per Peter

19 files changed, 143 insertions, 128 deletions

diff --git a/doc/src/sgml/advanced.sgml b/doc/src/sgml/advanced.sgml
index 51beab1907..35359f76ef 100644
--- a/doc/src/sgml/advanced.sgml
+++ b/doc/src/sgml/advanced.sgml
@@ -467,9 +467,9 @@ SELECT name, altitude
    </para>
 
    <para>
-    If you feel you need more introductory material, please visit the
-    PostgreSQL web site,
-    <ulink url="http://www.postgresql.org"></ulink>, for links to more resources.
+    If you feel you need more introductory material, please visit the PostgreSQL
+    <ulink url="http://www.postgresql.org">web site</ulink>
+    for links to more resources.
    </para>
   </sect1>
  </chapter>
diff --git a/doc/src/sgml/biblio.sgml b/doc/src/sgml/biblio.sgml
index 1ceaae5a60..3fead82e53 100644
--- a/doc/src/sgml/biblio.sgml
+++ b/doc/src/sgml/biblio.sgml
@@ -14,9 +14,8 @@ $PostgreSQL$
    Some white papers and technical reports from the original
    <productname>POSTGRES</productname> development team
    are available at the University of California, Berkeley, Computer Science
-    Department web site,
-   <ulink url="http://s2k-ftp.CS.Berkeley.EDU:8000/postgres/papers/">
-    </ulink>
+   Department <ulink url="http://s2k-ftp.CS.Berkeley.EDU:8000/postgres/papers/">
+   web site</ulink>.
   </para>
 
   <bibliodiv>
@@ -242,9 +241,10 @@ [email protected]
    </biblioentry>
 
   <biblioentry id="FONG">
-   <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>
+   <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>
    <author>
     <firstname>Zelaine</firstname>
     <surname>Fong</surname>
@@ -304,7 +304,9 @@ [email protected]
 
    <biblioentry id="ROWE87">
    <biblioset relation="article">
-    <title>The <productname>POSTGRES</productname> data model, <ulink url="http://s2k-ftp.CS.Berkeley.EDU:8000/postgres/papers/ERL-M87-13.pdf"></ulink></title>
+    <title><ulink url="http://s2k-ftp.CS.Berkeley.EDU:8000/postgres/papers/ERL-M87-13.pdf">
+    The <productname>POSTGRES</productname> data model
+    </ulink></title>
     <titleabbrev>Rowe and Stonebraker, 1987</titleabbrev>
     <authorgroup>
      <author>
@@ -326,7 +328,9 @@ [email protected]
 
    <biblioentry id="SESHADRI95">
    <biblioset relation="article">
-    <title>Generalized Partial Indexes, <ulink url="http://simon.cs.cornell.edu/home/praveen/papers/partindex.de95.ps.Z"></ulink>
+    <title><ulink url="http://simon.cs.cornell.edu/home/praveen/papers/partindex.de95.ps.Z">
+    Generalized Partial Indexes
+    </ulink>
     </title>
     <titleabbrev>Seshardri, 1995</titleabbrev>
     <authorgroup>
@@ -356,7 +360,9 @@ [email protected]
 
    <biblioentry id="STON86">
    <biblioset relation="article">
-    <title>The design of <productname>POSTGRES</productname>, <ulink url="http://s2k-ftp.CS.Berkeley.EDU:8000/postgres/papers/ERL-M85-95.pdf"></ulink></title>
+    <title><ulink url="http://s2k-ftp.CS.Berkeley.EDU:8000/postgres/papers/ERL-M85-95.pdf">
+    The design of <productname>POSTGRES</productname>
+    </ulink></title>
     <titleabbrev>Stonebraker and Rowe, 1986</titleabbrev>
     <authorgroup>
      <author>
@@ -404,7 +410,9 @@ [email protected]
 
    <biblioentry id="STON87b">
    <biblioset relation="article">
-    <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>
+    <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>
     <titleabbrev>Stonebraker, 1987</titleabbrev>
     <authorgroup>
      <author>
@@ -422,7 +430,9 @@ [email protected]
 
    <biblioentry id="STON89">
    <biblioset relation="article">
-    <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>
+    <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>
     <titleabbrev>Stonebraker et al, 1989</titleabbrev>
     <authorgroup>
      <author>
@@ -447,7 +457,9 @@ [email protected]
 
    <biblioentry id="STON89b">
    <biblioset relation="article">
-    <title>The case for partial indexes, <ulink url="http://s2k-ftp.CS.Berkeley.EDU:8000/postgres/papers/ERL-M89-17.pdf"></ulink></title>
+    <title><ulink url="http://s2k-ftp.CS.Berkeley.EDU:8000/postgres/papers/ERL-M89-17.pdf">
+    The case for partial indexes
+    </ulink></title>
     <titleabbrev>Stonebraker, M, 1989b</titleabbrev>
     <authorgroup>
      <author>
@@ -465,7 +477,9 @@ [email protected]
 
    <biblioentry id="STON90a">
    <biblioset relation="article">
-    <title>The implementation of <productname>POSTGRES</productname>, <ulink url="http://s2k-ftp.CS.Berkeley.EDU:8000/postgres/papers/ERL-M90-34.pdf"></ulink></title>
+    <title><ulink url="http://s2k-ftp.CS.Berkeley.EDU:8000/postgres/papers/ERL-M90-34.pdf">
+    The implementation of <productname>POSTGRES</productname>
+    </ulink></title>
     <titleabbrev>Stonebraker, Rowe, Hirohama, 1990</titleabbrev>
     <authorgroup>
      <author>
@@ -493,7 +507,9 @@ [email protected]
 
    <biblioentry id="STON90b">
    <biblioset relation="article">
-    <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>
+    <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>
     <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 05c242666c..53e9439da2 100644
--- a/doc/src/sgml/client-auth.sgml
+++ b/doc/src/sgml/client-auth.sgml
@@ -615,9 +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 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>,
+    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.
     Several sources for <productname>Kerberos</> distributions exist.
    </para>
@@ -689,8 +690,8 @@ local   db1,db2,@demodbs  all                         md5
    </para>
 
    <para>
-    If you use <application>mod_auth_kerb</application> from
-    <ulink url="http://modauthkerb.sf.net"></ulink>
+    If you use <ulink url="http://modauthkerb.sf.net">
+    <application>mod_auth_kerb</application></ulink>
     and <application>mod_perl</application> on your
     <productname>Apache</productname> web server, you can use
     <literal>AuthType KerberosV5SaveCredentials</literal> with a
@@ -883,10 +884,11 @@ 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 <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>.
+    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>.
    </para>
   </sect2>
  </sect1>
diff --git a/doc/src/sgml/contacts.sgml b/doc/src/sgml/contacts.sgml
index 37eee739a3..b5d88947ae 100644
--- a/doc/src/sgml/contacts.sgml
+++ b/doc/src/sgml/contacts.sgml
@@ -13,8 +13,8 @@ and the mailing lists themselves.
 
 <para>
 Refer to the introduction in this manual or to the
-<productname>PostgreSQL</productname> web page,
-<ulink url="http://www.postgresql.org"></ulink>,
+<productname>PostgreSQL</productname> 
+<ulink url="http://www.postgresql.org">web page</ulink>
 for subscription information to the no-cost mailing lists.
 </para>
 
diff --git a/doc/src/sgml/cvs.sgml b/doc/src/sgml/cvs.sgml
index f2c504394a..4f8da1efcb 100644
--- a/doc/src/sgml/cvs.sgml
+++ b/doc/src/sgml/cvs.sgml
@@ -298,8 +298,8 @@ cvs commit
    is <productname>CVSup</productname>.
    <productname>CVSup</productname> was developed by
    John Polstra (<email>[email protected]</email>) to
-   distribute CVS repositories and other file trees for
-   the FreeBSD project, <ulink url="http://www.freebsd.org"></ulink>.
+   distribute CVS repositories and other file trees for the
+   <ulink url="http://www.freebsd.org">FreeBSD project</ulink>.
   </para>
 
   <para>
@@ -449,8 +449,9 @@ CVSROOT/loginfo*
 
    <para>
     The following is a suggested <productname>CVSup</productname> config file from
-    the <productname>PostgreSQL</> ftp site, 
-    <ulink url="ftp://ftp.postgresql.org/pub/CVSup/README.cvsup"></ulink>,
+    the <productname>PostgreSQL</>
+    <ulink url="ftp://ftp.postgresql.org/pub/CVSup/README.cvsup">
+    ftp site</ulink>
     which will fetch the current snapshot only:
 
     <programlisting>
@@ -498,9 +499,9 @@ pgsql
     <para>
      You can use pre-built binaries
      if you have a platform for which binaries
-     are posted on
-     the <productname>PostgreSQL</productname> ftp site,
-     <ulink url="ftp://ftp.postgresql.org/pub"></ulink>,
+     are posted on the <productname>PostgreSQL</productname>
+     <ulink url="ftp://ftp.postgresql.org/pub">
+     ftp site</ulink>
      or if you are running FreeBSD, for which
      <productname>CVSup</productname> is available as a port.
 
@@ -541,8 +542,9 @@ pgsql
       <step performance="optional">
        <para>
 	If you have another platform, check for and download the appropriate binary from
-	the <productname>PostgreSQL</productname> ftp site, 
-        <ulink url="ftp://ftp.postgresql.org/pub"></ulink>.
+	the <productname>PostgreSQL</productname>
+        <ulink url="ftp://ftp.postgresql.org/pub">
+        ftp site</ulink>.
        </para>
       </step>
      </substeps>
@@ -624,11 +626,11 @@ $ which cvsup
       <step>
        <para>
 	Pick up the <productname>Modula-3</productname>
-	distribution from Polytechnique Montr�al,
-        <ulink url="http://m3.polymtl.ca/m3"></ulink>,
+	distribution from <ulink url="http://m3.polymtl.ca/m3">
+        Polytechnique Montr�al</ulink>
 	who are actively maintaining the code base originally developed by
-	the DEC Systems Research Center, <ulink
-	url="http://www.research.digital.com/SRC/modula-3/html/home.html"></ulink>.
+	the <ulink url="http://www.research.digital.com/SRC/modula-3/html/home.html">
+        DEC Systems Research Center</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
@@ -764,8 +766,9 @@ 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 the CVSup Handbook, 
-<ulink url="http://www.freebsd.org/handbook/cvsup.html"></ulink>.
+what you can do in the 
+<ulink url="http://www.freebsd.org/handbook/cvsup.html">
+CVSup Handbook</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 5865f0fd35..9cacfe9614 100644
--- a/doc/src/sgml/dfunc.sgml
+++ b/doc/src/sgml/dfunc.sgml
@@ -275,11 +275,10 @@ gcc -shared -o foo.so foo.o
 
  <tip>
   <para>
-   If this is too complicated for you, you should consider using
-   <productname>GNU Libtool</productname>,
-   <ulink url="http://www.gnu.org/software/libtool/"></ulink>,
-   which hides the platform differences
-   behind a uniform interface.
+   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 behind a uniform interface.
   </para>
  </tip>
 
diff --git a/doc/src/sgml/docguide.sgml b/doc/src/sgml/docguide.sgml
index 67e532d2b1..f05cf8e34a 100644
--- a/doc/src/sgml/docguide.sgml
+++ b/doc/src/sgml/docguide.sgml
@@ -60,17 +60,14 @@
    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 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
+   maintained by the <ulink url="http://www.oasis-open.org">
+   OASIS group</ulink>.  The <ulink url="http://www.oasis-open.org/docbook">
+   official DocBook site</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">
-   </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
+   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
    information, including a number of style guidelines that might be
    worth considering.
   </para>
@@ -86,7 +83,7 @@
 
    <variablelist>
     <varlistentry>
-     <term>DocBook DTD, <ulink url="http://www.oasis-open.org/docbook/sgml/"></ulink></term>
+     <term><ulink url="http://www.oasis-open.org/docbook/sgml/">DocBook DTD</ulink></term>
      <listitem>
       <para>
        This is the definition of DocBook itself.  We currently use
@@ -98,7 +95,7 @@
     </varlistentry>
 
     <varlistentry>
-     <term>ISO 8879 character entities, <ulink url="http://www.oasis-open.org/cover/ISOEnts.zip"></ulink></term>
+     <term><ulink url="http://www.oasis-open.org/cover/ISOEnts.zip">ISO 8879 character entities</ulink></term>
      <listitem>
       <para>
        These are required by DocBook but are distributed separately
@@ -108,7 +105,7 @@
     </varlistentry>
 
     <varlistentry>
-     <term>OpenJade, <ulink url="http://openjade.sourceforge.net"></ulink></term>
+     <term><ulink url="http://openjade.sourceforge.net">OpenJade</ulink></term>
      <listitem>
       <para>
        This is the base package of <acronym>SGML</acronym> processing.
@@ -123,7 +120,7 @@
     </varlistentry>
 
     <varlistentry>
-     <term>DocBook DSSSL Stylesheets, <ulink url="http://docbook.sourceforge.net/projects/dsssl/index.html"></ulink></term>
+     <term><ulink url="http://docbook.sourceforge.net/projects/dsssl/index.html">DocBook DSSSL Stylesheets</ulink></term>
      <listitem>
       <para>
        These contain the processing instructions for converting the
@@ -134,7 +131,7 @@
     </varlistentry>
 
     <varlistentry>
-     <term>DocBook2X tools, <ulink url="http://docbook2x.sourceforge.net"></ulink></term>
+     <term><ulink url="http://docbook2x.sourceforge.net">DocBook2X tools</ulink></term>
      <listitem>
       <para>
        This optional package is used to create man pages.  It has a
@@ -145,7 +142,7 @@
     </varlistentry>
 
     <varlistentry>
-     <term>JadeTeX, <ulink url="http://jadetex.sourceforge.net"></ulink></term>
+     <term><ulink url="http://jadetex.sourceforge.net">JadeTeX</ulink></term>
      <listitem>
       <para>
        If you want to, you can also install
@@ -240,8 +237,8 @@ CATALOG "/usr/local/share/sgml/docbook/4.2/docbook.cat"
 
    <para>
     More information about the FreeBSD documentation tools can be
-    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>.
+    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>.
    </para>
   </sect2>
 
@@ -335,8 +332,8 @@ CATALOG "dsssl/catalog"
     <procedure>
      <step>
       <para>
-       Obtain the DocBook V4.2 distribution,<ulink
-       url="http://www.docbook.org/sgml/4.2/docbook-4.2.zip"></ulink>.
+       Obtain the <ulink url="http://www.docbook.org/sgml/4.2/docbook-4.2.zip">
+       DocBook V4.2 distribution</ulink>.
       </para>
      </step>
 
@@ -377,9 +374,8 @@ CATALOG "docbook-4.2/docbook.cat"
 
      <step>
       <para>
-       Download the ISO 8879
-       character entities archive, <ulink
-       url="http://www.oasis-open.org/cover/ISOEnts.zip"></ulink>, unpack it, and put the
+       Download the <ulink url="http://www.oasis-open.org/cover/ISOEnts.zip">
+       ISO 8879 character entities archive</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 +448,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 <acronym>CTAN site</acronym>, <ulink
-     url="http://www.ctan.org"></ulink>.
+     your friendly neighborhood <ulink url="http://www.ctan.org">
+     <acronym>CTAN site</acronym></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 +927,8 @@ 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 PSGML web site, <ulink
-     url="http://www.lysator.liu.se/projects/about_psgml.html"></ulink>,
-     for downloads, installation instructions, and
+     well.  Check the <ulink url="http://www.lysator.liu.se/projects/about_psgml.html">
+     PSGML web site</ulink> for downloads, installation instructions, and
      detailed documentation.
     </para>
 
@@ -1051,9 +1046,10 @@ End:
     </para>
 
     <para>
-     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.
+     Norm Walsh offers a
+     <ulink url="http://nwalsh.com/emacs/docbookide/index.html">major mode</ulink>
+     specifically for DocBook 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 e50ac342a0..0a4ded3d9f 100644
--- a/doc/src/sgml/external-projects.sgml
+++ b/doc/src/sgml/external-projects.sgml
@@ -21,12 +21,10 @@ $PostgreSQL$
 
   <para>
    Many <productname>PostgreSQL</productname>-related projects are
-   hosted at either <productname>GBorg</> at <ulink
-   url="http://gborg.postgresql.org"></ulink>
-   or <productname>pgFoundry</> at <ulink
-   url="http://pgfoundry.org"></ulink>.
-   There are other
-   <productname>PostgreSQL</productname>-related projects that are hosted
+   hosted at either 
+   <ulink url="http://gborg.postgresql.org"><productname>GBorg</></ulink>
+   or <ulink url="http://pgfoundry.org"><productname>pgFoundry</></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.
   </para>
 
@@ -147,11 +145,9 @@ $PostgreSQL$
 
    </variablelist>
 
-   All of these can be found at 
-   <productname>GBorg</> (<ulink
-   url="http://gborg.postgresql.org"></ulink>)
-   or <productname>pgFoundry</> (<ulink
-   url="http://pgfoundry.org"></ulink>).
+   All of these can be found at
+   <ulink url="http://gborg.postgresql.org"><productname>GBorg</></ulink>
+   or <ulink url="http://pgfoundry.org"><productname>pgFoundry</></ulink>.
    </para>
 
  </sect1>
diff --git a/doc/src/sgml/geqo.sgml b/doc/src/sgml/geqo.sgml
index fc8ae99379..8886ebd21d 100644
--- a/doc/src/sgml/geqo.sgml
+++ b/doc/src/sgml/geqo.sgml
@@ -286,16 +286,16 @@ Genetic Optimizer
    <itemizedlist>
     <listitem>
      <para>
-      The Hitch-Hiker's Guide to Evolutionary Computation,
-      <ulink url="http://surf.de.uu.net/encore/www/"></ulink>, (FAQ for <ulink
+      <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"></ulink>)
      </para>
     </listitem>
    
     <listitem>
      <para>
-      Evolutionary Computation and its application to art and design,
-      <ulink url="http://www.red3d.com/cwr/evolve.html"></ulink>, by
+      <ulink url="http://www.red3d.com/cwr/evolve.html">
+      Evolutionary Computation and its application to art and design</ulink>, by
       Craig Reynolds
      </para>
     </listitem>
diff --git a/doc/src/sgml/gist.sgml b/doc/src/sgml/gist.sgml
index ece2b3f600..31c5de19cc 100644
--- a/doc/src/sgml/gist.sgml
+++ b/doc/src/sgml/gist.sgml
@@ -31,14 +31,15 @@ $PostgreSQL$
 
   <para>
     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>
+    Berkeley's GiST Indexing Project<ulink
+    url="http://gist.cs.berkeley.edu/">web site</ulink> and 
+    <ulink url="http://citeseer.nj.nec.com/448594.html">
+    Marcel Kornacker's thesis, Access Methods for Next-Generation Database Systems
+    </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
-    url="http://www.sai.msu.su/~megera/postgres/gist/"></>.
+    information on their<ulink url="http://www.sai.msu.su/~megera/postgres/gist/">
+    website</ulink>.
   </para>
 
 </sect1>
diff --git a/doc/src/sgml/history.sgml b/doc/src/sgml/history.sgml
index 9de8895c7b..26d8c7f38e 100644
--- a/doc/src/sgml/history.sgml
+++ b/doc/src/sgml/history.sgml
@@ -66,14 +66,14 @@ $PostgreSQL$
    <productname>POSTGRES</productname> has also been used as an
    educational tool at several universities.  Finally, Illustra
    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
+   <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
    commercialized it.  In late 1992,
    <productname>POSTGRES</productname> became the primary data manager
-   for the Sequoia 2000 scientific computing project, 
-   <ulink url="http://meteora.ucsd.edu/s2k/s2k_home.html"></ulink>.
+   for the 
+   <ulink url="http://meteora.ucsd.edu/s2k/s2k_home.html">
+   Sequoia 2000 scientific computing project</ulink>.
   </para>
 
   <para>
diff --git a/doc/src/sgml/info.sgml b/doc/src/sgml/info.sgml
index 90fdb7397b..5c818af07b 100644
--- a/doc/src/sgml/info.sgml
+++ b/doc/src/sgml/info.sgml
@@ -34,8 +34,8 @@ $PostgreSQL$
     <term>Web Site</term>
     <listitem>
      <para>
-      The <productname>PostgreSQL</productname> web site,
-      <ulink url="http://www.postgresql.org"></ulink>,
+      The <productname>PostgreSQL</productname> 
+      <ulink url="http://www.postgresql.org">web site</ulink>
       carries details on the latest release and other
       information to make your work or play with
       <productname>PostgreSQL</productname> more productive.
diff --git a/doc/src/sgml/installation.sgml b/doc/src/sgml/installation.sgml
index cf1e1a9279..b6e5f26dd5 100644
--- a/doc/src/sgml/installation.sgml
+++ b/doc/src/sgml/installation.sgml
@@ -1462,8 +1462,8 @@ 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 PostgreSQL Build Farm,
-   <ulink url="http://www.pgbuildfarm.org/"></ulink>.  
+   reported by the <ulink url="http://www.pgbuildfarm.org/">
+   PostgreSQL Build Farm</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
diff --git a/doc/src/sgml/intro.sgml b/doc/src/sgml/intro.sgml
index 2833e21e6a..530ecc1fdd 100644
--- a/doc/src/sgml/intro.sgml
+++ b/doc/src/sgml/intro.sgml
@@ -89,9 +89,9 @@ $PostgreSQL$
   <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">
-   </ulink>, developed at the University of California at Berkeley Computer Science
+   <productname>POSTGRES, Version 4.2</productname></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 4c0e8c5887..b314e6b1f2 100644
--- a/doc/src/sgml/nls.sgml
+++ b/doc/src/sgml/nls.sgml
@@ -154,15 +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 ISO 639-1 two-letter language code,
-    (in lower case), <ulink url="http://lcweb.loc.gov/standards/iso639-2/englangn.html"></ulink>,
-    e.g.,
+    where <replaceable>language</replaceable> is the 
+    <ulink url="http://lcweb.loc.gov/standards/iso639-2/englangn.html">
+    ISO 639-1 two-letter language code (in lower case)</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 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>,
+    where <replaceable>region</replaceable> is the
+    <ulink url="http://www.din.de/gremien/nas/nabd/iso3166ma/codlstp1/en_listp1.html">
+    ISO 3166-1 two-letter country code (in upper case)</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
diff --git a/doc/src/sgml/plperl.sgml b/doc/src/sgml/plperl.sgml
index e70de9fea0..87dd847184 100644
--- a/doc/src/sgml/plperl.sgml
+++ b/doc/src/sgml/plperl.sgml
@@ -15,8 +15,8 @@ $PostgreSQL$
 
   <para>
    PL/Perl is a loadable procedural language that enables you to write
-   <productname>PostgreSQL</productname> functions in the Perl programming language,
-   <ulink url="http://www.perl.com"></ulink>.
+   <productname>PostgreSQL</productname> functions in the 
+   <ulink url="http://www.perl.com">Perl programming language</ulink>.
   </para>
 
   <para>
@@ -200,10 +200,11 @@ 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 <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
+   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
    <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 fb0b067d82..3749b7171c 100644
--- a/doc/src/sgml/plpython.sgml
+++ b/doc/src/sgml/plpython.sgml
@@ -9,7 +9,7 @@
  <para>
   The <application>PL/Python</application> procedural language allows
   <productname>PostgreSQL</productname> functions to be written in the
-  Python language,<ulink url="http://www.python.org"></ulink>.
+  <ulink url="http://www.python.org">Python language</ulink>.
  </para>
 
  <para>
diff --git a/doc/src/sgml/pltcl.sgml b/doc/src/sgml/pltcl.sgml
index f35e28d27d..f0803ded45 100644
--- a/doc/src/sgml/pltcl.sgml
+++ b/doc/src/sgml/pltcl.sgml
@@ -16,8 +16,8 @@ $PostgreSQL$
   <para>
    PL/Tcl is a loadable procedural language for the
    <productname>PostgreSQL</productname> database system
-   that enables the Tcl language, <ulink url="http://www.tcl.tk/"></ulink>,
-   to be used to write functions and
+   that enables the <ulink url="http://www.tcl.tk/">
+   Tcl language</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 c1b9680cb0..1cac744f94 100644
--- a/doc/src/sgml/problems.sgml
+++ b/doc/src/sgml/problems.sgml
@@ -266,7 +266,7 @@ $PostgreSQL$
    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"></ulink>, 
+   an <ulink url="http://www.chiark.greenend.org.uk/~sgtatham/bugs.html">article</ulink>
    that outlines some more tips on reporting bugs.
   </para>
 
@@ -305,8 +305,8 @@ $PostgreSQL$
 
   <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/"></ulink>.
+   at the project's
+   <ulink url="http://www.postgresql.org/">web site</ulink>.
    Entering a bug report this way causes it to be mailed to the
    <email>[email protected]</email> mailing list.
   </para>