afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

replace old NRL URL throughout user manual

Browse source 
(Boeing r1802)
This commit is contained in:
ahrenholz 2013-12-04 19:33:50 +00:00
parent 3e99c9d12f
commit d03e836358
4 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
doc/emane.rst
View file

@ -29,9 +29,8 @@ EMANE is developed by U.S. Naval Research Labs (NRL) Code 5522 and Adjacent
Link LLC,
who maintain these websites:
* `<http://cs.itd.nrl.navy.mil/work/emane/index.php>`_
* `<http://www.nrl.navy.mil/itd/ncs/products/emane>`_
* `<http://www.adjacentlink.com/>`_
* `<http://labs.cengen.com/emane/>`_ (former EMANE project home)
Instead of building Linux Ethernet bridging networks with CORE, higher-fidelity
wireless networks can be emulated using EMANE bound to virtual devices. CORE
@ -94,7 +93,7 @@ containing the *EmaneModel* subclass. A portion of the default
EMANE can be installed from deb or RPM packages or from source. See the
`EMANE website <http://cs.itd.nrl.navy.mil/work/emane/index.php>`_ for
`EMANE website <http://www.nrl.navy.mil/itd/ncs/products/emane>`_ for
full details.
Here are quick instructions for installing all EMANE packages:

6
doc/install.rst
View file

@ -151,7 +151,7 @@ First install the Ubuntu |UBUNTUVERSION| operating system.
* Install Quagga for routing. If you plan on working with wireless
networks, we recommend
installing
`OSPF MDR <http://cs.itd.nrl.navy.mil/work/ospf-manet/index.php>`__
`OSPF MDR <http://www.nrl.navy.mil/itd/ncs/products/ospf-manet>`__
(replace `amd64` below with `i386` if needed
to match your architecture):
@ -241,7 +241,7 @@ Fedora release number.
* Install Quagga for routing. If you plan on working with wireless networks,
we recommend installing
`OSPF MDR <http://cs.itd.nrl.navy.mil/work/ospf-manet/>`_:
`OSPF MDR <http://www.nrl.navy.mil/itd/ncs/products/ospf-manet>`_:
.. parsed-literal::
@ -621,7 +621,7 @@ there are two different Quagga packages that you may use:
.. index:: MANET Designated Routers (MDR)
*
`OSPF MANET Designated Routers <http://cs.itd.nrl.navy.mil/work/ospf-manet/index.php>`_ (MDR) - the Quagga routing suite with a modified version of OSPFv3,
`OSPF MANET Designated Routers <http://www.nrl.navy.mil/itd/ncs/products/ospf-manet>`_ (MDR) - the Quagga routing suite with a modified version of OSPFv3,
optimized for use with mobile wireless networks. The *mdr* node type (and the MDR service) requires this variant of Quagga.
If you plan on working with wireless networks, we recommend installing OSPF MDR;

2
doc/intro.rst
View file

@ -224,7 +224,7 @@ contributing to CORE, please visit the
Besides this manual, there are other additional resources available online:
* `CORE website <http://cs.itd.nrl.navy.mil/work/core/>`_ - main project page containing demos, downloads, and mailing list information.
* `CORE website <http://www.nrl.navy.mil/itd/ncs/products/core>`_ - main project page containing demos, downloads, and mailing list information.
* `CORE supplemental website <http://code.google.com/p/coreemu/>`_ - supplemental Google Code page with a quickstart guide, wiki, bug tracker, and screenshots.
.. index::

2
doc/usage.rst
View file

@ -1686,7 +1686,7 @@ file, you will need to stop the emulation if it were running and reload the
file.
The :file:`.xml` file schema
is `specified by NRL <http://cs.itd.nrl.navy.mil/work/mnmtools/index.php>`_.
is `specified by NRL <http://www.nrl.navy.mil/itd/ncs/products/mnmtools>`_.
Planning documents are specified in NRL's Network Modeling Framework (NMF).
Here the individual planning documents are several tags
encased in one `<Scenario>` tag: