diff -r b8528d30dfb3 doc/tutorial/conceptual-overview.texi --- a/doc/tutorial/conceptual-overview.texi Thu Apr 02 13:16:13 2009 +0100 +++ b/doc/tutorial/conceptual-overview.texi Fri Apr 03 02:30:10 2009 +0400 @@ -276,7 +276,7 @@ @end verbatim to build the project. So now if you look in the directory -@code{build/debug/ns-3} you will find the four module include files shown +@code{build/debug/ns3} you will find the four module include files shown above. You can take a look at the contents of these files and find that they do include all of the public include files in their respective modules. @@ -308,8 +308,7 @@ We will use this statement as a convenient place to talk about our Doxygen documentation system. If you look at the project web site, -@uref{http://www.nsnam.org,,ns-3 project}, you will find a link to ``APIs -(Doxygen)'' in the navigation bar. If you select this link, you will be +@uref{http://www.nsnam.org,,ns-3 project}, you will find a link to ``Doxygen (ns-3-dev)'' in the navigation bar. If you select this link, you will be taken to our documentation page. Along the left side, you will find a graphical representation of the structure diff -r b8528d30dfb3 doc/tutorial/getting-started.texi --- a/doc/tutorial/getting-started.texi Thu Apr 02 13:16:13 2009 +0100 +++ b/doc/tutorial/getting-started.texi Fri Apr 03 02:30:10 2009 +0400 @@ -44,7 +44,7 @@ @cindex tarball The @command{ns-3} code is available in Mercurial repositories on the server -code.nsnam.org. You can also download a tarball release at +@uref{http://code.nsnam.org}. You can also download a tarball release at @uref{http://www.nsnam.org/releases/}, or you can work with repositories using Mercurial. We recommend using Mercurial unless there's a good reason not to. See the end of this section for instructions on how to get a tarball @@ -53,7 +53,7 @@ @cindex repository The simplest way to get started using Mercurial repositories is to use the @code{ns-3-allinone} environment. This is a set of scripts that manages the -downloading and building of various subystems of @command{ns-3} for you. We +downloading and building of various subsystems of @command{ns-3} for you. We recommend that you begin your @command{ns-3} adventures in this environment as it can really simplify your life at this point. @@ -128,12 +128,12 @@ 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.4 and ns-3.4-ref-traces) 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. +code either by inspection of the repository list or by going to the @uref{http://www.nsnam.org/getting_started.html,,``Getting +Started''} web page and looking for the latest release identifier. Go ahead and change into the @code{ns-3-allinone} directory you created when you cloned that repository. We are now going to use the @code{download.py} -script to pull down the various pieces of @command{ns-3} you will be using/ +script to pull down the various pieces of @command{ns-3} you will be using. Go ahead and type the following into your shell (remember you can substitute the name of your chosen release number instead of @code{ns-3-dev} -- like @@ -257,15 +257,15 @@ mkdir tarballs cd tarballs wget http://www.nsnam.org/releases/ns-allinone-3.4.tar.bz2 - tar xjf ns-3.4.tar.bz2 + tar xjf ns-allinone-3.4.tar.bz2 @end verbatim If you change into the directory @code{ns-allinone-3.4} you should see a number of files: @verbatim -build.py* ns-3.4-RC2/ nsc-0.5.0/ util.py -constants.py ns-3.4-RC2-ref-traces/ pybindgen-0.10.0.630/ +build.py* ns-3.4/ nsc-0.5.0/ README +constants.py ns-3.4-ref-traces/ pybindgen-0.10.0.630/ util.py @end verbatim You are now ready to build the @command{ns-3} distribution. @@ -404,7 +404,7 @@ @end verbatim Note the last part of the above output. Some ns-3 options are not enabled by -default or require support from the underlying system to work properly +default or require support from the underlying system to work properly. For instance, to enable XmlTo, the library libxml-2.0 must be found on the system. in the example above, this library was not found and the corresponding feature was not enabled. There is a feature to use sudo to set the suid bit of @@ -438,7 +438,7 @@ available in waf. To explore these options, type: @verbatim - ./waf -- help + ./waf --help @end verbatim We'll use some of the testing-related commands in the next section. @@ -488,7 +488,7 @@ @cindex regression tests You can also run our regression test suite to ensure that your distribution and -tool chain have produced binaries that generate output that is identical to +toolchain have produced binaries that generate output that is identical to known-good reference output files. You downloaded these reference traces to your machine during the download process above. (Warning: The @code{ns-3.2} and @code{ns-3.3} releases do not use the @code{ns-3-allinone} environment @@ -505,7 +505,7 @@ has gone awry. If the error was discovered in a pcap file, it will be useful to convert the pcap files to text using tcpdump prior to comparison. -Some regression tests wmay be SKIPped if the required support +Some regression tests may be SKIPped if the required support is not present. To run the regression tests, you provide Waf with the regression flag. @@ -568,7 +568,7 @@ @end verbatim Waf first checks to make sure that the program is built correctly and -executes a build if required. Waf then then executes the program, which +executes a build if required. Waf then executes the program, which produces the following output. @verbatim diff -r b8528d30dfb3 doc/tutorial/introduction.texi --- a/doc/tutorial/introduction.texi Thu Apr 02 13:16:13 2009 +0100 +++ b/doc/tutorial/introduction.texi Fri Apr 03 02:30:10 2009 +0400 @@ -226,7 +226,7 @@ order to extend the system in most cases. For those interested in the gory details of Waf, the main web site can be -found at @uref{http://freehackers.org/~tnagy/waf.html}. +found at @uref{http://code.google.com/p/waf/}. @node Development Environment @section Development Environment @@ -275,7 +275,7 @@ @cindex MinGW If you do use Cygwin or MinGW; and use Logitech products, we will save you quite a bit of heartburn right off the bat and encourage you to take a look -at the @uref{http://www.mingw.org/MinGWiki/index.php/FAQ,,MinGW FAQ}. +at the @uref{http://oldwiki.mingw.org/index.php/FAQ,,MinGW FAQ}. @cindex Logitech Search for ``Logitech'' and read the FAQ entry, ``why does make often @@ -295,7 +295,7 @@ We will assume a basic facility with the Berkeley Sockets API in the examples used in this tutorial. If you are new to sockets, we recommend reviewing the API and some common usage cases. For a good overview of programming TCP/IP -sockets we recommend @uref{http://www.elsevier.com/wps/product/cws_home/680765,,Practical TCP/IP Sockets in C, Donahoo and Calvert}. +sockets we recommend @uref{http://www.elsevier.com/wps/find/bookdescription.cws_home/717656/description#description,,TCP/IP Sockets in C, Donahoo and Calvert}. There is an associated web site that includes source for the examples in the book, which you can find at: @@ -305,6 +305,6 @@ not have access to a copy of the book, the echo clients and servers shown in the website above) you will be in good shape to understand the tutorial. There is a similar book on Multicast Sockets, -@uref{http://www.elsevier.com/wps/product/cws_home/700736,,Multicast Sockets, Makofske and Almeroth}. +@uref{http://www.elsevier.com/wps/find/bookdescription.cws_home/700736/description#description,,Multicast Sockets, Makofske and Almeroth}. that covers material you may need to understand if you look at the multicast examples in the distribution.