--- a/src/common/data-rate.h	Wed Jun 04 11:35:14 2008 -0700
+++ b/src/common/data-rate.h	Wed Jun 04 11:48:52 2008 -0700
@@ -33,7 +33,9 @@
 /**
  * \ingroup common
  * \defgroup datarate Data Rate
- *
+ */
+/**
+ * \ingroup datarate
  * \brief Class for representing data rates
  *
  * Allows for natural and familiar use of data rates.  Allows construction

--- a/src/common/error-model.h	Wed Jun 04 11:35:14 2008 -0700
+++ b/src/common/error-model.h	Wed Jun 04 11:48:52 2008 -0700
@@ -32,7 +32,9 @@
 /**
  * \ingroup common
  * \defgroup errormodel Error Model
- *
+ */
+/**
+ * \ingroup errormodel
  * \brief General error model that can be used to corrupt packets
  *
  * This object is used to flag packets as being lost/errored or not.

--- a/src/common/packet.h	Wed Jun 04 11:35:14 2008 -0700
+++ b/src/common/packet.h	Wed Jun 04 11:48:52 2008 -0700
@@ -34,6 +34,12 @@
 namespace ns3 {
 
 /**
+ * \ingroup common
+ * \defgroup packet Packet
+ */
+
+/**
+ * \ingroup packet
  * \brief Iterator over the set of tags in a packet
  *
  * This is a java-style iterator.
@@ -96,9 +102,7 @@
 };
 
 /**
- * \ingroup common
- * \defgroup packet Packet
- *
+ * \ingroup packet
  * \brief network packets
  *
  * Each network packet contains a byte buffer, a set of tags, and

--- a/src/internet-node/tcp-socket-factory-impl.h	Wed Jun 04 11:35:14 2008 -0700
+++ b/src/internet-node/tcp-socket-factory-impl.h	Wed Jun 04 11:48:52 2008 -0700
@@ -30,7 +30,9 @@
 /**
  * \ingroup internetNode
  * \defgroup Tcp Tcp
- *
+ */
+/**
+ * \ingroup Tcp
  * \section Tcp Overview
  *
  * The TCP code in ns3::InternetNode is ported from the  

--- a/src/node/application.h	Wed Jun 04 11:35:14 2008 -0700
+++ b/src/node/application.h	Wed Jun 04 11:48:52 2008 -0700
@@ -35,8 +35,10 @@
 /**
  * \ingroup node
  * \defgroup application Application
- *
- * \brief The base class for all ns3 applicationes
+ */
+/**
+ * \ingroup application
+ * \brief The base class for all ns3 applications
  * 
  * Class Application is the base class for all ns3 applications.
  * Applications are associated with individual nodes.

--- a/src/node/channel.h	Wed Jun 04 11:35:14 2008 -0700
+++ b/src/node/channel.h	Wed Jun 04 11:48:52 2008 -0700
@@ -29,7 +29,9 @@
 /**
  * \ingroup node
  * \defgroup channel Channel
- *
+ */
+/**
+ * \ingroup channel
  * \brief Abstract Channel Base Class.
  *
  * A channel is a logical path over which information flows.  The path can

--- a/src/node/net-device.h	Wed Jun 04 11:35:14 2008 -0700
+++ b/src/node/net-device.h	Wed Jun 04 11:48:52 2008 -0700
@@ -40,7 +40,7 @@
  * \defgroup netdevice NetDevice
  */
 /**
- * \ingroup NetDevice
+ * \ingroup netdevice
  *
  * \brief Network layer to device interface
  *

--- a/src/node/queue.h	Wed Jun 04 11:35:14 2008 -0700
+++ b/src/node/queue.h	Wed Jun 04 11:48:52 2008 -0700
@@ -35,7 +35,9 @@
 /**
  * \ingroup node
  * \defgroup queue Queue
- *
+ */
+/**
+ * \ingroup queue
  * \brief Abstract base class for packet Queues
  * 
  * This class defines the base APIs for packet queues in the ns-3 system

--- a/src/node/socket.h	Wed Jun 04 11:35:14 2008 -0700
+++ b/src/node/socket.h	Wed Jun 04 11:48:52 2008 -0700
@@ -39,7 +39,11 @@
 /**
  * \ingroup node
  * \defgroup socket Socket
+ */
+
+/**
  * \brief A low-level Socket API based loosely on the BSD Socket API.
+ * \ingroup socket
  *
  * A few things to keep in mind about this type of socket:
  * - it uses ns-3 API constructs such as class ns3::Address instead of

--- a/src/simulator/nstime.h	Wed Jun 04 11:35:14 2008 -0700
+++ b/src/simulator/nstime.h	Wed Jun 04 11:48:52 2008 -0700
@@ -62,7 +62,9 @@
 /**
  * \ingroup simulator
  * \defgroup time Time
- *
+ */
+/**
+ * \ingroup time
  * \brief keep track of time unit.
  *
  * This template class is used to keep track of the value 

--- a/src/simulator/scheduler.h	Wed Jun 04 11:35:14 2008 -0700
+++ b/src/simulator/scheduler.h	Wed Jun 04 11:48:52 2008 -0700
@@ -30,7 +30,9 @@
 /**
  * \ingroup simulator
  * \defgroup scheduler Scheduler
- *
+ */
+/**
+ * \ingroup scheduler
  * \brief Maintain the event list
  *
  * This base class specifies the interface used to maintain the