Remove some of the html table stuff.

7 files changed, 371 insertions, 478 deletions

diff --git a/Distrib/WebHome.mdwn b/Distrib/WebHome.mdwn
index 3131c453..9e1e2c15 100644
--- a/Distrib/WebHome.mdwn
+++ b/Distrib/WebHome.mdwn
@@ -8,100 +8,84 @@ Jon: We need a better logo for this page - ever since the Gentoo and Bee movemen
 
 This web is about the distribution of software: where and how to get it.
 
-<form action="%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%WEB%/">
-  <table>
-    <tr>
-      <td valign="top" width="65%">
-        <p> %TOC% </p>
-        <p><nop></nop></p>
-        <h2><a name="Distributions"> Distributions </a></h2>
-        <p><nop></nop></p>
-        <h3><a name="Debian_nbsp_http_www_debian_org_"> </a> Debian <a href="http://www.debian.org/ports/hurd/" target="_top">GNU/Hurd port</a>: </h3>
-        <p> Official page about the Debian distribution of the GNU/Hurd system. Some additional notes are at [[DebianStatus]]. </p>
-        <ul>
-          <li><a href="http://people.debian.org/~mbanck/talks/hurd_lt2004/html/" target="_top">Presentation "Debian GNU/Hurd" by Michael Banck, <nop>LinuxTag 2004 Karlsruhe</nop></a></li>
-        </ul>
-        <p>
-        </p>
-        <ul>
-          <li><a href="http://www.numenor.art.pl/balrog/hurd/" target="_top">A disk image with an installation of the Debian distribution of GNU/Hurd</a></li>
-        </ul>
-        <p>
-        </p>
-        <ul>
-          <li>[[DebianFAQ]]</li>
-        </ul>
-        <p>
-        </p>
-        <ul>
-          <li>[[DebianAfterInstall]] -- Do this to get networking, new console and X </li>
-        </ul>
-        <p>
-        </p>
-        <dl>
-          <dt><a href="http://hurd.rustedhalo.net/" target="_top">Gentoo-Hurd</a></dt>
-          <dd> Unofficial port to Gentoo &amp;amp; the portage system. It was <a href="http://forums.gentoo.org/viewtopic.php?t=41939&amp;postdays=0&amp;postorder=asc&amp;start=0" target="_top">announced</a> March 17, 2003 in the Gentoo forums. There's a #gentoo-irc channel similar to [[Hurd/HurdIRC]]. At present (May 2005), there's no activity and Eric Olinger has not the time to maintain this distri. </dd>
-        </dl>
-        <p>
-        </p>
-        <dl>
-          <dt><a href="http://bee.es.gnu.org/" target="_top">Bee GNU/Hurd</a></dt>
-          <dd> Castellano distribution, pkgsrc package based. [[BochsEmulator]] image available too. They have their own <a href="http://es.gnu.org/cgi-bin/beewiki.pl?Wiki_Bee_GNU" target="_top">wiki</a> and a <a href="http://bee.es.gnu.org/?p=mail&amp;l=en" target="_top">mail list</a> (no archive). </dd>
-        </dl>
-        <p>
-        </p>
-        <dl>
-          <dt> Some ISOs</dt>
-          <dd><a href="http://www.gnuab.org/qui-som" target="_top">GNUAB</a> has some images and packages available at <a href="http://ftp.gnuab.org" target="_top">http://ftp.gnuab.org</a> for the unreleased (not unstable) Debian distro </dd>
-        </dl>
-        <p>
-        </p>
-        <dl>
-          <dt>[[GnuOS]]</dt>
-          <dd> distribution is in discussion &amp;amp; pre-planning phase </dd>
-        </dl>
-        <p><nop></nop></p>
-        <h2><a name="General"> General </a></h2>
-        <p>
-        </p>
-        <dl>
-          <dt><a href="http://lists.debian.org/debian-hurd/2002/debian-hurd-200210/msg00035.html" target="_top">Welcome Note</a></dt>
-          <dd> Introduction to GNU and the Hurd sent monthly to <nop>Help-Hurd@gnu.org. </nop></dd>
-        </dl>
-        <p>
-        </p>
-        <dl>
-          <dt>[[SoftwareLicensing]]</dt>
-          <dd> The copyright and license information for software that is distributed with the Hurd software is important. Debian has it's DFSG guidelines. Other distributions will need to address these same issues. </dd>
-        </dl>
-        <p>
-        </p>
-        <dl>
-          <dt>[[FrequentlyAskedQuestions]]</dt>
-          <dd> It's good to read it before asking questions. </dd>
-        </dl>
-        <p>
-        </p>
-        <dl>
-          <dt>[[GnuDebianRelationship]]</dt>
-          <dd> How does the GNU/Debian relationship work? </dd>
-        </dl>
-        <p>
-        </p>
-        <dl>
-          <dt>[[SoftwareLicensing]]</dt>
-          <dd> The copyright and license information for software that is distributed with the Hurd software is important. Debian has it's DFSG guidelines. Other distributions will need to address these same issues. </dd>
-        </dl>
-        <p>
-        </p>
-      </td>
-      <td>
-        <p>
-        </p>
-      </td>
-    </tr>
-  </table>
-</form>
+<h2><a name="Distributions"> Distributions </a></h2>
+<p><nop></nop></p>
+<h3><a name="Debian_nbsp_http_www_debian_org_"> </a> Debian <a href="http://www.debian.org/ports/hurd/" target="_top">GNU/Hurd port</a>: </h3>
+<p> Official page about the Debian distribution of the GNU/Hurd system. Some additional notes are at [[DebianStatus]]. </p>
+<ul>
+<li><a href="http://people.debian.org/~mbanck/talks/hurd_lt2004/html/" target="_top">Presentation "Debian GNU/Hurd" by Michael Banck, <nop>LinuxTag 2004 Karlsruhe</nop></a></li>
+</ul>
+<p>
+</p>
+<ul>
+<li><a href="http://www.numenor.art.pl/balrog/hurd/" target="_top">A disk image with an installation of the Debian distribution of GNU/Hurd</a></li>
+</ul>
+<p>
+</p>
+<ul>
+<li>[[DebianFAQ]]</li>
+</ul>
+<p>
+</p>
+<ul>
+<li>[[DebianAfterInstall]] -- Do this to get networking, new console and X </li>
+</ul>
+<p>
+</p>
+<dl>
+<dt><a href="http://hurd.rustedhalo.net/" target="_top">Gentoo-Hurd</a></dt>
+<dd> Unofficial port to Gentoo &amp;amp; the portage system. It was <a href="http://forums.gentoo.org/viewtopic.php?t=41939&amp;postdays=0&amp;postorder=asc&amp;start=0" target="_top">announced</a> March 17, 2003 in the Gentoo forums. There's a #gentoo-irc channel similar to [[Hurd/HurdIRC]]. At present (May 2005), there's no activity and Eric Olinger has not the time to maintain this distri. </dd>
+</dl>
+<p>
+</p>
+<dl>
+<dt><a href="http://bee.es.gnu.org/" target="_top">Bee GNU/Hurd</a></dt>
+<dd> Castellano distribution, pkgsrc package based. [[BochsEmulator]] image available too. They have their own <a href="http://es.gnu.org/cgi-bin/beewiki.pl?Wiki_Bee_GNU" target="_top">wiki</a> and a <a href="http://bee.es.gnu.org/?p=mail&amp;l=en" target="_top">mail list</a> (no archive). </dd>
+</dl>
+<p>
+</p>
+<dl>
+<dt> Some ISOs</dt>
+<dd><a href="http://www.gnuab.org/qui-som" target="_top">GNUAB</a> has some images and packages available at <a href="http://ftp.gnuab.org" target="_top">http://ftp.gnuab.org</a> for the unreleased (not unstable) Debian distro </dd>
+</dl>
+<p>
+</p>
+<dl>
+<dt>[[GnuOS]]</dt>
+<dd> distribution is in discussion &amp;amp; pre-planning phase </dd>
+</dl>
+<p><nop></nop></p>
+<h2><a name="General"> General </a></h2>
+<p>
+</p>
+<dl>
+<dt><a href="http://lists.debian.org/debian-hurd/2002/debian-hurd-200210/msg00035.html" target="_top">Welcome Note</a></dt>
+<dd> Introduction to GNU and the Hurd sent monthly to <nop>Help-Hurd@gnu.org. </nop></dd>
+</dl>
+<p>
+</p>
+<dl>
+<dt>[[SoftwareLicensing]]</dt>
+<dd> The copyright and license information for software that is distributed with the Hurd software is important. Debian has it's DFSG guidelines. Other distributions will need to address these same issues. </dd>
+</dl>
+<p>
+</p>
+<dl>
+<dt>[[FrequentlyAskedQuestions]]</dt>
+<dd> It's good to read it before asking questions. </dd>
+</dl>
+<p>
+</p>
+<dl>
+<dt>[[GnuDebianRelationship]]</dt>
+<dd> How does the GNU/Debian relationship work? </dd>
+</dl>
+<p>
+</p>
+<dl>
+<dt>[[SoftwareLicensing]]</dt>
+<dd> The copyright and license information for software that is distributed with the Hurd software is important. Debian has it's DFSG guidelines. Other distributions will need to address these same issues. </dd>
+</dl>
 
 ## <a name="Installation"> Installation </a>
 
