diff --git a/src/share/classes/java/security/AccessController.java b/src/share/classes/java/security/AccessController.java
index ed103a9186db69b6ce5cd589fadfe6913a88e36f..a7d089958feae73841335d47d42f42de17c0fa41 100644
--- a/src/share/classes/java/security/AccessController.java
+++ b/src/share/classes/java/security/AccessController.java
@@ -279,6 +279,9 @@ public final class AccessController {
      * <p> Note that any DomainCombiner associated with the current
      * AccessControlContext will be ignored while the action is performed.
      *
+     * @param <T> the type of the value returned by the PrivilegedAction's
+     *                  {@code run} method.
+     *
      * @param action the action to be performed.
      *
      * @return the value returned by the action's {@code run} method.
@@ -305,6 +308,9 @@ public final class AccessController {
      * <p> This method preserves the current AccessControlContext's
      * DomainCombiner (which may be null) while the action is performed.
      *
+     * @param <T> the type of the value returned by the PrivilegedAction's
+     *                  {@code run} method.
+     *
      * @param action the action to be performed.
      *
      * @return the value returned by the action's {@code run} method.
@@ -344,6 +350,8 @@ public final class AccessController {
      * {@link java.security.SecurityPermission}, then the action is performed
      * with no permissions.
      *
+     * @param <T> the type of the value returned by the PrivilegedAction's
+     *                  {@code run} method.
      * @param action the action to be performed.
      * @param context an <i>access control context</i>
      *                representing the restriction to be applied to the
@@ -377,6 +385,8 @@ public final class AccessController {
      * If the action's {@code run} method throws an (unchecked) exception,
      * it will propagate through this method.
      *
+     * @param <T> the type of the value returned by the PrivilegedAction's
+     *                  {@code run} method.
      * @param action the action to be performed.
      * @param context an <i>access control context</i>
      *                representing the restriction to be applied to the
@@ -429,6 +439,8 @@ public final class AccessController {
      * <p> This method preserves the current AccessControlContext's
      * DomainCombiner (which may be null) while the action is performed.
      *
+     * @param <T> the type of the value returned by the PrivilegedAction's
+     *                  {@code run} method.
      * @param action the action to be performed.
      * @param context an <i>access control context</i>
      *                representing the restriction to be applied to the
@@ -479,6 +491,9 @@ public final class AccessController {
      * <p> Note that any DomainCombiner associated with the current
      * AccessControlContext will be ignored while the action is performed.
      *
+     * @param <T> the type of the value returned by the
+     *                  PrivilegedExceptionAction's {@code run} method.
+     *
      * @param action the action to be performed
      *
      * @return the value returned by the action's {@code run} method
@@ -509,6 +524,9 @@ public final class AccessController {
      * <p> This method preserves the current AccessControlContext's
      * DomainCombiner (which may be null) while the action is performed.
      *
+     * @param <T> the type of the value returned by the
+     *                  PrivilegedExceptionAction's {@code run} method.
+     *
      * @param action the action to be performed.
      *
      * @return the value returned by the action's {@code run} method
@@ -585,6 +603,8 @@ public final class AccessController {
      * {@link java.security.SecurityPermission}, then the action is performed
      * with no permissions.
      *
+     * @param <T> the type of the value returned by the
+     *                  PrivilegedExceptionAction's {@code run} method.
      * @param action the action to be performed
      * @param context an <i>access control context</i>
      *                representing the restriction to be applied to the
@@ -622,6 +642,8 @@ public final class AccessController {
      * If the action's {@code run} method throws an (unchecked) exception,
      * it will propagate through this method.
      *
+     * @param <T> the type of the value returned by the
+     *                  PrivilegedExceptionAction's {@code run} method.
      * @param action the action to be performed.
      * @param context an <i>access control context</i>
      *                representing the restriction to be applied to the
@@ -676,6 +698,8 @@ public final class AccessController {
      * <p> This method preserves the current AccessControlContext's
      * DomainCombiner (which may be null) while the action is performed.
      *
+     * @param <T> the type of the value returned by the
+     *                  PrivilegedExceptionAction's {@code run} method.
      * @param action the action to be performed.
      * @param context an <i>access control context</i>
      *                representing the restriction to be applied to the
diff --git a/src/share/classes/java/security/AlgorithmParameters.java b/src/share/classes/java/security/AlgorithmParameters.java
index c603a196c9f003981a0d01f188c608be1616484a..b548fcb64c8a9c0e438dc81f3565ad32dfa50d00 100644
--- a/src/share/classes/java/security/AlgorithmParameters.java
+++ b/src/share/classes/java/security/AlgorithmParameters.java
@@ -324,6 +324,7 @@ public class AlgorithmParameters {
      * parameters should be returned in an instance of the
      * {@code DSAParameterSpec} class.
      *
+     * @param <T> the type of the parameter specification to be returrned
      * @param paramSpec the specification class in which
      * the parameters should be returned.
      *
diff --git a/src/share/classes/java/security/AlgorithmParametersSpi.java b/src/share/classes/java/security/AlgorithmParametersSpi.java
index be231a4cafe1b60e336cb786e6f2ae63dc5b009f..282493b97b9728467d14f3ba1c06ed4e032dcacc 100644
--- a/src/share/classes/java/security/AlgorithmParametersSpi.java
+++ b/src/share/classes/java/security/AlgorithmParametersSpi.java
@@ -102,6 +102,8 @@ public abstract class AlgorithmParametersSpi {
      * parameters should be returned in an instance of the
      * {@code DSAParameterSpec} class.
      *
+     * @param <T> the type of the parameter specification to be returned
+     *
      * @param paramSpec the specification class in which
      * the parameters should be returned.
      *
diff --git a/src/share/classes/java/security/KeyFactory.java b/src/share/classes/java/security/KeyFactory.java
index 0eb6b754107712d2222ed2091fe71007158d85d4..8e761ff41f727d3311f897d60d4e9b1d42cfe5ba 100644
--- a/src/share/classes/java/security/KeyFactory.java
+++ b/src/share/classes/java/security/KeyFactory.java
@@ -395,6 +395,8 @@ public class KeyFactory {
      * key material should be returned in an instance of the
      * {@code DSAPublicKeySpec} class.
      *
+     * @param <T> the type of the key specification to be returned
+     *
      * @param key the key.
      *
      * @param keySpec the specification class in which
diff --git a/src/share/classes/java/security/KeyFactorySpi.java b/src/share/classes/java/security/KeyFactorySpi.java
index 877c3a11be1ed0493f01bb0fb4fadf84f04ccdf2..5ee7f4589315d84a1f4d2e600cda21427eb973f2 100644
--- a/src/share/classes/java/security/KeyFactorySpi.java
+++ b/src/share/classes/java/security/KeyFactorySpi.java
@@ -106,6 +106,8 @@ public abstract class KeyFactorySpi {
      * key material should be returned in an instance of the
      * {@code DSAPublicKeySpec} class.
      *
+     * @param <T> the type of the key specification to be returned
+     *
      * @param key the key.
      *
      * @param keySpec the specification class in which
diff --git a/src/share/classes/java/security/KeyStore.java b/src/share/classes/java/security/KeyStore.java
index c363d0719f7ea603e59d2b1f7cd39e48e60d6850..187683baa50399a246db76a80a469745ee091699 100644
--- a/src/share/classes/java/security/KeyStore.java
+++ b/src/share/classes/java/security/KeyStore.java
@@ -1753,6 +1753,7 @@ public class KeyStore {
         /**
          * Returns the KeyStore described by this object.
          *
+         * @return the {@code KeyStore} described by this object
          * @exception KeyStoreException if an error occured during the
          *   operation, for example if the KeyStore could not be
          *   instantiated or loaded
diff --git a/src/share/classes/java/security/Principal.java b/src/share/classes/java/security/Principal.java
index 48938cfdd0716498338bc1d9cda3e191018b417f..a538e707ee761179d0223d1131f8b9c2fca15183 100644
--- a/src/share/classes/java/security/Principal.java
+++ b/src/share/classes/java/security/Principal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -81,6 +81,7 @@ public interface Principal {
      * <p>Subclasses may override this with a different implementation, if
      * necessary.
      *
+     * @param subject the {@code Subject}
      * @return true if {@code subject} is non-null and is
      *              implied by this principal, or false otherwise.
      * @since 1.8
diff --git a/src/share/classes/java/security/cert/CertPathBuilderSpi.java b/src/share/classes/java/security/cert/CertPathBuilderSpi.java
index 87908c03bd9f239f343a19ff4fb116d44dcfd92f..e77554117973876444bb64beb979d01f1db2e7ea 100644
--- a/src/share/classes/java/security/cert/CertPathBuilderSpi.java
+++ b/src/share/classes/java/security/cert/CertPathBuilderSpi.java
@@ -87,6 +87,8 @@ public abstract class CertPathBuilderSpi {
      * service providers, this method cannot be abstract and by default throws
      * an {@code UnsupportedOperationException}.
      *
+     * @return a {@code CertPathChecker} that this implementation uses to
+     * check the revocation status of certificates
      * @throws UnsupportedOperationException if this method is not supported
      * @since 1.8
      */
diff --git a/src/share/classes/java/security/cert/CertPathValidatorSpi.java b/src/share/classes/java/security/cert/CertPathValidatorSpi.java
index 50ad9c85c9bb86801339f4fb25bb2a4e54812270..02d503c9e62d084050eb7e416090e1f4e81e3f81 100644
--- a/src/share/classes/java/security/cert/CertPathValidatorSpi.java
+++ b/src/share/classes/java/security/cert/CertPathValidatorSpi.java
@@ -97,6 +97,8 @@ public abstract class CertPathValidatorSpi {
      * service providers, this method cannot be abstract and by default throws
      * an {@code UnsupportedOperationException}.
      *
+     * @return a {@code CertPathChecker} that this implementation uses to
+     * check the revocation status of certificates
      * @throws UnsupportedOperationException if this method is not supported
      * @since 1.8
      */
diff --git a/src/share/classes/java/security/cert/PKIXRevocationChecker.java b/src/share/classes/java/security/cert/PKIXRevocationChecker.java
index b667397c8e5855f48821720a0fc7d026024d8a59..3046a03ed2303145201b55abac109bb1fee302cf 100644
--- a/src/share/classes/java/security/cert/PKIXRevocationChecker.java
+++ b/src/share/classes/java/security/cert/PKIXRevocationChecker.java
@@ -103,6 +103,9 @@ public abstract class PKIXRevocationChecker extends PKIXCertPathChecker {
     private Map<X509Certificate, byte[]> ocspResponses = Collections.emptyMap();
     private Set<Option> options = Collections.emptySet();
 
+    /**
+     * Default constructor.
+     */
     protected PKIXRevocationChecker() {}
 
     /**
diff --git a/src/share/classes/java/security/interfaces/RSAMultiPrimePrivateCrtKey.java b/src/share/classes/java/security/interfaces/RSAMultiPrimePrivateCrtKey.java
index 19cddcee0e413d468da68b23cfc8de8e7b3abfaa..f85d96a768230b83910d0c820e774219c9e6ff6a 100644
--- a/src/share/classes/java/security/interfaces/RSAMultiPrimePrivateCrtKey.java
+++ b/src/share/classes/java/security/interfaces/RSAMultiPrimePrivateCrtKey.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -46,6 +46,11 @@ import java.security.spec.RSAOtherPrimeInfo;
 
 public interface RSAMultiPrimePrivateCrtKey extends RSAPrivateKey {
 
+    /**
+     * The type fingerprint that is set to indicate
+     * serialization compatibility with a previous
+     * version of the type.
+     */
     static final long serialVersionUID = 618058533534628008L;
 
     /**
diff --git a/src/share/classes/java/security/interfaces/RSAPrivateCrtKey.java b/src/share/classes/java/security/interfaces/RSAPrivateCrtKey.java
index 670af4624c4a64a6b5c77043b864d9b6614c6a2f..0408feabbbcde4a467575a12f8fbb529b1290e36 100644
--- a/src/share/classes/java/security/interfaces/RSAPrivateCrtKey.java
+++ b/src/share/classes/java/security/interfaces/RSAPrivateCrtKey.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,6 +39,11 @@ import java.math.BigInteger;
 
 public interface RSAPrivateCrtKey extends RSAPrivateKey {
 
+    /**
+     * The type fingerprint that is set to indicate
+     * serialization compatibility with a previous
+     * version of the type.
+     */
     static final long serialVersionUID = -5682214253527700368L;
 
     /**
diff --git a/src/share/classes/java/security/interfaces/RSAPrivateKey.java b/src/share/classes/java/security/interfaces/RSAPrivateKey.java
index 522c5ba70439f21c9caab501077ccd1659bc2c41..5d69ad6837e210d319cadee3b5c96f4dcfaec9bf 100644
--- a/src/share/classes/java/security/interfaces/RSAPrivateKey.java
+++ b/src/share/classes/java/security/interfaces/RSAPrivateKey.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,6 +39,11 @@ import java.math.BigInteger;
 public interface RSAPrivateKey extends java.security.PrivateKey, RSAKey
 {
 
+    /**
+     * The type fingerprint that is set to indicate
+     * serialization compatibility with a previous
+     * version of the type.
+     */
     static final long serialVersionUID = 5187144804936595022L;
 
     /**
diff --git a/src/share/classes/java/security/interfaces/RSAPublicKey.java b/src/share/classes/java/security/interfaces/RSAPublicKey.java
index 04d80cfc0e11ca75f94a3e09af0c1446b250b2ce..a698c05f73805947faab6ecfa1b76822f4d9f587 100644
--- a/src/share/classes/java/security/interfaces/RSAPublicKey.java
+++ b/src/share/classes/java/security/interfaces/RSAPublicKey.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,6 +36,11 @@ import java.math.BigInteger;
 
 public interface RSAPublicKey extends java.security.PublicKey, RSAKey
 {
+    /**
+     * The type fingerprint that is set to indicate
+     * serialization compatibility with a previous
+     * version of the type.
+     */
     static final long serialVersionUID = -8727434096241101194L;
 
     /**