Make use of <email> tag for marking up email addresses.

22 files changed, 70 insertions, 86 deletions

diff --git a/doc/src/sgml/charset.sgml b/doc/src/sgml/charset.sgml
index e79c14229ac..c0826bdf5d7 100644
--- a/doc/src/sgml/charset.sgml
+++ b/doc/src/sgml/charset.sgml
@@ -1,4 +1,4 @@
-<!-- $Header: /cvsroot/pgsql/doc/src/sgml/charset.sgml,v 2.4 2000/12/20 00:44:49 ishii Exp $ -->
+<!-- $Header: /cvsroot/pgsql/doc/src/sgml/charset.sgml,v 2.5 2000/12/22 21:51:57 petere Exp $ -->
 
 <chapter id="charset">
  <title>Localization</>
@@ -235,7 +235,7 @@ perl: warning: Falling back to the standard locale ("C").
     <title>Author</title>
 
     <para>
-     <ulink url="mailto:[email protected]">Tatsuo Ishii</ulink>,
+     Tatsuo Ishii (<email>[email protected]</email>),
      last updated 2000-03-22.
      Check <ulink
       url="http://www.sra.co.jp/people/t-ishii/PostgreSQL/">Tatsuo's
@@ -670,7 +670,7 @@ Jan 26, 1999
 	* Add support for Big5 for fronend encoding
 	  (you need to create a database with EUC_TW to use Big5)
 	* Add regression test case for EUC_TW
-	  (contributed by <ulink url="mailto:[email protected]">Jonah Kuo</ulink>)
+	  (contributed by Jonah Kuo <email>[email protected]</email>)
 
 Dec 15, 1998
 	* Bugs related to SQL_ASCII support fixed
@@ -701,7 +701,7 @@ April 21, 1998 some enhancements/fixes
 	* add octet_length()
 	* add --with-mb option to configure
 	* new regression tests for EUC_KR
-  	  (contributed by <ulink url="mailto:[email protected]">Soonmyung. Hong</ulink>)
+  	  (contributed by Soonmyung Hong <email>[email protected]</email>)
 	* add some test cases to the EUC_JP regression test
 	* fix problem in regress/regress.sh in case of System V
 	* fix toupper(), tolower() to handle 8bit chars
@@ -730,7 +730,7 @@ is not necceary in 6.5.1 - Tatsuo]
 Version: 0.91 for PgSQL 6.5
 Author: Pavel Behal
 Revised by: Tatsuo Ishii
-Email: <ulink url="mailto:[email protected]">[email protected]</ulink>
+Email: [email protected]
 Licence: The Same as PostgreSQL
 
 Sorry for my Eglish and C code, I'm not native :-)
diff --git a/doc/src/sgml/compiler.sgml b/doc/src/sgml/compiler.sgml
index 9bb27a507ed..b7c99f6d7a1 100644
--- a/doc/src/sgml/compiler.sgml
+++ b/doc/src/sgml/compiler.sgml
@@ -14,7 +14,7 @@
 <Para>
 <Note>
 <Para>
-Contributed by <ULink url="mailto:[email protected]">Brian Gallew</ULink>
+Contributed by Brian Gallew (<email>[email protected]</email>)
 </Para>
 </Note>
 </para>
diff --git a/doc/src/sgml/cvs.sgml b/doc/src/sgml/cvs.sgml
index 656e28f11e2..d019de89b12 100644
--- a/doc/src/sgml/cvs.sgml
+++ b/doc/src/sgml/cvs.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/cvs.sgml,v 1.12 2000/12/22 18:57:49 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/cvs.sgml,v 1.13 2000/12/22 21:51:57 petere Exp $
 CVS code repository
 Thomas Lockhart
 -->
@@ -44,7 +44,7 @@ Thomas Lockhart
    <note>
     <title>Author</title>
     <para>
-     Written by <ulink url="mailto:[email protected]">Marc G. Fournier</ulink> on 1998-11-05.
+     Written by Marc G. Fournier (<email>[email protected]</email>) on 1998-11-05
     </para>
    </note>
   </para>
@@ -294,7 +294,7 @@ $ chmod -R go-w pgsql
    the <productname>Postgres</productname> source tree
    is <productname>CVSup</productname>.
    <productname>CVSup</productname> was developed by
-   <ulink url="mailto:[email protected]">John Polstra</ulink> to
+   John Polstra (<email>[email protected]</email>) to
    distribute CVS repositories and other file trees for
    <ulink url="http://www.freebsd.org">the FreeBSD project</ulink>.
   </para>
diff --git a/doc/src/sgml/datetime.sgml b/doc/src/sgml/datetime.sgml
index 06726fb1ff3..5244f353b80 100644
--- a/doc/src/sgml/datetime.sgml
+++ b/doc/src/sgml/datetime.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/datetime.sgml,v 2.14 2000/12/21 22:55:27 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/datetime.sgml,v 2.15 2000/12/22 21:51:57 petere Exp $
 Date/time details
 -->
 
@@ -637,8 +637,7 @@ Date/time details
 
   <note>
    <para>
-    Contributed by 
-    <ulink url="mailto:[email protected]">Jos� Soares</ulink>.
+    Contributed by Jos� Soares (<email>[email protected]</email>)
    </para>
   </note>
 
diff --git a/doc/src/sgml/ecpg.sgml b/doc/src/sgml/ecpg.sgml
index e0ba477b3a9..1befbf796c0 100644
--- a/doc/src/sgml/ecpg.sgml
+++ b/doc/src/sgml/ecpg.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ecpg.sgml,v 1.17 2000/09/29 20:21:33 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ecpg.sgml,v 1.18 2000/12/22 21:51:57 petere Exp $
 -->
 
  <chapter id="ecpg">
@@ -31,8 +31,8 @@ $Header: /cvsroot/pgsql/doc/src/sgml/ecpg.sgml,v 1.17 2000/09/29 20:21:33 petere
   <para>
    This describes an embedded <acronym>SQL</acronym> in <acronym>C</acronym> 
    package for <productname>Postgres</productname>.
-   It is written by <ulink url="mailto:[email protected]">Linus Tolke</ulink>
-   and <ulink url="mailto:[email protected]">Michael Meskes</ulink>.
+   It was written by Linus Tolke (<email>[email protected]</email>)
+   and Michael Meskes (<email>[email protected]</email>).
    The package is installed with the <productname>Postgres</> distribution.
 
    <note>
diff --git a/doc/src/sgml/geqo.sgml b/doc/src/sgml/geqo.sgml
index 546a864901b..19ecca700e0 100644
--- a/doc/src/sgml/geqo.sgml
+++ b/doc/src/sgml/geqo.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/geqo.sgml,v 1.14 2000/12/16 22:44:47 tgl Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/geqo.sgml,v 1.15 2000/12/22 21:51:57 petere Exp $
 Genetic Optimizer
 -->
 
@@ -34,7 +34,7 @@ Genetic Optimizer
    <note>
     <title>Author</title>
     <para>
-     Written by <ulink url="mailto:[email protected]">Martin Utesch</ulink>
+     Written by Martin Utesch (<email>[email protected]</email>)
      for the Institute of Automatic Control at the University of Mining and Technology in Freiberg, Germany.
     </para>
    </note>
diff --git a/doc/src/sgml/gist.sgml b/doc/src/sgml/gist.sgml
index b858b1e8480..e8c9f9ee3ce 100644
--- a/doc/src/sgml/gist.sgml
+++ b/doc/src/sgml/gist.sgml
@@ -25,8 +25,8 @@ And there is more interesting reading at the Berkely database site at
 <Note>
 <Title>Author</Title>
 <Para>
-This extraction from an e-mail sent by 
-<ULink url="mailto:[email protected]">Eugene Selkov Jr.</ULink>
+This extraction from an email sent by 
+Eugene Selkov, Jr. (<email>[email protected]</email>)
 contains good information
 on GiST. Hopefully we will learn more in the future and update this information.
 - thomas 1998-03-01
diff --git a/doc/src/sgml/history.sgml b/doc/src/sgml/history.sgml
index fe2168cb074..df55881665e 100644
--- a/doc/src/sgml/history.sgml
+++ b/doc/src/sgml/history.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/history.sgml,v 1.11 2000/12/21 22:55:27 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/history.sgml,v 1.12 2000/12/22 21:51:57 petere Exp $
 -->
 
 <sect1 id="history">
@@ -96,10 +96,7 @@ $Header: /cvsroot/pgsql/doc/src/sgml/history.sgml,v 1.11 2000/12/21 22:55:27 pet
   <title><productname>Postgres95</productname></title>
 
   <para>
-   In 1994,
-   <ulink url="mailto:[email protected]">Andrew Yu</ulink>
-   and
-   <ulink url="http://http.cs.berkeley.edu/~jolly/">Jolly Chen</ulink>
+   In 1994, Andrew Yu and Jolly Chen
    added a SQL language interpreter to <productname>Postgres</productname>.
    <productname>Postgres95</productname> was subsequently released to
    the Web to find its own way in the world as an
diff --git a/doc/src/sgml/indexcost.sgml b/doc/src/sgml/indexcost.sgml
index 4570bc4f642..9c781f97fc8 100644
--- a/doc/src/sgml/indexcost.sgml
+++ b/doc/src/sgml/indexcost.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/Attic/indexcost.sgml,v 2.5 2000/09/29 20:21:34 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/Attic/indexcost.sgml,v 2.6 2000/12/22 21:51:57 petere Exp $
 -->
 
  <chapter id="indexcost">
@@ -9,8 +9,7 @@ $Header: /cvsroot/pgsql/doc/src/sgml/Attic/indexcost.sgml,v 2.5 2000/09/29 20:21
    <title>Author</title>
 
    <para>
-    Written by <ulink url="mailto:[email protected]">Tom Lane</ulink>
-    on 2000-01-24.
+    Written by Tom Lane (<email>[email protected]</email>) on 2000-01-24
    </para>
   </note>
 
diff --git a/doc/src/sgml/indices.sgml b/doc/src/sgml/indices.sgml
index ebb46d71b3a..9623ec05c13 100644
--- a/doc/src/sgml/indices.sgml
+++ b/doc/src/sgml/indices.sgml
@@ -160,8 +160,7 @@ SELECT am.amname AS acc_name,
     <note>
      <title>Author</title>
      <para>
-      Written by 
-      <ulink url="mailto:[email protected]">Herouth Maoz</ulink>
+      Written by Herouth Maoz (<email>[email protected]</email>).
       This originally appeared on the User's Mailing List on 1998-03-02
       in response to the question:
       "What is the difference between PRIMARY KEY and UNIQUE constraints?".
@@ -325,8 +324,8 @@ CREATE MEMSTORE ON &lt;table&gt; COLUMNS &lt;cols&gt;
    <note>
     <title>Author</title>
     <para>
-     This is from a reply to a question on the e-mail list
-     by <ulink url="mailto:[email protected]">Paul M. Aoki</ulink>
+     This is from a reply to a question on the email list
+     by Paul M. Aoki (<email>[email protected]</email>)
      on 1998-08-11.
 <!--
   Paul M. Aoki         | University of California at Berkeley
diff --git a/doc/src/sgml/info.sgml b/doc/src/sgml/info.sgml
index 7f51e54d18b..753bdd2f795 100644
--- a/doc/src/sgml/info.sgml
+++ b/doc/src/sgml/info.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/info.sgml,v 1.9 2000/09/29 20:21:34 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/info.sgml,v 1.10 2000/12/22 21:51:57 petere Exp $
 -->
 
 <sect1 id="resources">