diff --git a/GNU/WebHome.mdwn b/GNU/WebHome.mdwn
index ab1ba33f..6c90cf14 100644
--- a/GNU/WebHome.mdwn
+++ b/GNU/WebHome.mdwn
@@ -6,45 +6,31 @@ Sporadic efforts by numerous individuals have been made to keep the information
 
 GNU stands for GNU's Not Unix. It is a project announced in 1983 by [[RichardStallman]] (RMS). The Free Software Foundation ([FSF](http://www.fsf.org/fsf/fsf.html)) was founded in 1985 to act as a parent organization for GNU and many other projects. GNU and some non-GNU projects are now hosted on the [Savannah](http://savannah.gnu.org) platform similar to SourceForge.net.
 
-<form action="%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%WEB%/">
-  <table>
-    <tr>
-      <td valign="top" width="65%">
-        <p>
-        </p>
-        <dl>
-          <dt>[[History]]</dt>
-          <dd> Background information about the GNU Project. </dd>
-          <dt>[[GnuNames]]</dt>
-          <dd> A page describing the name GNU itself and it's usage. </dd>
-          <dt>[[TheGnuManifesto]]</dt>
-          <dd> A founding document that still influences the system's technical design and moral philosophy. </dd>
-          <dt>[[CopyleftLicenses]]</dt>
-          <dd> Information on the licenses used on GNU software, and on other free software licenses </dd>
-          <dt>[[FreeDocumentationLicense]]</dt>
-          <dd> A relatively new license used by the FSF to extend the copyright of documentation. </dd>
-          <dt> FAQ Link</dt>
-          <dd> What is the relation between <a href="http://www.gnu.org/software/hurd/faq.en.html#q1-2" target="_top">GNU and Hurd</a>? </dd>
-          <dt> Assisting</dt>
-          <dd> If you would like to help the GNU movement visit the official site at <a href="http://www.gnu.org" target="_top">http://www.gnu.org</a>. </dd>
-          <dt>[[SoftwareProjects]]</dt>
-          <dd> Information about other GNU projects. </dd>
-          <dt><a href="http://lists.gnu.org/mailman/listinfo/gnu-system-discuss" target="_top">gnu-system-discuss</a></dt>
-          <dd> Mailing list for discussion about the GNU system. </dd>
-        </dl>
-        <p>
-        </p>
-        <dl>
-          <dt>[[WebDiscuss]]</dt>
-          <dd> Meta discussion about how to make this section of the site better. </dd>
-        </dl>
-        <p>
-        </p>
-      </td>
-      <td>
-        <p>
-        </p>
-      </td>
-    </tr>
-  </table>
-</form>
+<dl>
+<dt>[[History]]</dt>
+<dd> Background information about the GNU Project. </dd>
+<dt>[[GnuNames]]</dt>
+<dd> A page describing the name GNU itself and it's usage. </dd>
+<dt>[[TheGnuManifesto]]</dt>
+<dd> A founding document that still influences the system's technical design and moral philosophy. </dd>
+<dt>[[CopyleftLicenses]]</dt>
+<dd> Information on the licenses used on GNU software, and on other free software licenses </dd>
+<dt>[[FreeDocumentationLicense]]</dt>
+<dd> A relatively new license used by the FSF to extend the copyright of documentation. </dd>
+<dt> FAQ Link</dt>
+<dd> What is the relation between <a href="http://www.gnu.org/software/hurd/faq.en.html#q1-2" target="_top">GNU and Hurd</a>? </dd>
+<dt> Assisting</dt>
+<dd> If you would like to help the GNU movement visit the official site at <a href="http://www.gnu.org" target="_top">http://www.gnu.org</a>. </dd>
+<dt>[[SoftwareProjects]]</dt>
+<dd> Information about other GNU projects. </dd>
+<dt><a href="http://lists.gnu.org/mailman/listinfo/gnu-system-discuss" target="_top">gnu-system-discuss</a></dt>
+<dd> Mailing list for discussion about the GNU system. </dd>
+</dl>
+<p>
+</p>
+<dl>
+<dt>[[WebDiscuss]]</dt>
+<dd> Meta discussion about how to make this section of the site better. </dd>
+</dl>
+<p>
+</p>
diff --git a/Hug/WebHome.mdwn b/Hug/WebHome.mdwn
index eb1afa85..bf8d7c04 100644
--- a/Hug/WebHome.mdwn
+++ b/Hug/WebHome.mdwn
@@ -2,32 +2,19 @@ Sporadic efforts by numerous individuals have been made to keep the information
 
 -- [[Main/GrantBow]] - 24 Jul 2007
 
