diff --git a/core/src/main/java/org/acegisecurity/providers/cas/CasAuthenticationProvider.java b/core/src/main/java/org/acegisecurity/providers/cas/CasAuthenticationProvider.java
index 9905a76db1..9f4c8fa861 100644
--- a/core/src/main/java/org/acegisecurity/providers/cas/CasAuthenticationProvider.java
+++ b/core/src/main/java/org/acegisecurity/providers/cas/CasAuthenticationProvider.java
@@ -44,6 +44,9 @@ import org.springframework.util.Assert;
  * CasProcessingFilter#CAS_STATELESS_IDENTIFIER}. It can also validate a
  * previously created {@link CasAuthenticationToken}.
  * </p>
+ *
+ * @author Ben Alex
+ * @version $Id$
  */
 public class CasAuthenticationProvider implements AuthenticationProvider,
     InitializingBean, MessageSourceAware {
diff --git a/core/src/main/java/org/acegisecurity/providers/x509/X509AuthenticationProvider.java b/core/src/main/java/org/acegisecurity/providers/x509/X509AuthenticationProvider.java
index e4ac2f6171..d393a3080a 100644
--- a/core/src/main/java/org/acegisecurity/providers/x509/X509AuthenticationProvider.java
+++ b/core/src/main/java/org/acegisecurity/providers/x509/X509AuthenticationProvider.java
@@ -40,6 +40,9 @@ import org.springframework.util.Assert;
  * The request will typically originate from {@link
  * org.acegisecurity.ui.x509.X509ProcessingFilter}).
  * </p>
+ *
+ * @author Luke Taylor
+ * @version $Id$
  */
 public class X509AuthenticationProvider implements AuthenticationProvider,
     InitializingBean, MessageSourceAware {
diff --git a/core/src/main/java/org/acegisecurity/providers/x509/X509AuthoritiesPopulator.java b/core/src/main/java/org/acegisecurity/providers/x509/X509AuthoritiesPopulator.java
index 3707e65a9c..450e1d3f80 100644
--- a/core/src/main/java/org/acegisecurity/providers/x509/X509AuthoritiesPopulator.java
+++ b/core/src/main/java/org/acegisecurity/providers/x509/X509AuthoritiesPopulator.java
@@ -30,7 +30,8 @@ import java.security.cert.X509Certificate;
  * it should throw a {@link org.acegisecurity.BadCredentialsException}.
  * </p>
  *
- * @author Luke
+ * @author Luke Taylor
+ * @version $Id$
  */
 public interface X509AuthoritiesPopulator {
     /**
diff --git a/core/src/main/java/org/acegisecurity/providers/x509/cache/EhCacheBasedX509UserCache.java b/core/src/main/java/org/acegisecurity/providers/x509/cache/EhCacheBasedX509UserCache.java
index 69331dd829..1e9ccf3b6d 100644
--- a/core/src/main/java/org/acegisecurity/providers/x509/cache/EhCacheBasedX509UserCache.java
+++ b/core/src/main/java/org/acegisecurity/providers/x509/cache/EhCacheBasedX509UserCache.java
@@ -36,7 +36,7 @@ import java.security.cert.X509Certificate;
 
 /**
  * Caches <code>User</code> objects using a Spring IoC defined <a
- * HREF="http://ehcache.sourceforge.net">EHCACHE</a>.
+ * href="http://ehcache.sourceforge.net">EHCACHE</a>.
  *
  * @author Luke Taylor
  * @author Ben Alex
diff --git a/core/src/main/java/org/acegisecurity/providers/x509/populator/DaoX509AuthoritiesPopulator.java b/core/src/main/java/org/acegisecurity/providers/x509/populator/DaoX509AuthoritiesPopulator.java
index c8cdd8c803..785dee7b83 100644
--- a/core/src/main/java/org/acegisecurity/providers/x509/populator/DaoX509AuthoritiesPopulator.java
+++ b/core/src/main/java/org/acegisecurity/providers/x509/populator/DaoX509AuthoritiesPopulator.java
@@ -41,6 +41,9 @@ import org.springframework.util.Assert;
 /**
  * Populates the X509 authorities via an {@link
  * org.acegisecurity.userdetails.UserDetailsService}.
+ *
+ * @author Luke Taylor
+ * @version $Id$
  */
 public class DaoX509AuthoritiesPopulator implements X509AuthoritiesPopulator,
     InitializingBean, MessageSourceAware {
diff --git a/core/src/test/java/org/acegisecurity/providers/x509/X509AuthenticationProviderTests.java b/core/src/test/java/org/acegisecurity/providers/x509/X509AuthenticationProviderTests.java
index 664896d89c..26c9473ed1 100644
--- a/core/src/test/java/org/acegisecurity/providers/x509/X509AuthenticationProviderTests.java
+++ b/core/src/test/java/org/acegisecurity/providers/x509/X509AuthenticationProviderTests.java
@@ -30,7 +30,7 @@ import org.acegisecurity.userdetails.UserDetails;
 
 
 /**
- * Tests {@link org.acegisecurity.providers.x509.X509AuthenticationProvider}
+ * Tests {@link X509AuthenticationProvider}
  *
  * @author Luke Taylor
  * @version $Id$
diff --git a/core/src/test/java/org/acegisecurity/providers/x509/X509AuthenticationTokenTests.java b/core/src/test/java/org/acegisecurity/providers/x509/X509AuthenticationTokenTests.java
index e43e1addf5..3ced755330 100644
--- a/core/src/test/java/org/acegisecurity/providers/x509/X509AuthenticationTokenTests.java
+++ b/core/src/test/java/org/acegisecurity/providers/x509/X509AuthenticationTokenTests.java
@@ -19,9 +19,10 @@ import junit.framework.TestCase;
 
 
 /**
- * DOCUMENT ME!
+ * Tests for {@link X509AuthenticationToken}.
  *
  * @author Luke Taylor
+ * @version $Id$
  */
 public class X509AuthenticationTokenTests extends TestCase {
     //~ Constructors ===========================================================
diff --git a/core/src/test/java/org/acegisecurity/providers/x509/X509TestUtils.java b/core/src/test/java/org/acegisecurity/providers/x509/X509TestUtils.java
index 0fa1b15495..4a4d8cf6fb 100644
--- a/core/src/test/java/org/acegisecurity/providers/x509/X509TestUtils.java
+++ b/core/src/test/java/org/acegisecurity/providers/x509/X509TestUtils.java
@@ -20,7 +20,10 @@ import java.security.cert.CertificateFactory;
 import java.io.ByteArrayInputStream;
 
 /**
+ * Certificate creation utility for use in X.509 tests.
+ *
  * @author Luke Taylor
+ * @version $Id$
  */
 public class X509TestUtils {
 
diff --git a/core/src/test/java/org/acegisecurity/providers/x509/cache/EhCacheBasedX509UserCacheTests.java b/core/src/test/java/org/acegisecurity/providers/x509/cache/EhCacheBasedX509UserCacheTests.java
index ce9b3cf059..6ad2fb0987 100644
--- a/core/src/test/java/org/acegisecurity/providers/x509/cache/EhCacheBasedX509UserCacheTests.java
+++ b/core/src/test/java/org/acegisecurity/providers/x509/cache/EhCacheBasedX509UserCacheTests.java
@@ -30,7 +30,7 @@ import org.springframework.context.ApplicationContext;
 
 
 /**
- * DOCUMENT ME!
+ * Tests for {@link EhCacheBasedX509UserCache}.
  *
  * @author Luke Taylor
  * @version $Id$
diff --git a/core/src/test/java/org/acegisecurity/providers/x509/populator/DaoX509AuthoritiesPopulatorTests.java b/core/src/test/java/org/acegisecurity/providers/x509/populator/DaoX509AuthoritiesPopulatorTests.java
index 156301bb15..ceaf48a031 100644
--- a/core/src/test/java/org/acegisecurity/providers/x509/populator/DaoX509AuthoritiesPopulatorTests.java
+++ b/core/src/test/java/org/acegisecurity/providers/x509/populator/DaoX509AuthoritiesPopulatorTests.java
@@ -31,9 +31,10 @@ import org.springframework.dao.DataAccessException;
 
 
 /**
- * DOCUMENT ME!
+ * Tests for {@link DaoX509AuthoritiesPopulator}
  *
  * @author Luke Taylor
+ * @version $Id$
  */
 public class DaoX509AuthoritiesPopulatorTests extends TestCase {
     //~ Constructors ===========================================================