--- web/www/menu.inc	2007/03/28 14:33:24	1.12
+++ web/www/menu.inc	2013/06/21 16:50:17	1.17
@@ -15,7 +15,6 @@
         <ul>
           <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/laroona/">Laroona</a></li>
           <li><a href="http://www.i-scream.org/cms/">CMS</a></li>
         </ul>
         <ul>
@@ -28,13 +27,15 @@
           <li><a href="http://www.i-scream.org/mirrors.xhtml">Download Mirrors</a></li>
         </ul>
         <ul>
+          <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>
-          <li><a href="http://wiki.i-scream.org/">Wiki</a></li>
         </ul>
         <ul>
+          <li><a href="http://www.i-scream.org/contributing.xhtml">Contributing</a></li>
+        </ul>
+        <ul>
           <li><a href="http://www.i-scream.org/mailinglists.xhtml">Mailing Lists</a></li>
-          <li><a href="http://www.i-scream.org/support.xhtml">Support</a></li>
-          <li><a href="http://www.i-scream.org/support.xhtml">Bug Tracking</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>
@@ -46,66 +47,7 @@
           <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>
-        <h3 class="heading">
-          Contact Us
-        </h3>
-        <ul>
-          <li><a href="mailto:support@i-scream.org">support@i-scream.org</a></li>
-        </ul>
-        <script type="text/javascript">
-          <!--
-            google_ad_client = "pub-4199687771151670";
-            google_ad_width = 150;
-            google_ad_height = 95;
-            google_ad_format = "120x90_0ads_al_s";
-            google_ad_channel ="";
-            google_color_border = "000066";
-            google_color_bg = "EEEEFF";
-            google_color_link = "0000FF";
-            google_color_url = "008000";
-            google_color_text = "000000";
-          //-->
-        </script>
-        <script type="text/javascript"
-          src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-        </script>
         <p class="logo">
-          <script type="text/javascript">
-            <!--
-              google_ad_client = "pub-4199687771151670";
-              google_ad_width = 110;
-              google_ad_height = 32;
-              google_ad_format = "110x32_as_rimg";
-              google_cpa_choice = "CAAQicuTlwIaCPjxiNeKLGBaKLPGvnU";
-            //-->
-          </script>
-          <script type="text/javascript"
-            src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-          </script>
-          <script type="text/javascript">
-            <!--
-              google_ad_client = "pub-4199687771151670";
-              google_ad_width = 110;
-              google_ad_height = 32;
-              google_ad_format = "110x32_as_rimg";
-              google_cpa_choice = "CAAQhYPuiwIaCMI-dwXE1ar9KJPw43Q";
-            //-->
-          </script>
-          <script type="text/javascript"
-            src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-          </script>
-          <script type="text/javascript">
-            <!--
-              google_ad_client = "pub-4199687771151670";
-              google_ad_width = 110;
-              google_ad_height = 32;
-              google_ad_format = "110x32_as_rimg";
-              google_cpa_choice = "CAAQmJTCmwIaCCHf1wnmCd4VKOz1uosB";
-            //-->
-          </script>
-          <script type="text/javascript"
-            src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-          </script>
           <a href="http://www.freebsd.org/">
             <img src="http://www.i-scream.org/images/freebsdlogo_small.gif" alt="Powered By FreeBSD" />
           </a>