@@ -125,7 +125,7 @@ $Header: /cvsroot/pgsql/doc/src/sgml/info.sgml,v 1.9 2000/09/29 20:21:34 petere
    <listitem>
     <para>
      The
-     <ulink url="mailto:[email protected]">pgsql-general</ulink>
+     <email>[email protected]</email>
      (<ulink url="http://www.postgresql.org/mhonarc/pgsql-general/">archive</ulink>)
      mailing list is a good place to have user questions answered.
      Other mailing lists are available; consult the Info Central section of the
@@ -152,8 +152,8 @@ $Header: /cvsroot/pgsql/doc/src/sgml/info.sgml,v 1.9 2000/09/29 20:21:34 petere
      Even those without a lot of experience can provide corrections and
      minor changes in the documentation, and that is a good way to start.
      The 
-     <ulink url="mailto:[email protected]">pgsql-docs</ulink>
-     (<ulink url="http://www.PostgreSQL.ORG/mhonarc/pgsql-docs/">archive</ulink>)
+     <email>[email protected]</email>
+     (<ulink url="http://www.postgresql.org/mhonarc/pgsql-docs/">archive</ulink>)
      mailing list is the place to get going.
     </para>
    </listitem>
diff --git a/doc/src/sgml/jdbc.sgml b/doc/src/sgml/jdbc.sgml
index 83196939ba4..7643abfbddc 100644
--- a/doc/src/sgml/jdbc.sgml
+++ b/doc/src/sgml/jdbc.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/Attic/jdbc.sgml,v 1.17 2000/12/22 18:57:49 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/Attic/jdbc.sgml,v 1.18 2000/12/22 21:51:58 petere Exp $
 -->
 
  <chapter id="jdbc">
@@ -9,7 +9,7 @@ $Header: /cvsroot/pgsql/doc/src/sgml/Attic/jdbc.sgml,v 1.17 2000/12/22 18:57:49
    <note>
     <title>Author</title>
     <para>
-     Written by <ulink url="mailto:[email protected]">Peter T. Mount</ulink>, the
+     Written by Peter T. Mount (<email>[email protected]</email>), the
      author of the <acronym>JDBC</acronym> driver.
     </para>
    </note>
diff --git a/doc/src/sgml/keys.sgml b/doc/src/sgml/keys.sgml
index 6c8c3d5be97..c1a454a2b4e 100644
--- a/doc/src/sgml/keys.sgml
+++ b/doc/src/sgml/keys.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/Attic/keys.sgml,v 1.6 2000/12/22 18:57:49 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/Attic/keys.sgml,v 1.7 2000/12/22 21:51:58 petere Exp $
 Indices and Keys
 -->
 
@@ -19,8 +19,8 @@ Indices and Keys
   <note>
    <title>Author</title>
    <para>
-    Written by 
-    <ulink url="mailto:[email protected]">Herouth Maoz</ulink>
+    Written by Herouth Maoz
+    (<email>[email protected]</email>)
    </para>
   </note>
 
diff --git a/doc/src/sgml/libpgeasy.sgml b/doc/src/sgml/libpgeasy.sgml
index c06df9aab72..a8dac2a67d5 100644
--- a/doc/src/sgml/libpgeasy.sgml
+++ b/doc/src/sgml/libpgeasy.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/Attic/libpgeasy.sgml,v 2.3 2000/05/18 14:24:31 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/Attic/libpgeasy.sgml,v 2.4 2000/12/22 21:51:58 petere Exp $
 -->
 
  <chapter id="pgeasy-chapter">
@@ -10,8 +10,8 @@ $Header: /cvsroot/pgsql/doc/src/sgml/Attic/libpgeasy.sgml,v 2.3 2000/05/18 14:24
 
    <para>
     Written by Bruce Momjian
-    (<ulink url="mailto:[email protected]">[email protected]</ulink>)
-    and last updated 2000-03-30.
+    (<email>[email protected]</email>)
+    and last updated 2000-03-30
    </para>
   </note>
 
