diff --git a/doc/installation/source/quick-start.rst b/doc/installation/source/quick-start.rst index 1cae262e2..5b8647df8 100644 --- a/doc/installation/source/quick-start.rst +++ b/doc/installation/source/quick-start.rst @@ -80,13 +80,13 @@ Download There are two main options: -1. Download a release tarball. This will unpack to a directory such as ``ns-allinone-3.39`` +1. Download a release tarball. This will unpack to a directory such as ``ns-allinone-3.40`` containing |ns3| and some other programs. Below is a command-line download using ``wget``, but a browser download will also work:: - $ wget https://www.nsnam.org/releases/ns-allinone-3.39.tar.bz2 - $ tar xfj ns-allinone-3.39.tar.bz2 - $ cd ns-allinone-3.39/ns-3.39 + $ wget https://www.nsnam.org/releases/ns-allinone-3.40.tar.bz2 + $ tar xfj ns-allinone-3.40.tar.bz2 + $ cd ns-allinone-3.40/ns-3.40 2. Clone |ns3| from the Git repository. The ``ns-3-allinone`` can be cloned, as well as ``ns-3-dev`` by itself. Below, we illustrate the latter:: @@ -99,7 +99,7 @@ you clone |ns3|, your directory will be named ``ns-3-dev``. By default, Git wil the |ns3| ``master`` branch, which is a development branch. All |ns3| releases are tagged in Git, so if you would then like to check out a past release, you can do so as follows:: - $ git checkout -b ns-3.39-release ns-3.39 + $ git checkout -b ns-3.40-release ns-3.40 In this quick-start, we are omitting download and build instructions for optional |ns3| modules, the ``NetAnim`` animator, Python bindings, and ``NetSimulyzer``. The diff --git a/doc/tutorial/source/getting-started.rst b/doc/tutorial/source/getting-started.rst index d8ccba2f5..c393b9020 100644 --- a/doc/tutorial/source/getting-started.rst +++ b/doc/tutorial/source/getting-started.rst @@ -61,7 +61,7 @@ the project provides an installation guide for various systems, available at https://www.nsnam.org/docs/installation/html/index.html. -As of the most recent |ns3| release (ns-3.39), the following tools +As of the most recent |ns3| release (ns-3.40), the following tools are needed to get started with |ns3|: ============ =========================================================== @@ -116,21 +116,21 @@ get a copy of a release by typing the following into your Linux shell $ cd $ mkdir workspace $ cd workspace - $ wget https://www.nsnam.org/release/ns-allinone-3.39.tar.bz2 - $ tar xjf ns-allinone-3.39.tar.bz2 + $ wget https://www.nsnam.org/release/ns-allinone-3.40.tar.bz2 + $ tar xjf ns-allinone-3.40.tar.bz2 Notice the use above of the ``wget`` utility, which is a command-line tool to fetch objects from the web; if you do not have this installed, you can use a browser for this step. Following these steps, if you change into the directory -``ns-allinone-3.39``, you should see a number of files and directories +``ns-allinone-3.40``, you should see a number of files and directories .. sourcecode:: text - $ cd ns-allinone-3.39 + $ cd ns-allinone-3.40 $ ls - bake build.py constants.py netanim-3.109 ns-3.39 README.md util.py + bake build.py constants.py netanim-3.109 ns-3.40 README.md util.py You are now ready to build the base |ns3| distribution and may skip ahead to the section on building |ns3|. @@ -180,7 +180,7 @@ release number: .. sourcecode:: console - $ python3 download.py -n ns-3.39 + $ python3 download.py -n ns-3.40 After this step, the additional repositories of |ns3|, bake, pybindgen, and netanim will be downloaded to the ``ns-3-allinone`` directory. @@ -249,9 +249,9 @@ distribution of your choice. There are a few configuration targets available: -1. ``ns-3.39``: the code corresponding to the release +1. ``ns-3.40``: the code corresponding to the release 2. ``ns-3-dev``: a similar module but using the development code tree -3. ``ns-allinone-3.39``: the module that includes other optional features +3. ``ns-allinone-3.40``: the module that includes other optional features such as bake build system, netanim animator, and pybindgen 4. ``ns-3-allinone``: similar to the released version of the allinone module, but for development code. @@ -268,7 +268,7 @@ code either by inspection of the repository list or by going to the `"ns-3 Releases" `_ web page and clicking on the latest release link. We'll proceed in -this tutorial example with ``ns-3.39``. +this tutorial example with ``ns-3.40``. We are now going to use the bake tool to pull down the various pieces of |ns3| you will be using. First, we'll say a word about running bake. @@ -297,7 +297,7 @@ Step into the workspace directory and type the following into your shell: .. sourcecode:: console - $ ./bake.py configure -e ns-allinone-3.39 + $ ./bake.py configure -e ns-allinone-3.40 Next, we'll ask bake to check whether we have enough tools to download various components. Type: @@ -347,7 +347,7 @@ should yield something like: >> Downloading click-ns-3.37 - OK >> Downloading BRITE - OK >> Downloading openflow-dev - OK - >> Downloading ns-3.39 (target directory:ns-3.39) - OK + >> Downloading ns-3.40 (target directory:ns-3.40) - OK The above suggests that three sources have been downloaded. Check the ``source`` directory now and type ``ls``; one should see: @@ -356,7 +356,7 @@ The above suggests that three sources have been downloaded. Check the $ cd source $ ls - BRITE click-ns-3.37 netanim-3.109 ns-3.39 openflow-dev + BRITE click-ns-3.37 netanim-3.109 ns-3.40 openflow-dev You are now ready to build the |ns3| distribution. @@ -386,7 +386,7 @@ native |ns3| build system, CMake, to be introduced later in this tutorial. If you downloaded using a tarball you should have a directory called something like -``ns-allinone-3.39`` under your ``~/workspace`` directory. +``ns-allinone-3.40`` under your ``~/workspace`` directory. Type the following: .. sourcecode:: console @@ -419,7 +419,7 @@ and you should see something like: .. sourcecode:: text >> Building netanim-3.109 - OK - >> Building ns-3.39 - OK + >> Building ns-3.40 - OK There may be failures to build all components, but the build will proceed anyway if the component is optional. diff --git a/doc/tutorial/source/quick-start.rst b/doc/tutorial/source/quick-start.rst index d32f54d6d..6c072d173 100644 --- a/doc/tutorial/source/quick-start.rst +++ b/doc/tutorial/source/quick-start.rst @@ -64,13 +64,13 @@ Downloading the Latest Release :: - $ tar xjf ns-allinone-3.39.tar.bz2 + $ tar xjf ns-allinone-3.40.tar.bz2 3) Change into the |ns3| directory directly; e.g. :: - $ cd ns-allinone-3.39/ns-3.39 + $ cd ns-allinone-3.40/ns-3.40 The ns-allinone directory has some additional components but we are skipping over them here; one can work directly from the |ns3| source code directory. @@ -92,12 +92,12 @@ only to `cd` into ns-3-dev; the `master` branch is checked out by default. $ cd ns-3-dev -If instead you want to try the most recent release (version 3.39 as of this +If instead you want to try the most recent release (version 3.40 as of this writing), you can checkout a branch corresponding to that git tag: :: - $ git checkout -b ns-3.39-branch ns-3.39 + $ git checkout -b ns-3.40-branch ns-3.40 Building and testing ns-3 *************************