diff --git a/chapters/install.openbsd.xml b/chapters/install.openbsd.xml
index 690ac77bc1..8e7fce7578 100644
--- a/chapters/install.openbsd.xml
+++ b/chapters/install.openbsd.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
 <sect1 id="install.openbsd">
  <title>Unix/OpenBSD installs</title>
  <para>
@@ -67,7 +67,7 @@
    this method, it is now deprecated.  You can still use the old stable
    ports trees if you wish, but they are unsupported by the OpenBSD team.
    If you have any comments about this, the current maintainer for the port
-   is <ulink url='mailto:avsm@openbsd.org'>Anil Madhavapeddy</ulink>.
+   is Anil Madhavapeddy (avsm at openbsd dot org).
   </simpara>
  </sect2>
 </sect1>
diff --git a/reference/calendar/functions/easter-date.xml b/reference/calendar/functions/easter-date.xml
index 0d2f401b52..d2fc6103c3 100644
--- a/reference/calendar/functions/easter-date.xml
+++ b/reference/calendar/functions/easter-date.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
 <!-- splitted from ./en/functions/calendar.xml, last change in rev 1.2 -->
   <refentry id="function.easter-date">
    <refnamediv>
@@ -59,7 +59,7 @@ echo date ("M-d-Y", easter_date(2001));        // Apr-15-2001
     </para>
     <para>
      (The code is based on a C program by Simon Kershaw,
-     &lt;webmaster@ely.anglican.org&gt;)
+     &lt;webmaster at ely.anglican dot org&gt;)
     </para>
     <para>
      See <function>easter_days</function> for calculating Easter
diff --git a/reference/calendar/functions/easter-days.xml b/reference/calendar/functions/easter-days.xml
index 760b11b27d..69f1c21e16 100644
--- a/reference/calendar/functions/easter-days.xml
+++ b/reference/calendar/functions/easter-days.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
 <!-- splitted from ./en/functions/calendar.xml, last change in rev 1.2 -->
   <refentry id="function.easter-days">
    <refnamediv>
@@ -71,7 +71,7 @@ echo easter_days (1913);        //  2, i.e. March 23
     </para>
     <para>
      (The code is based on a C program by Simon Kershaw,
-     &lt;webmaster@ely.anglican.org&gt;)
+     &lt;webmaster at ely.anglican dot org&gt;)
     </para>
     <para>
      See also <function>easter_date</function>.
diff --git a/reference/oci8/reference.xml b/reference/oci8/reference.xml
index 61af03f37a..baf8588591 100644
--- a/reference/oci8/reference.xml
+++ b/reference/oci8/reference.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.9 $ -->
+<!-- $Revision: 1.10 $ -->
  <reference id="ref.oci8">
   <title>Oracle 8 functions</title>
   <titleabbrev>OCI8</titleabbrev>
@@ -137,7 +137,7 @@
       <programlisting role="php">
 <![CDATA[
 <?php
-// by sergo@bacup.ru
+// by sergo at bacup dot ru
 
 // Use option: OCI_DEFAULT for execute command to delay execution
 OCIExecute($stmt, OCI_DEFAULT);
@@ -171,7 +171,7 @@ OCICommit($conn);
       <programlisting role="php">
 <![CDATA[
 <?php
-// by webmaster@remoterealty.com
+// by webmaster at remoterealty dot com
 $sth = OCIParse ( $dbh, "begin sp_newaddress( :address_id, '$firstname',
  '$lastname', '$company', '$address1', '$address2', '$city', '$state',
  '$postalcode', '$country', :error_code );end;" );
diff --git a/reference/strings/functions/metaphone.xml b/reference/strings/functions/metaphone.xml
index 36f78fef32..2620d990ef 100644
--- a/reference/strings/functions/metaphone.xml
+++ b/reference/strings/functions/metaphone.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <!-- splitted from ./en/functions/strings.xml, last change in rev 1.2 -->
   <refentry id="function.metaphone">
    <refnamediv>
@@ -24,7 +24,7 @@
     </para>
     <para>
      Metaphone was developed by Lawrence Philips
-     &lt;lphilips@verity.com>. It is described in ["Practical
+     &lt;lphilips at verity dot com>. It is described in ["Practical
      Algorithms for Programmers", Binstock &amp; Rex, Addison Wesley,
      1995].
     </para>