From cabdaadcf8994ff25be4fe4b376dc68bdc148a44 Mon Sep 17 00:00:00 2001 From: Craig Dowell Date: Fri, 9 Oct 2009 20:50:17 -0700 Subject: [PATCH] Update tutorial typos --- doc/tutorial/building-topologies.texi | 16 +++++----- doc/tutorial/conceptual-overview.texi | 8 ++--- doc/tutorial/getting-started.texi | 20 ++++++------ doc/tutorial/tweaking.texi | 44 +++++++++++++-------------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/doc/tutorial/building-topologies.texi b/doc/tutorial/building-topologies.texi index 44585005d..8d6bbd0c0 100644 --- a/doc/tutorial/building-topologies.texi +++ b/doc/tutorial/building-topologies.texi @@ -380,8 +380,8 @@ Since we have set up the UDP echo applications to log just as we did in @code{first.cc}, you will see similar output when you run the script. @verbatim - Waf: Entering directory `/home/craigdo/repos/ns-3-allinone-3.5-tutorial/ns-3-dev/build' - Waf: Leaving directory `/home/craigdo/repos/ns-3-allinone-3.5-tutorial/ns-3-dev/build' + Waf: Entering directory `/home/craigdo/repos/ns-3-allinone/ns-3-dev/build' + Waf: Leaving directory `/home/craigdo/repos/ns-3-allinone/ns-3-dev/build' 'build' finished successfully (0.415s) Sent 1024 bytes to 10.1.2.4 Received 1024 bytes from 10.1.1.1 @@ -560,8 +560,8 @@ devices set to four: You should now see, @verbatim - Waf: Entering directory `/home/craigdo/repos/ns-3-allinone-3.5-tutorial/ns-3-dev/build' - Waf: Leaving directory `/home/craigdo/repos/ns-3-allinone-3.5-tutorial/ns-3-dev/build' + Waf: Entering directory `/home/craigdo/repos/ns-3-allinone/ns-3-dev/build' + Waf: Leaving directory `/home/craigdo/repos/ns-3-allinone/ns-3-dev/build' 'build' finished successfully (0.405s) Sent 1024 bytes to 10.1.2.5 Received 1024 bytes from 10.1.1.1 @@ -634,8 +634,8 @@ If you build the new script and run the simulation setting @code{nCsma} to 100, you will see the following output: @verbatim - Waf: Entering directory `/home/craigdo/repos/ns-3-allinone-3.5-tutorial/ns-3-dev/build' - Waf: Leaving directory `/home/craigdo/repos/ns-3-allinone-3.5-tutorial/ns-3-dev/build' + Waf: Entering directory `/home/craigdo/repos/ns-3-allinone/ns-3-dev/build' + Waf: Leaving directory `/home/craigdo/repos/ns-3-allinone/ns-3-dev/build' 'build' finished successfully (0.407s) Sent 1024 bytes to 10.1.2.101 Received 1024 bytes from 10.1.1.1 @@ -1117,8 +1117,8 @@ Again, since we have set up the UDP echo applications just as we did in the @code{second.cc} script, you will see similar output. @verbatim - Waf: Entering directory `/home/craigdo/repos/ns-3-allinone-3.5-tutorial/ns-3-dev/build' - Waf: Leaving directory `/home/craigdo/repos/ns-3-allinone-3.5-tutorial/ns-3-dev/build' + Waf: Entering directory `/home/craigdo/repos/ns-3-allinone/ns-3-dev/build' + Waf: Leaving directory `/home/craigdo/repos/ns-3-allinone/ns-3-dev/build' 'build' finished successfully (0.407s) Sent 1024 bytes to 10.1.2.4 Received 1024 bytes from 10.1.3.3 diff --git a/doc/tutorial/conceptual-overview.texi b/doc/tutorial/conceptual-overview.texi index 76d61bdec..39100f058 100644 --- a/doc/tutorial/conceptual-overview.texi +++ b/doc/tutorial/conceptual-overview.texi @@ -750,10 +750,10 @@ You should see messages reporting that your @code{myfirst} example was built successfully. @verbatim - Waf: Entering directory `/home/craigdo/repos/ns-3-allinone-3.5-tutorial/ns-3-dev/build' + Waf: Entering directory `/home/craigdo/repos/ns-3-allinone/ns-3-dev/build' [614/708] cxx: scratch/myfirst.cc -> build/debug/scratch/myfirst_3.o [706/708] cxx_link: build/debug/scratch/myfirst_3.o -> build/debug/scratch/myfirst - Waf: Leaving directory `/home/craigdo/repos/ns-3-allinone-3.5-tutorial/ns-3-dev/build' + Waf: Leaving directory `/home/craigdo/repos/ns-3-allinone/ns-3-dev/build' 'build' finished successfully (2.357s) @end verbatim @@ -767,8 +767,8 @@ directory you must run it out of the scratch directory): You should see some output: @verbatim - Waf: Entering directory `/home/craigdo/repos/ns-3-allinone-3.5-tutorial/ns-3-dev/build' - Waf: Leaving directory `/home/craigdo/repos/ns-3-allinone-3.5-tutorial/ns-3-dev/build' + Waf: Entering directory `/home/craigdo/repos/ns-3-allinone/ns-3-dev/build' + Waf: Leaving directory `/home/craigdo/repos/ns-3-allinone/ns-3-dev/build' 'build' finished successfully (0.418s) Sent 1024 bytes to 10.1.1.2 Received 1024 bytes from 10.1.1.1 diff --git a/doc/tutorial/getting-started.texi b/doc/tutorial/getting-started.texi index 238d93047..106b9cb18 100644 --- a/doc/tutorial/getting-started.texi +++ b/doc/tutorial/getting-started.texi @@ -126,8 +126,8 @@ introduced features. Since the release numbers are going to be changing, I will stick with 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.5 and -ns-3.5-ref-traces) in the text below. You can find the latest version of the +string ``ns-3-dev'' with your choice of release (e.g., ns-3.6 and +ns-3.6-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 @uref{http://www.nsnam.org/getting_started.html,,``Getting Started''} web page and looking for the latest release identifier. @@ -138,7 +138,7 @@ 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 -@code{"ns-3.5"} and @code{"ns-3.5-ref-traces"} if you want to work with a +@code{"ns-3.6"} and @code{"ns-3.6-ref-traces"} if you want to work with a stable release). @verbatim @@ -267,16 +267,16 @@ get a copy of a release by typing the following into your Linux shell cd mkdir tarballs cd tarballs - wget http://www.nsnam.org/releases/ns-allinone-3.5.tar.bz2 - tar xjf ns-allinone-3.5.tar.bz2 + wget http://www.nsnam.org/releases/ns-allinone-3.6.tar.bz2 + tar xjf ns-allinone-3.6.tar.bz2 @end verbatim -If you change into the directory @code{ns-allinone-3.5} you should see a +If you change into the directory @code{ns-allinone-3.6} you should see a number of files: @verbatim -build.py* ns-3.5/ nsc-0.5.0/ README -constants.py ns-3.5-ref-traces/ pybindgen-0.10.0.640/ util.py +build.py* ns-3.6/ nsc-0.5.1/ README +constants.py ns-3.6-ref-traces/ pybindgen-0.12.0.700/ util.py @end verbatim You are now ready to build the @command{ns-3} distribution. @@ -298,7 +298,7 @@ Change into the directory you created in the download section above. If you downloaded using Mercurial you should have a directory called @code{ns-3-allinone} under your @code{~/repos} directory. If you downloaded using a tarball you should have a directory called something like -@code{ns-allinone-3.5} under your @code{~/tarballs} directory. Take a deep +@code{ns-allinone-3.6} under your @code{~/tarballs} directory. Take a deep breath and type the following: @verbatim @@ -310,7 +310,7 @@ script builds the various pieces you downloaded. Eventually you should see the following magic words: @verbatim - Waf: Leaving directory `/home/craigdo/repos/ns-3-allinone-3.5-tutorial/ns-3-dev/build' + Waf: Leaving directory `/home/craigdo/repos/ns-3-allinone/ns-3-dev/build' 'build' finished successfully (2m30.586s) @end verbatim diff --git a/doc/tutorial/tweaking.texi b/doc/tutorial/tweaking.texi index 9524a2022..2da297b1d 100644 --- a/doc/tutorial/tweaking.texi +++ b/doc/tutorial/tweaking.texi @@ -100,8 +100,8 @@ You should see the now familiar output of the first @command{ns-3} example program @verbatim - Waf: Entering directory `/home/craigdo/repos/ns-3-allinone-3.5-tutorial/ns-3-dev/build' - Waf: Leaving directory `/home/craigdo/repos/ns-3-allinone-3.5-tutorial/ns-3-dev/build' + Waf: Entering directory `/home/craigdo/repos/ns-3-allinone/ns-3-dev/build' + Waf: Leaving directory `/home/craigdo/repos/ns-3-allinone/ns-3-dev/build' 'build' finished successfully (0.413s) Sent 1024 bytes to 10.1.1.2 Received 1024 bytes from 10.1.1.1 @@ -150,8 +150,8 @@ you run the script with NS_LOG set this way, the @command{ns-3} logging system will pick up the change and you should see the following output: @verbatim - Waf: Entering directory `/home/craigdo/repos/ns-3-allinone-3.5-tutorial/ns-3-dev/build - Waf: Leaving directory `/home/craigdo/repos/ns-3-allinone-3.5-tutorial/ns-3-dev/build' + Waf: Entering directory `/home/craigdo/repos/ns-3-allinone/ns-3-dev/build + Waf: Leaving directory `/home/craigdo/repos/ns-3-allinone/ns-3-dev/build' 'build' finished successfully (0.404s) UdpEchoClientApplication:UdpEchoClient() UdpEchoClientApplication:SetDataSize(1024) @@ -205,8 +205,8 @@ that every message from the given log component is prefixed with the component name. @verbatim - Waf: Entering directory `/home/craigdo/repos/ns-3-allinone-3.5-tutorial/ns-3-dev/build' - Waf: Leaving directory `/home/craigdo/repos/ns-3-allinone-3.5-tutorial/ns-3-dev/build' + Waf: Entering directory `/home/craigdo/repos/ns-3-allinone/ns-3-dev/build' + Waf: Leaving directory `/home/craigdo/repos/ns-3-allinone/ns-3-dev/build' 'build' finished successfully (0.417s) UdpEchoClientApplication:UdpEchoClient() UdpEchoClientApplication:SetDataSize(1024) @@ -242,8 +242,8 @@ echo client and server applications. You may see that this can be very useful in debugging problems. @verbatim - Waf: Entering directory `/home/craigdo/repos/ns-3-allinone-3.5-tutorial/ns-3-dev/build' - Waf: Leaving directory `/home/craigdo/repos/ns-3-allinone-3.5-tutorial/ns-3-dev/build' + Waf: Entering directory `/home/craigdo/repos/ns-3-allinone/ns-3-dev/build' + Waf: Leaving directory `/home/craigdo/repos/ns-3-allinone/ns-3-dev/build' 'build' finished successfully (0.406s) UdpEchoServerApplication:UdpEchoServer() UdpEchoClientApplication:UdpEchoClient() @@ -277,8 +277,8 @@ Again, you will have to remove the newline above. If you run the script now, you should see the following output: @verbatim - Waf: Entering directory `/home/craigdo/repos/ns-3-allinone-3.5-tutorial/ns-3-dev/build' - Waf: Leaving directory `/home/craigdo/repos/ns-3-allinone-3.5-tutorial/ns-3-dev/build' + Waf: Entering directory `/home/craigdo/repos/ns-3-allinone/ns-3-dev/build' + Waf: Leaving directory `/home/craigdo/repos/ns-3-allinone/ns-3-dev/build' 'build' finished successfully (0.418s) 0s UdpEchoServerApplication:UdpEchoServer() 0s UdpEchoClientApplication:UdpEchoClient() @@ -410,8 +410,8 @@ If you now run the script you will see your new ``Creating Topology'' log message, @verbatim - Waf: Entering directory `/home/craigdo/repos/ns-3-allinone-3.5-tutorial/ns-3-dev/build' - Waf: Leaving directory `/home/craigdo/repos/ns-3-allinone-3.5-tutorial/ns-3-dev/build' + Waf: Entering directory `/home/craigdo/repos/ns-3-allinone/ns-3-dev/build' + Waf: Leaving directory `/home/craigdo/repos/ns-3-allinone/ns-3-dev/build' 'build' finished successfully (0.404s) Creating Topology Sent 1024 bytes to 10.1.1.2 @@ -465,8 +465,8 @@ sort out which program gets which argument. The command line parser will now see the @code{--PrintHelp} argument and respond with, @verbatim - Waf: Entering directory `/home/craigdo/repos/ns-3-allinone-3.5-tutorial/ns-3-dev/build' - Waf: Leaving directory `/home/craigdo/repos/ns-3-allinone-3.5-tutorial/ns-3-dev/build' + Waf: Entering directory `/home/craigdo/repos/ns-3-allinone/ns-3-dev/build' + Waf: Leaving directory `/home/craigdo/repos/ns-3-allinone/ns-3-dev/build' 'build' finished successfully (0.413s) TcpL4Protocol:TcpStateMachine() CommandLine:HandleArgument(): Handle arg name=PrintHelp value= @@ -542,8 +542,8 @@ time prefix. If you run the script, you should now see the following output, @verbatim - Waf: Entering directory `/home/craigdo/repos/ns-3-allinone-3.5-tutorial/ns-3-dev/build' - Waf: Leaving directory `/home/craigdo/repos/ns-3-allinone-3.5-tutorial/ns-3-dev/build' + Waf: Entering directory `/home/craigdo/repos/ns-3-allinone/ns-3-dev/build' + Waf: Leaving directory `/home/craigdo/repos/ns-3-allinone/ns-3-dev/build' 'build' finished successfully (0.405s) 0s UdpEchoServerApplication:UdpEchoServer() 1s UdpEchoServerApplication:StartApplication() @@ -606,8 +606,8 @@ in which case we recover the timing we had when we explicitly set the @code{DataRate} and @code{Delay} in the script: @verbatim - Waf: Entering directory `/home/craigdo/repos/ns-3-allinone-3.5-tutorial/ns-3-dev/bu - Waf: Leaving directory `/home/craigdo/repos/ns-3-allinone-3.5-tutorial/ns-3-dev/bui + Waf: Entering directory `/home/craigdo/repos/ns-3-allinone/ns-3-dev/build' + Waf: Leaving directory `/home/craigdo/repos/ns-3-allinone/ns-3-dev/build' 'build' finished successfully (0.417s) 0s UdpEchoServerApplication:UdpEchoServer() 1s UdpEchoServerApplication:StartApplication() @@ -684,8 +684,8 @@ Try, @end verbatim @verbatim - Waf: Entering directory `/home/craigdo/repos/ns-3-allinone-3.5-tutorial/ns-3-dev/build' - Waf: Leaving directory `/home/craigdo/repos/ns-3-allinone-3.5-tutorial/ns-3-dev/build' + Waf: Entering directory `/home/craigdo/repos/ns-3-allinone/ns-3-dev/build' + Waf: Leaving directory `/home/craigdo/repos/ns-3-allinone/ns-3-dev/build' 'build' finished successfully (0.403s) --PrintHelp: Print this help message. --PrintGroups: Print the list of groups. @@ -707,8 +707,8 @@ setting the @code{--nPackets} argument in the command line, You should now see @verbatim - Waf: Entering directory `/home/craigdo/repos/ns-3-allinone-3.5-tutorial/ns-3-dev/build' - Waf: Leaving directory `/home/craigdo/repos/ns-3-allinone-3.5-tutorial/ns-3-dev/build' + Waf: Entering directory `/home/craigdo/repos/ns-3-allinone/ns-3-dev/build' + Waf: Leaving directory `/home/craigdo/repos/ns-3-allinone/ns-3-dev/build' 'build' finished successfully (0.404s) 0s UdpEchoServerApplication:UdpEchoServer() 1s UdpEchoServerApplication:StartApplication()