diff --git a/doc/tutorial/source/getting-started.rst b/doc/tutorial/source/getting-started.rst index 45da02c8d..976d6c025 100644 --- a/doc/tutorial/source/getting-started.rst +++ b/doc/tutorial/source/getting-started.rst @@ -57,18 +57,9 @@ emacs, or Eclipse) and, if using the development repositories, an installation of Git source code control system. Most beginning users need not concern themselves if their configuration reports some missing optional features of |ns3|, but for those wishing a full installation, -the project provides a wiki that includes pages with many useful hints -and tips. One such page is the "Installation" page, with install instructions +the project provides an installation guide for various systems, available at -https://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 -commands used to install them for common Linux or macOS variants. - -You may want to take this opportunity to explore the |ns3| wiki -a bit, or the main web site at https://www.nsnam.org, since there is a -wealth of information there. +https://www.nsnam.org/docs/installation/html/index.html. As of the most recent |ns3| release (ns-3.38), the following tools are needed to get started with |ns3|: @@ -87,7 +78,8 @@ bunzip2 any recent version (to uncompress an |ns3| release) To check the default version of Python, type ``python -V``. To check the default version of g++, type ``g++ -v``. If your installation is -missing or too old, please consult the |ns3| installation wiki for guidance. +missing or too old, please consult the |ns3| +`installation guide `_ for guidance. From this point forward, we are going to assume that the reader is working in Linux, macOS, or a Linux emulation environment, and has at least the above diff --git a/doc/tutorial/source/resources.rst b/doc/tutorial/source/resources.rst index ebee294c3..fc4301444 100644 --- a/doc/tutorial/source/resources.rst +++ b/doc/tutorial/source/resources.rst @@ -84,18 +84,14 @@ neither make directly. We use CMake for these functions. On macOS, the toolchain used is Xcode. |ns3| users on a Mac are strongly encouraged to install Xcode and the command-line tools packages from the -Apple App Store, and to look at the |ns3| installation wiki for more -information (https://www.nsnam.org/wiki/Installation). +Apple App Store, and to look at the |ns3| installation guide for more +information (https://www.nsnam.org/docs/installation/html/). Typically an |ns3| author will work in Linux or a Unix-like environment. For those running under Windows, there do exist environments which simulate the Linux environment to various degrees. The |ns3| -project has in the past (but not presently) supported development in the Cygwin environment for -these users. See http://www.cygwin.com/ -for details on downloading, and visit the |ns3| wiki for more information -about Cygwin and |ns3|. MinGW is presently not officially supported. -Another alternative to Cygwin is to install a virtual machine environment -such as VMware server and install a Linux virtual machine. +installation guide has information about Windows support +(https://www.nsnam.org/docs/installation/html/windows.html). Socket Programming ******************