7 files changed, 8 insertions, 11 deletions
diff --git a/src/libcharon/config/peer_cfg.h b/src/libcharon/config/peer_cfg.h
index 7e82b517f..3e780394a 100644
--- a/src/libcharon/config/peer_cfg.h
+++ b/src/libcharon/config/peer_cfg.h
@@ -373,7 +373,7 @@ struct peer_cfg_t {
  * @param over_time			maximum overtime before closing a rekeying/reauth SA
  * @param mobike			use MOBIKE (RFC4555) if peer supports it
  * @param aggressive		use/accept aggressive mode with IKEv1
- * @param pullmode			TRUE to use modeconfig pull, FALSE for push
+ * @param pull_mode			TRUE to use modeconfig pull, FALSE for push
  * @param dpd				DPD check interval, 0 to disable
  * @param dpd_timeout		DPD timeout interval (IKEv1 only), if 0 default applies
  * @param mediation			TRUE if this is a mediation connection
diff --git a/src/libcharon/plugins/dnscert/dnscert.h b/src/libcharon/plugins/dnscert/dnscert.h
index f93263fd6..567a9dfac 100644
--- a/src/libcharon/plugins/dnscert/dnscert.h
+++ b/src/libcharon/plugins/dnscert/dnscert.h
@@ -59,8 +59,7 @@ enum dnscert_type_t {
 };
 
 /**
- * DNSCERT algorithms as defined in http://www.iana.org/assignments/
- *  dns-sec-alg-numbers/dns-sec-alg-numbers.xhtml#dns-sec-alg-numbers-1
+ * DNSCERT algorithms as defined in http://www.iana.org/assignments/dns-sec-alg-numbers/dns-sec-alg-numbers.xhtml#dns-sec-alg-numbers-1
  */
 enum dnscert_algorithm_t {
 	/** No defined */
diff --git a/src/libpts/libpts.h b/src/libpts/libpts.h
index 0846aaea2..e3814e97d 100644
--- a/src/libpts/libpts.h
+++ b/src/libpts/libpts.h
@@ -18,6 +18,9 @@
  * @defgroup libpts_plugins plugins
  * @ingroup libpts
  *
+ * @defgroup swid swid
+ * @ingroup libpts
+ *
  * @addtogroup libpts
  * @{
  */
diff --git a/src/libpts/plugins/imv_attestation/imv_attestation_build.h b/src/libpts/plugins/imv_attestation/imv_attestation_build.h
index 4b7c9ff3d..0cee49b34 100644
--- a/src/libpts/plugins/imv_attestation/imv_attestation_build.h
+++ b/src/libpts/plugins/imv_attestation/imv_attestation_build.h
@@ -34,7 +34,7 @@
  * Process a TCG PTS attribute
  *
  * @param out_msg				outbound PA-TNC message to be built
- * @param _state				state of a given connection
+ * @param state					state of a given connection
  * @param supported_algorithms	supported PTS measurement algorithms
  * @param supported_dh_groups	supported DH groups
  * @param pts_db				PTS configuration database
diff --git a/src/libpttls/pt_tls.h b/src/libpttls/pt_tls.h
index dd3d25055..275dc89e9 100644
--- a/src/libpttls/pt_tls.h
+++ b/src/libpttls/pt_tls.h
@@ -121,10 +121,6 @@ bool pt_tls_write(tls_socket_t *tls, pt_tls_message_type_t type,
 				  u_int32_t identifier, chunk_t data);
 
 /**
- * @}
- * @addtogroup libpttls
- * @{
- *
  * Dummy libpttls initialization function needed for integrity test
  */
 void libpttls_init(void);
diff --git a/src/libstrongswan/ipsec/ipsec_types.h b/src/libstrongswan/ipsec/ipsec_types.h
index 43f72ccaa..6851f916a 100644
--- a/src/libstrongswan/ipsec/ipsec_types.h
+++ b/src/libstrongswan/ipsec/ipsec_types.h
@@ -170,7 +170,7 @@ struct mark_t {
 #define MARK_REQID (0xFFFFFFFF)
 
 /**
- * Try to parse a mark_t from the given string of the form <mark>[/<mask>].
+ * Try to parse a mark_t from the given string of the form mark[/mask].
  *
  * @param value		string to parse
  * @param mark		mark to fill
diff --git a/src/libtnccs/plugins/tnccs_20/messages/pb_tnc_msg.h b/src/libtnccs/plugins/tnccs_20/messages/pb_tnc_msg.h
index ace5d7837..6eeed5156 100644
--- a/src/libtnccs/plugins/tnccs_20/messages/pb_tnc_msg.h
+++ b/src/libtnccs/plugins/tnccs_20/messages/pb_tnc_msg.h
@@ -139,8 +139,7 @@ struct pb_tnc_msg_t {
  * Useful for the parser which wants a generic constructor for all
  * pb_tnc_message_t types.
  *
- * @param vendor_id			PB-TNC vendor ID
- * @param type				PB-TNC message type
+ * @param msg_type			PB-TNC message type
  * @param value				PB-TNC message value
  */
 pb_tnc_msg_t* pb_tnc_msg_create_from_data(pen_type_t msg_type, chunk_t value);