-Welcome to the home of **%WIKITOOLNAME%.%WEB%**. This is a web-based collaboration area for Hurd user groups.
+Welcome. This is a web-based collaboration area for Hurd user groups.
 
-<form action="%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%WEB%/">
-  <table>
-    <tr>
-      <td valign="top" width="65%">
-        <p><span style="background:"><font color="">Hug.Web Discuss</font></span><a href="http://LOCATIONHug/WebDiscuss">?</a></p>
-        <p>
-        </p>
-        <ul>
-          <li><nop>HurdFr: <a href="http://www.hurdfr.org" target="_top">http://www.hurdfr.org</a> <img alt="hurd-fr.png" src="http://wiki.hurd.ru/data/images/other/hurd-fr.png" /> </nop></li>
-          <li><nop>HurdUk: <a href="http://uwhug.org.uk/" target="_top">http://uwhug.org.uk/</a> <img alt="hurd-uk.png" src="http://wiki.hurd.ru/data/images/other/hurd-uk.png" /> </nop></li>
-          <li><nop>HurdEs: <a href="http://hurd.es.gnu.org/" target="_top">http://hurd.es.gnu.org/</a> <img alt="hurd-es.png" src="http://wiki.hurd.ru/data/images/other/hurd-es.png" /> </nop></li>
-          <li><nop>HurdIt: <a href="http://hurd-it.sf.net/" target="_top">http://hurd-it.sf.net/</a> <img alt="hurd-it.png" src="http://wiki.hurd.ru/data/images/other/hurd-it.png" /> </nop></li>
-          <li><nop>HurdCa: <a href="http://www.nongnu.org/thug/" target="_top">http://www.nongnu.org/thug/</a> <img alt="hurd-ca.png" src="http://wiki.hurd.ru/data/images/other/hurd-ca.png" /> </nop></li>
-          <li><nop>HurdPl: <a href="http://hurd.pl/forum/" target="_top">http://hurd.pl/forum/</a> <img alt="hurd-pl.png" src="http://wiki.hurd.ru/data/images/other/hurd-pl.png" /> </nop></li>
-          <li><nop>HurdRu: <a href="http://wiki.hurd.ru/" target="_top">http://wiki.hurd.ru/</a> <img alt="hurd-ru.png" src="http://wiki.hurd.ru/data/images/other/hurd-ru.png" /> </nop></li>
-          <li><nop>HurdBr: <a href="http://hurd.gnufans.org/bin/view/Hug/HurdBr" target="_top">http://hurd.gnufans.org/bin/view/Hug/HurdBr</a> <img alt="hurd-br.png" src="http://wiki.hurd.ru/data/images/other/hurd-br.png" /> </nop></li>
-          <li><nop>HurdIn: <a href="http://i-hug.sarovar.org" target="_top">http://i-hug.sarovar.org</a> <img alt="hurd-in.png" src="http://wiki.hurd.ru/data/images/other/hurd-in.png" /> </nop></li>
-          <li><nop>HurdUs: <a href="http://hurd.gnufans.org/" target="_top">http://hurd.gnufans.org/</a> <img alt="hurd-us.png" src="http://wiki.hurd.ru/data/images/other/hurd-us.png" /> </nop></li>
-        </ul>
-        <p>
-        </p>
-        <p>
-        </p>
-      </td>
-    </tr>
-  </table>
-</form>
+<ul>
+<li><nop>HurdFr: <a href="http://www.hurdfr.org" target="_top">http://www.hurdfr.org</a> <img alt="hurd-fr.png" src="http://wiki.hurd.ru/data/images/other/hurd-fr.png" /> </nop></li>
+<li><nop>HurdUk: <a href="http://uwhug.org.uk/" target="_top">http://uwhug.org.uk/</a> <img alt="hurd-uk.png" src="http://wiki.hurd.ru/data/images/other/hurd-uk.png" /> </nop></li>
+<li><nop>HurdEs: <a href="http://hurd.es.gnu.org/" target="_top">http://hurd.es.gnu.org/</a> <img alt="hurd-es.png" src="http://wiki.hurd.ru/data/images/other/hurd-es.png" /> </nop></li>
+<li><nop>HurdIt: <a href="http://hurd-it.sf.net/" target="_top">http://hurd-it.sf.net/</a> <img alt="hurd-it.png" src="http://wiki.hurd.ru/data/images/other/hurd-it.png" /> </nop></li>
+<li><nop>HurdCa: <a href="http://www.nongnu.org/thug/" target="_top">http://www.nongnu.org/thug/</a> <img alt="hurd-ca.png" src="http://wiki.hurd.ru/data/images/other/hurd-ca.png" /> </nop></li>
+<li><nop>HurdPl: <a href="http://hurd.pl/forum/" target="_top">http://hurd.pl/forum/</a> <img alt="hurd-pl.png" src="http://wiki.hurd.ru/data/images/other/hurd-pl.png" /> </nop></li>
+<li><nop>HurdRu: <a href="http://wiki.hurd.ru/" target="_top">http://wiki.hurd.ru/</a> <img alt="hurd-ru.png" src="http://wiki.hurd.ru/data/images/other/hurd-ru.png" /> </nop></li>
+<li><nop>HurdBr: <a href="http://hurd.gnufans.org/bin/view/Hug/HurdBr" target="_top">http://hurd.gnufans.org/bin/view/Hug/HurdBr</a> <img alt="hurd-br.png" src="http://wiki.hurd.ru/data/images/other/hurd-br.png" /> </nop></li>
+<li><nop>HurdIn: <a href="http://i-hug.sarovar.org" target="_top">http://i-hug.sarovar.org</a> <img alt="hurd-in.png" src="http://wiki.hurd.ru/data/images/other/hurd-in.png" /> </nop></li>
+<li><nop>HurdUs: <a href="http://hurd.gnufans.org/" target="_top">http://hurd.gnufans.org/</a> <img alt="hurd-us.png" src="http://wiki.hurd.ru/data/images/other/hurd-us.png" /> </nop></li>
+</ul>
+
+<p>[[WebDiscuss]]</p>
diff --git a/Hurd/WebHome.mdwn b/Hurd/WebHome.mdwn
index e60da193..a83be917 100644
--- a/Hurd/WebHome.mdwn
+++ b/Hurd/WebHome.mdwn
@@ -10,143 +10,130 @@ If you cannot find what you look for the topic might have been moved to the new
 
 For an introduction to this site, see <http://hurd.gnufans.org>.
 