diff --git a/doc/src/sgml/lisp.sgml b/doc/src/sgml/lisp.sgml
index c2682525e13..8de2c5ed3f7 100644
--- a/doc/src/sgml/lisp.sgml
+++ b/doc/src/sgml/lisp.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/Attic/lisp.sgml,v 2.3 2000/05/02 20:01:52 thomas Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/Attic/lisp.sgml,v 2.4 2000/12/22 21:51:58 petere Exp $
 -->
 
  <chapter id="lisp">
@@ -15,9 +15,8 @@ $Header: /cvsroot/pgsql/doc/src/sgml/Attic/lisp.sgml,v 2.3 2000/05/02 20:01:52 t
   <note>
    <title>Author</title>
    <para>
-    Written by
-    <ulink url="mailto:[email protected]">Eric Marsden</ulink>
-    on 21 Jul 1999.
+    Written by Eric Marsden <email>[email protected]</email>
+    on 1999-07-21
    </para>
   </note>
 
diff --git a/doc/src/sgml/mvcc.sgml b/doc/src/sgml/mvcc.sgml
index 724aa0d30fb..c7313fe1a2b 100644
--- a/doc/src/sgml/mvcc.sgml
+++ b/doc/src/sgml/mvcc.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/mvcc.sgml,v 2.10 2000/10/11 18:29:52 tgl Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/mvcc.sgml,v 2.11 2000/12/22 21:51:58 petere Exp $
 -->
 
  <chapter id="mvcc">
@@ -11,7 +11,7 @@ $Header: /cvsroot/pgsql/doc/src/sgml/mvcc.sgml,v 2.10 2000/10/11 18:29:52 tgl Ex
     (MVCC)
     is an advanced technique for improving database performance in a
     multi-user environment. 
-    <ulink url="mailto:[email protected]">Vadim Mikheev</ulink> provided
+    Vadim Mikheev (<email>[email protected]</email>) provided
     the implementation for <productname>Postgres</productname>.
    </para>
   </abstract>
diff --git a/doc/src/sgml/notation.sgml b/doc/src/sgml/notation.sgml
index e6faf72fecd..9661beb6584 100644
--- a/doc/src/sgml/notation.sgml
+++ b/doc/src/sgml/notation.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/notation.sgml,v 1.12 2000/12/22 19:31:56 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/notation.sgml,v 1.13 2000/12/22 21:51:58 petere Exp $
 -->
 
 <sect1 id="terminology">
@@ -101,8 +101,8 @@ $Header: /cvsroot/pgsql/doc/src/sgml/notation.sgml,v 1.12 2000/12/22 19:31:56 pe
    the notation for
    flagging commands is not universally consistant throughout the
    documentation set.
-   Please report problems to
-   <ulink url="mailto:[email protected]">the Documentation Mailing List</ulink>.
+   Please report problems to the documentation mailing list
+   <email>[email protected]</email>.
   </para>
  </note>
 
diff --git a/doc/src/sgml/odbc.sgml b/doc/src/sgml/odbc.sgml
index 45b4c8347f7..9acb962a18e 100644
--- a/doc/src/sgml/odbc.sgml
+++ b/doc/src/sgml/odbc.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/Attic/odbc.sgml,v 1.19 2000/12/22 18:57:49 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/Attic/odbc.sgml,v 1.20 2000/12/22 21:51:58 petere Exp $
 -->
 
  <chapter id="odbc">
@@ -21,8 +21,8 @@ $Header: /cvsroot/pgsql/doc/src/sgml/Attic/odbc.sgml,v 1.19 2000/12/22 18:57:49
 
   <note>
    <para>
-    Background information originally by
-    <ulink url="mailto:[email protected]">Tim Goeke</ulink>
+    Background information originally by Tim Goeke
+    (<email>[email protected]</email>)
    </para>
   </note>
 
@@ -523,8 +523,8 @@ TextAsLongVarchar=0
 	 The September release of ApplixWare v4.4.1 (the first release with official
 	 <acronym>ODBC</acronym> support under Linux) shows problems when usernames
 	 exceed eight (8) characters in length.
