propagate from branch 'net.randombit.botan' (head 294e2082ce9231d6165276e2f2a4153a0116aca3)

            to branch 'net.randombit.botan.c++0x' (head 0b695fad10f924601e07b009fcd781191fafcb28)

1 files changed, 15 insertions, 15 deletions

diff --git a/src/cert/x509/x509cert.h b/src/cert/x509/x509cert.h
index 4a9d11f7f..dc7ef4dbb 100644
--- a/src/cert/x509/x509cert.h
+++ b/src/cert/x509/x509cert.h
@@ -24,19 +24,19 @@ class BOTAN_DLL X509_Certificate : public X509_Object
    public:
      /**
      * Get the public key associated with this certificate.
-     * @return the subject public key of this certificate
+     * @return subject public key of this certificate
      */
       Public_Key* subject_public_key() const;
 
       /**
       * Get the issuer certificate DN.
-      * @return the issuer DN of this certificate
+      * @return issuer DN of this certificate
       */
       X509_DN issuer_dn() const;
 
       /**
       * Get the subject certificate DN.
-      * @return the subject DN of this certificate
+      * @return subject DN of this certificate
       */
       X509_DN subject_dn() const;
 
@@ -50,7 +50,7 @@ class BOTAN_DLL X509_Certificate : public X509_Object
       * "X509v3.BasicConstraints.is_ca", "X509v3.ExtendedKeyUsage",
       * "X509v3.CertificatePolicies", "X509v3.SubjectKeyIdentifier" or
       * "X509.Certificate.serial".
-      * @return the value(s) of the specified parameter
+      * @return value(s) of the specified parameter
       */
       std::vector<std::string> subject_info(const std::string& name) const;
 
@@ -58,43 +58,43 @@ class BOTAN_DLL X509_Certificate : public X509_Object
       * Get a value for a specific subject_info parameter name.
       * @param name the name of the paramter to look up. Possible names are
       * "X509.Certificate.v2.key_id" or "X509v3.AuthorityKeyIdentifier".
-      * @return the value(s) of the specified parameter
+      * @return value(s) of the specified parameter
       */
       std::vector<std::string> issuer_info(const std::string& name) const;
 
       /**
       * Get the notBefore of the certificate.
-      * @return the notBefore of the certificate
+      * @return notBefore of the certificate
       */
       std::string start_time() const;
 
       /**
       * Get the notAfter of the certificate.
-      * @return the notAfter of the certificate
+      * @return notAfter of the certificate
       */
       std::string end_time() const;
 
       /**
       * Get the X509 version of this certificate object.
-      * @return the X509 version
+      * @return X509 version
       */
       u32bit x509_version() const;
 
       /**
       * Get the serial number of this certificate.
-      * @return the certificates serial number
+      * @return certificates serial number
       */
       MemoryVector<byte> serial_number() const;
 
       /**
       * Get the DER encoded AuthorityKeyIdentifier of this certificate.
-      * @return the DER encoded AuthorityKeyIdentifier
+      * @return DER encoded AuthorityKeyIdentifier
       */
       MemoryVector<byte> authority_key_id() const;
 
       /**
       * Get the DER encoded SubjectKeyIdentifier of this certificate.
-      * @return the DER encoded SubjectKeyIdentifier
+      * @return DER encoded SubjectKeyIdentifier
       */
       MemoryVector<byte> subject_key_id() const;
 
@@ -113,14 +113,14 @@ class BOTAN_DLL X509_Certificate : public X509_Object
       /**
       * Get the path limit as defined in the BasicConstraints extension of
       * this certificate.
-      * @return the path limit
+      * @return path limit
       */
       u32bit path_limit() const;
 
       /**
       * Get the key constraints as defined in the KeyUsage extension of this
       * certificate.
-      * @return the key constraints
+      * @return key constraints
       */
       Key_Constraints constraints() const;
 
@@ -128,14 +128,14 @@ class BOTAN_DLL X509_Certificate : public X509_Object
       * Get the key constraints as defined in the ExtendedKeyUsage
       * extension of this
       * certificate.
-      * @return the key constraints
+      * @return key constraints
       */
       std::vector<std::string> ex_constraints() const;
 
       /**
       * Get the policies as defined in the CertificatePolicies extension
       * of this certificate.
-      * @return the certificate policies
+      * @return certificate policies
       */
       std::vector<std::string> policies() const;