diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/ContainerFieldStrategy.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/ContainerFieldStrategy.java
index 925442e54..6ee0293e1 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/ContainerFieldStrategy.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/ContainerFieldStrategy.java
@@ -29,7 +29,7 @@ import org.apache.openjpa.jdbc.sql.Select;
  * An abstract container mapping that handles traversing the
  * join to examine the size of the relation.
  *
- * @author <a href="mailto:mprudhom@bea.com">Marc Prud'hommeaux</a>
+ * @author Marc Prud'hommeaux
  */
 public abstract class ContainerFieldStrategy
     extends AbstractFieldStrategy {
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/ParseException.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/ParseException.java
index 04ce062e9..b52babca5 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/ParseException.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/ParseException.java
@@ -24,7 +24,7 @@ import org.apache.openjpa.util.UserException;
 /**
  * Signifies that a lexical error occurred when parsing the JPQL statement.
  *
- * @author <a href="mailto:mprudhom@bea.com">Marc Prud'hommeaux</a>
+ * @author Marc Prud'hommeaux
  */
 public class ParseException
     extends UserException {
diff --git a/openjpa-lib/src/test/java/org/apache/openjpa/lib/test/AbstractTestCase.java b/openjpa-lib/src/test/java/org/apache/openjpa/lib/test/AbstractTestCase.java
index 4a187ffb1..4e6bd99c8 100644
--- a/openjpa-lib/src/test/java/org/apache/openjpa/lib/test/AbstractTestCase.java
+++ b/openjpa-lib/src/test/java/org/apache/openjpa/lib/test/AbstractTestCase.java
@@ -1029,7 +1029,7 @@ public abstract class AbstractTestCase extends TestCase {
      * A ClassLoader that is completely isolated with respect to
      * any classes that are loaded in the System ClassLoader.
      *
-     * @author <a href="mailto:marc@solarmetric.com">Marc Prud'hommeaux</a>
+     * @author Marc Prud'hommeaux
      */
     private static class IsolatedClassLoader extends NestedClassLoader {
 
@@ -1460,7 +1460,7 @@ public abstract class AbstractTestCase extends TestCase {
      * if a test hasn't completed in a shorted amount of time than
      * the global test timeout.
      *
-     * @author <a href="mailto:marc@solarmetric.com">Marc Prud'hommeaux</a>
+     * @author Marc Prud'hommeaux
      */
     private static class WatchdogThread extends Thread {
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestPersistence.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestPersistence.java
index c04ae62c7..fc0282f14 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestPersistence.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestPersistence.java
@@ -29,7 +29,7 @@ import org.apache.openjpa.persistence.OpenJPAEntityManager;
 /**
  * Simple test case to get an EntityManager and perform some basic operations.
  *
- * @author <a href="mailto:mprudhom@bea.com">Marc Prud'hommeaux</a>
+ * @author Marc Prud'hommeaux
  */
 public class TestPersistence
     extends TestCase {
@@ -38,7 +38,7 @@ public class TestPersistence
 
     public void setUp() {
         Map props = new HashMap();
-        props.put("openjpa.MetaDataFactory", 
+        props.put("openjpa.MetaDataFactory",
             "jpa(Types=" + AllFieldTypes.class.getName() + ")");
         emf = Persistence.createEntityManagerFactory("test", props);
     }
diff --git a/openjpa-project/src/doc/manual/ref_guide_remote.xml b/openjpa-project/src/doc/manual/ref_guide_remote.xml
index 0e089fbf1..bb215cb3f 100644
--- a/openjpa-project/src/doc/manual/ref_guide_remote.xml
+++ b/openjpa-project/src/doc/manual/ref_guide_remote.xml
@@ -53,7 +53,7 @@ sections explain these capabilities in detail.
         </indexterm>
         <para>
 The JPA Overview describes the specification's standard detach and attach APIs
-in <xref linkend="jpa_overview_em_lifecycle"/>. This section enumerates 
+in <xref linkend="jpa_overview_em_lifecycle"/>. This section enumerates
 OpenJPA's enhancements to the standard behavior.
         </para>
         <section id="ref_guide_detach_behavior">
@@ -621,7 +621,7 @@ the following:
                         TCP Remote Commit Provider Configuration
                     </title>
 <programlisting>
-&lt;property name="openjpa.RemoteCommitProvider" 
+&lt;property name="openjpa.RemoteCommitProvider"
     value="tcp(Addresses=10.0.1.10;10.0.1.11;10.0.1.12;10.0.1.13)"/&gt;
 </programlisting>
                 </example>
@@ -685,9 +685,7 @@ creating an implementation of the
 <classname> RemoteCommitProvider</classname></ulink> interface, possibly by
 extending the
 <ulink url="../apidocs/org/apache/openjpa/event/AbstractRemoteCommitProvider.html">
-<classname>AbstractRemoteCommitProvider</classname></ulink> abstract class. For
-details on particular customization needs, contact us at
-<ulink url="mailto:support@solarmetric.com"> support@solarmetric.com</ulink>.
+<classname>AbstractRemoteCommitProvider</classname></ulink> abstract class..
             </para>
         </section>
     </section>