--- web/www/menu-static.inc	2004/03/24 23:56:07	1.1
+++ web/www/menu-static.inc	2013/06/21 17:26:08	1.11
@@ -1,22 +1,21 @@
       <div id="menu">
         <h3 class="heading">
-          <img src="http://nwww.i-scream.org/cgi-bin/logo.jpg" class="cornerlogo" alt="a random image"/>
+          <img src="http://www.i-scream.org/cgi-bin/logo.jpg" class="cornerlogo" alt="a random image"/>
           <br />
           Main
         </h3>
         <ul>
-          <li><a href="http://nwww.i-scream.org/">i-scream Home</a></li>
-          <li><a href="http://nwww.i-scream.org/#news">News</a></li>
-          <li><a href="http://nwww.i-scream.org/#search">Search</a></li>
+          <li><a href="http://www.i-scream.org/">i-scream Home</a></li>
+          <li><a href="http://www.i-scream.org/#news">News</a></li>
+          <li><a href="http://www.i-scream.org/#search">Search</a></li>
         </ul>
         <h3 class="heading">
           Projects
         </h3>
         <ul>
-          <li><a href="http://nwww.i-scream.org/libstatgrab/">libstatgrab</a></li>
-          <li><a href="http://nwww.i-scream.org/pystatgrab/">pystatgrab</a></li>
-          <li><a href="http://nwww.i-scream.org/laroona/">Laroona</a></li>
-          <li><a href="http://nwww.i-scream.org/cms/">CMS</a></li>
+          <li><a href="http://www.i-scream.org/libstatgrab/">libstatgrab</a></li>
+          <li><a href="http://www.i-scream.org/pystatgrab/">pystatgrab</a></li>
+          <li><a href="http://www.i-scream.org/cms/">CMS</a></li>
         </ul>
         <ul>
           <li><a href="http://www.cs.kent.ac.uk/people/staff/tdb/#acl">Java TCP/UDP ACL's</a></li>
@@ -25,39 +24,38 @@
           Resources
         </h3>
         <ul>
-          <li><a href="http://nwww.i-scream.org/cvs.xhtml">CVS Repository</a></li>
-          <li><a href="http://wiki.i-scream.org/">Wiki</a></li>
+          <li><a href="http://www.i-scream.org/mirrors.xhtml">Download Mirrors</a></li>
         </ul>
         <ul>
-          <li><a href="http://nwww.i-scream.org/mailinglists.xhtml">Mailing Lists</a></li>
-          <li><a href="http://nwww.i-scream.org/support.xhtml">Support</a></li>
-          <li><a href="http://nwww.i-scream.org/support.xhtml">Bug Tracking</a></li>
+          <li><a href="http://www.i-scream.org/git.xhtml">Git Repositories</a></li>
+          <li><a href="http://www.i-scream.org/cvs.xhtml">CVS Repository</a></li>
         </ul>
         <ul>
-          <li><a href="http://nwww.i-scream.org/license.xhtml">Licensing</a></li>
+          <li><a href="http://www.i-scream.org/contributing.xhtml">Contributing</a></li>
         </ul>
-        <h3 class="heading">
-          i-scream
-        </h3>
         <ul>
-          <li><a href="http://nwww.i-scream.org/who.xhtml">Who We Are</a></li>
-          <li><a href="http://nwww.i-scream.org/pgpkey.xhtml">PGP Key</a></li>
+          <li><a href="http://www.i-scream.org/mailinglists.xhtml">Mailing Lists</a></li>
+          <li><a href="http://www.i-scream.org/support.xhtml">Reporting Bugs</a></li>
         </ul>
+        <ul>
+          <li><a href="http://www.i-scream.org/license.xhtml">Licensing</a></li>
+        </ul>
         <h3 class="heading">
-          Contact Us
+          i-scream
         </h3>
         <ul>
-          <li><a href="mailto:dev@i-scream.org">dev@i-scream.org</a></li>
+          <li><a href="http://www.i-scream.org/who.xhtml">Who We Are</a></li>
+          <li><a href="http://www.i-scream.org/pgpkey.xhtml">PGP Key</a></li>
         </ul>
         <p class="logo">
+          <a href="http://www.freebsd.org/">
+            <img src="http://www.i-scream.org/images/freebsdlogo_small.gif" alt="Powered By FreeBSD" />
+          </a>
           <a href="http://validator.w3.org/check/referer">
-            <img src="http://nwww.i-scream.org/images/valid-xhtml11.png" alt="Valid XHTML 1.1!" />
+            <img src="http://www.i-scream.org/images/valid-xhtml11.png" alt="Valid XHTML 1.1!" />
           </a>
           <a href="http://jigsaw.w3.org/css-validator/check/referer">
-            <img src="http://nwww.i-scream.org/images/vcss.png" alt="Valid CSS!" />
-          </a>
-          <a href="http://www.freebsd.org/">
-            <img src="http://nwww.i-scream.org/images/freebsdlogo_small.gif" alt="Powered By FreeBSD" />
+            <img src="http://www.i-scream.org/images/vcss.png" alt="Valid CSS!" />
           </a>
         </p>
       </div>
\ No newline at end of file