Changes between Version 49 and Version 50 of WikiStart

Timestamp:

Feb 6, 2011 12:01:05 PM (14 years ago)

Author:

braden

Comment:

--

WikiStart

@@ -1 +1 @@
 [[TOC]]
 
-== Welcome to the DETERlab Documentation and Trouble Ticket site ==
+== DETERlab Documentation 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, DETERlab is operated by the DETER project, which is also pursueing a vigorous research program to make DETERlab a more powerful research instrument.
+DETERlab is an Emulab-based cluster testbed for cyber security research.  DETERlab is operated by the DETER project, which is also pursuing a vigorous research program to make DETERlab a more powerful instrument for its users.
 
-== Getting Help (Contact Us) ==
-
- * [wiki:GettingHelp Contact Us]
-
-== Getting Started with DETERlab ==
+== Getting Started ==
 
  * [wiki:GettingStarted Getting Started with DETERlab]
  * [wiki:Deter/Web/Beginners DETERlab for Beginners]
  * [wiki:FrequentlyAskedQuestions Frequently Asked Questions about DETERlab]
+ * [wiki:GettingHelp Contact Us]
 
 == DETERlab Documentation ==
 
  * Using DETERlab
+  * [wiki:Tutorial Tutorial on using DETERlab
   * [wiki:DeterResources Experimentation Resources]
   * [wiki:Topologies Sample topologies and NS files]
@@ -28 +26 @@
   * [wiki:NetFPGA/nodes Available netFPGA nodes]
 
- * Other
+ * Links
+  * [wiki:Deter/Web DETERlab home page (currently under construction)]
   * DETER project home page [http://www.isi.edu/deter]
-  * [wiki:ISIUCB Location of the DETERlab machine rooms]
 
-DETERlab is based on the [http://www.emulab.net/] Emulab  software.
-However, DETERlab differs from Emulab in user features,
-node types, supported operating systems, available tools, and registration procedures.  See the links above.
-The DETERlab documentation available from this page is generally specific to DETERlab.
-For more advanced documentation (e.g., advanced examples or an NS reference),
+The documentation linked from this page is specific to DETERlab. Although DETERlab is based on the [http://www.emulab.net/] Emulab software, it differs from Emulab in facilities,
+features, and registration procedures.
+For more extended and advanced documentation (e.g., advanced examples or an NS script reference), you can
 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; we have filtered
-it to replace Emulab links with DETERlab links.
+Note that this link will take you to a DETERized version of
+the real Emulab documentation on the Emulab web site [http://www.emulab.net/]; i.e., we have filtered
+their documentation 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
-lead you to an Emulab page that is incorrect for DETERlab. Please tell us if that happens so we can
+If you reach, from DETERlab documentation, a page that does not have "DETERlab" or "DETER"
+at the top , you may have been diverted into an Emulab-specific (unfiltered) page that
+may be incorrect for DETERlab. Please tell us if that happens so we can
 plug the leak.