Skip to content

Commit adfaaf7

Browse files
committed
replace old NRL URL throughout user manual
(Boeing r1802)
1 parent 3d7dac6 commit adfaaf7

File tree

4 files changed

+7
-8
lines changed

4 files changed

+7
-8
lines changed

doc/emane.rst

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,8 @@ EMANE is developed by U.S. Naval Research Labs (NRL) Code 5522 and Adjacent
2929
Link LLC,
3030
who maintain these websites:
3131

32-
* `<http://cs.itd.nrl.navy.mil/work/emane/index.php>`_
32+
* `<http://www.nrl.navy.mil/itd/ncs/products/emane>`_
3333
* `<http://www.adjacentlink.com/>`_
34-
* `<http://labs.cengen.com/emane/>`_ (former EMANE project home)
3534

3635
Instead of building Linux Ethernet bridging networks with CORE, higher-fidelity
3736
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
9493
9594

9695
EMANE can be installed from deb or RPM packages or from source. See the
97-
`EMANE website <http://cs.itd.nrl.navy.mil/work/emane/index.php>`_ for
96+
`EMANE website <http://www.nrl.navy.mil/itd/ncs/products/emane>`_ for
9897
full details.
9998

10099
Here are quick instructions for installing all EMANE packages:

doc/install.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ First install the Ubuntu |UBUNTUVERSION| operating system.
151151
* Install Quagga for routing. If you plan on working with wireless
152152
networks, we recommend
153153
installing
154-
`OSPF MDR <http://cs.itd.nrl.navy.mil/work/ospf-manet/index.php>`__
154+
`OSPF MDR <http://www.nrl.navy.mil/itd/ncs/products/ospf-manet>`__
155155
(replace `amd64` below with `i386` if needed
156156
to match your architecture):
157157

@@ -241,7 +241,7 @@ Fedora release number.
241241

242242
* Install Quagga for routing. If you plan on working with wireless networks,
243243
we recommend installing
244-
`OSPF MDR <http://cs.itd.nrl.navy.mil/work/ospf-manet/>`_:
244+
`OSPF MDR <http://www.nrl.navy.mil/itd/ncs/products/ospf-manet>`_:
245245

246246
.. parsed-literal::
247247
@@ -621,7 +621,7 @@ there are two different Quagga packages that you may use:
621621
.. index:: MANET Designated Routers (MDR)
622622

623623
*
624-
`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,
624+
`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,
625625
optimized for use with mobile wireless networks. The *mdr* node type (and the MDR service) requires this variant of Quagga.
626626

627627
If you plan on working with wireless networks, we recommend installing OSPF MDR;

doc/intro.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ contributing to CORE, please visit the
224224

225225
Besides this manual, there are other additional resources available online:
226226

227-
* `CORE website <http://cs.itd.nrl.navy.mil/work/core/>`_ - main project page containing demos, downloads, and mailing list information.
227+
* `CORE website <http://www.nrl.navy.mil/itd/ncs/products/core>`_ - main project page containing demos, downloads, and mailing list information.
228228
* `CORE supplemental website <http://code.google.com/p/coreemu/>`_ - supplemental Google Code page with a quickstart guide, wiki, bug tracker, and screenshots.
229229

230230
.. index::

doc/usage.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1686,7 +1686,7 @@ file, you will need to stop the emulation if it were running and reload the
16861686
file.
16871687

16881688
The :file:`.xml` file schema
1689-
is `specified by NRL <http://cs.itd.nrl.navy.mil/work/mnmtools/index.php>`_.
1689+
is `specified by NRL <http://www.nrl.navy.mil/itd/ncs/products/mnmtools>`_.
16901690
Planning documents are specified in NRL's Network Modeling Framework (NMF).
16911691
Here the individual planning documents are several tags
16921692
encased in one `<Scenario>` tag:

0 commit comments

Comments
 (0)