merge
authorTommaso Pecorella <tommaso.pecorella@unifi.it>
Thu, 23 Jun 2011 22:10:42 +0200
changeset 7316 3cce0564b57e
parent 7315 8bf3aba819f2 (current diff)
parent 7314 7162e24118ea (diff)
child 7317 998d309a9b3d
merge
--- a/doc/tutorial/source/getting-started.rst	Thu Jun 23 00:08:47 2011 +0200
+++ b/doc/tutorial/source/getting-started.rst	Thu Jun 23 22:10:42 2011 +0200
@@ -29,9 +29,7 @@
 Linux or a Linux emulation environment (Linux, Cygwin, etc.) and has the GNU
 toolchain installed and verified along with the prerequisites mentioned 
 above.  We are also going to assume that you have Mercurial and Waf installed
-and running on the target system as described in the "Getting Started" section 
-of the  |ns3| web site: 
-http://www.nsnam.org/getting_started.html.
+and running on the target system.
 
 The |ns3| code is available in Mercurial repositories on the server
 http://code.nsnam.org.  You can also download a tarball release at
@@ -106,9 +104,9 @@
 string "ns-3-dev" with your choice of release (e.g., ns-3.10) in the 
 text below.  You can find the latest version  of the
 code either by inspection of the repository list or by going to the 
-`"Getting Started"
-<http://www.nsnam.org/getting_started.html>`_
-web page and looking for the latest release identifier.
+`"ns-3 Releases"
+<http://www.nsnam.org/releases>`_
+web page and clicking on the latest release link.
 
 Go ahead and change into the ``ns-3-allinone`` directory you created when
 you cloned that repository.  We are now going to use the ``download.py`` 
--- a/doc/tutorial/source/index.rst	Thu Jun 23 00:08:47 2011 +0200
+++ b/doc/tutorial/source/index.rst	Thu Jun 23 22:10:42 2011 +0200
@@ -4,7 +4,7 @@
 ===========================
 
 This is the *ns-3 Tutorial*. Primary documentation for the ns-3 project is
-available in four forms:
+available in five forms:
 
 * `ns-3 Doxygen <http://www.nsnam.org/doxygen/index.html>`_: Documentation of the public APIs of the simulator
 * `Tutorial <http://www.nsnam.org/tutorials.html>`_: *(this document)*
--- a/doc/tutorial/source/introduction.rst	Thu Jun 23 00:08:47 2011 +0200
+++ b/doc/tutorial/source/introduction.rst	Thu Jun 23 22:10:42 2011 +0200
@@ -9,18 +9,6 @@
 <http://www.nsnam.org>`_, 
 started in 2006, is an open-source project developing |ns3|.
 
-Primary documentation for the |ns3| project is available in four
-forms:
-
-* `ns-3 Doxygen/Manual
-  <http://www.nsnam.org/doxygen/index.html>`_:  
-  Documentation of the public APIs of the simulator
-* Tutorial (this document)
-* `Reference Manual
-  <http://www.nsnam.org/docs/manual.html>`_:  Reference Manual
-* `ns-3 wiki
-  <http://www.nsnam.org/wiki/index.php>`_
-
 The purpose of this tutorial is to introduce new |ns3| users to the 
 system in a structured way.  It is sometimes difficult for new users to
 glean essential information from detailed manuals and to convert this