-<form action="%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%WEB%/">
-  <table>
-    <tr>
-      <td valign="top" width="65%">
-        <p>
-        </p>
-        <p>
-        </p>
-        <dl>
-          <dt>[[GNUHurdStatus]]</dt>
-          <dd> Things [[ToDo]] before the next release </dd>
-          <dt>[[KnownHurdLimits]]</dt>
-          <dd> Limitations of the GNU operating system. Includes updates on the status of [[RandomDevice]] (for ssh), [[DhcpClient]], [[PppDaemon]], [[HurdConsole]], [[ExtTwoSize]], other filesystems, etc. </dd>
-          <dt>[[SeenHurd]]</dt>
-          <dd> GNU/Hurd sightings. </dd>
-          <dt>[[TranslatorPages]]</dt>
-          <dd> What translators exist, info about them </dd>
-          <dt>[[FrequentlyAskedQuestions]]</dt>
-          <dd> For anything else you cannot find here. </dd>
-        </dl>
-        <p><nop></nop></p>
-        <h3><a name="Introduction"> Introduction </a></h3>
-        <p><a name="GnuHurd"></a></p>
-        <dl>
-          <dt>[[TheGnuHurd]]</dt>
-          <dd> About the GNU/Hurd System <a href="http://wiki.debian.org/TheHurd" target="_top">Debian Wiki about The Hurd</a>. </dd>
-          <dt>[[HurdNames]]</dt>
-          <dd> What does the HURD acronym stand for? </dd>
-          <dt><a href="http://lists.debian.org/debian-hurd/2002/debian-hurd-200210/msg00035.html" target="_top">Welcome Note</a></dt>
-          <dd> Formerly sent monthly to <a href="http://lists.debian.org/debian-hurd/" target="_top">debian-hurd@lists.debian.org</a> and <a href="http://mail.gnu.org/mailman/listinfo/help-hurd" target="_top">help-hurd@gnu.org</a></dd>
-          <dt><a href="http://wiki.debian.org/TheHurd" target="_top">Debian Wiki: Hurd</a></dt>
-          <dd>
-          </dd>
-          <dt>[[FunnyHurd]]</dt>
-          <dd> Logos, rumors and other funny unrelated stuff mentioning "Hurd" </dd>
-          <dt>[[Shopping]]</dt>
-          <dd> Items that can be bought. </dd>
-          <dt>[[Translation]]</dt>
-          <dd> Hurd translation and Hurd wiki page in different languages. </dd>
-          <dt><a href="http://lists.gnu.org/archive/html/l4-hurd/2005-10/msg00718.html" target="_top">History 1997-2003</a></dt>
-          <dd> Personal view of Marcus Brinkmann about Hurd development in 1997-2003. </dd>
-        </dl>
-        <p><nop></nop></p>
-        <h3><a name="Running_the_Hurd"> Running the Hurd </a></h3>
-        <dl>
-          <dt>[[LiveCD]]</dt>
-          <dd> Enjoy a bootable Hurd from within CD (opt. HD or USB installation). </dd>
-          <dt>[[Distrib/QEMU]]</dt>
-          <dd> play downloaded [[LiveCd]] Isos without burn them (emulation). </dd>
-          <dt>[[FlashHurd]]</dt>
-          <dd> Bootable Hurd from within USB flash memory. </dd>
-          <dt>[[BuildingHurd]]</dt>
-          <dd>
-          </dd>
-          <dt>[[PublicHurdBoxen]]</dt>
-          <dd> Hurd boxes available to hack on. </dd>
-          <dt>[[SubhurdHowto]]</dt>
-          <dd>
-          </dd>
-        </dl>
-        <p><nop></nop></p>
-        <h3><a name="Running_Applications_on_the_Hurd"> Running Applications on the Hurd </a></h3>
-        <p>
-        </p>
-        <dl>
-          <dt>[[HurdConsole]]</dt>
-          <dd> How to set up the console. </dd>
-          <dt>[[Xfree86]]</dt>
-          <dd> Setting up X. </dd>
-          <dt>[[DebianX]]</dt>
-          <dd> Setting up X in Debian. </dd>
-          <dt>[[DebianXorg]]</dt>
-          <dd> Settin up Xorg in Debian. </dd>
-          <dt>[[GNUstep]]</dt>
-          <dd> Setting up GNUstep on Hurd. </dd>
-        </dl><nop><h3><a name="Technical_References"> Technical References </a></h3>
-          <p>
-          </p>
-          <ul>
-            <li><a href="http://www.gnu.org/software/hurd/docs.html" target="_top">Official documentation,  papers and presentations</a>: Available form the Hurd Web site. </li>
-            <li><a href="http://www.gnu.org/software/hurd/hurd-paper.html" target="_top">Towards a New  Strategy of OS Design</a>: an architectural overview by Thomas Bushnell, BSG. Marcus Brinkmann <a href="http://lists.gnu.org/archive/html/l4-hurd/2005-10/msg00651.html" target="_top">revisited some parts of the paper</a> and Jonathan S. Shapiro <a href="http://lists.gnu.org/archive/html/l4-hurd/2005-10/msg00654.html" target="_top">has further comments</a></li>
-            <li><a href="http://kilobug.free.fr/hurd/pres-en/slides/slides.html" target="_top">Presentation by  Ga�l Le Mignot</a>: </li>
-            <li><a href="http://www.pjbruin.dds.nl/hurd/" target="_top">Power PC port, using OSF Mach</a>: </li>
-            <li>[[DistributedServers]]: Architecture made possible by the Hurd. </li>
-          </ul>
-          <p><nop></nop></p>
-          <h3><a name="Developer_Notes"> Developer Notes </a></h3>
-          <p>
-          </p>
-          <ul>
-            <li>[[CrossCompiling]]. </li>
-            <li>[[HurdSpecificGlibcApi]]: Functions in GLIBC for the Hurd. </li>
-            <li>[[Debugging]]. </li>
-            <li>[[XattrHurd]]: Setting translators under GNU/Linux </li>
-            <li>[[ABITransitionStatus]]: Old info (early 2002) on the <abbrev title="Application Binary Interface">ABI</abbrev> transition </li>
-            <li>[[KernelCousinDebianHurd]]: A defunct newsletter about Hurd development. </li>
-            <li>[[Mach/OskitMachStatusList]]: Status and TODO information </li>
-            <li><a href="http://www.htu.tugraz.at/~past/hurd/global/" target="_top">Hurd Sourcecode Reference</a>: Searchable and browsable index of the code. </li>
-            <li>[[Mach/PortToL4]]: Out-dated Wiki. </li>
-            <li>[[HurdOnL4]]: Work in process for <strong>new</strong> wiki. </li>
-            <li>[[QemuImageForL4]]: </li>
-            <li>[[SubhurdHowto]]: Using and a neighbour for testing and debugging. </li>
-            <li>[[SerialConsole]]: Setting up a serial console. </li>
-          </ul>
-          <p>
-          </p>
-          <hr />
-          <p>
-          </p>
-          <dl>
-            <dt>[[InstallNotes]]</dt>
-            <dd> How to install the GNU system. <br /> For Further information, See the [[Distrib/WebHome]] web. </dd>
-          </dl>
-          <p>
-          </p>
-          <dl>
-            <dt> Community &amp;amp; People</dt>
-            <dd> Please see the [[Main/WebHome]] web for registered users information and Hurd community resources. </dd>
-          </dl>
-          <p> See [[HurdDonations]] if you've got more money than hack time. </p>
-          <p>
-          </p>
-          <dl>
-            <dt> Microkernel Systems</dt>
-            <dd> Please see the [[Mach/WebHome]] web </dd>
-          </dl>
-          <p>
-          </p>
-          <dl>
-            <dt> Developer Related</dt>
-            <dd> Please see above and the [[Distrib/WebHome]] web </dd>
-          </dl>
-          <p>
-          </p></nop></td>
-    </tr>
-  </table>
-</form>
+<dl>
+<dt>[[GNUHurdStatus]]</dt>
+<dd> Things [[ToDo]] before the next release </dd>
+<dt>[[KnownHurdLimits]]</dt>
+<dd> Limitations of the GNU operating system. Includes updates on the status of [[RandomDevice]] (for ssh), [[DhcpClient]], [[PppDaemon]], [[HurdConsole]], [[ExtTwoSize]], other filesystems, etc. </dd>
+<dt>[[SeenHurd]]</dt>
+<dd> GNU/Hurd sightings. </dd>
+<dt>[[TranslatorPages]]</dt>
+<dd> What translators exist, info about them </dd>
+<dt>[[FrequentlyAskedQuestions]]</dt>
+<dd> For anything else you cannot find here. </dd>
+</dl>
+<p><nop></nop></p>
+<h3><a name="Introduction"> Introduction </a></h3>
+<p><a name="GnuHurd"></a></p>
+<dl>
+<dt>[[TheGnuHurd]]</dt>
+<dd> About the GNU/Hurd System <a href="http://wiki.debian.org/TheHurd" target="_top">Debian Wiki about The Hurd</a>. </dd>
+<dt>[[HurdNames]]</dt>
+<dd> What does the HURD acronym stand for? </dd>
+<dt><a href="http://lists.debian.org/debian-hurd/2002/debian-hurd-200210/msg00035.html" target="_top">Welcome Note</a></dt>
+<dd> Formerly sent monthly to <a href="http://lists.debian.org/debian-hurd/" target="_top">debian-hurd@lists.debian.org</a> and <a href="http://mail.gnu.org/mailman/listinfo/help-hurd" target="_top">help-hurd@gnu.org</a></dd>
+<dt><a href="http://wiki.debian.org/TheHurd" target="_top">Debian Wiki: Hurd</a></dt>
+<dd>
+</dd>
+<dt>[[FunnyHurd]]</dt>
+<dd> Logos, rumors and other funny unrelated stuff mentioning "Hurd" </dd>
+<dt>[[Shopping]]</dt>
+<dd> Items that can be bought. </dd>
+<dt>[[Translation]]</dt>
+<dd> Hurd translation and Hurd wiki page in different languages. </dd>
+<dt><a href="http://lists.gnu.org/archive/html/l4-hurd/2005-10/msg00718.html" target="_top">History 1997-2003</a></dt>
+<dd> Personal view of Marcus Brinkmann about Hurd development in 1997-2003. </dd>
+</dl>
+<p><nop></nop></p>
+<h3><a name="Running_the_Hurd"> Running the Hurd </a></h3>
+<dl>
+<dt>[[LiveCD]]</dt>
+<dd> Enjoy a bootable Hurd from within CD (opt. HD or USB installation). </dd>
+<dt>[[Distrib/QEMU]]</dt>
+<dd> play downloaded [[LiveCd]] Isos without burn them (emulation). </dd>
+<dt>[[FlashHurd]]</dt>
+<dd> Bootable Hurd from within USB flash memory. </dd>
+<dt>[[BuildingHurd]]</dt>
+<dd>
+</dd>
+<dt>[[PublicHurdBoxen]]</dt>
+<dd> Hurd boxes available to hack on. </dd>
+<dt>[[SubhurdHowto]]</dt>
+<dd>
+</dd>
+</dl>
+<p><nop></nop></p>
+<h3><a name="Running_Applications_on_the_Hurd"> Running Applications on the Hurd </a></h3>
+<p>
+</p>
+<dl>
+<dt>[[HurdConsole]]</dt>
+<dd> How to set up the console. </dd>
+<dt>[[Xfree86]]</dt>
+<dd> Setting up X. </dd>
+<dt>[[DebianX]]</dt>
+<dd> Setting up X in Debian. </dd>
+<dt>[[DebianXorg]]</dt>
+<dd> Settin up Xorg in Debian. </dd>
+<dt>[[GNUstep]]</dt>
+<dd> Setting up GNUstep on Hurd. </dd>
+</dl><nop><h3><a name="Technical_References"> Technical References </a></h3>
+<p>
+</p>
+<ul>
+<li><a href="http://www.gnu.org/software/hurd/docs.html" target="_top">Official documentation,  papers and presentations</a>: Available form the Hurd Web site. </li>
+<li><a href="http://www.gnu.org/software/hurd/hurd-paper.html" target="_top">Towards a New  Strategy of OS Design</a>: an architectural overview by Thomas Bushnell, BSG. Marcus Brinkmann <a href="http://lists.gnu.org/archive/html/l4-hurd/2005-10/msg00651.html" target="_top">revisited some parts of the paper</a> and Jonathan S. Shapiro <a href="http://lists.gnu.org/archive/html/l4-hurd/2005-10/msg00654.html" target="_top">has further comments</a></li>
+<li><a href="http://kilobug.free.fr/hurd/pres-en/slides/slides.html" target="_top">Presentation by  Ga�l Le Mignot</a>: </li>
+<li><a href="http://www.pjbruin.dds.nl/hurd/" target="_top">Power PC port, using OSF Mach</a>: </li>
+<li>[[DistributedServers]]: Architecture made possible by the Hurd. </li>
+</ul>
+<p><nop></nop></p>
+<h3><a name="Developer_Notes"> Developer Notes </a></h3>
+<p>
+</p>
+<ul>
+<li>[[CrossCompiling]]. </li>
+<li>[[HurdSpecificGlibcApi]]: Functions in GLIBC for the Hurd. </li>
+<li>[[Debugging]]. </li>
+<li>[[XattrHurd]]: Setting translators under GNU/Linux </li>
+<li>[[ABITransitionStatus]]: Old info (early 2002) on the <abbrev title="Application Binary Interface">ABI</abbrev> transition </li>
+<li>[[KernelCousinDebianHurd]]: A defunct newsletter about Hurd development. </li>
+<li>[[Mach/OskitMachStatusList]]: Status and TODO information </li>
+<li><a href="http://www.htu.tugraz.at/~past/hurd/global/" target="_top">Hurd Sourcecode Reference</a>: Searchable and browsable index of the code. </li>
+<li>[[Mach/PortToL4]]: Out-dated Wiki. </li>
+<li>[[HurdOnL4]]: Work in process for <strong>new</strong> wiki. </li>
+<li>[[QemuImageForL4]]: </li>
+<li>[[SubhurdHowto]]: Using and a neighbour for testing and debugging. </li>
+<li>[[SerialConsole]]: Setting up a serial console. </li>
+</ul>
+<p>
+</p>
+<hr />
+<p>
+</p>
+<dl>
+<dt>[[InstallNotes]]</dt>
+<dd> How to install the GNU system. <br /> For Further information, See the [[Distrib/WebHome]] web. </dd>
+</dl>
+<p>
+</p>
+<dl>
+<dt> Community &amp;amp; People</dt>
+<dd> Please see the [[Main/WebHome]] web for registered users information and Hurd community resources. </dd>
+</dl>
+<p> See [[HurdDonations]] if you've got more money than hack time. </p>
+<p>
+</p>
+<dl>
+<dt> Microkernel Systems</dt>
+<dd> Please see the [[Mach/WebHome]] web </dd>
+</dl>
+<p>
+</p>
+<dl>
+<dt> Developer Related</dt>
+<dd> Please see above and the [[Distrib/WebHome]] web </dd>
+</dl>
 
 ----
 
