1 files changed, 52 insertions, 35 deletions

diff --git a/src/charon/daemon.h b/src/charon/daemon.h
index 6ba676812..ebc38738e 100644
--- a/src/charon/daemon.h
+++ b/src/charon/daemon.h
@@ -97,6 +97,14 @@ typedef struct daemon_t daemon_t;
  */
 
 /**
+ * @defgroup bus bus
+ *
+ * Signaling bus and its listeners.
+ *
+ * @ingroup charon
+ */
+
+/**
  * @defgroup config config
  *
  * Classes implementing configuration related things.
@@ -105,6 +113,30 @@ typedef struct daemon_t daemon_t;
  */
 
 /**
+ * @defgroup backends backends
+ *
+ * Classes implementing configuration backends.
+ *
+ * @ingroup config
+ */
+
+/**
+ * @defgroup credentials credentials
+ *
+ * Trust chain verification and certificate store.
+ *
+ * @ingroup config
+ */
+
+/**
+ * @defgroup control control
+ *
+ * Classes which control the daemon using IPC mechanisms.
+ *
+ * @ingroup charon
+ */
+
+/**
  * @defgroup encoding encoding
  *
  * Classes used to encode and decode IKEv2 messages.
@@ -121,52 +153,49 @@ typedef struct daemon_t daemon_t;
  */
 
 /**
- * @defgroup network network
+ * @defgroup kernel kernel
  *
- * Classes for network relevant stuff.
+ * Classes to configure and query the kernel.
  *
  * @ingroup charon
  */
 
 /**
- * @defgroup queues queues
+ * @defgroup network network
  *
- * Different kind of queues
- * (thread save lists).
+ * Classes for sending and receiving UDP packets over the network.
  *
  * @ingroup charon
  */
 
 /**
- * @defgroup jobs jobs
+ * @defgroup processing processing
  *
- * Jobs used in job queue and event queue.
+ * Queueing, scheduling and processing of jobs
  *
- * @ingroup queues
+ * @ingroup charon
  */
 
 /**
- * @defgroup sa sa
+ * @defgroup jobs jobs
  *
- * Security associations for IKE and IPSec,
- * and some helper classes.
+ * Jobs to queue, schedule and process.
  *
- * @ingroup charon
+ * @ingroup processing
  */
 
 /**
- * @defgroup tasks tasks
+ * @defgroup sa sa
  *
- * Tasks process and build message payloads. They are used to create
- * and process multiple exchanges.
+ * Security associations for IKE and IPSec, and its helper classes.
  *
- * @ingroup sa
+ * @ingroup charon
  */
 
 /**
  * @defgroup authenticators authenticators
  *
- * Authenticator classes to prove identity of peer.
+ * Authenticator classes to prove identity of a peer.
  *
  * @ingroup sa
  */
@@ -174,25 +203,18 @@ typedef struct daemon_t daemon_t;
 /**
  * @defgroup eap eap
  *
- * EAP authentication module interface and it's implementations.
+ * EAP module loader, interface and it's implementations.
  *
  * @ingroup authenticators
  */
-
+ 
 /**
- * @defgroup threads threads
- *
- * Threaded classes, which will do their job alone.
- *
- * @ingroup charon
- */
-
-/**
- * @defgroup bus bus
+ * @defgroup tasks tasks
  *
- * Signaling bus and its listeners.
+ * Tasks process and build message payloads. They are used to create
+ * and process multiple exchanges.
  *
- * @ingroup charon
+ * @ingroup sa
  */
 
 /**
@@ -316,11 +338,6 @@ struct daemon_t {
 	ike_sa_manager_t *ike_sa_manager;
 	
 	/**
-	 * A configuration_t instance.
-	 */
-	configuration_t *configuration;
-	
-	/**
 	 * A connection_store_t instance.
 	 */
 	cfg_store_t *cfg_store;