10 files changed, 24 insertions, 11 deletions
diff --git a/src/engine/aes_isa_eng/aes_isa_engine.h b/src/engine/aes_isa_eng/aes_isa_engine.h
index 8a913551a..46b296bd5 100644
--- a/src/engine/aes_isa_eng/aes_isa_engine.h
+++ b/src/engine/aes_isa_eng/aes_isa_engine.h
@@ -12,6 +12,10 @@
 
 namespace Botan {
 
+/**
+* Engine for implementations that hook into CPU-specific
+* AES implementations (eg AES-NI, VIA C7, or AMD Geode)
+*/
 class AES_ISA_Engine : public Engine
    {
    public:
diff --git a/src/engine/amd64_eng/amd64_engine.h b/src/engine/amd64_eng/amd64_engine.h
index 358e31132..2b1038012 100644
--- a/src/engine/amd64_eng/amd64_engine.h
+++ b/src/engine/amd64_eng/amd64_engine.h
@@ -12,6 +12,9 @@
 
 namespace Botan {
 
+/**
+* Engine for implementations that are x86-64 specific
+*/
 class AMD64_Assembler_Engine : public Engine
    {
    public:
diff --git a/src/engine/def_engine/default_engine.h b/src/engine/def_engine/default_engine.h
index 1e40cfe46..d07bf6598 100644
--- a/src/engine/def_engine/default_engine.h
+++ b/src/engine/def_engine/default_engine.h
@@ -12,7 +12,7 @@
 
 namespace Botan {
 
-/*
+/**
 * Default Engine
 */
 class Default_Engine : public Engine
diff --git a/src/engine/engine.h b/src/engine/engine.h
index 69592886c..9937d1dda 100644
--- a/src/engine/engine.h
+++ b/src/engine/engine.h
@@ -26,7 +26,7 @@ namespace Botan {
 class Algorithm_Factory;
 class Keyed_Filter;
 
-/*
+/**
 * Engine Base Class
 */
 class BOTAN_DLL Engine
diff --git a/src/engine/gnump/gmp_wrap.h b/src/engine/gnump/gmp_wrap.h
index 82437ceba..52d130d6b 100644
--- a/src/engine/gnump/gmp_wrap.h
+++ b/src/engine/gnump/gmp_wrap.h
@@ -13,8 +13,8 @@
 
 namespace Botan {
 
-/*
-* Lightweight GMP mpz_t Wrapper
+/**
+* Lightweight GMP mpz_t wrapper. For internal use only.
 */
 class GMP_MPZ
    {
diff --git a/src/engine/gnump/gnump_engine.h b/src/engine/gnump/gnump_engine.h
index 1ca5a3548..fe154b914 100644
--- a/src/engine/gnump/gnump_engine.h
+++ b/src/engine/gnump/gnump_engine.h
@@ -12,8 +12,8 @@
 
 namespace Botan {
 
-/*
-* GMP Engine
+/**
+* Engine using GNU MP
 */
 class GMP_Engine : public Engine
    {
diff --git a/src/engine/ia32_eng/ia32_engine.h b/src/engine/ia32_eng/ia32_engine.h
index 77bdc5d74..6db5b55f6 100644
--- a/src/engine/ia32_eng/ia32_engine.h
+++ b/src/engine/ia32_eng/ia32_engine.h
@@ -12,6 +12,9 @@
 
 namespace Botan {
 
+/**
+* Engine for x86-32 specific implementations
+*/
 class IA32_Assembler_Engine : public Engine
    {
    public:
diff --git a/src/engine/openssl/bn_wrap.h b/src/engine/openssl/bn_wrap.h
index 02a229fdd..372f5a329 100644
--- a/src/engine/openssl/bn_wrap.h
+++ b/src/engine/openssl/bn_wrap.h
@@ -13,8 +13,8 @@
 
 namespace Botan {
 
-/*
-* Lightweight OpenSSL BN Wrapper
+/**
+* Lightweight OpenSSL BN wrapper. For internal use only.
 */
 class OSSL_BN
    {
@@ -36,8 +36,8 @@ class OSSL_BN
       ~OSSL_BN();
    };
 
-/*
-* Lightweight OpenSSL BN_CTX Wrapper
+/**
+* Lightweight OpenSSL BN_CTX wrapper. For internal use only.
 */
 class OSSL_BN_CTX
    {
diff --git a/src/engine/openssl/openssl_engine.h b/src/engine/openssl/openssl_engine.h
index 1ee7e4c11..b6b027e6e 100644
--- a/src/engine/openssl/openssl_engine.h
+++ b/src/engine/openssl/openssl_engine.h
@@ -12,7 +12,7 @@
 
 namespace Botan {
 
-/*
+/**
 * OpenSSL Engine
 */
 class OpenSSL_Engine : public Engine
diff --git a/src/engine/simd_engine/simd_engine.h b/src/engine/simd_engine/simd_engine.h
index 9c117d45d..a2d51023d 100644
--- a/src/engine/simd_engine/simd_engine.h
+++ b/src/engine/simd_engine/simd_engine.h
@@ -12,6 +12,9 @@
 
 namespace Botan {
 
+/**
+* Engine for implementations that use some kind of SIMD
+*/
 class SIMD_Engine : public Engine
    {
    public: