diff --git a/RELEASE_NOTES b/RELEASE_NOTES index c9d8a0209..97626df98 100644 --- a/RELEASE_NOTES +++ b/RELEASE_NOTES @@ -1009,7 +1009,7 @@ ns-3.9 has been tested on the following platforms: Not all ns-3 options are available on all platforms; consult the wiki for more information: -http://www.nsnam.org/wiki/index.php/Installation +http://www.nsnam.org/wiki/Installation New user-visible features ------------------------- @@ -1166,7 +1166,7 @@ ns-3.8 has been tested on the following platforms: Not all ns-3 options are available on all platforms; consult the wiki for more information: -http://www.nsnam.org/wiki/index.php/Installation +http://www.nsnam.org/wiki/Installation New user-visible features ------------------------- @@ -1310,7 +1310,7 @@ Unofficially supported platform Not all ns-3 options are available on all platforms; consult the wiki for more information: -http://www.nsnam.org/wiki/index.php/Installation +http://www.nsnam.org/wiki/Installation New user-visible features ------------------------- @@ -1430,7 +1430,7 @@ ns-3.6 has been tested on the following platforms: Not all ns-3 options are available on all platforms; consult the wiki for more information: -http://www.nsnam.org/wiki/index.php/Installation +http://www.nsnam.org/wiki/Installation New user-visible features ------------------------- @@ -1507,7 +1507,7 @@ ns-3.5 has been tested on the following platforms: Not all ns-3 options are available on all platforms; consult the wiki for more information: -http://www.nsnam.org/wiki/index.php/Installation +http://www.nsnam.org/wiki/Installation New user-visible features ------------------------- @@ -1565,7 +1565,7 @@ ns-3.4 has been tested on the following platforms: Not all ns-3 options are available on all platforms; consult the wiki for more information: -http://www.nsnam.org/wiki/index.php/Installation +http://www.nsnam.org/wiki/Installation New user-visible features ------------------------- @@ -1629,7 +1629,7 @@ ns-3.3 has been tested on the following platforms: Not all ns-3 options are available on all platforms; consult the wiki for more information: -http://www.nsnam.org/wiki/index.php/Installation +http://www.nsnam.org/wiki/Installation New user-visible features ------------------------- @@ -1696,7 +1696,7 @@ ns-3.2 has been tested on the following platforms: Not all ns-3 options are available on all platforms; consult the wiki for more information: -http://www.nsnam.org/wiki/index.php/Installation +http://www.nsnam.org/wiki/Installation New user-visible features ------------------------- @@ -1724,7 +1724,7 @@ New user-visible features keep track of simulation data in persistent storage across multiple runs (database and ascii file backends are available). More information on the wiki: - http://www.nsnam.org/wiki/index.php/Statistical_Framework_for_Network_Simulation + http://www.nsnam.org/wiki/Statistical_Framework_for_Network_Simulation API changes from ns-3.1 ----------------------- diff --git a/doc/build.txt b/doc/build.txt index 5f424f3d6..430f5977a 100644 --- a/doc/build.txt +++ b/doc/build.txt @@ -3,7 +3,7 @@ build system (http://www.freehackers.org/~tnagy/waf.html) Note: We've added a wiki page with more complete build instructions than the quick ones you find below: -http://www.nsnam.org/wiki/index.php/Installation +http://www.nsnam.org/wiki/Installation === Installing Waf === diff --git a/doc/manual/source/index.rst b/doc/manual/source/index.rst index 4094b2c77..a5c2c3b57 100644 --- a/doc/manual/source/index.rst +++ b/doc/manual/source/index.rst @@ -8,7 +8,7 @@ available in five forms: * `ns-3 Doxygen `_: Documentation of the public APIs of the simulator * Tutorial, Manual *(this document)*, and Model Library for the `latest release `_ and `development tree `_ -* `ns-3 wiki `_ +* `ns-3 wiki `_ This document is written in `reStructuredText `_ for `Sphinx `_ and is maintained in the ``doc/manual`` directory of ns-3's source code. diff --git a/doc/manual/source/python.rst b/doc/manual/source/python.rst index c8a983ff0..736f37dde 100644 --- a/doc/manual/source/python.rst +++ b/doc/manual/source/python.rst @@ -312,4 +312,4 @@ The ``src//bindings`` directory may contain the following files, some of More Information for Developers ******************************* -If you are a developer and need more information on |ns3|'s Python bindings, please see the `Python Bindings wiki page `_. +If you are a developer and need more information on |ns3|'s Python bindings, please see the `Python Bindings wiki page `_. diff --git a/doc/manual/source/troubleshoot.rst b/doc/manual/source/troubleshoot.rst index 45809f7c0..f704a15cb 100644 --- a/doc/manual/source/troubleshoot.rst +++ b/doc/manual/source/troubleshoot.rst @@ -8,7 +8,7 @@ This chapter posts some information about possibly common errors in building or running |ns3| programs. Please note that the wiki -(``_) may have contributed +(``_) may have contributed items. Build errors diff --git a/doc/models/source/index.rst b/doc/models/source/index.rst index 02b144448..d2e68fdf0 100644 --- a/doc/models/source/index.rst +++ b/doc/models/source/index.rst @@ -8,7 +8,7 @@ available in five forms: * `ns-3 Doxygen `_: Documentation of the public APIs of the simulator * Tutorial, Manual, and Model Library *(this document)* for the `latest release `_ and `development tree `_ -* `ns-3 wiki `_ +* `ns-3 wiki `_ This document is written in `reStructuredText `_ for `Sphinx `_ and is maintained in the ``doc/models`` directory of ns-3's source code. diff --git a/doc/tutorial-pt-br/source/getting-started.rst b/doc/tutorial-pt-br/source/getting-started.rst index 63cc27a9d..edbb1eed0 100644 --- a/doc/tutorial-pt-br/source/getting-started.rst +++ b/doc/tutorial-pt-br/source/getting-started.rst @@ -30,9 +30,9 @@ Baixando o ns-3 present on your system before proceeding. |ns3| provides a wiki for your reading pleasure that includes pages with many useful hints and tips. One such page is the "Installation" page, - http://www.nsnam.org/wiki/index.php/Installation. + http://www.nsnam.org/wiki/Installation. -O |ns3|, como um todo, é bastante complexo e possui várias dependências. Isto também é verdade para as ferramentas que fornecem suporte ao |ns3| (exemplos, `"GNU toolchain"`, Mercurial e um editor para a programação), desta forma é necessário assegurar que várias bibliotecas estejam presentes no sistema. O |ns3| fornece um Wiki com várias dicas sobre o sistema. Uma das páginas do Wiki é a página de instalação (`"Installation"`) que está disponível em: http://www.nsnam.org/wiki/index.php/Installation. +O |ns3|, como um todo, é bastante complexo e possui várias dependências. Isto também é verdade para as ferramentas que fornecem suporte ao |ns3| (exemplos, `"GNU toolchain"`, Mercurial e um editor para a programação), desta forma é necessário assegurar que várias bibliotecas estejam presentes no sistema. O |ns3| fornece um Wiki com várias dicas sobre o sistema. Uma das páginas do Wiki é a página de instalação (`"Installation"`) que está disponível em: http://www.nsnam.org/wiki/Installation. .. The "Prerequisites" section of this wiki page explains which packages are @@ -740,7 +740,7 @@ Agora, ao executar o programa ``hello-simulator`` devemos ter a seguinte a sa .. If you want to run programs under another tool such as gdb or valgrind, see this `wiki entry - `_. + `_. -Se o leitor for executar seus programas sob outras ferramentas, tais como Gdb ou Valgrind, é recomendável que leia a seguinte `entrada no Wiki `_. +Se o leitor for executar seus programas sob outras ferramentas, tais como Gdb ou Valgrind, é recomendável que leia a seguinte `entrada no Wiki `_. diff --git a/doc/tutorial-pt-br/source/index.rst b/doc/tutorial-pt-br/source/index.rst index e61456072..70309c64a 100644 --- a/doc/tutorial-pt-br/source/index.rst +++ b/doc/tutorial-pt-br/source/index.rst @@ -30,7 +30,7 @@ Este * Tutorial *(este documento)*, manual, modelos de bibliotecas para a `última release `_ e `árvore de desenvolvimento `_; -* `ns-3 wiki `_. +* `ns-3 wiki `_. .. This document is written in `reStructuredText `_ for `Sphinx `_ and is maintained in the diff --git a/doc/tutorial-pt-br/source/introduction.rst b/doc/tutorial-pt-br/source/introduction.rst index 69680fe80..02280b693 100644 --- a/doc/tutorial-pt-br/source/introduction.rst +++ b/doc/tutorial-pt-br/source/introduction.rst @@ -132,15 +132,15 @@ O |ns3| * Licença de código aberto compatível com GNU GPLv2; -* `Wiki `_; +* `Wiki `_; .. * `Contributed Code - `_ page, similar to ns-2's popular Contributed Code + `_ page, similar to ns-2's popular Contributed Code `page `_ -* Página para `contribuição com o código `_, similar a página de contribuição do `ns-2 `_; +* Página para `contribuição com o código `_, similar a página de contribuição do `ns-2 `_; .. * Open `bug tracker diff --git a/doc/tutorial/source/getting-started.rst b/doc/tutorial/source/getting-started.rst index e04ac169e..c702ac8cf 100644 --- a/doc/tutorial/source/getting-started.rst +++ b/doc/tutorial/source/getting-started.rst @@ -43,7 +43,7 @@ editor) you will need to ensure that a number of additional libraries are present on your system before proceeding. |ns3| provides a wiki page that includes pages with many useful hints and tips. One such page is the "Installation" page, -http://www.nsnam.org/wiki/index.php/Installation. +http://www.nsnam.org/wiki/Installation. The "Prerequisites" section of this wiki page explains which packages are required to support common |ns3| options, and also provides the @@ -661,5 +661,5 @@ expected output. If you want to run programs under another tool such as gdb or valgrind, see this `wiki entry -`_. +`_. diff --git a/doc/tutorial/source/index.rst b/doc/tutorial/source/index.rst index 4e2d10e09..7f0144723 100644 --- a/doc/tutorial/source/index.rst +++ b/doc/tutorial/source/index.rst @@ -8,7 +8,7 @@ available in five forms: * `ns-3 Doxygen `_: Documentation of the public APIs of the simulator * Tutorial *(this document)*, Manual, and Model Library for the `latest release `_ and `development tree `_ -* `ns-3 wiki `_ +* `ns-3 wiki `_ This document is written in `reStructuredText `_ for `Sphinx `_ and is maintained in the ``doc/tutorial`` directory of ns-3's source code. diff --git a/doc/tutorial/source/introduction.rst b/doc/tutorial/source/introduction.rst index 23c850f4d..ac716a0b8 100644 --- a/doc/tutorial/source/introduction.rst +++ b/doc/tutorial/source/introduction.rst @@ -135,9 +135,9 @@ contribute to |ns3| like they have for |ns2|: * Open source licensing based on GNU GPLv2 compatibility * `wiki - `_ + `_ * `Contributed Code - `_ page, similar to |ns2|'s popular Contributed Code + `_ page, similar to |ns2|'s popular Contributed Code `page `_ * Open `bug tracker diff --git a/examples/stats/README b/examples/stats/README index 2918f0e24..f317f91d3 100644 --- a/examples/stats/README +++ b/examples/stats/README @@ -13,7 +13,7 @@ output from this example. More information on the statistics package and this example is available online on the ns-3 wiki at: -http://www.nsnam.org/wiki/index.php/Statistical_Framework_for_Network_Simulation +http://www.nsnam.org/wiki/Statistical_Framework_for_Network_Simulation *** Using ns-3 with the OMNeT++ analysis tool *** diff --git a/src/emu/doc/emu.rst b/src/emu/doc/emu.rst index f99c2b178..97c3a5f99 100644 --- a/src/emu/doc/emu.rst +++ b/src/emu/doc/emu.rst @@ -70,8 +70,8 @@ may want to take a moment to review a couple of HOWTO pages on the |ns3| wiki that describe how to set up a virtual test network using VMware and how to run a set of example (client server) simulations that use ``Emu`` net devices. -* ``_ -* ``_ +* ``_ +* ``_ Once you are over the configuration hurdle, the script changes required to use an ``Emu`` device are trivial. The main structural difference is that you will diff --git a/src/energy/model/li-ion-energy-source.h b/src/energy/model/li-ion-energy-source.h index ff20cd53c..74b806053 100644 --- a/src/energy/model/li-ion-energy-source.h +++ b/src/energy/model/li-ion-energy-source.h @@ -59,8 +59,8 @@ namespace ns3 { * depleted * * For a complete reference of the energy source model and model's fitting please refer - * to UAN Framework - * page and Li-Ion model + * to UAN Framework + * page and Li-Ion model * fitting page. * * References: diff --git a/src/fd-net-device/model/fd-net-device.h b/src/fd-net-device/model/fd-net-device.h index 478034f33..84aa7fd7b 100644 --- a/src/fd-net-device/model/fd-net-device.h +++ b/src/fd-net-device/model/fd-net-device.h @@ -178,7 +178,7 @@ protected: private: // private copy constructor as sugested in: - // http://www.nsnam.org/wiki/index.php/NS-3_Python_Bindings#.22invalid_use_of_incomplete_type.22 + // http://www.nsnam.org/wiki/NS-3_Python_Bindings#.22invalid_use_of_incomplete_type.22 FdNetDevice (FdNetDevice const &); /** diff --git a/src/internet/doc/tcp.rst b/src/internet/doc/tcp.rst index 0bba390e8..d294de177 100644 --- a/src/internet/doc/tcp.rst +++ b/src/internet/doc/tcp.rst @@ -147,7 +147,7 @@ Validation ++++++++++ Several TCP validation test results can be found in the -`wiki page `_ +`wiki page `_ describing this implementation. Current limitations @@ -365,4 +365,4 @@ Limitations * The non-Linux stacks of NSC are not supported in |ns3| * Not all socket API callbacks are supported -For more information, see `this wiki page `_. +For more information, see `this wiki page `_. diff --git a/src/mesh/doc/mesh.rst b/src/mesh/doc/mesh.rst index ebe256b4c..41da69a75 100644 --- a/src/mesh/doc/mesh.rst +++ b/src/mesh/doc/mesh.rst @@ -7,4 +7,4 @@ Mesh NetDevice The Mesh NetDevice based on 802.11s was added in *ns-3.6*. An overview presentation by Kirill Andreev was published at the wns-3 workshop -in 2009: ``_. +in 2009: ``_. diff --git a/src/mobility/doc/mobility.rst b/src/mobility/doc/mobility.rst index c172d7248..c56a75606 100644 --- a/src/mobility/doc/mobility.rst +++ b/src/mobility/doc/mobility.rst @@ -168,7 +168,7 @@ Some examples of external tools that can export in this format include: - BonnMotion http://net.cs.uni-bonn.de/wg/cs/applications/bonnmotion/ - - Some installation instructions for BonnMotion can be found here: http://www.nsnam.org/wiki/index.php/HOWTO_use_ns-3_with_BonnMotion_mobility_generator_and_analysis_tool + - Some installation instructions for BonnMotion can be found here: http://www.nsnam.org/wiki/HOWTO_use_ns-3_with_BonnMotion_mobility_generator_and_analysis_tool - Documentation on using BonnMotion with |ns3| is posted here: http://www.ida.liu.se/~rikno/files/mobility_generation.pdf - SUMO http://sourceforge.net/apps/mediawiki/sumo/index.php?title=Main_Page diff --git a/src/netanim/doc/animation.rst b/src/netanim/doc/animation.rst index fae0a27ec..bfa260974 100644 --- a/src/netanim/doc/animation.rst +++ b/src/netanim/doc/animation.rst @@ -6,7 +6,7 @@ Animation Animation is an important tool for network simulation. While |ns3| does not contain a default graphical animation tool, we currently have two ways to provide animation, namely using the PyViz method or the NetAnim method. -The PyViz method is described in http://www.nsnam.org/wiki/index.php/PyViz. +The PyViz method is described in http://www.nsnam.org/wiki/PyViz. We will describe the NetAnim method briefly here. @@ -320,4 +320,4 @@ Wiki ==== For detailed instructions on installing "NetAnim", F.A.Qs and loading the XML trace file (mentioned earlier) using NetAnim please refer: -http://www.nsnam.org/wiki/index.php/NetAnim +http://www.nsnam.org/wiki/NetAnim diff --git a/src/visualizer/doc/readme.txt b/src/visualizer/doc/readme.txt index 125f4f3eb..c456c28ee 100644 --- a/src/visualizer/doc/readme.txt +++ b/src/visualizer/doc/readme.txt @@ -6,4 +6,4 @@ that can be used to debug the state of the running objects. Although it is mostly written in Python, it works both with Python and pure C++ simulations. -For more information, see http://www.nsnam.org/wiki/index.php/PyViz +For more information, see http://www.nsnam.org/wiki/PyViz