diff --git a/Mach/WebHome.mdwn b/Mach/WebHome.mdwn
index 7b1fe5cf..46dc8a7c 100644
--- a/Mach/WebHome.mdwn
+++ b/Mach/WebHome.mdwn
@@ -4,111 +4,93 @@ Sporadic efforts by numerous individuals have been made to keep the information
 
 ## <a name="GNU_Mach"> </a> GNU Mach
 
-<form action="%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%WEB%/">
-  <table>
-    <tr>
-      <td valign="top" width="65%"> This web deals with the Mach micro kernel, the base for the Hurd servers which makes out the GNU operating system. This is also the logical place for any other future microkernel, like <a href="http://www.l4ka.org" target="_top">L4</a> for instance. <p> Feel free to add relevant content. </p>
-        <p><strong><em>Table of Contents:</em></strong></p>
-        <p>
-        </p>
-        <ul>
-          <li>[[MachHistory]]: History of Mach </li>
-        </ul>
-        <p>
-        </p>
-        <ul>
-          <li>[[MachConcepts]]: <a href="http://www.dina.dk/~abraham/Linus_vs_Tanenbaum.html" target="_top">Linus vs. Tanenbaum</a></li>
-        </ul>
-        <p>
-        </p>
-        <p>
-        </p>
-        <ul>
-          <li><a href="http://www.cs.cornell.edu/Info/People/ulfar/ukernel/ukernel.html" target="_top">Microkernels</a> (an HTML review of the area from late 1996) </li>
-        </ul>
-        <p>
-        </p>
-        <ul>
-          <li><a href="http://www.nongnu.org/hurdextras/ipc_guide/ipc_guide.html" target="_top">The Unofficial GNU Mach IPC beginner's guide</a> (part of <a href="http://savannah.nongnu.org/projects/hurdextras/" target="_top">Hurd Extras project</a>) </li>
-        </ul>
-        <p>
-        </p>
-        <ul>
-          <li><a href="http://foobar-qux.org:8080/hde/MACH_DOCS_PDFS/" target="_top">Documents about Mach</a></li>
-        </ul>
-        <p>
-        </p>
-        <ul>
-          <li>[[GNUMach]]: GNUmach 1.x kernel <ul>
-              <li>[[BuildingGNUMach]]</li>
-            </ul>
-          </li>
-        </ul>
-        <p>
-        </p>
-        <ul>
-          <li>[[OskitMach]]: GNUmach 2.0 (DEFUNCT) <ul>
-              <li>[[OskitMachStatusList]]: Status and TODO list (<a href="http://packages.debian.org/gnumach" target="_top">deb status</a>) </li>
-              <li>[[OskitMachPatches]]: Bleeding edge patches </li>
-              <li>[[OskitPatches]]: Useful patches for the OSKit </li>
-              <li>[[BuildingOskitMach]]: How to build your own GNUmach kernel </li>
-              <li>[[RemoteDebugOskitMach]]: How to use gdb to remote debug the GNUmach kernel </li>
-            </ul>
-          </li>
-        </ul>
-        <p>
-        </p>
-        <ul>
-          <li>[[MicroKernelFUD]]: Fear, Uncertainty, Doubt - The Micro Kernel Experiment Continues </li>
-        </ul>
-        <p>
-        </p>
-        <ul>
-          <li>[[MicroKernelResearch]]: Papers on Mach related topics, [[PosixSemaphores]], [[PortToL4]]. </li>
-        </ul>
-        <p>
-        </p>
-        <ul>
-          <li>[[MicroKernelsForBeginners]]: (suggested page, better description needed) For experienced users who know little about microkernels but wish to learn about them. </li>
-        </ul>
-        <p>
-        </p>
-        <ul>
-          <li><a href="http://i30www.ira.uka.de/teaching/pastcourses/lecture.php?courseid=80" target="_top">Microkernel construction</a> (lectures by the <a href="http://l4ka.org/projects/pistachio/" target="_top">L4Ka::Pistachio</a> team) </li>
-        </ul>
-        <p>
-        </p>
-        <ul>
-          <li> Other <nop>Mach kernels that can be of interest (noone even investigate yet if they can be of some use): <ul>
-                <li><a href="http://developer.apple.com/darwin/" target="_top">Darwin</a>: The kernel of <a href="http://www.apple.com/macosx/" target="_top">Max OS X</a> (<a href="http://developer.apple.com/techpubs/macosx/Darwin/General/KernelProgramming/" target="_top">Kernel Programming book</a>) </li>
-                <li><a href="http://www.kerneltrap.org/node.php?id=543" target="_top">Darwin binary compatibilty</a> in <a href="http://www.netbsd.org/" target="_top">NetBSD</a></li>
-                <li><a href="http://www.morphos.org" target="_top">http://www.morphos.org</a></li>
-                <li> a small <a href="http://cliki.tunes.org/Microkernel%20Debate" target="_top">Microkernel debate</a></li>
-                <li> a <a href="http://www.ussg.iu.edu/hypermail/linux/kernel/0206.2/1337.html" target="_top">reply</a> to Alan Cox re: Amiga DOS </li>
-              </ul></nop></li>
-        </ul>
-        <p>
-        </p>
-        <ul>
-          <li>[[GNUMachRevivalProject]]: Task and Wish list for a new effort to make GNU Mach a reliable (in stability and performance terms) microkernel for The Hurd. </li>
-        </ul>
-        <p>
-        </p>
-      </td>
-      <td>
-      </td>
-      <td valign="top" width="35%">
-        <p>
-        </p>
-        <p> Currently, Web refers to the Mach Web. </p>
-        <p>
-        </p>
-        <ul>
-          <li>[[WebDiscuss]] - Content discussions </li>
-        </ul>
-        <p>
-        </p>
-      </td>
-    </tr>
-  </table>
-</form>
+This web deals with the Mach micro kernel, the base for the Hurd servers which makes out the GNU operating system. This is also the logical place for any other future microkernel, like <a href="http://www.l4ka.org" target="_top">L4</a> for instance. <p> Feel free to add relevant content. </p>
+<p><strong><em>Table of Contents:</em></strong></p>
+<p>
+</p>
+<ul>
+<li>[[MachHistory]]: History of Mach </li>
+</ul>
+<p>
+</p>
+<ul>
+<li>[[MachConcepts]]: <a href="http://www.dina.dk/~abraham/Linus_vs_Tanenbaum.html" target="_top">Linus vs. Tanenbaum</a></li>
+</ul>
+<p>
+</p>
+<p>
+</p>
+<ul>
+<li><a href="http://www.cs.cornell.edu/Info/People/ulfar/ukernel/ukernel.html" target="_top">Microkernels</a> (an HTML review of the area from late 1996) </li>
+</ul>
+<p>
+</p>
+<ul>
+<li><a href="http://www.nongnu.org/hurdextras/ipc_guide/ipc_guide.html" target="_top">The Unofficial GNU Mach IPC beginner's guide</a> (part of <a href="http://savannah.nongnu.org/projects/hurdextras/" target="_top">Hurd Extras project</a>) </li>
+</ul>
+<p>
+</p>
+<ul>
+<li><a href="http://foobar-qux.org:8080/hde/MACH_DOCS_PDFS/" target="_top">Documents about Mach</a></li>
+</ul>
+<p>
+</p>
+<ul>
+<li>[[GNUMach]]: GNUmach 1.x kernel <ul>
+<li>[[BuildingGNUMach]]</li>
+</ul>
+</li>
+</ul>
+<p>
+</p>
+<ul>
+<li>[[OskitMach]]: GNUmach 2.0 (DEFUNCT) <ul>
+<li>[[OskitMachStatusList]]: Status and TODO list (<a href="http://packages.debian.org/gnumach" target="_top">deb status</a>) </li>
+<li>[[OskitMachPatches]]: Bleeding edge patches </li>
+<li>[[OskitPatches]]: Useful patches for the OSKit </li>
+<li>[[BuildingOskitMach]]: How to build your own GNUmach kernel </li>
+<li>[[RemoteDebugOskitMach]]: How to use gdb to remote debug the GNUmach kernel </li>
+</ul>
+</li>
+</ul>
+<p>
+</p>
+<ul>
+<li>[[MicroKernelFUD]]: Fear, Uncertainty, Doubt - The Micro Kernel Experiment Continues </li>
+</ul>
+<p>
+</p>
+<ul>
+<li>[[MicroKernelResearch]]: Papers on Mach related topics, [[PosixSemaphores]], [[PortToL4]]. </li>
+</ul>
+<p>
+</p>
+<ul>
+<li>[[MicroKernelsForBeginners]]: (suggested page, better description needed) For experienced users who know little about microkernels but wish to learn about them. </li>
+</ul>
+<p>
+</p>
+<ul>
+<li><a href="http://i30www.ira.uka.de/teaching/pastcourses/lecture.php?courseid=80" target="_top">Microkernel construction</a> (lectures by the <a href="http://l4ka.org/projects/pistachio/" target="_top">L4Ka::Pistachio</a> team) </li>
+</ul>
+<p>
+</p>
+<ul>
+<li> Other <nop>Mach kernels that can be of interest (noone even investigate yet if they can be of some use): <ul>
+<li><a href="http://developer.apple.com/darwin/" target="_top">Darwin</a>: The kernel of <a href="http://www.apple.com/macosx/" target="_top">Max OS X</a> (<a href="http://developer.apple.com/techpubs/macosx/Darwin/General/KernelProgramming/" target="_top">Kernel Programming book</a>) </li>
+<li><a href="http://www.kerneltrap.org/node.php?id=543" target="_top">Darwin binary compatibilty</a> in <a href="http://www.netbsd.org/" target="_top">NetBSD</a></li>
+<li><a href="http://www.morphos.org" target="_top">http://www.morphos.org</a></li>
+<li> a small <a href="http://cliki.tunes.org/Microkernel%20Debate" target="_top">Microkernel debate</a></li>
+<li> a <a href="http://www.ussg.iu.edu/hypermail/linux/kernel/0206.2/1337.html" target="_top">reply</a> to Alan Cox re: Amiga DOS </li>
+</ul></nop></li>
+</ul>
+<p>
+</p>
+<ul>
+<li>[[GNUMachRevivalProject]]: Task and Wish list for a new effort to make GNU Mach a reliable (in stability and performance terms) microkernel for The Hurd. </li>
+</ul>
+<p>
+</p>
+<ul>
+<li>[[WebDiscuss]] - Content discussions </li>
+</ul>
diff --git a/Main/WebHome.mdwn b/Main/WebHome.mdwn
index 3295a7c5..b57ce6e7 100644
--- a/Main/WebHome.mdwn
+++ b/Main/WebHome.mdwn
@@ -2,51 +2,30 @@ Sporadic efforts by numerous individuals have been made to keep the information
 
 -- [[Main/GrantBow]] - 24 Jul 2007
 
