Changes between Version 45 and Version 46 of WikiStart

Timestamp:

Feb 5, 2011 7:38:09 PM (14 years ago)

Author:

braden

Comment:

--

WikiStart

@@ -3 +3 @@
 == Welcome to the DETERlab Documentation Wiki and Trouble Ticket site ==
 
-DETERlab [http://www.isi.deterlab.net] is an Emulab-based cluster testbed designed for cyber security research.  Under funding from DHS and other agencies, the DETER project operates DETERlab while pursueing a vigorous research program to make DETERlab a more powerful research instrument.
-Our project homepage can be found at [http://www.isi.edu/deter].
+DETERlab [http://www.isi.deterlab.net] is an Emulab-based cluster testbed designed for cyber security research.  Under funding from DHS and other agencies, DETERlab is operated by the DETER project, which is also pursueing a vigorous research program to make DETERlab a more powerful research instrument.
 
 == Getting Help (Contact Us) ==
@@ -18 +17 @@
 
  * Using DETERlab
+  * [wiki:DeterResources Experimentation Resources]
   * [wiki:Topologies Sample topologies and NS files]
   * [wiki:DETERSSH Using SSH to access testbed nodes]
@@ -27 +27 @@
 
  * Other
-  * [wiki:DeterResources DETER Resources] DETERlab user resources.
+  * DETER project home page [http://www.isi.edu/deter]
   * [wiki:ISIUCB Location of the DETERlab machine rooms]
 
@@ -38 +38 @@
 refer to the Emulab-based documentation at [http://docfilter.deterlab.net/].
 Note that this link to Emulab-based documentation takes you to a DETERized version of
-the real Emulab documentation, which contains internal links to Emulab. We have filtered
-it to replace Emulab references to DETERlab references.
-differs from that on the Emulab site;
+the real Emulab documentation; we have filtered
+it to replace Emulab links with DETERlab links.
 
 If you find a page that does not have "DETERlab" or "DETER"
 at the top, you may have been diverted into the real Emulab documentation, which may
-lad to information that is incorrect for DETERlab. Please tell us if that happens so we can
+lead you to an Emulab page that is incorrect for DETERlab. Please tell us if that happens so we can
 plug the leak.