-	 Problem description ontributed by 
-	 <ulink url="mailto:[email protected]">Steve Campbell</ulink>.
+	 Problem description ontributed by Steve Campbell
+	 (<email>[email protected]</email>).
 	</para>
        </listitem>
       </varlistentry>
@@ -537,9 +537,8 @@ TextAsLongVarchar=0
       <title>Author</title>
 
       <para>
-       Contributed by 
-       <ulink url="mailto:[email protected]">Steve Campbell</ulink> on
-       1998-10-20.
+       Contributed by Steve Campbell (<email>[email protected]</email>),
+       1998-10-20
       </para>
      </note>
 
diff --git a/doc/src/sgml/problems.sgml b/doc/src/sgml/problems.sgml
index e8a40f2a7d6..2bc5148115e 100644
--- a/doc/src/sgml/problems.sgml
+++ b/doc/src/sgml/problems.sgml
@@ -251,21 +251,16 @@
   <title>Where to report bugs</title>
 
   <para>
-   In general, send bug reports to
-   <ulink url="mailto:[email protected]">the bug report
-    mailing list</ulink>.
+   In general, send bug reports to the bug report mailing list at
+   <email>[email protected]</email>.
    You are invited to find a descriptive subject for your email
    message, perhaps parts of the error message.
   </para>
 
   <para> 
    Do not send bug reports to any of the user mailing lists, such as
-
-   <ulink url="mailto:[email protected]">the SQL language
-    mailing list</ulink>
-   or
-   <ulink url="mailto:[email protected]">the general topics
-    mailing list</ulink>.
+   <email>[email protected]</email> or
+   <email>[email protected]</email>.
    These mailing lists are for answering
    user questions and their subscribers normally do not wish to receive
    bug reports. More importantly, they are unlikely to fix them.
@@ -273,8 +268,7 @@
 
   <para>
    Also, please do <emphasis>not</emphasis> send reports to
-   <ulink url="mailto:[email protected]">the developers'
-    mailing list</ulink>.
+   the developers' mailing list <email>[email protected]</email>.
    This list is for discussing the
    development of <productname>PostgreSQL</productname> and it would be nice
    if we could keep the bug reports separate. We might choose to take up a
@@ -284,15 +278,13 @@
 
   <para>
    If you have a problem with the documentation, send email to
-   <ulink url="mailto:[email protected]">the documentation
-    mailing list</ulink>.
+   the documentation mailing list <email>[email protected]</email>.
    Mention the document, chapter, and sections in your problem report.
   </para>
  
   <para>
    If your bug is a portability problem on a non-supported platform,
-   send mail to
-   <ulink url="mailto:[email protected]">the porting issues mail list</ulink>,
+   send mail to <email>[email protected]</email>,
    so we (and you) can work on
    porting <productname>PostgreSQL</productname> to your platform.
   </para>
@@ -306,7 +298,7 @@
     subscribe to the special pgsql-loophole mailing list, which
     allows you to post to all <productname>PostgreSQL</productname>
     mailing lists without receiving any messages. Send email to
-    <ulink url="mailto:[email protected]">[email protected]</ulink>
+    <email>[email protected]</email>
     to subscribe.
    </para>
   </note>
diff --git a/doc/src/sgml/protocol.sgml b/doc/src/sgml/protocol.sgml
index bcf3399ebcc..5a813ed3393 100644
--- a/doc/src/sgml/protocol.sgml
+++ b/doc/src/sgml/protocol.sgml
@@ -11,8 +11,8 @@
 <Para>
 <Note>
 <Para>
-Written by <ULink url="mailto:[email protected]">Phil Thompson</ULink>.
-Updates for protocol 2.0 by <ULink url="mailto:[email protected]">Tom Lane</ULink>.
+Written by Phil Thompson (<email>[email protected]</email>).
+Updates for protocol 2.0 by Tom Lane (<email>[email protected]</email>).
 </Para>
 </Note>
 </para>