-**<font> %TWIKIWEB%.WelcomeGuest: </font>** Wiki is a web-based collaboration tool, document management tool and knowledge base tool. We have used [TWiki](http://TWiki.org) to create our site, <http://hurd.gnufans.org>. You can edit any wiki page, and please, use [[TWiki/GoodStyle]].
-
-Please start where we %TWIKIWEB%.WelcomeGuests; it is a topic explaining what this is, how to get around, and how you get involved. Frequent visitors may want to go straight to one of the collaboration areas on the menu to the left side, or another of the useful %TWIKIWEB%.StartingPoints.
-
-<form action="%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%WEB%/">
-  <table>
-    <tr>
-      <td valign="top" width="65%">
-        <p> There is an expanding community of people developing and running test Debian GNU/Hurd machines. Many have already registered on this TWiki system and contributed information directly to this site. We have also linked to all the relevant data you can find on other sites. </p>
-        <p> The two key resources most often used for communication are the Debian and GNU [[Hurd/MailLists]], as well as the [[Hurd/HurdIRC]]. </p>
-        <p>
-        </p>
-        <dl>
-          <dt>[[Hurd/MailLists]]</dt>
-          <dd> Available mailing lists </dd>
-        </dl>
-        <p><a href="http://hurd.gnufans.org/bin/view/Hurd/WebHome" target="_top">Hurd Wiki</a></p>
-        <dl>
-          <dt>[[Hurd/HurdIRC]]</dt>
-          <dd>
-          </dd>
-          <dt>[[Hurd/WhoRunsGNU]]</dt>
-          <dd>
-          </dd>
-          <dt>[[Hurd/HurdDevelopers]]</dt>
-          <dd> Who's who? </dd>
-          <dt>[[Hurd/PersonalHurdPages]]</dt>
-          <dd> Users with Hurd wiki pages </dd>
-          <dt>[[Hurd/UserGroups]]</dt>
-          <dd> Canadian, French &amp;amp; Russian </dd>
-          <dt>[[Hurd/HurdConferences]]</dt>
-          <dd> Meetings either directly held for the Hurd or with significant Hurd developer attendance. </dd>
-        </dl>
-        <p><a href="http://www.gnu.org/software/hurd/users-guide/using_gnuhurd.html" target="_top">Hurd User's Guide</a>. </p>
-        <p> The main HTML page for <a href="http://hurd.gnufans.org" target="_top">http://hurd.gnufans.org</a> is located at [[HurdGnuFansOrg]] but has restricted editing. If you are interested in helping us better represent the site to new and returning users (by helping edit the front page) you are encouraged to participate in the discussion held in the [[HurdGnuFansOrgDiscuss]] topic. </p>
-        <p>
-        </p>
-      </td>
-    </tr>
-  </table>
-</form>
-
-<table>
-  <tr align="right">
-    <td align="right" width="50%"><b>The TWiki<sup>TM</sup> home is at <a href="http://TWiki.org/" target="_top">http://TWiki.org/</a> </b></td>
-    <td align="right" width="50%"><a href="http://TWiki.org/"><img alt="Powered by TWiki" border="0" height="54" src="%PUBURL%/twikilogo2.gif" width="121" /></a></td>
-  </tr>
-</table>
+<p> There is an expanding community of people developing and running test Debian GNU/Hurd machines. Many have already registered on this TWiki system and contributed information directly to this site. We have also linked to all the relevant data you can find on other sites. </p>
+<p> The two key resources most often used for communication are the Debian and GNU [[Hurd/MailLists]], as well as the [[Hurd/HurdIRC]]. </p>
+<p>
+</p>
+<dl>
+<dt>[[Hurd/MailLists]]</dt>
+<dd> Available mailing lists </dd>
+</dl>
+<p><a href="http://hurd.gnufans.org/bin/view/Hurd/WebHome" target="_top">Hurd Wiki</a></p>
+<dl>
+<dt>[[Hurd/HurdIRC]]</dt>
+<dd>
+</dd>
+<dt>[[Hurd/WhoRunsGNU]]</dt>
+<dd>
+</dd>
+<dt>[[Hurd/HurdDevelopers]]</dt>
+<dd> Who's who? </dd>
+<dt>[[Hurd/PersonalHurdPages]]</dt>
+<dd> Users with Hurd wiki pages </dd>
+<dt>[[Hurd/UserGroups]]</dt>
+<dd> Canadian, French &amp;amp; Russian </dd>
+<dt>[[Hurd/HurdConferences]]</dt>
+<dd> Meetings either directly held for the Hurd or with significant Hurd developer attendance. </dd>
+</dl>
+<p><a href="http://www.gnu.org/software/hurd/users-guide/using_gnuhurd.html" target="_top">Hurd User's Guide</a>. </p>
+<p> The main HTML page for <a href="http://hurd.gnufans.org" target="_top">http://hurd.gnufans.org</a> is located at [[HurdGnuFansOrg]] but has restricted editing. If you are interested in helping us better represent the site to new and returning users (by helping edit the front page) you are encouraged to participate in the discussion held in the [[HurdGnuFansOrgDiscuss]] topic. </p>
diff --git a/Mig/WebHome.mdwn b/Mig/WebHome.mdwn
index 0d1d7368..7334d4d9 100644
--- a/Mig/WebHome.mdwn
+++ b/Mig/WebHome.mdwn
@@ -4,24 +4,12 @@ Sporadic efforts by numerous individuals have been made to keep the information
 
 The [[MachInterfaceGenerator]] (MIG) is a program which generates inter-process communication (IPC) code. Specifically Mig generates remote procedure call (RPC) code for communication between client and server processes running on a Mach microkernel.
 
-<form action="%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%WEB%/">
-  <table>
-    <tr>
-      <td valign="top" width="65%">
-        <p> Mach servers run as separate tasks and communicate with RPC messages. The RPC interface is language independant and somewhat complex. MIG mitigates this complexity. </p>
-        <p> GNU MIG is fully compatible with OSF MIG. The <a href="http://www.gnu.org/software/hurd/mig.html" target="_top">official Mig</a> site is a page hosted on the official Hurd site. [[MigDocumentation]] is available. Mig also has it's own CVS module within the main Hurd CVS site. </p>
-        <p>[[BuildingMIG]]</p>
-        <p>
-        </p>
-        <dl>
-          <dt>[[WebDiscuss]]</dt>
-          <dd> Discussion about how to make this part of the site better and more informative. </dd>
-        </dl>
-        <p>
-        </p>
-        <p>
-        </p>
-      </td>
-    </tr>
-  </table>
-</form>
+<p> Mach servers run as separate tasks and communicate with RPC messages. The RPC interface is language independant and somewhat complex. MIG mitigates this complexity. </p>
+<p> GNU MIG is fully compatible with OSF MIG. The <a href="http://www.gnu.org/software/hurd/mig.html" target="_top">official Mig</a> site is a page hosted on the official Hurd site. [[MigDocumentation]] is available. Mig also has it's own CVS module within the main Hurd CVS site. </p>
+<p>[[BuildingMIG]]</p>
+<p>
+</p>
+<dl>
+<dt>[[WebDiscuss]]</dt>
+<dd> Discussion about how to make this part of the site better and more informative. </dd>
+</dl>