--- a/doc/manual/source/routing.rst	Thu May 05 21:29:34 2011 -0700
+++ b/doc/manual/source/routing.rst	Fri May 06 08:38:41 2011 -0700
@@ -107,7 +107,7 @@
 
 The public API is very minimal. User scripts include the following:::
 
-    #include "ns3/helper-module.h"
+    #include "ns3/internet-module.h"
 
 If the default InternetStackHelper is used, then an instance of global routing
 will be aggregated to each node.  After IP addresses are configured, the

--- a/doc/tutorial/source/building-topologies.rst	Thu May 05 21:29:34 2011 -0700
+++ b/doc/tutorial/source/building-topologies.rst	Fri May 06 08:38:41 2011 -0700
@@ -38,9 +38,12 @@
 ::
 
   #include "ns3/core-module.h"
-  #include "ns3/simulator-module.h"
-  #include "ns3/node-module.h"
-  #include "ns3/helper-module.h"
+  #include "ns3/network-module.h"
+  #include "ns3/csma-module.h"
+  #include "ns3/internet-module.h"
+  #include "ns3/point-to-point-module.h"
+  #include "ns3/applications-module.h"
+  #include "ns3/ipv4-global-routing-helper.h"
 
 One thing that can be surprisingly useful is a small bit of ASCII art that
 shows a cartoon of the network topology constructed in the example.  You will
@@ -805,11 +808,12 @@
 ::
 
 #include "ns3/core-module.h"
-#include "ns3/simulator-module.h"
-#include "ns3/node-module.h"
-#include "ns3/helper-module.h"
-#include "ns3/wifi-module.h"
-#include "ns3/mobility-module.h"
+#include "ns3/network-module.h"
+#include "ns3/csma-module.h"
+#include "ns3/internet-module.h"
+#include "ns3/point-to-point-module.h"
+#include "ns3/applications-module.h"
+#include "ns3/ipv4-global-routing-helper.h"
 
 The network topology illustration follows:
 

--- a/doc/tutorial/source/conceptual-overview.rst	Thu May 05 21:29:34 2011 -0700
+++ b/doc/tutorial/source/conceptual-overview.rst	Fri May 06 08:38:41 2011 -0700
@@ -220,9 +220,10 @@
 ::
 
   #include "ns3/core-module.h"
-  #include "ns3/simulator-module.h"
-  #include "ns3/node-module.h"
-  #include "ns3/helper-module.h"
+  #include "ns3/network-module.h"
+  #include "ns3/internet-module.h"
+  #include "ns3/point-to-point-module.h"
+  #include "ns3/applications-module.h"
 
 To help our high-level script users deal with the large number of include 
 files present in the system, we group includes according to relatively large 

--- a/doc/tutorial/source/introduction.rst	Thu May 05 21:29:34 2011 -0700
+++ b/doc/tutorial/source/introduction.rst	Fri May 06 08:38:41 2011 -0700
@@ -96,7 +96,6 @@
   <http://www.nsnam.org/wiki/index.php/Contributed_Code>`_ page, similar to ns-2's popular Contributed Code
   `page
   <http://nsnam.isi.edu/nsnam/index.php/Contributed_Code>`_; 
-* ``src/contrib`` directory (we will host your contributed code);
 * Open `bug tracker
   <http://www.nsnam.org/bugzilla>`_;
 * |ns3| developers will gladly help potential contributors to get

--- a/doc/tutorial/source/tracing.rst	Thu May 05 21:29:34 2011 -0700
+++ b/doc/tutorial/source/tracing.rst	Fri May 06 08:38:41 2011 -0700
@@ -1339,10 +1339,10 @@
   
   #include <fstream>
   #include "ns3/core-module.h"
-  #include "ns3/common-module.h"
-  #include "ns3/simulator-module.h"
-  #include "ns3/node-module.h"
-  #include "ns3/helper-module.h"
+  #include "ns3/network-module.h"
+  #include "ns3/internet-module.h"
+  #include "ns3/point-to-point-module.h"
+  #include "ns3/applications-module.h"
   
   using namespace ns3;