Merge branch 'iki-master' of kepler:tmp/hurd/wiki/hurd-wiki.d

Conflicts:

	Distrib/WebHome.mdwn
	Hug/WebHome.mdwn

1 files changed, 53 insertions, 30 deletions

diff --git a/Hug/WebHome.mdwn b/Hug/WebHome.mdwn
index 3e89469a..b4f806b1 100644
--- a/Hug/WebHome.mdwn
+++ b/Hug/WebHome.mdwn
@@ -1,34 +1,57 @@
-Welcome to the home of **%WIKITOOLNAME%.%WEB%**. This is a web-based collaboration area for Hurd user groups.
-
-[[Hug/WebDiscuss]]
+Sporadic efforts by numerous individuals have been made to keep the information in this wiki current. The hope that the primary development team would make this a canonical source has not been fulfilled. While some of the information and links here are still valid, unfortunately much is not.
 
-* HurdFr: <http://www.hurdfr.org> ![hurd-fr.png](http://wiki.hurd.ru/data/images/other/hurd-fr.png)
-* HurdUk: <http://uwhug.org.uk/> ![hurd-uk.png](http://wiki.hurd.ru/data/images/other/hurd-uk.png)
-* HurdEs: <http://hurd.es.gnu.org/> ![hurd-es.png](http://wiki.hurd.ru/data/images/other/hurd-es.png)
-* HurdIt: <http://hurd-it.sf.net/> ![hurd-it.png](http://wiki.hurd.ru/data/images/other/hurd-it.png)
-* HurdCa: <http://www.nongnu.org/thug/> ![hurd-ca.png](http://wiki.hurd.ru/data/images/other/hurd-ca.png)
-* HurdPl: <http://hurd.pl/forum/> ![hurd-pl.png](http://wiki.hurd.ru/data/images/other/hurd-pl.png)
-* HurdRu: <http://wiki.hurd.ru/> ![hurd-ru.png](http://wiki.hurd.ru/data/images/other/hurd-ru.png)
-* HurdBr: <http://hurd.gnufans.org/bin/view/Hug/HurdBr> ![hurd-br.png](http://wiki.hurd.ru/data/images/other/hurd-br.png)
-* HurdIn: <http://i-hug.sarovar.org> ![hurd-in.png](http://wiki.hurd.ru/data/images/other/hurd-in.png)
-* HurdUs: <http://hurd.gnufans.org/> ![hurd-us.png](http://wiki.hurd.ru/data/images/other/hurd-us.png)
+-- [[Main/GrantBow]] - 24 Jul 2007
 
-## <a name="Maintenance_of_the_WEB_web"> Maintenance of the %WEB% web </a>
+Welcome to the home of **%WIKITOOLNAME%.%WEB%**. This is a web-based collaboration area for Hurd user groups.
 
-<form action="%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%WEB%/SearchResult">
-  <ul>
-    <li><input name="search" size="32" type="text" /> <input type="submit" value="Search" />    (More options in [[WebSearch]]) </li>
-    <li>[[WebChanges]]: Find out recent modifications to the %WIKITOOLNAME%.%WEB% web. </li>
-    <li>[[WebIndex]]: Display all %WIKITOOLNAME%.%WEB% topics in alphabetical order. See also the faster [[WebTopicList]]</li>
-    <li> %NOTIFYTOPIC%: Subscribe to be automatically notified when something changes in the %WIKITOOLNAME%.%WEB% web. </li>
-    <li> %STATISTICSTOPIC%: View access statistics of the %WIKITOOLNAME%.%WEB% web. </li>
-    <li> %WEBPREFSTOPIC%: Preferences of the %WIKITOOLNAME%.%WEB% web. </li>
-  </ul>
+<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>
+      <td valign="top" width="35%">
+        <p>
+        </p>
+        <table border="1" cellpadding="1" cellspacing="0">
+          <tr>
+            <th bgcolor="#99CCCC"><strong>Hot Topics <font size="-1">(<span style="background:"><font color="">more</font></span><a href="http://LOCATION/WebStatistics">?</a>)</font></strong></th>
+            <th bgcolor="#99CCCC"><strong>Top Contributors</strong></th>
+          </tr>
+        </table> %INCLUDE{"WebStatistics" pattern=".*?\-\-statTopContributors\-\-\&amp;gt;[^\|]+\|[^\|]+\|[^\|]+\|[^\|]+\|[^\|]+\|[^\|]+(\|[^\|]+\|[^\|]+\|).*"}% <p>
+        </p><input name="search" size="20" type="text" /> <input type="submit" value="Search %WEB%" /><br /><font size="-1">More search options in <span style="background:"><font color="">Web Search</font></span><a href="http://LOCATION/WebSearch">?</a></font><br />
+        <p> Here, Web refers to the Main Web. </p>
+        <p>
+        </p>
+        <ul>
+          <li><span style="background:"><font color="">Web Index</font></span><a href="http://LOCATION/WebIndex">?</a> - alphabetical </li>
+          <li><span style="background:"><font color="">Web Changes</font></span><a href="http://LOCATION/WebChanges">?</a> - by modification time <ul>
+              <li><span style="background:"><font color="">Web Notify</font></span><a href="http://LOCATION/WebNotify">?</a> - email alerts </li>
+            </ul>
+          </li>
+          <li><span style="background:"><font color="">Web Preferences</font></span><a href="http://LOCATION/WebPreferences">?</a> - settings </li>
+        </ul>
+        <p>
+        </p>
+      </td>
+    </tr>
+  </table>
 </form>
-
-**Notes:**
-
-* You are currently in the %WIKITOOLNAME%.%WEB% web. The color code for this web is a (SPECIFY COLOR) background, so you know where you are.
-* If you are not familiar with the %WIKITOOLNAME% collaboration tool, please visit %TWIKIWEB%.WelcomeGuest in the %WIKITOOLNAME%.%TWIKIWEB% web first.
-
-%INCLUDE\{"%TWIKIWEB%.TWikiWebsTable"\}%