8 files changed, 14 insertions, 11 deletions
diff --git a/src/libstrongswan/credentials/containers/container.h b/src/libstrongswan/credentials/containers/container.h
index 3421e7783..fc5c09041 100644
--- a/src/libstrongswan/credentials/containers/container.h
+++ b/src/libstrongswan/credentials/containers/container.h
@@ -31,13 +31,13 @@ typedef enum container_type_t container_type_t;
  * Type of the container.
  */
 enum container_type_t {
-	/* Any kind of PKCS7/CMS container */
+	/** Any kind of PKCS7/CMS container */
 	CONTAINER_PKCS7,
-	/* PKCS7/CMS plain "data" */
+	/** PKCS7/CMS plain "data" */
 	CONTAINER_PKCS7_DATA,
-	/* PKCS7/CMS "signed-data" */
+	/** PKCS7/CMS "signed-data" */
 	CONTAINER_PKCS7_SIGNED_DATA,
-	/* PKCS7/CMS "enveloped-data" */
+	/** PKCS7/CMS "enveloped-data" */
 	CONTAINER_PKCS7_ENVELOPED_DATA,
 };
 
diff --git a/src/libstrongswan/library.h b/src/libstrongswan/library.h
index 6f455a617..f164a6052 100644
--- a/src/libstrongswan/library.h
+++ b/src/libstrongswan/library.h
@@ -34,6 +34,9 @@
  * @defgroup certificates certificates
  * @ingroup credentials
  *
+ * @defgroup containers containers
+ * @ingroup credentials
+ *
  * @defgroup sets sets
  * @ingroup credentials
  *
diff --git a/src/libstrongswan/plugins/pkcs7/pkcs7_attributes.h b/src/libstrongswan/plugins/pkcs7/pkcs7_attributes.h
index 2959194b0..d5f6156a1 100644
--- a/src/libstrongswan/plugins/pkcs7/pkcs7_attributes.h
+++ b/src/libstrongswan/plugins/pkcs7/pkcs7_attributes.h
@@ -16,7 +16,7 @@
 
 /**
  * @defgroup pkcs7_attributes pkcs7_attributes
- * @{ @ingroup pkcs7
+ * @{ @ingroup pkcs7p
  */
 
 #ifndef PKCS7_ATTRIBUTES_H_
diff --git a/src/libstrongswan/plugins/pkcs7/pkcs7_data.h b/src/libstrongswan/plugins/pkcs7/pkcs7_data.h
index 459d355ca..86512b76f 100644
--- a/src/libstrongswan/plugins/pkcs7/pkcs7_data.h
+++ b/src/libstrongswan/plugins/pkcs7/pkcs7_data.h
@@ -15,7 +15,7 @@
 
 /**
  * @defgroup pkcs7_data pkcs7_data
- * @{ @ingroup pkcs7
+ * @{ @ingroup pkcs7p
  */
 
 #ifndef PKCS7_DATA_H_
diff --git a/src/libstrongswan/plugins/pkcs7/pkcs7_enveloped_data.h b/src/libstrongswan/plugins/pkcs7/pkcs7_enveloped_data.h
index 08ac0dcdb..5e35abd54 100644
--- a/src/libstrongswan/plugins/pkcs7/pkcs7_enveloped_data.h
+++ b/src/libstrongswan/plugins/pkcs7/pkcs7_enveloped_data.h
@@ -15,7 +15,7 @@
 
 /**
  * @defgroup pkcs7_enveloped_data pkcs7_enveloped_data
- * @{ @ingroup pkcs7
+ * @{ @ingroup pkcs7p
  */
 
 #ifndef PKCS7_ENVELOPED_DATA_H_
diff --git a/src/libstrongswan/plugins/pkcs7/pkcs7_generic.h b/src/libstrongswan/plugins/pkcs7/pkcs7_generic.h
index 8bdc62b36..819343c4d 100644
--- a/src/libstrongswan/plugins/pkcs7/pkcs7_generic.h
+++ b/src/libstrongswan/plugins/pkcs7/pkcs7_generic.h
@@ -15,7 +15,7 @@
 
 /**
  * @defgroup pkcs7_generic pkcs7_generic
- * @{ @ingroup pkcs7
+ * @{ @ingroup pkcs7p
  */
 
 #ifndef PKCS7_GENERIC_H_
diff --git a/src/libstrongswan/plugins/pkcs7/pkcs7_plugin.h b/src/libstrongswan/plugins/pkcs7/pkcs7_plugin.h
index c86001a4e..3d582c7c6 100644
--- a/src/libstrongswan/plugins/pkcs7/pkcs7_plugin.h
+++ b/src/libstrongswan/plugins/pkcs7/pkcs7_plugin.h
@@ -14,11 +14,11 @@
  */
 
 /**
- * @defgroup pkcs7 pkcs7
+ * @defgroup pkcs7p pkcs7
  * @ingroup plugins
  *
  * @defgroup pkcs7_plugin pkcs7_plugin
- * @{ @ingroup pkcs7
+ * @{ @ingroup pkcs7p
  */
 
 #ifndef PKCS7_PLUGIN_H_
diff --git a/src/libstrongswan/plugins/pkcs7/pkcs7_signed_data.h b/src/libstrongswan/plugins/pkcs7/pkcs7_signed_data.h
index 6ada6279f..5de672117 100644
--- a/src/libstrongswan/plugins/pkcs7/pkcs7_signed_data.h
+++ b/src/libstrongswan/plugins/pkcs7/pkcs7_signed_data.h
@@ -15,7 +15,7 @@
 
 /**
  * @defgroup pkcs7_signed_data pkcs7_signed_data
- * @{ @ingroup pkcs7
+ * @{ @ingroup pkcs7p
  */
 
 #ifndef PKCS7_SIGNED_DATA_H_