--- a/doc/manual/attributes.texi	Fri Apr 24 16:00:44 2009 -0700
+++ b/doc/manual/attributes.texi	Sat Apr 25 14:56:52 2009 -0700
@@ -72,7 +72,7 @@
 @node CreateObject
 @subsection CreateObject
 
-As we discussed above in @ref{Object Creation}, 
+As we discussed above in @ref{CreateObject and Create}, 
 at the lowest-level API, objects of type @code{ns3::Object} are 
 not instantiated using @code{operator new} as usual but instead by
 a templated function called @code{CreateObject()}.

--- a/doc/manual/csma.texi	Fri Apr 24 16:00:44 2009 -0700
+++ b/doc/manual/csma.texi	Sat Apr 25 14:56:52 2009 -0700
@@ -5,13 +5,13 @@
 Csma model doxygen.
 
 @menu
-* Overview of the model::
+* Overview of the CSMA model::
 * Using the CsmaNetDevice::
 * CSMA Tracing::
 @end menu
 
-@node Overview of the model
-@section Overview of the model
+@node Overview of the CSMA model
+@section Overview of the CSMA model
 
 The ns-3 CSMA device models a simple bus network in the spirit of Ethernet.
 Although it does not model any real physical network you could ever build 
@@ -254,7 +254,7 @@
   NetDeviceContainer csmaDevices = csma.Install (csmaNodes);
 @end verbatim
 
-@node Csma Tracing
+@node CSMA Tracing
 @section CSMA Tracing
 
 Like all ns-3 devices, the CSMA Model provides a number of trace sources.

--- a/doc/manual/emulation.texi	Fri Apr 24 16:00:44 2009 -0700
+++ b/doc/manual/emulation.texi	Sat Apr 25 14:56:52 2009 -0700
@@ -4,7 +4,7 @@
 
 ns-3 has been designed for integration into testbed and virtual machine
 environments.  We have addressed this need by providing two kinds of 
-net devices.  The first kind, which we call an @code{Emu} @code {NetDevice}
+net devices.  The first kind, which we call an @code{Emu} @code{NetDevice}
 allows ns-3 simulations to send data on a ``real'' network.  The second kind,
 called a @code{Tap} @code{NetDevice} allows a ``real'' host to participate 
 in an ns-3 simulation as if it were one of the simulated nodes.  An ns-3 

--- a/doc/manual/manual.texi	Fri Apr 24 16:00:44 2009 -0700
+++ b/doc/manual/manual.texi	Sat Apr 25 14:56:52 2009 -0700
@@ -65,7 +65,9 @@
 
 @c So the toc is printed at the start.
 @anchor{Full Table of Contents}
+@ifnottex
 @contents
+@end ifnottex
 
 @ifnottex
 @node Top, Overview, Full Table of Contents 

--- a/doc/manual/new-models.texi	Fri Apr 24 16:00:44 2009 -0700
+++ b/doc/manual/new-models.texi	Sat Apr 25 14:56:52 2009 -0700
@@ -399,7 +399,7 @@
 
 
 @subsection Object Framework
-
+@verbatim
   static const ClassId cid;
 
 

--- a/doc/manual/point-to-point.texi	Fri Apr 24 16:00:44 2009 -0700
+++ b/doc/manual/point-to-point.texi	Sat Apr 25 14:56:52 2009 -0700
@@ -5,13 +5,13 @@
 PointToPoint model doxygen.
 
 @menu
-* Overview of the model::
+* Overview of the PointToPoint model::
 * Using the PointToPointNetDevice::
 * PointToPoint Tracing::
 @end menu
 
-@node Overview of the model
-@section Overview of the model
+@node Overview of the PointToPoint model
+@section Overview of the PointToPoint model
 
 The ns-3 point-to-point model is of a very simple point to point data link
 connecting exactly two PointToPointNetDevice devices over an

--- a/doc/manual/realtime.texi	Fri Apr 24 16:00:44 2009 -0700
+++ b/doc/manual/realtime.texi	Sat Apr 25 14:56:52 2009 -0700
@@ -77,8 +77,8 @@
 
 The implementation is contained in the following files:
 @itemize @bullet
-@item @code{src/simulator/realtime-simulator-impl.{cc,h}}
-@item @code{src/simulator/wall-clock-synchronizer.{cc,h}}
+@item @code{src/simulator/realtime-simulator-impl.@{cc,h@}}
+@item @code{src/simulator/wall-clock-synchronizer.@{cc,h@}}
 @end itemize
 
 In order to create a realtime scheduler, to a first approximation you 

--- a/doc/manual/tcp.texi	Fri Apr 24 16:00:44 2009 -0700
+++ b/doc/manual/tcp.texi	Sat Apr 25 14:56:52 2009 -0700
@@ -13,7 +13,7 @@
 
 There are two important abstract base classes:
 @itemize @bullet
-@item @code{class TcpSocket}:  This is defined in @code{src/node/tcp-socket.{cc,h}}.  This class exists for hosting TcpSocket attributes that can be
+@item @code{class TcpSocket}:  This is defined in @code{src/node/tcp-socket.@{cc,h@}}.  This class exists for hosting TcpSocket attributes that can be
 reused across different implementations.  For instance, 
 @code{TcpSocket::SetInitialCwnd()} can be used for any of the implementations
 that derive from @code{class TcpSocket}.