diff --git a/doc/src/sgml/release.sgml b/doc/src/sgml/release.sgml
index adb12435101..34b1ff5c564 100644
--- a/doc/src/sgml/release.sgml
+++ b/doc/src/sgml/release.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/release.sgml,v 1.70 2000/12/21 22:55:27 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/release.sgml,v 1.71 2000/12/22 21:51:58 petere Exp $
 -->
 
  <chapter id="release">
@@ -724,7 +724,7 @@ Enhancements
 ------------
 New CLI interface include file sqlcli.h, based on SQL3/SQL98
 Remove all limits on query length, row length limit still exists (Tom)
-Update jdbc protocol to 2.0 (<ulink url="mailto:[email protected]">Jens Glaser</ulink>)
+Update jdbc protocol to 2.0 (Jens Glaser <email>[email protected]</email>)
 Add TRUNCATE command to quickly truncate relation (Mike Mascari)
 Fix to give super user and createdb user proper update catalog rights (Peter E)
 Allow ecpg bool variables to have NULL values (Christof)
@@ -745,7 +745,7 @@ Allow WHERE restriction on ctid (physical heap location) (Hiroshi)
 Move pginterface from contrib to interface directory, rename to pgeasy (Bruce)
 Change pgeasy connectdb() parameter ordering (Bruce)
 Require SELECT DISTINCT target list to have all ORDER BY columns (Tom)
-Add Oracle's COMMENT ON command (<ulink url="mailto:mascarim@yahoo">Mike Mascari</ulink>)
+Add Oracle's COMMENT ON command (Mike Mascari <email>[email protected]</email>)
 libpq's PQsetNoticeProcessor function now returns previous hook(Peter E)
 Prevent PQsetNoticeProcessor from being set to NULL (Peter E)
 Make USING in COPY optional (Bruce)
@@ -939,7 +939,7 @@ Add scripts for checking includes (Bruce)
 Remove un-needed #include's from *.c files (Bruce)
 Change #include's to use &lt;&gt; and "" as appropriate (Bruce)
 Enable WIN32 compilation of libpq
-Alpha spinlock fix from <ulink url="mailto:[email protected]">Uncle George</ulink>
+Alpha spinlock fix from Uncle George <email>[email protected]</email>
 Overhaul of optimizer data structures (Tom)
 Fix to cygipc library (Yutaka Tanida)
 Allow pgsql to work on newer Cygwin snapshots (Dan)
@@ -957,7 +957,7 @@ Fix for plpgsql on BSDI
 Add SQL_ASCII test case to the regression test (Tatsuo)
 configure --with-mb now deprecated (Tatsuo)
 NT fixes
-NetBSD fixes <ulink url="mailto:[email protected]">Johnny C. Lam</ulink>
+NetBSD fixes (Johnny C. Lam <email>[email protected]</email>)
 Fixes for Alpha compiles
 New multibyte encodings
      </programlisting>
diff --git a/doc/src/sgml/y2k.sgml b/doc/src/sgml/y2k.sgml
index a0028668a37..4d3f0f8ccad 100644
--- a/doc/src/sgml/y2k.sgml
+++ b/doc/src/sgml/y2k.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/Attic/y2k.sgml,v 1.7 2000/05/02 20:01:53 thomas Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/Attic/y2k.sgml,v 1.8 2000/12/22 21:51:58 petere Exp $
 -->
 
 <sect1 id="y2k">
@@ -9,8 +9,8 @@ $Header: /cvsroot/pgsql/doc/src/sgml/Attic/y2k.sgml,v 1.7 2000/05/02 20:01:53 th
   <title>Author</title>
 
   <para>
-   Written by 
-   <ulink url="mailto:[email protected]">Thomas Lockhart</ulink>
+   Written by Thomas Lockhart
+   (<email>[email protected]</email>)
    on 1998-10-22. Updated 2000-03-31.
   </para>
  </note>