diff --git a/doc/tutorial/source/getting-started.rst b/doc/tutorial/source/getting-started.rst index 2c8f3c7c4..7f19084be 100644 --- a/doc/tutorial/source/getting-started.rst +++ b/doc/tutorial/source/getting-started.rst @@ -29,9 +29,7 @@ From this point forward, we are going to assume that the reader is working in 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 @@ the more constant ns-3-dev here in the tutorial, but you can replace the 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" -`_ -web page and looking for the latest release identifier. +`"ns-3 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`` diff --git a/doc/tutorial/source/index.rst b/doc/tutorial/source/index.rst index 54f4b6bd6..e9d18adf4 100644 --- a/doc/tutorial/source/index.rst +++ b/doc/tutorial/source/index.rst @@ -4,7 +4,7 @@ ns-3 Tutorial =========================== 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 `_: Documentation of the public APIs of the simulator * `Tutorial `_: *(this document)* diff --git a/doc/tutorial/source/introduction.rst b/doc/tutorial/source/introduction.rst index 6ba74a79f..f733c72ce 100644 --- a/doc/tutorial/source/introduction.rst +++ b/doc/tutorial/source/introduction.rst @@ -9,18 +9,6 @@ primarily for research and educational use. The `_, 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 - `_: - Documentation of the public APIs of the simulator -* Tutorial (this document) -* `Reference Manual - `_: Reference Manual -* `ns-3 wiki - `_ - 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