52 files changed, 1285 insertions, 168 deletions
diff --git a/TWiki/AppendixFileSystem.mdwn b/TWiki/AppendixFileSystem.mdwn
index 7713b7e0..02f3c94f 100644
--- a/TWiki/AppendixFileSystem.mdwn
+++ b/TWiki/AppendixFileSystem.mdwn
@@ -36,7 +36,7 @@ You can rename the root TWiki directory - `twiki` - to whatever you like by chan
   <tr>
     <td><code>twiki/pub</code></td>
     <td align="center"> list </td>
-    <td> Public files (e.g. images) and <span style="background:"><font color="">File Attachments</font></span><a href="http://LOCATION/FileAttachments">?</a> and their RCS histories </td>
+    <td> Public files (e.g. images) and [[FileAttachments]] and their RCS histories </td>
   </tr>
   <tr>
     <td><code>twiki/data</code></td>
@@ -104,7 +104,7 @@ Perl CGI scripts. _Full file list:_
   </tr>
   <tr>
     <td><code>attach</code></td>
-    <td> Script that shows the attach file page (<span style="background:"><font color="">File Attachment</font></span><a href="http://LOCATION/FileAttachment">?</a>) </td>
+    <td> Script that shows the attach file page ([[FileAttachment]]) </td>
   </tr>
   <tr>
     <td><code>edit</code></td>
@@ -164,7 +164,7 @@ Perl CGI scripts. _Full file list:_
   </tr>
   <tr>
     <td><code>upload</code></td>
-    <td> Script that does file upload (<span style="background:"><font color="">File Attachment</font></span><a href="http://LOCATION/FileAttachment">?</a>) </td>
+    <td> Script that does file upload ([[FileAttachment]]) </td>
   </tr>
   <tr>
     <td><code>view</code></td>
@@ -467,7 +467,7 @@ Templates used to control appearance of all rendered pages. _Full file list:_
   </tr>
   <tr>
     <td><code>changes.tmpl</code></td>
-    <td> Displays <span style="background:"><font color="">Web Changes</font></span><a href="http://LOCATION/WebChanges">?</a> list of recently changed topics </td>
+    <td> Displays [[WebChanges]] list of recently changed topics </td>
   </tr>
   <tr>
     <td><code>edit.iejs.tmpl</code></td>
diff --git a/TWiki/ChangePassword.mdwn b/TWiki/ChangePassword.mdwn
index 8ed244ed..9bb5fcc4 100644
--- a/TWiki/ChangePassword.mdwn
+++ b/TWiki/ChangePassword.mdwn
@@ -1,12 +1,12 @@
 <table align="center" border="true" width="60%">
   <tr>
-    <td> Terribly sorry about this, but due to the amount of <span style="background:"><font color="">Wiki Spam</font></span><a href="http://LOCATION/WikiSpam">?</a> all automatic password changes, as well as new account creation, has been disabled. Use the <span style="background:"><font color="">Reset Password</font></span><a href="http://LOCATION/ResetPassword">?</a> for changing, resetting and creating new passwords for new users. <p>
+    <td> Terribly sorry about this, but due to the amount of [[WikiSpam]] all automatic password changes, as well as new account creation, has been disabled. Use the [[ResetPassword]] for changing, resetting and creating new passwords for new users. <p>
       </p>
       <ul>
-        <li><font size="+1">Use <span style="background:"><font color="">Reset Password</font></span><a href="http://LOCATION/ResetPassword">?</a> instead due to <span style="background:"><font color="">Wiki Spam</font></span><a href="http://LOCATION/WikiSpam">?</a></font></li>
+        <li><font size="+1">Use [[ResetPassword]] instead due to [[WikiSpam]]</font></li>
       </ul>
       <p> Thank you. </p>
-      <p> -- <span style="background:"><font color="">Joachim Nilsson</font></span><a href="http://LOCATIONMain/JoachimNilsson">?</a> - 28 Jan 2005 </p>
+      <p> -- [[Main/JoachimNilsson]] - 28 Jan 2005 </p>
     </td>
   </tr>
 </table>
diff --git a/TWiki/FindElsewherePlugin.mdwn b/TWiki/FindElsewherePlugin.mdwn
index 33c4dbd5..ff1e77f7 100644
--- a/TWiki/FindElsewherePlugin.mdwn
+++ b/TWiki/FindElsewherePlugin.mdwn
@@ -28,25 +28,25 @@ If a topic is not found in the current web, this plugin will look in the LOOKELS
   <tr>
     <td> found here </td>
     <td><nop>WebHome </nop></td>
-    <td><span style="background:"><font color="">Web Home</font></span><a href="http://LOCATION/WebHome">?</a></td>
+    <td>[[WebHome]]</td>
     <td><nop>WebHome </nop></td>
   </tr>
   <tr>
     <td> found singular here </td>
     <td><nop>WebHomes </nop></td>
-    <td><span style="background:"><font color="">Web Homes</font></span><a href="http://LOCATION/WebHomes">?</a></td>
+    <td>[[WebHomes]]</td>
     <td><nop>WebHomes </nop></td>
   </tr>
   <tr>
     <td> found elsewhere </td>
     <td><nop>TWikiAdminGroup </nop></td>
-    <td><span style="background:"><font color="">TWiki Admin Group</font></span><a href="http://LOCATION/TWikiAdminGroup">?</a></td>
+    <td>[[TWikiAdminGroup]]</td>
     <td><nop>Main.TWikiAdminGroup </nop></td>
   </tr>
   <tr>
     <td> found singular elsewhere </td>
     <td><nop>TWikiAdminGroups </nop></td>
-    <td><span style="background:"><font color="">TWiki Admin Groups</font></span><a href="http://LOCATION/TWikiAdminGroups">?</a></td>
+    <td>[[TWikiAdminGroups]]</td>
     <td><nop>Main.TWikiAdminGroups </nop></td>
   </tr>
 </table>
@@ -64,31 +64,31 @@ Don't break other types of links...
   </tr>
   <tr>
     <td><nop>TWiki.WebHome </nop></td>
-    <td><span style="background:"><font color="">Web Home</font></span><a href="http://LOCATIONTWiki/WebHome">?</a></td>
+    <td>[[TWiki/WebHome]]</td>
   </tr>
   <tr>
     <td><nop>WebHome </nop></td>
-    <td><span style="background:"><font color="">Web Home</font></span><a href="http://LOCATION/WebHome">?</a></td>
+    <td>[[WebHome]]</td>
   </tr>
   <tr>
     <td> [<nop>[TWiki.WebHome]] </nop></td>
-    <td><span style="background:"><font color="">TWiki.Web Home</font></span><a href="http://LOCATIONTWiki/WebHome">?</a></td>
+    <td>[[TWiki/WebHome]]</td>
   </tr>
   <tr>
     <td> [<nop>[TWiki.WikiWord]] </nop></td>
-    <td><span style="background:"><font color="">TWiki.Wiki Word</font></span><a href="http://LOCATIONTWiki/WikiWord">?</a></td>
+    <td>[[TWiki/WikiWord]]</td>
   </tr>
   <tr>
     <td> [<nop>[TWiki.WikiWords]] </nop></td>
-    <td><span style="background:"><font color="">TWiki.Wiki Words</font></span><a href="http://LOCATIONTWiki/WikiWords">?</a></td>
+    <td>[[TWiki/WikiWords]]</td>
   </tr>
   <tr>
     <td><nop>TWiki.WikiWord </nop></td>
-    <td><span style="background:"><font color="">Wiki Word</font></span><a href="http://LOCATIONTWiki/WikiWord">?</a></td>
+    <td>[[TWiki/WikiWord]]</td>
   </tr>
   <tr>
     <td><nop>TWiki.WikiWords </nop></td>
-    <td><span style="background:"><font color="">Wiki Words</font></span><a href="http://LOCATIONTWiki/WikiWords">?</a></td>
+    <td>[[TWiki/WikiWords]]</td>
   </tr>
 </table>
 
@@ -137,7 +137,7 @@ Don't break other types of links...
 <table border="1" cellpadding="1" cellspacing="0">
   <tr>
     <td align="right"> Plugin Author: </td>
-    <td><span style="background:"><font color="">Mike Barton</font></span><a href="http://LOCATIONMain/MikeBarton">?</a></td>
+    <td>[[Main/MikeBarton]]</td>
   </tr>
   <tr>
     <td align="right"> Plugin Version: </td>
diff --git a/TWiki/FormattedSearch.mdwn b/TWiki/FormattedSearch.mdwn
index 8dcec745..8cec7728 100644
--- a/TWiki/FormattedSearch.mdwn
+++ b/TWiki/FormattedSearch.mdwn
@@ -69,7 +69,7 @@ Variables that can be used in the format string:
   </tr>
   <tr>
     <td><code>$formfield(name)</code></td>
-    <td> The field value of a form field, i.e. <code>$formfield(<nop>TopicClassification)</nop></code> would get expanded to <code>PublicFAQ</code>. This applies only to topics that have a <span style="background:"><font color="">TWiki Form</font></span><a href="http://LOCATION/TWikiForms">?</a></td>
+    <td> The field value of a form field, i.e. <code>$formfield(<nop>TopicClassification)</nop></code> would get expanded to <code>PublicFAQ</code>. This applies only to topics that have a [[TWikiForms]]</td>
   </tr>
   <tr>
     <td><code>$pattern(reg-exp)</code></td>
diff --git a/TWiki/GnuSkin/GnuSkin-2002_06_04_094442_shot.jpg b/TWiki/GnuSkin/GnuSkin-2002_06_04_094442_shot.jpg
new file mode 100644
index 00000000..19f4d4e9
--- /dev/null
+++ b/TWiki/GnuSkin/GnuSkin-2002_06_04_094442_shot.jpg
diff --git a/TWiki/GnuSkin/RCS/menuscript.js b/TWiki/GnuSkin/RCS/menuscript.js
new file mode 100644
index 00000000..6b30f176
--- /dev/null
+++ b/TWiki/GnuSkin/RCS/menuscript.js
@@ -0,0 +1,289 @@
+// Determine browser type (Netscape 6 or IE 5.5).
+
+
+var isIE5 = (navigator.userAgent.indexOf("MSIE 5.5") > 0) ? 1 : 0;
+var isIE5 = (navigator.userAgent.indexOf("MSIE 5") > 0) ? 1 : 0;
+var isNS6 = (navigator.userAgent.indexOf("Gecko")    > 0) ? 1 : 0;
+var isNS4 = ((navigator.appName.indexOf("Netscape")==0)
+			&&(navigator.userAgent.indexOf("Mozilla/4")  == 0)) ? 1 : 0;
+
+//if (isNS4==0)
+// alert("This skin has been designed for Netscape 4.x.");
+
+// For IE, adjust menu bar styling.
+
+if (isIE5) {
+  document.styleSheets[document.styleSheets.length - 1].addRule("#menuBar", "padding-top:3px");
+  document.styleSheets[document.styleSheets.length - 1].addRule("#menuBar", "padding-bottom:3px");
+}
+
+// Global variable for tracking the currently active button.
+
+var activeButton = null;
+
+if (isIE5)
+  document.onmousedown = pageMousedown;
+if (isNS6)
+  document.addEventListener("mousedown", pageMousedown, true);
+
+function pageMousedown(event) {
+
+  var className;
+
+  // If the object clicked on was not a menu button or item, close any active
+  // menu.
+
+  if (isIE5)
+    className = window.event.srcElement.className;
+  if (isNS6)
+    className = (event.target.className ?
+      event.target.className : event.target.parentNode.className);
+
+  //Top menu mouseover
+  if (className != "menuButton" && className != "menuItem" && className != "menuItemDiff" && activeButton)
+    resetButton(activeButton);
+    
+
+  //Left menu show hide
+  var eSrc = window.event.srcElement;
+  window.event.cancelBubble = true;
+  if ("clsShowHide" == eSrc.className) return contentsHeading_click(eSrc);
+  
+  //Original version of this (with frames support)
+  //while ("BODY" != eSrc.tagName) {
+  //  if ("clsItem" == eSrc.className || "clsItemSelect" == eSrc.className) return contentsItem_click(eSrc);
+  //  else if ("clsShowHide" == eSrc.className || "clsHeading" == eSrc.className) return contentsHeading_click(eSrc);
+  //  eSrc = eSrc.parentElement;
+  //}
+}
+
+function buttonClick(button, menuName) {
+
+  // Blur focus from the link to remove that annoying outline.
+
+  if (!isNS4)
+   button.blur();
+
+  // Associate the named menu to this button if not already done.
+
+  if (!button.menu)
+  {
+   if (isNS4)
+    button.menu = document.layers[menuName];
+   else
+    button.menu = document.getElementById(menuName);
+  }
+
+
+  // Reset the currently active button, if any.
+
+  if (activeButton && activeButton != button)
+    resetButton(activeButton);
+
+  // Toggle the button's state.
+
+  if (button.isDepressed)
+    resetButton(button);
+  else
+    depressButton(button);
+
+  return false;
+}
+
+function buttonMouseover(button, menuName) {
+
+  // If any other button menu is active, deactivate it and activate this one.
+  // Note: if this button has no menu, leave the active menu alone.
+
+  if (activeButton) {
+    if (activeButton != button) {
+      resetButton(activeButton);
+      if (menuName)
+        buttonClick(button, menuName);
+    }
+    else {
+    }
+  }
+  else {
+    if (menuName)
+      buttonClick(button, menuName);
+  }
+}
+
+function depressButton(button) {
+
+  // Save current style values so they can be restored later.
+  // Only needs to be done once.
+
+  if (!button.oldBackgroundColor) {
+    button.oldBackgroundColor = button.style.backgroundColor;
+    button.oldBorderBottomColor = button.style.borderBottomColor;
+    button.oldBorderRightColor = button.style.borderRightColor;
+    button.oldBorderTopColor = button.style.borderTopColor;
+    button.oldBorderLeftColor = button.style.borderLeftColor;
+    button.oldColor = button.style.color;
+    button.oldLeft = button.style.left;
+    button.oldPosition = button.style.position;
+    button.oldTop = button.style.top;
+  }
+
+  // Change style value to make the button looks like it's
+  // depressed.
+
+  button.style.backgroundColor = "#99CC99";
+  button.style.borderBottomColor = "#99CC99";
+  button.style.borderRightColor = "#99CC99";
+  button.style.borderTopColor = "#99CC99";
+  button.style.borderLeftColor = "#99CC99";
+  button.style.color = "#E9E9E9";
+  button.style.left = "0px";
+  button.style.position = "relative";
+  button.style.top = "0px";
+
+  // For IE, force first menu item to the width of the parent menu,
+  // this causes mouseovers work for all items even when cursor is
+  // not over the link text.
+
+  if (isIE5 && !button.menu.firstChild.style.width)
+    button.menu.firstChild.style.width =
+      button.menu.offsetWidth + "px";
+
+if (isNS4)
+{
+  button.menu.left = (window.innerWidth-100);
+  button.menu.top  = 0;
+  button.menu.visibility = "show";
+}
+else
+{
+
+
+  // Position the associated drop down menu under the button and
+  // show it. Note that the position must be adjusted according to
+  // browser, styling and positioning.
+
+  //x = getPageOffsetLeft(button);
+  x = getPageOffsetLeft(button);
+  y = getPageOffsetTop(button) + button.offsetHeight;
+  if (isIE5)
+    y += 2;
+  if (isNS6) {
+    x--;
+    y--;
+  }
+  x -= 20;
+  y -= 10;
+  button.menu.style.left = x + "px";
+  button.menu.style.top  = y + "px";
+  button.menu.style.visibility = "visible";
+}
+
+  // Set button state and let the world know which button is
+  // active.
+
+  button.isDepressed = true;
+  activeButton = button;
+}
+
+function resetButton(button) {
+
+  // Restore the button's style settings.
+
+  button.style.backgroundColor = button.oldBackgroundColor;
+  button.style.borderBottomColor = button.oldBorderBottomColor;
+  button.style.borderRightColor = button.oldBorderRightColor;
+  button.style.borderTopColor = button.oldBorderTopColor;
+  button.style.borderLeftColor = button.oldBorderLeftColor;
+  button.style.color = button.oldColor;
+  button.style.left = button.oldLeft;
+  button.style.position = button.oldPosition;
+  button.style.top = button.oldTop;
+
+  // Hide the button's menu.
+
+  if (button.menu)
+  {
+   if (isNS4)
+    button.menu.visibility = "hide";
+   else
+    button.menu.style.visibility = "hidden";
+
+  }
+
+
+  // Set button state and clear active menu global.
+
+  button.isDepressed = false;
+  activeButton = null;
+}
+
+function getPageOffsetLeft(el) {
+
+  // Return the true x coordinate of an element relative to the page.
+
+  return el.offsetLeft + (el.offsetParent ? getPageOffsetLeft(el.offsetParent) : 0);
+}
+
+
+function getPageOffsetTop(el) {
+
+  // Return the true y coordinate of an element relative to the page.
+
+  return el.offsetTop + (el.offsetParent ? getPageOffsetTop(el.offsetParent) : 0);
+}
+
+
+// Swap background colour
+function bgcolour(obj, Colour) {
+	obj.style.backgroundColor=Colour
+}
+
+//Pop up window
+function MM_openBrWindow(theURL,winName,features) { //v2.0
+  window.open(theURL,winName,features);
+}
+
+function MM_findObj(n, d) { //v3.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document); return x;
+}
+/* Functions that swaps %PUBURLPATH%/skins/tiger. */
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+
+//Left menu folders
+var eSelected = null;
+function contentsHeading_click(eSrc)  {
+	if ("clsShowHide" == eSrc.className) eSrc = document.all[eSrc.sourceIndex + 1];
+	var iNumElements = document.all.length;
+	for (var i=eSrc.sourceIndex+1;i<iNumElements;i++) {
+		var eTemp = document.all[i];
+		if ("clsHeading" == eTemp.className) return;
+		else if ("clsItemsHide" == eTemp.className)  {
+			eTemp.className = "clsItemsShow";
+			//No image url in .js - not subject to wiki vars
+			//eSrc.style.listStyleImage = "url('images/blueminus.gif')";
+			return eSrc.blur();
+		}
+		else if("clsItemsShow" == eTemp.className)  {
+			eTemp.className = "clsItemsHide";
+			//No image url in .js - not subject to wiki vars
+			//eSrc.style.listStyleImage = "url('images/blueplus.gif')";
+			return eSrc.blur();
+		}
+	}
+}
+function contentsItem_click(eSrc)  {
+	if (document.all["styleView"]) eSrc.target = document.all["styleView"].checked ? "_blank" : "TEXT";
+	else if ("" == eSrc.target) eSrc.target = "TEXT"
+	if(null != eSelected) eSelected.className = "clsItem";
+	eSrc.className = "clsItemSelect";
+	eSelected = eSrc;
+}
+
+
+
diff --git a/TWiki/GnuSkinPlugin.mdwn b/TWiki/GnuSkinPlugin.mdwn
index af18356d..ae20183d 100644
--- a/TWiki/GnuSkinPlugin.mdwn
+++ b/TWiki/GnuSkinPlugin.mdwn
@@ -29,7 +29,7 @@ For non-graphical user agents the `alt` attribute of the WEBLOGO is hard coded t
 <table border="1" cellpadding="1" cellspacing="0">
   <tr>
     <td align="center"> Plugin Author: </td>
-    <td><span style="background:"><font color="">Joachim Nilsson</font></span><a href="http://LOCATIONMain/JoachimNilsson">?</a></td>
+    <td>[[Main/JoachimNilsson]]</td>
   </tr>
   <tr>
     <td align="center"> Plugin Version: </td>
diff --git a/TWiki/GnuSkinReleaseNotes.mdwn b/TWiki/GnuSkinReleaseNotes.mdwn
index c0632d39..de4e1026 100644
--- a/TWiki/GnuSkinReleaseNotes.mdwn
+++ b/TWiki/GnuSkinReleaseNotes.mdwn
@@ -1,5 +1,5 @@
 <div>
-  <center> [ <span style="background:"><font color="">Gnu Skin</font></span><a href="http://LOCATION/GnuSkin">?</a> | <span style="background:"><font color="">Gnu Skin</font></span><a href="http://LOCATION/GnuSkin">?</a> | <span style="background:"><font color="">Gnu Skin Plugin</font></span><a href="http://LOCATION/GnuSkinPlugin">?</a> | <span style="background:"><font color="">Gnu Skin Todo</font></span><a href="http://LOCATION/GnuSkinTodo">?</a> | <nop>GnuSkinReleaseNotes | <a href="http://savannah.gnu.org/projects/twiki-skins" target="_top">CVS</a> ] </nop></center>
+  <center> [ [[GnuSkin]] | [[GnuSkin]] | [[GnuSkinPlugin]] | [[GnuSkinTodo]] | <nop>GnuSkinReleaseNotes | <a href="http://savannah.gnu.org/projects/twiki-skins" target="_top">CVS</a> ] </nop></center>
 </div>
 
 ## <a name="Release_Notes_for_the_GnuSkin"> </a> Release Notes for the [[GnuSkin]]
diff --git a/TWiki/GnuSkinTodo.mdwn b/TWiki/GnuSkinTodo.mdwn
index 79432568..14dd2fba 100644
--- a/TWiki/GnuSkinTodo.mdwn
+++ b/TWiki/GnuSkinTodo.mdwn
@@ -1,5 +1,5 @@
 <div>
-  <center> [ <span style="background:"><font color="">Gnu Skin</font></span><a href="http://LOCATION/GnuSkin">?</a> | <span style="background:"><font color="">Gnu Skin</font></span><a href="http://LOCATION/GnuSkin">?</a> | <span style="background:"><font color="">Gnu Skin Plugin</font></span><a href="http://LOCATION/GnuSkinPlugin">?</a> | <nop>GnuSkinTodo | <span style="background:"><font color="">Gnu Skin Release Notes</font></span><a href="http://LOCATION/GnuSkinReleaseNotes">?</a> | <a href="http://savannah.gnu.org/projects/twiki-skins" target="_top">CVS</a> ] </nop></center>
+  <center> [ [[GnuSkin]] | [[GnuSkin]] | [[GnuSkinPlugin]] | <nop>GnuSkinTodo | [[GnuSkinReleaseNotes]] | <a href="http://savannah.gnu.org/projects/twiki-skins" target="_top">CVS</a> ] </nop></center>
 </div>
 
 ## <a name="Small_ToDo_list_for_the_GnuSkin"> </a> Small ToDo list for the [[GnuSkin]]
diff --git a/TWiki/GnuSkinTodo/gnuskin-comment-bug.diff b/TWiki/GnuSkinTodo/gnuskin-comment-bug.diff
new file mode 100644
index 00000000..a1afb5e2
--- /dev/null
+++ b/TWiki/GnuSkinTodo/gnuskin-comment-bug.diff
@@ -0,0 +1,4 @@
+34c34
+<           &nbsp;&nbsp;%TMPL:P{"parents"}%<!-- %WEBTOPICLIST% --> </td>
+---
+>           &nbsp;&nbsp;%TMPL:P{"parents"}%<!--%WEBTOPICLIST%--></td>
diff --git a/TWiki/GnuSkinTodo/gnuskin-i18n-diffs b/TWiki/GnuSkinTodo/gnuskin-i18n-diffs
new file mode 100644
index 00000000..c0b26cbb
--- /dev/null
+++ b/TWiki/GnuSkinTodo/gnuskin-i18n-diffs
@@ -0,0 +1,66 @@
+========= changeform.gnu.tmpl
+5c5
+<  <meta http-equiv="Content-Type" content="text/html; charset=%CHARSET%" />
+---
+>  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+11c11
+< <form name="main" action="%SCRIPTURLPATH%/edit%SCRIPTSUFFIX%/%INTURLENCODE{"%WEB%/%TOPIC%"}%" method="post">
+---
+> <form name="main" action="%SCRIPTURLPATH%/edit%SCRIPTSUFFIX%/%WEB%/%TOPIC%" method="post">
+========= edit.gnu.tmpl
+6c6
+<  <meta http-equiv="Content-Type" content="text/html; charset=%CHARSET%" />
+---
+>  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+12c12
+< <form name="main" action="%SCRIPTURLPATH%/save%SCRIPTSUFFIX%/%INTURLENCODE{"%WEB%/%TOPIC%"}%" method="post">
+---
+> <form name="main" action="%SCRIPTURLPATH%/save%SCRIPTSUFFIX%/%WEB%/%TOPIC%" method="post">
+========= preview.gnu.tmpl
+6c6
+<  <meta http-equiv="Content-Type" content="text/html; charset=%CHARSET%" />
+---
+>  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+26c26
+< <form name="main" action="%SCRIPTURLPATH%/save%SCRIPTSUFFIX%/%INTURLENCODE{"%WEB%/%TOPIC%"}%" method="post">
+---
+> <form name="main" action="%SCRIPTURLPATH%/save%SCRIPTSUFFIX%/%WEB%/%TOPIC%" method="post">
+========= rdiff.gnu.tmpl
+6c6
+<  <meta http-equiv="Content-Type" content="text/html; charset=%CHARSET%" />
+---
+>  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+========= search.gnu.tmpl
+6c6
+<  <meta http-equiv="Content-Type" content="text/html; charset=%CHARSET%" />
+---
+>  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+========= searchbookview.gnu.tmpl
+6c6
+<  <meta http-equiv="Content-Type" content="text/html; charset=%CHARSET%" />
+---
+>  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+========= searchformat.gnu.tmpl
+6c6
+<  <meta http-equiv="Content-Type" content="text/html; charset=%CHARSET%" />
+---
+>  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+========= searchrenameview.gnu.tmpl
+6c6
+<  <meta http-equiv="Content-Type" content="text/html; charset=%CHARSET%" />
+---
+>  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+========= twiki.gnu.tmpl
+23c23
+<       ); ;(
+---
+>       ): :(
+226c226
+<  <meta http-equiv="Content-Type" content="text/html; charset=%CHARSET%" />
+---
+>  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+========= view.gnu.tmpl
+6c6
+<  <meta http-equiv="Content-Type" content="text/html; charset=%CHARSET%" />
+---
+>  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
diff --git a/TWiki/GnuSkinTodo/gnuskin-icon-problem.png b/TWiki/GnuSkinTodo/gnuskin-icon-problem.png
new file mode 100644
index 00000000..971192a5
--- /dev/null
+++ b/TWiki/GnuSkinTodo/gnuskin-icon-problem.png
diff --git a/TWiki/InterWikis.mdwn b/TWiki/InterWikis.mdwn
index 2d40aff6..7cf474db 100644
--- a/TWiki/InterWikis.mdwn
+++ b/TWiki/InterWikis.mdwn
@@ -40,27 +40,27 @@ Whenever you write <code>**ExternalSite:Page**</code> it will be linked automati
     <td> '$page' on Zope's Wiki </td>
   </tr>
   <tr>
-    <td><span style="background:"><font color="">Org Patterns</font></span><a href="http://LOCATION/OrgPatterns">?</a></td>
+    <td>[[OrgPatterns]]</td>
     <td><a href="http://www.bell-labs.com/cgi-user/OrgPatterns/OrgPatterns" target="_top">http://www.bell-labs.com/cgi-user/OrgPatterns/OrgPatterns</a></td>
     <td> '$page' on Organizational Patterns site </td>
   </tr>
   <tr>
-    <td><span style="background:"><font color="">Fox Wiki</font></span><a href="http://LOCATION/FoxWiki">?</a></td>
+    <td>[[FoxWiki]]</td>
     <td><a href="http://fox.wikis.com/wc.dll?Wiki~" target="_top">http://fox.wikis.com/wc.dll?Wiki~</a></td>
     <td> '$page' on Fox Wiki site </td>
   </tr>
   <tr>
-    <td><span style="background:"><font color="">Php Wiki</font></span><a href="http://LOCATION/PhpWiki">?</a></td>
+    <td>[[PhpWiki]]</td>
     <td><a href="http://phpwiki.sourceforge.net/phpwiki/index.php3" target="_top">http://phpwiki.sourceforge.net/phpwiki/index.php3</a>? </td>
     <td> '$page' on Wiki site written in PHP </td>
   </tr>
   <tr>
-    <td><span style="background:"><font color="">Mu Web</font></span><a href="http://LOCATION/MuWeb">?</a></td>
+    <td>[[MuWeb]]</td>
     <td><a href="http://www.dunstable.com/scripts/MuWebWeb" target="_top">http://www.dunstable.com/scripts/MuWebWeb</a>? </td>
     <td> '$page' on 'MuWeb' site </td>
   </tr>
   <tr>
-    <td><span style="background:"><font color="">Py Wiki</font></span><a href="http://LOCATION/PyWiki">?</a></td>
+    <td>[[PyWiki]]</td>
     <td><a href="http://www.voght.com/cgi-bin/pywiki" target="_top">http://www.voght.com/cgi-bin/pywiki</a>? </td>
     <td> '$page' on Wiki site written in Python </td>
   </tr>
@@ -70,22 +70,22 @@ Whenever you write <code>**ExternalSite:Page**</code> it will be linked automati
     <td> '$page' on Squeak Smalltalk Wiki </td>
   </tr>
   <tr>
-    <td><span style="background:"><font color="">Use Mod</font></span><a href="http://LOCATION/UseMod">?</a></td>
+    <td>[[UseMod]]</td>
     <td><a href="http://www.usemod.com/cgi-bin/wiki.pl" target="_top">http://www.usemod.com/cgi-bin/wiki.pl</a>? </td>
     <td> '$page' on 'UseMod' Wiki site </td>
   </tr>
   <tr>
-    <td><span style="background:"><font color="">Meat Ball</font></span><a href="http://LOCATION/MeatBall">?</a></td>
+    <td>[[MeatBall]]</td>
     <td><a href="http://www.usemod.com/cgi-bin/mb.pl" target="_top">http://www.usemod.com/cgi-bin/mb.pl</a>? </td>
     <td> '$page' on 'MeatBall' site, a 'UseMod' Wiki variant </td>
   </tr>
   <tr>
-    <td><span style="background:"><font color="">Mb Test</font></span><a href="http://LOCATION/MbTest">?</a></td>
+    <td>[[MbTest]]</td>
     <td><a href="http://www.usemod.com/cgi-bin/mbtest.pl" target="_top">http://www.usemod.com/cgi-bin/mbtest.pl</a>? </td>
     <td> '$page' on 'UseMod' Wiki variant </td>
   </tr>
   <tr>
-    <td><span style="background:"><font color="">Hammond Wiki</font></span><a href="http://LOCATION/HammondWiki">?</a></td>
+    <td>[[HammondWiki]]</td>
     <td><a href="http://www.dairiki.org/HammondWiki/index.php3" target="_top">http://www.dairiki.org/HammondWiki/index.php3</a>? </td>
     <td> '$page' on 'HammondWiki' site </td>
   </tr>
@@ -95,37 +95,37 @@ Whenever you write <code>**ExternalSite:Page**</code> it will be linked automati
     <td> '$page' on Advogato community site (with peer review) </td>
   </tr>
   <tr>
-    <td><span style="background:"><font color="">Moin Moin</font></span><a href="http://LOCATION/MoinMoin">?</a></td>
+    <td>[[MoinMoin]]</td>
     <td><a href="http://moin.sourceforge.net/cgi-bin/moin/moin/" target="_top">http://moin.sourceforge.net/cgi-bin/moin/moin/</a></td>
     <td> '$page' on 'MoinMoin' Wiki site </td>
   </tr>
   <tr>
-    <td><span style="background:"><font color="">Efnet Python Wiki</font></span><a href="http://LOCATION/EfnetPythonWiki">?</a></td>
+    <td>[[EfnetPythonWiki]]</td>
     <td><a href="http://www.encrypted.net/~jh/python-wiki/moin.cgi/" target="_top">http://www.encrypted.net/~jh/python-wiki/moin.cgi/</a></td>
     <td> '$page' on 'EfnetPythonWiki' site </td>
   </tr>
   <tr>
-    <td><span style="background:"><font color="">Efnet Cpp Wiki</font></span><a href="http://LOCATION/EfnetCppWiki">?</a></td>
+    <td>[[EfnetCppWiki]]</td>
     <td><a href="http://www.encrypted.net/~jh/cpp-wiki/moin.cgi/" target="_top">http://www.encrypted.net/~jh/cpp-wiki/moin.cgi/</a></td>
     <td> '$page' on Efnet Cpp Wiki site </td>
   </tr>
   <tr>
-    <td><span style="background:"><font color="">Efnet Xml Wiki</font></span><a href="http://LOCATION/EfnetXmlWiki">?</a></td>
+    <td>[[EfnetXmlWiki]]</td>
     <td><a href="http://www.encrypted.net/~jh/xml-wiki/moin.cgi/" target="_top">http://www.encrypted.net/~jh/xml-wiki/moin.cgi/</a></td>
     <td> '$page' on Efnet XML Wiki site </td>
   </tr>
   <tr>
-    <td><span style="background:"><font color="">Politizen Wiki</font></span><a href="http://LOCATION/PolitizenWiki">?</a></td>
+    <td>[[PolitizenWiki]]</td>
     <td><a href="http://www.politizen.com/wiki.asp" target="_top">http://www.politizen.com/wiki.asp</a>? </td>
     <td> '$page' on 'PolitizenWiki' site </td>
   </tr>
   <tr>
-    <td><span style="background:"><font color="">Dolphin Wiki</font></span><a href="http://LOCATION/DolphinWiki">?</a></td>
+    <td>[[DolphinWiki]]</td>
     <td><a href="http://www.object-arts.com/wiki/html/Dolphin/" target="_top">http://www.object-arts.com/wiki/html/Dolphin/</a></td>
     <td> '$page' on Dolphin Wiki site </td>
   </tr>
   <tr>
-    <td><span style="background:"><font color="">Lego Wiki</font></span><a href="http://LOCATION/LegoWiki">?</a></td>
+    <td>[[LegoWiki]]</td>
     <td><a href="http://www.object-arts.com/wiki/html/Lego-Robotics/" target="_top">http://www.object-arts.com/wiki/html/Lego-Robotics/</a></td>
     <td> '$page' on 'LegoWiki' site </td>
   </tr>
@@ -135,12 +135,12 @@ Whenever you write <code>**ExternalSite:Page**</code> it will be linked automati
     <td> '$page' on TWiki site, we know it! </td>
   </tr>
   <tr>
-    <td><span style="background:"><font color="">Visual Works</font></span><a href="http://LOCATION/VisualWorks">?</a></td>
+    <td>[[VisualWorks]]</td>
     <td><a href="http://wiki.cs.uiuc.edu/VisualWorks/" target="_top">http://wiki.cs.uiuc.edu/VisualWorks/</a></td>
     <td> '$page' on 'VisualWorks' site </td>
   </tr>
   <tr>
-    <td><span style="background:"><font color="">Hurd Wiki</font></span><a href="http://LOCATION/HurdWiki">?</a></td>
+    <td>[[HurdWiki]]</td>
     <td><a href="http://hurd.gnufans.org/bin/view/" target="_top">http://hurd.gnufans.org/bin/view/</a></td>
     <td> '$page' on 'HurdWiki' site </td>
   </tr>
@@ -160,7 +160,7 @@ Whenever you write <code>**ExternalSite:Page**</code> it will be linked automati
     <td> Look up $page on Acronym Finder site </td>
   </tr>
   <tr>
-    <td><span style="background:"><font color="">Debian Bug</font></span><a href="http://LOCATION/DebianBug">?</a></td>
+    <td>[[DebianBug]]</td>
     <td><a href="http://bugs.debian.org/" target="_top">http://bugs.debian.org/</a></td>
     <td> Debian Bug '$page' by number or package name </td>
   </tr>
@@ -170,12 +170,12 @@ Whenever you write <code>**ExternalSite:Page**</code> it will be linked automati
     <td> Debian Bug '$page' by number or package name </td>
   </tr>
   <tr>
-    <td><span style="background:"><font color="">Debian List</font></span><a href="http://LOCATION/DebianList">?</a></td>
+    <td>[[DebianList]]</td>
     <td><a href="http://lists.debian.org/" target="_top">http://lists.debian.org/</a></td>
     <td> Debian List '$page' </td>
   </tr>
   <tr>
-    <td><span style="background:"><font color="">Debian Package</font></span><a href="http://LOCATION/DebianPackage">?</a></td>
+    <td>[[DebianPackage]]</td>
     <td><a href="http://packages.debian.org/" target="_top">http://packages.debian.org/</a></td>
     <td> Debian Package '$page' </td>
   </tr>
@@ -185,7 +185,7 @@ Whenever you write <code>**ExternalSite:Page**</code> it will be linked automati
     <td> Debian Package '$page' </td>
   </tr>
   <tr>
-    <td><span style="background:"><font color="">Deja News</font></span><a href="http://LOCATION/DejaNews">?</a></td>
+    <td>[[DejaNews]]</td>
     <td><a href="http://www.deja.com/=dnc/getdoc.xp?AN=" target="_top">http://www.deja.com/=dnc/getdoc.xp?AN=</a></td>
     <td> '$page' on Net News </td>
   </tr>
diff --git a/TWiki/MetaDataRendering.mdwn b/TWiki/MetaDataRendering.mdwn
index 0f637bbf..08838cfc 100644
--- a/TWiki/MetaDataRendering.mdwn
+++ b/TWiki/MetaDataRendering.mdwn
@@ -15,7 +15,7 @@ At present support is fairly basic:
   </tr>
   <tr>
     <td> %<nop>META{"form"}% </nop></td>
-    <td> Show form data, see <span style="background:"><font color="">Form Templates</font></span><a href="http://LOCATION/TWikiDocumentation">?</a></td>
+    <td> Show form data, see [[TWikiDocumentation]]</td>
   </tr>
   <tr>
     <td> %<nop>META{"attachments"}% </nop></td>
diff --git a/TWiki/PreviewBackground.mdwn b/TWiki/PreviewBackground.mdwn
index 9eadd5e9..092b20a1 100644
--- a/TWiki/PreviewBackground.mdwn
+++ b/TWiki/PreviewBackground.mdwn
@@ -26,7 +26,7 @@ Remarks:
     <td valign="top"><twkaction><a href="%SCRIPTURLPATH%/viewfile%SCRIPTSUFFIX%/%WEB%/%TOPIC%?filename=blankltgraybg.gif">view</a> <a href="%SCRIPTURLPATH%/attach%SCRIPTSUFFIX%/%WEB%/%TOPIC%?filename=blankltgraybg.gif">update</a></twkaction></td>
     <td align="right" valign="top"><twkfilesize>878</twkfilesize></td>
     <td valign="top"><twkfiledate>03 Oct 2000 - 00:48</twkfiledate></td>
-    <td valign="top"><twkfileuser> <span style="background:"><font color="">Peter Thoeny</font></span><a href="http://LOCATIONMain/PeterThoeny">?</a></twkfileuser></td>
+    <td valign="top"><twkfileuser> [[Main/PeterThoeny]]</twkfileuser></td>
     <td valign="top"><twkfilecomment>Blank white background</twkfilecomment></td>
   </tr>
   <tr>
@@ -37,7 +37,7 @@ Remarks:
     <td valign="top"><twkaction><a href="%SCRIPTURLPATH%/viewfile%SCRIPTSUFFIX%/%WEB%/%TOPIC%?filename=blankwhitebg.gif">view</a> <a href="%SCRIPTURLPATH%/attach%SCRIPTSUFFIX%/%WEB%/%TOPIC%?filename=blankwhitebg.gif">update</a></twkaction></td>
     <td align="right" valign="top"><twkfilesize>878</twkfilesize></td>
     <td valign="top"><twkfiledate>03 Oct 2000 - 00:48</twkfiledate></td>
-    <td valign="top"><twkfileuser> <span style="background:"><font color="">Peter Thoeny</font></span><a href="http://LOCATIONMain/PeterThoeny">?</a></twkfileuser></td>
+    <td valign="top"><twkfileuser> [[Main/PeterThoeny]]</twkfileuser></td>
     <td valign="top"><twkfilecomment>Blank white background</twkfilecomment></td>
   </tr>
   <tr>
@@ -48,7 +48,7 @@ Remarks:
     <td valign="top"><twkaction><a href="%SCRIPTURLPATH%/viewfile%SCRIPTSUFFIX%/%WEB%/%TOPIC%?filename=previewbg.gif">view</a> <a href="%SCRIPTURLPATH%/attach%SCRIPTSUFFIX%/%WEB%/%TOPIC%?filename=previewbg.gif">update</a></twkaction></td>
     <td align="right" valign="top"><twkfilesize>1821</twkfilesize></td>
     <td valign="top"><twkfiledate>03 Oct 2000 - 00:46</twkfiledate></td>
-    <td valign="top"><twkfileuser> <span style="background:"><font color="">Peter Thoeny</font></span><a href="http://LOCATIONMain/PeterThoeny">?</a></twkfileuser></td>
+    <td valign="top"><twkfileuser> [[Main/PeterThoeny]]</twkfileuser></td>
     <td valign="top"><twkfilecomment>Slanted PREVIEW watermark</twkfilecomment></td>
   </tr>
   <tr>
diff --git a/TWiki/SmiliesPlugin/biggrin.gif b/TWiki/SmiliesPlugin/biggrin.gif
new file mode 100644
index 00000000..c1509e17
--- /dev/null
+++ b/TWiki/SmiliesPlugin/biggrin.gif
diff --git a/TWiki/SmiliesPlugin/confused.gif b/TWiki/SmiliesPlugin/confused.gif
new file mode 100644
index 00000000..684b51c9
--- /dev/null
+++ b/TWiki/SmiliesPlugin/confused.gif
diff --git a/TWiki/SmiliesPlugin/cool.gif b/TWiki/SmiliesPlugin/cool.gif
new file mode 100644
index 00000000..b2c0b8c6
--- /dev/null
+++ b/TWiki/SmiliesPlugin/cool.gif
diff --git a/TWiki/SmiliesPlugin/eek.gif b/TWiki/SmiliesPlugin/eek.gif
new file mode 100644
index 00000000..43cf2125
--- /dev/null
+++ b/TWiki/SmiliesPlugin/eek.gif
diff --git a/TWiki/SmiliesPlugin/frown.gif b/TWiki/SmiliesPlugin/frown.gif
new file mode 100644
index 00000000..e3086d11
--- /dev/null
+++ b/TWiki/SmiliesPlugin/frown.gif
diff --git a/TWiki/SmiliesPlugin/mad.gif b/TWiki/SmiliesPlugin/mad.gif
new file mode 100644
index 00000000..a38492bf
--- /dev/null
+++ b/TWiki/SmiliesPlugin/mad.gif
diff --git a/TWiki/SmiliesPlugin/redface.gif b/TWiki/SmiliesPlugin/redface.gif
new file mode 100644
index 00000000..44cd75a8
--- /dev/null
+++ b/TWiki/SmiliesPlugin/redface.gif
diff --git a/TWiki/SmiliesPlugin/rolleyes.gif b/TWiki/SmiliesPlugin/rolleyes.gif
new file mode 100644
index 00000000..d5e29f52
--- /dev/null
+++ b/TWiki/SmiliesPlugin/rolleyes.gif
diff --git a/TWiki/SmiliesPlugin/smile.gif b/TWiki/SmiliesPlugin/smile.gif
new file mode 100644
index 00000000..603ddddb
--- /dev/null
+++ b/TWiki/SmiliesPlugin/smile.gif
diff --git a/TWiki/SmiliesPlugin/tongue.gif b/TWiki/SmiliesPlugin/tongue.gif
new file mode 100644
index 00000000..1b36c3d0
--- /dev/null
+++ b/TWiki/SmiliesPlugin/tongue.gif
diff --git a/TWiki/SmiliesPlugin/wink.gif b/TWiki/SmiliesPlugin/wink.gif
new file mode 100644
index 00000000..077383e1
--- /dev/null
+++ b/TWiki/SmiliesPlugin/wink.gif
diff --git a/TWiki/SpacedWikiWordPlugin.mdwn b/TWiki/SpacedWikiWordPlugin.mdwn
index 3ba4d244..9f622139 100644
--- a/TWiki/SpacedWikiWordPlugin.mdwn
+++ b/TWiki/SpacedWikiWordPlugin.mdwn
@@ -24,7 +24,7 @@ NB. Needs TWiki:Codev.CairoRelease or alphas after 12 Apr 2004
   <tr>
     <td> !DogWalkers </td>
     <td> Dog Walkers </td>
-    <td><span style="background:"><font color="">Dog Walkers</font></span><a href="http://LOCATION/DogWalkers">?</a></td>
+    <td>[[DogWalkers]]</td>
   </tr>
   <tr>
     <td> !Lotus123 </td>
@@ -34,7 +34,7 @@ NB. Needs TWiki:Codev.CairoRelease or alphas after 12 Apr 2004
   <tr>
     <td> !ILikeTWiki </td>
     <td> I Like T Wiki </td>
-    <td><span style="background:"><font color="">ILike TWiki</font></span><a href="http://LOCATION/ILikeTWiki">?</a></td>
+    <td>[[ILikeTWiki]]</td>
   </tr>
 </table>
 
@@ -58,7 +58,7 @@ To install plugin:
 <table border="1" cellpadding="1" cellspacing="0">
   <tr>
     <td align="right"> Plugin Author: </td>
-    <td><span style="background:"><font color="">Martin Cleaver</font></span><a href="http://LOCATIONMain/MartinCleaver">?</a></td>
+    <td>[[Main/MartinCleaver]]</td>
   </tr>
   <tr>
     <td align="right"> Plugin Version: </td>
diff --git a/TWiki/StartingPoints.mdwn b/TWiki/StartingPoints.mdwn
index ba998c96..dfd917b5 100644
--- a/TWiki/StartingPoints.mdwn
+++ b/TWiki/StartingPoints.mdwn
@@ -8,7 +8,7 @@
 <form action="%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%WEB%/">
   <ul>
     <li> %MAINWEB%.WebSearch: Full text search of the %WIKITOOLNAME%.%MAINWEB% web. </li>
-    <li><input name="search" size="32" type="text" /> <input type="submit" value="Search" />    (More options in <span style="background:"><font color="">Web Search</font></span><a href="http://LOCATION/WebSearch">?</a>) </li>
+    <li><input name="search" size="32" type="text" /> <input type="submit" value="Search" />    (More options in [[WebSearch]]) </li>
     <li> %MAINWEB%.WebChanges: Find out recent modifications to the %WIKITOOLNAME%.%MAINWEB% web. </li>
     <li> %MAINWEB%.WebIndex: Display all %WIKITOOLNAME%.%MAINWEB% topics in alphabetical order. See also the faster %MAINWEB%.WebTopicList </li>
     <li> %MAINWEB%.%NOTIFYTOPIC%: Subscribe to be automatically notified when something changes in the %WIKITOOLNAME%.%MAINWEB% web. </li>
diff --git a/TWiki/TWikiDocGraphics/8831.gif b/TWiki/TWikiDocGraphics/8831.gif
new file mode 100644
index 00000000..08d0b23e
--- /dev/null
+++ b/TWiki/TWikiDocGraphics/8831.gif
diff --git a/TWiki/TWikiDocGraphics/help.gif b/TWiki/TWikiDocGraphics/help.gif
new file mode 100644
index 00000000..be8659e1
--- /dev/null
+++ b/TWiki/TWikiDocGraphics/help.gif
diff --git a/TWiki/TWikiDocGraphics/tip.gif b/TWiki/TWikiDocGraphics/tip.gif
new file mode 100644
index 00000000..0705fe35
--- /dev/null
+++ b/TWiki/TWikiDocGraphics/tip.gif
diff --git a/TWiki/TWikiDocGraphics/warning.gif b/TWiki/TWikiDocGraphics/warning.gif
new file mode 100644
index 00000000..dad469ac
--- /dev/null
+++ b/TWiki/TWikiDocGraphics/warning.gif
diff --git a/TWiki/TWikiFAQ.mdwn b/TWiki/TWikiFAQ.mdwn
index e597b2ec..00602ac6 100644
--- a/TWiki/TWikiFAQ.mdwn
+++ b/TWiki/TWikiFAQ.mdwn
@@ -10,7 +10,7 @@ This is a real FAQ, and also a demo of one easily implemented knowledge base sol
 
 Please ask support questions in the TWiki:Support web. The FAQs are here for frequently asked questions **_including_** answers.
 
-<form action="%SCRIPTURLPATH%/edit%SCRIPTSUFFIX%/%WEB%/"> New FAQ topic:   (Use a name in <span style="background:"><font color="">Wiki Notation</font></span><a href="http://LOCATIONTWiki/WikiNotation">?</a>) <br /><input name="topic" size="32" type="text" /> <input name="onlywikiname" type="hidden" value="on" /> <input name="templatetopic" type="hidden" value="TWikiFaqTemplate" /> <input type="submit" value="Create Topic" /><br /><strong><em>NOTE:</em></strong> New FAQ topics are based on the <span style="background:"><font color="">TWiki Faq Template</font></span><a href="http://LOCATION/TWikiFaqTemplate">?</a></form>
+<form action="%SCRIPTURLPATH%/edit%SCRIPTSUFFIX%/%WEB%/"> New FAQ topic:   (Use a name in [[TWiki/WikiNotation]]) <br /><input name="topic" size="32" type="text" /> <input name="onlywikiname" type="hidden" value="on" /> <input name="templatetopic" type="hidden" value="TWikiFaqTemplate" /> <input type="submit" value="Create Topic" /><br /><strong><em>NOTE:</em></strong> New FAQ topics are based on the [[TWikiFaqTemplate]]</form>
 
 ## <a name="More_sources_"> More sources... </a>
 
diff --git a/TWiki/TWikiForms.mdwn b/TWiki/TWikiForms.mdwn
index 1f6ad367..0fe0b122 100644
--- a/TWiki/TWikiForms.mdwn
+++ b/TWiki/TWikiForms.mdwn
@@ -92,21 +92,21 @@ A Form Template is simply a page containing your form, defined in a table where
 >     <th bgcolor="#99CCCC"><strong>Tooltip message</strong></th>
 >   </tr>
 >   <tr>
->     <td><span style="background:"><font color="">Topic Classification</font></span><a href="http://LOCATIONKnow/TopicClassification">?</a></td>
+>     <td>[[Know/TopicClassification]]</td>
 >     <td> select </td>
 >     <td align="center"> 1 </td>
->     <td><span style="background:"><font color="">No Disclosure</font></span><a href="http://LOCATIONKnow/NoDisclosure">?</a>, <span style="background:"><font color="">Public Supported</font></span><a href="http://LOCATIONKnow/PublicSupported">?</a>, <span style="background:"><font color="">Public FAQ</font></span><a href="http://LOCATIONKnow/PublicFAQ">?</a></td>
+>     <td>[[Know/NoDisclosure]], [[Know/PublicSupported]], [[Know/PublicFAQ]]</td>
 >     <td> blah blah... </td>
 >   </tr>
 >   <tr>
->     <td><span style="background:"><font color="">Operating System</font></span><a href="http://LOCATIONKnow/OperatingSystem">?</a></td>
+>     <td>[[Know/OperatingSystem]]</td>
 >     <td> checkbox </td>
 >     <td align="center"> 3 </td>
->     <td><span style="background:"><font color="">Os HPUX</font></span><a href="http://LOCATIONKnow/OsHPUX">?</a>, <span style="background:"><font color="">Os Linux</font></span><a href="http://LOCATIONKnow/OsLinux">?</a>, <span style="background:"><font color="">Os Solaris</font></span><a href="http://LOCATIONKnow/OsSolaris">?</a>, <span style="background:"><font color="">Os Win</font></span><a href="http://LOCATIONKnow/OsWin">?</a></td>
+>     <td>[[Know/OsHPUX]], [[Know/OsLinux]], [[Know/OsSolaris]], [[Know/OsWin]]</td>
 >     <td> blah blah... </td>
 >   </tr>
 >   <tr>
->     <td><span style="background:"><font color="">Os Version</font></span><a href="http://LOCATIONKnow/OsVersion">?</a></td>
+>     <td>[[Know/OsVersion]]</td>
 >     <td> text </td>
 >     <td align="center"> 16 </td>
 >     <td>   </td>
@@ -132,21 +132,21 @@ The Form Template can also be defined in an alternative way by using more then o
 >     <th bgcolor="#99CCCC"><strong>Tooltip message</strong></th>
 >   </tr>
 >   <tr>
->     <td><span style="background:"><font color="">Topic Classification</font></span><a href="http://LOCATIONKnow/TopicClassification">?</a></td>
+>     <td>[[Know/TopicClassification]]</td>
 >     <td> select </td>
 >     <td> 1 </td>
 >     <td align="center"> ... </td>
 >     <td> blah blah... </td>
 >   </tr>
 >   <tr>
->     <td><span style="background:"><font color="">Operating System</font></span><a href="http://LOCATIONKnow/OperatingSystem">?</a></td>
+>     <td>[[Know/OperatingSystem]]</td>
 >     <td> checkbox </td>
 >     <td> 3 </td>
 >     <td align="center"> ... </td>
 >     <td> blah blah... </td>
 >   </tr>
 >   <tr>
->     <td><span style="background:"><font color="">Os Version</font></span><a href="http://LOCATIONKnow/OsVersion">?</a></td>
+>     <td>[[Know/OsVersion]]</td>
 >     <td> text </td>
 >     <td> 16 </td>
 >     <td align="center"> ... </td>
@@ -161,17 +161,17 @@ The Form Template can also be defined in an alternative way by using more then o
 >     <th bgcolor="#99CCCC"><strong>Tooltip message</strong></th>
 >   </tr>
 >   <tr>
->     <td><span style="background:"><font color="">No Disclosure</font></span><a href="http://LOCATIONKnow/NoDisclosure">?</a></td>
+>     <td>[[Know/NoDisclosure]]</td>
 >     <td> option </td>
 >     <td> blah blah... </td>
 >   </tr>
 >   <tr>
->     <td><span style="background:"><font color="">Public Supported</font></span><a href="http://LOCATIONKnow/PublicSupported">?</a></td>
+>     <td>[[Know/PublicSupported]]</td>
 >     <td> option </td>
 >     <td> blah blah... </td>
 >   </tr>
 >   <tr>
->     <td><span style="background:"><font color="">Public FAQ</font></span><a href="http://LOCATIONKnow/PublicFAQ">?</a></td>
+>     <td>[[Know/PublicFAQ]]</td>
 >     <td> option </td>
 >     <td> blah blah... </td>
 >   </tr>
diff --git a/TWiki/TWikiMetaData.mdwn b/TWiki/TWikiMetaData.mdwn
index d1a8973e..dc035ff6 100644
--- a/TWiki/TWikiMetaData.mdwn
+++ b/TWiki/TWikiMetaData.mdwn
@@ -106,7 +106,7 @@ Notes:
   </tr>
   <tr>
     <td> name </td>
-    <td> The topic from which this was created, <span style="background:"><font color="">Web Home</font></span><a href="http://LOCATION/WebHome">?</a> if done from <code>Go</code>, othewise topic where <code>?</code> or form used. Normally just topic, but is full web.topic format if parent is in a different Web. Renaming a Web will then only break a few of these references or they can be scanned and fixed. </td>
+    <td> The topic from which this was created, [[WebHome]] if done from <code>Go</code>, othewise topic where <code>?</code> or form used. Normally just topic, but is full web.topic format if parent is in a different Web. Renaming a Web will then only break a few of these references or they can be scanned and fixed. </td>
   </tr>
 </table>
 
@@ -185,7 +185,7 @@ Extra fields that are added if an attachment is moved:
   </tr>
   <tr>
     <td> name </td>
-    <td> A topic name - the topic represents one of the <span style="background:"><font color="">TWiki Forms</font></span><a href="http://LOCATION/TWikiForms">?</a>. Can optionally include the web name i.e. web.topic, but doesn't normally </td>
+    <td> A topic name - the topic represents one of the [[TWikiForms]]. Can optionally include the web name i.e. web.topic, but doesn't normally </td>
   </tr>
 </table>
 
@@ -200,11 +200,11 @@ Should only be present if there is a META:FORM entry. Note that this data is use
   </tr>
   <tr>
     <td> name </td>
-    <td> Ties to entry in <span style="background:"><font color="">TWiki Forms</font></span><a href="http://LOCATION/TWikiForms">?</a> template, is title with all bar alphanumerics and . removed </td>
+    <td> Ties to entry in [[TWikiForms]] template, is title with all bar alphanumerics and . removed </td>
   </tr>
   <tr>
     <td> title </td>
-    <td> Full text from <span style="background:"><font color="">TWiki Forms</font></span><a href="http://LOCATION/TWikiForms">?</a> template </td>
+    <td> Full text from [[TWikiForms]] template </td>
   </tr>
   <tr>
     <td> value </td>
@@ -248,14 +248,14 @@ Current support covers:
   </tr>
   <tr>
     <td> %<nop>META{"form"}% </nop></td>
-    <td> Show form data, see <span style="background:"><font color="">TWiki Forms</font></span><a href="http://LOCATION/TWikiForms">?</a></td>
+    <td> Show form data, see [[TWikiForms]]</td>
   </tr>
   <tr>
     <td> %<nop>META{"attachments"}% </nop></td>
     <td> Show attachments, exclude hidden </td>
   </tr>
   <tr>
-    <td> Options for <span style="background:"><font color="">Attachments</font></span><a href="http://LOCATION/FileAttachments">?</a>: </td>
+    <td> Options for [[FileAttachments]]: </td>
     <td>   </td>
   </tr>
   <tr>
diff --git a/TWiki/TWikiRegistration.mdwn b/TWiki/TWikiRegistration.mdwn
index 200410ab..d4cb76cb 100644
--- a/TWiki/TWikiRegistration.mdwn
+++ b/TWiki/TWikiRegistration.mdwn
@@ -15,7 +15,7 @@ An account of your own helps us handle copyright issues with contributed materia
       <td><input name="Twk1Name" onblur="var sIn = this.value; var sOut = ''; var chgUpper = true; for ( var i = 0; i &lt; sIn.length; i++ ) { var ch = sIn.charAt( i ); var ch2 = ''; if((ch=='à')||(ch=='á')||(ch=='â')||(ch=='ã')||(ch=='å') ) { ch = 'a'; } if( (ch=='è')||(ch=='é')||(ch=='ê') ) { ch = 'e'; } if( ch=='ç') { ch = 'c'; } if( ch=='ñ') { ch = 'n'; } if( (ch=='ò')||(ch=='ó')||(ch=='ô') ) { ch = 'o'; } if( ch=='ä') { ch = 'a'; ch2 = 'e'; } if( ch=='ö') { ch = 'o'; ch2 = 'e'; } if( (ch=='ù')||(ch=='ú')||(ch=='û') ) { ch = 'o'; } if( ch=='ü') { ch = 'u'; ch2 = 'e'; } if( ch=='Ä') { ch = 'A'; ch2 = 'e'; } if( ch=='Ö') { ch = 'O'; ch2 = 'e'; } if( ch=='Ü') { ch = 'U'; ch2 = 'e'; } if( ch=='ß') { ch = 's'; ch2 = 's'; } if( ((ch&gt;='a')&amp;&amp;(ch&lt;='z')) || ((ch&gt;='A')&amp;&amp;(ch&lt;='Z')) ) { if( chgUpper ) { ch = ch.toUpperCase(); chgUpper = false; } sOut+=ch; if( ch2!='') { sOut+=ch2; } } else { if( ch==' ' ) { chgUpper = true; } } } this.form.Twk1WikiName.value=sOut;" size="40" type="text" value="" /> <code><font color="red">**</font></code></td>
     </tr>
     <tr>
-      <td align="right"> Your <span style="background:"><font color="">Wiki Name</font></span><a href="http://LOCATION/WikiName">?</a>: </td>
+      <td align="right"> Your [[WikiName]]: </td>
       <td><input name="Twk1WikiName" size="40" type="text" value="" /> <code><font color="red">**</font></code></td>
     </tr>
     <tr>
diff --git a/TWiki/TWikiRegistrationNone.mdwn b/TWiki/TWikiRegistrationNone.mdwn
index e4ebdc5d..e7e3917a 100644
--- a/TWiki/TWikiRegistrationNone.mdwn
+++ b/TWiki/TWikiRegistrationNone.mdwn
@@ -9,7 +9,7 @@ To register as a new user, simply fill out this form:
       <td><input name="Twk1Name" onblur="var sIn = this.value; var sOut = ''; var chgUpper = true; for ( var i = 0; i &lt; sIn.length; i++ ) { var ch = sIn.charAt( i ); var ch2 = ''; if((ch=='à')||(ch=='á')||(ch=='â')||(ch=='ã')||(ch=='å') ) { ch = 'a'; } if( (ch=='è')||(ch=='é')||(ch=='ê') ) { ch = 'e'; } if( ch=='ç') { ch = 'c'; } if( ch=='ñ') { ch = 'n'; } if( (ch=='ò')||(ch=='ó')||(ch=='ô') ) { ch = 'o'; } if( ch=='ä') { ch = 'a'; ch2 = 'e'; } if( ch=='ö') { ch = 'o'; ch2 = 'e'; } if( (ch=='ù')||(ch=='ú')||(ch=='û') ) { ch = 'o'; } if( ch=='ü') { ch = 'u'; ch2 = 'e'; } if( ch=='Ä') { ch = 'A'; ch2 = 'e'; } if( ch=='Ö') { ch = 'O'; ch2 = 'e'; } if( ch=='Ü') { ch = 'U'; ch2 = 'e'; } if( ch=='ß') { ch = 's'; ch2 = 's'; } if( ((ch&gt;='a')&amp;&amp;(ch&lt;='z')) || ((ch&gt;='A')&amp;&amp;(ch&lt;='Z')) ) { if( chgUpper ) { ch = ch.toUpperCase(); chgUpper = false; } sOut+=ch; if( ch2!='') { sOut+=ch2; } } else { if( ch==' ' ) { chgUpper = true; } } } this.form.Twk1WikiName.value=sOut;" size="40" type="text" value="" /> <code><font color="red">**</font></code></td>
     </tr>
     <tr>
-      <td align="right"> Your <span style="background:"><font color="">Wiki Name</font></span><a href="http://LOCATION/WikiName">?</a>: </td>
+      <td align="right"> Your [[WikiName]]: </td>
       <td><input name="Twk1WikiName" size="40" type="text" value="" /> <code><font color="red">**</font></code></td>
     </tr>
     <tr>
diff --git a/TWiki/TWikiShorthand.mdwn b/TWiki/TWikiShorthand.mdwn
index 395d606d..1d7f2be2 100644
--- a/TWiki/TWikiShorthand.mdwn
+++ b/TWiki/TWikiShorthand.mdwn
@@ -21,7 +21,7 @@ Working in TWiki is as easy as typing in text - exactly like email. You don't ne
     </td>
   </tr>
   <tr bgcolor="#ffffff">
-    <td valign="top"><strong>Headings:</strong><br /> At least three dashes at the beginning of a line, followed by plus signs and the heading text. One plus creates a level 1 heading (most important), two pluses a level 2 heading; the maximum is level 6. <strong><em>Note:</em></strong> A Table of Content can be created automatically with the <code>%<nop>TOC%</nop></code> variable, see <span style="background:"><font color="">TWiki Variables</font></span><a href="http://LOCATION/TWikiVariables">?</a>. </td>
+    <td valign="top"><strong>Headings:</strong><br /> At least three dashes at the beginning of a line, followed by plus signs and the heading text. One plus creates a level 1 heading (most important), two pluses a level 2 heading; the maximum is level 6. <strong><em>Note:</em></strong> A Table of Content can be created automatically with the <code>%<nop>TOC%</nop></code> variable, see [[TWikiVariables]]. </td>
     <td valign="top"><span style="background: #FFFFCC"><font color="#990000"> <pre>
 <nop>---++ Sushi
 
@@ -200,37 +200,37 @@ class CatAnimal {
     </td>
   </tr>
   <tr bgcolor="#ffffff">
-    <td valign="top"><strong><nop>WikiWord Links:</nop></strong><br /><nop>CapitalizedWordsStuckTogether (or <span style="background:"><font color="">Wiki Words</font></span><a href="http://LOCATION/WikiWords">?</a>) will produce a link automatically. <br /><strong><em>Note:</em></strong> In case you want to link to a topic in a different %WIKITOOLNAME% web write <code>Webname.TopicName</code>. </nop></td>
+    <td valign="top"><strong><nop>WikiWord Links:</nop></strong><br /><nop>CapitalizedWordsStuckTogether (or [[WikiWords]]) will produce a link automatically. <br /><strong><em>Note:</em></strong> In case you want to link to a topic in a different %WIKITOOLNAME% web write <code>Webname.TopicName</code>. </nop></td>
     <td valign="top"><span style="background: #FFFFCC"><font color="#990000"> <pre>
 WebNotify
 
 Know.ReadmeFirst
 </pre> </font></span></td>
-    <td valign="top"><span style="background:"><font color="">Web Notify</font></span><a href="http://LOCATION/WebNotify">?</a><p><span style="background:"><font color="">Readme First</font></span><a href="http://LOCATIONKnow/ReadmeFirst">?</a></p>
+    <td valign="top">[[WebNotify]]<p>[[Know/ReadmeFirst]]</p>
     </td>
   </tr>
   <tr bgcolor="#ffffff">
-    <td valign="top"><a name="SquareBrackets"></a> <strong>Forced Links:</strong><br /> You can create a forced internal link by enclosing words in double square brackets. <br /><strong><em>Note:</em></strong> Text within the brackets may contain optional spaces; the topic name is formed by capitalizing the initial letter and by removing the spaces; i.e. <code>[<nop>[text formatting FAQ]]</nop></code> links to topic <span style="background:"><font color="">Text Formatting FAQ</font></span><a href="http://LOCATION/TextFormattingFAQ">?</a>. You can also refer to a different web and use anchors. </td>
+    <td valign="top"><a name="SquareBrackets"></a> <strong>Forced Links:</strong><br /> You can create a forced internal link by enclosing words in double square brackets. <br /><strong><em>Note:</em></strong> Text within the brackets may contain optional spaces; the topic name is formed by capitalizing the initial letter and by removing the spaces; i.e. <code>[<nop>[text formatting FAQ]]</nop></code> links to topic [[TextFormattingFAQ]]. You can also refer to a different web and use anchors. </td>
     <td valign="top"><span style="background: #FFFFCC"><font color="#990000"> <pre>
 [[wiki syntax]]
 
 [[%MAINWEB%.TWiki users]]
 </pre> </font></span></td>
-    <td valign="top"><span style="background:"><font color="">wiki syntax</font></span><a href="http://LOCATION/WikiSyntax">?</a><p><span style="background:"><font color="">%MAINWEB%.TWiki users</font></span><a href="http://LOCATION/MAINWEBTWikiUsers">?</a></p>
+    <td valign="top">[[WikiSyntax]]<p>[[MAINWEBTWikiUsers]]</p>
     </td>
   </tr>
   <tr bgcolor="#ffffff">
-    <td valign="top"><strong>Specific Links:</strong><br /> Create a link where you can specify the link text and the link reference separately, using nested square brackets like <code>[<nop>[reference][text]]</nop></code>. Internal link references (i.e. <span style="background:"><font color="">Wiki Syntax</font></span><a href="http://LOCATION/WikiSyntax">?</a>) and external link references (i.e. <a href="http://TWiki.org/)" target="_top">http://TWiki.org/)</a> are supported. The same <strong><em>Forced Links</em></strong> rules apply for internal link references. Anchor names can be added as well, like <code>[<nop>[WebHome#MyAnchor][go home]]</nop></code> and <code>[<nop>[http://www.yahoo.com/#somewhere][Yahoo!]]</nop></code>. </td>
+    <td valign="top"><strong>Specific Links:</strong><br /> Create a link where you can specify the link text and the link reference separately, using nested square brackets like <code>[<nop>[reference][text]]</nop></code>. Internal link references (i.e. [[WikiSyntax]]) and external link references (i.e. <a href="http://TWiki.org/)" target="_top">http://TWiki.org/)</a> are supported. The same <strong><em>Forced Links</em></strong> rules apply for internal link references. Anchor names can be added as well, like <code>[<nop>[WebHome#MyAnchor][go home]]</nop></code> and <code>[<nop>[http://www.yahoo.com/#somewhere][Yahoo!]]</nop></code>. </td>
     <td valign="top"><span style="background: #FFFFCC"><font color="#990000"> <pre>
 [[WikiSyntax][syntax]]
 
 [[http://gnu.org][GNU]]
 </pre> </font></span></td>
-    <td valign="top"><span style="background:"><font color="">syntax</font></span><a href="http://LOCATION/WikiSyntax">?</a><p><a href="http://gnu.org" target="_top">GNU</a></p>
+    <td valign="top">[[WikiSyntax]]<p><a href="http://gnu.org" target="_top">GNU</a></p>
     </td>
   </tr>
   <tr bgcolor="#ffffff">
-    <td valign="top"><strong>Anchors:</strong><br /> You can define a link reference inside a %WIKITOOLNAME% topic (called an anchor name) and link to that. To <strong><em>define</em></strong> an anchor write <code>#AnchorName</code> at the beginning of a line. The anchor name must be a <span style="background:"><font color="">Wiki Word</font></span><a href="http://LOCATION/WikiWord">?</a>. To <strong><em>link to</em></strong> an anchor name use the <code>[<nop>[MyTopic#MyAnchor]]</nop></code> syntax. You can omit the topic name if you want to link within the same topic. </td>
+    <td valign="top"><strong>Anchors:</strong><br /> You can define a link reference inside a %WIKITOOLNAME% topic (called an anchor name) and link to that. To <strong><em>define</em></strong> an anchor write <code>#AnchorName</code> at the beginning of a line. The anchor name must be a [[WikiWord]]. To <strong><em>link to</em></strong> an anchor name use the <code>[<nop>[MyTopic#MyAnchor]]</nop></code> syntax. You can omit the topic name if you want to link within the same topic. </td>
     <td valign="top"><span style="background: #FFFFCC"><font color="#990000"> <pre>
 [[WebHome#NotThere]]
 
@@ -238,12 +238,12 @@ Know.ReadmeFirst
 
 #MyAnchor To here
 </pre> </font></span></td>
-    <td valign="top"><span style="background:"><font color="">Web Home#Not There</font></span><a href="http://LOCATION/WebHome">?</a><p> Jump </p>
+    <td valign="top">[[WebHome]]<p> Jump </p>
       <p><a name="MyAnchor"></a> To here </p>
     </td>
   </tr>
   <tr bgcolor="#ffffff">
-    <td valign="top"><strong>Prevent a Link:</strong><br /> Prevent a <span style="background:"><font color="">Wiki Word</font></span><a href="http://LOCATION/WikiWord">?</a> from being linked by prepending it with the <code>&amp;lt;nop&amp;gt;</code> tag. </td>
+    <td valign="top"><strong>Prevent a Link:</strong><br /> Prevent a [[WikiWord]] from being linked by prepending it with the <code>&amp;lt;nop&amp;gt;</code> tag. </td>
     <td valign="top"><span style="background: #FFFFCC"><font color="#990000"> <pre>
 &amp;lt;nop&amp;gt;SunOS
 </pre> </font></span></td>
diff --git a/TWiki/TWikiTemplates.mdwn b/TWiki/TWikiTemplates.mdwn
index dbf625fe..9929d8c4 100644
--- a/TWiki/TWikiTemplates.mdwn
+++ b/TWiki/TWikiTemplates.mdwn
@@ -103,15 +103,15 @@ Template topics define the default text for new topics. There are three types of
 >     <th bgcolor="#99CCCC"><strong>What it is:</strong></th>
 >   </tr>
 >   <tr>
->     <td><span style="background:"><font color="">Web Topic View Template</font></span><a href="http://LOCATION/WebTopicViewTemplate">?</a></td>
+>     <td>[[WebTopicViewTemplate]]</td>
 >     <td> Help text shown when you view a non existing topic. </td>
 >   </tr>
 >   <tr>
->     <td><span style="background:"><font color="">Web Topic Non Wiki Template</font></span><a href="http://LOCATION/WebTopicNonWikiTemplate">?</a></td>
->     <td> Help text shown when you view a non existing topic that has not a <span style="background:"><font color="">Wiki Name</font></span><a href="http://LOCATION/WikiName">?</a>. </td>
+>     <td>[[WebTopicNonWikiTemplate]]</td>
+>     <td> Help text shown when you view a non existing topic that has not a [[WikiName]]. </td>
 >   </tr>
 >   <tr>
->     <td><span style="background:"><font color="">Web Topic Edit Template</font></span><a href="http://LOCATION/WebTopicEditTemplate">?</a></td>
+>     <td>[[WebTopicEditTemplate]]</td>
 >     <td> Default text shown when you create a new topic. </td>
 >   </tr>
 > </table>
diff --git a/TWiki/TWikiTemplates/testscreen.gif b/TWiki/TWikiTemplates/testscreen.gif
new file mode 100644
index 00000000..179b083d
--- /dev/null
+++ b/TWiki/TWikiTemplates/testscreen.gif
diff --git a/TWiki/TWikiVariables.mdwn b/TWiki/TWikiVariables.mdwn
index 869f8834..532e7c66 100644
--- a/TWiki/TWikiVariables.mdwn
+++ b/TWiki/TWikiVariables.mdwn
@@ -97,11 +97,11 @@ Most predefined variables return values that were either defined when TWiki was
   </tr>
   <tr>
     <td><code>%<nop>HOMETOPIC%</nop></code></td>
-    <td> The home topic in each web. Is <b><span style="background:"><font color="">%HOMETOPIC%</font></span><a href="http://LOCATION/HOMETOPIC">?</a></b></td>
+    <td> The home topic in each web. Is <b>[[HOMETOPIC]]</b></td>
   </tr>
   <tr>
     <td><code>%<nop>NOTIFYTOPIC%</nop></code></td>
-    <td> The notify topic in each web. Is <b><span style="background:"><font color="">%NOTIFYTOPIC%</font></span><a href="http://LOCATION/NOTIFYTOPIC">?</a></b></td>
+    <td> The notify topic in each web. Is <b>[[NOTIFYTOPIC]]</b></td>
   </tr>
   <tr>
     <td><code>%<nop>WIKIUSERSTOPIC%</nop></code></td>
@@ -285,7 +285,7 @@ Most predefined variables return values that were either defined when TWiki was
   </tr>
   <tr>
     <td><code>%<nop>INCLUDE{"page" ...}%</nop></code></td>
-    <td> Server side include to <span style="background:"><font color="">Include Topics And Web Pages</font></span><a href="http://LOCATION/IncludeTopicsAndWebPages">?</a>. Parameters are page name, and an optional <code>pattern="(reg-exp)"</code>. The page name is: <table border="1" cellpadding="1" cellspacing="0">
+    <td> Server side include to [[IncludeTopicsAndWebPages]]. Parameters are page name, and an optional <code>pattern="(reg-exp)"</code>. The page name is: <table border="1" cellpadding="1" cellspacing="0">
         <tr>
           <td><code>"SomeTopic"</code></td>
           <td> The name of a topic located in the current web, i.e. <code>%<nop>INCLUDE{"WebNotify"}%</nop></code></td>
@@ -315,7 +315,7 @@ Most predefined variables return values that were either defined when TWiki was
   </tr>
   <tr>
     <td><code>%<nop>TOC{"SomeTopic" ...}%</nop></code></td>
-    <td> Table of Contents. Shows a TOC that is generated automatically based on headings of a topic. Headings in <span style="background:"><font color="">Wiki Syntax</font></span><a href="http://LOCATION/WikiSyntax">?</a> (<code>"---++ text"</code>) and HTML (<code>"&amp;lt;h2&amp;gt;text&amp;lt;h2&amp;gt;"</code>) are taken into account. (But not <code>"&amp;lt;H2&amp;gt;text&amp;lt;/H2&amp;gt;"</code>, which can be used to exclude a heading from the TOC.) Parameters are topic name, web and depth: <table border="1" cellpadding="1" cellspacing="0">
+    <td> Table of Contents. Shows a TOC that is generated automatically based on headings of a topic. Headings in [[WikiSyntax]] (<code>"---++ text"</code>) and HTML (<code>"&amp;lt;h2&amp;gt;text&amp;lt;h2&amp;gt;"</code>) are taken into account. (But not <code>"&amp;lt;H2&amp;gt;text&amp;lt;/H2&amp;gt;"</code>, which can be used to exclude a heading from the TOC.) Parameters are topic name, web and depth: <table border="1" cellpadding="1" cellspacing="0">
         <tr>
           <th bgcolor="#99CCCC"><strong>Parameter:</strong></th>
           <th bgcolor="#99CCCC"><strong>Description:</strong></th>
@@ -378,7 +378,7 @@ Most predefined variables return values that were either defined when TWiki was
         </tr>
         <tr>
           <td><code>regex="on"</code></td>
-          <td><span style="background:"><font color="">Regular Expression</font></span><a href="http://LOCATION/RegularExpression">?</a> search </td>
+          <td>[[RegularExpression]] search </td>
           <td> Literal search </td>
         </tr>
         <tr>
@@ -398,7 +398,7 @@ Most predefined variables return values that were either defined when TWiki was
         </tr>
         <tr>
           <td><code>bookview="on"</code></td>
-          <td><span style="background:"><font color="">Book View</font></span><a href="http://LOCATION/BookView">?</a> search, e.g. show complete topic text </td>
+          <td>[[BookView]] search, e.g. show complete topic text </td>
           <td> Show topic summary </td>
         </tr>
         <tr>
@@ -418,7 +418,7 @@ Most predefined variables return values that were either defined when TWiki was
         </tr>
         <tr>
           <td><code><b>format="..."</b></code></td>
-          <td> Flexible custom result formatting: see <strong><span style="background:"><font color="">Formatted Search</font></span><a href="http://LOCATION/FormattedSearch">?</a></strong> for usage </td>
+          <td> Flexible custom result formatting: see <strong>[[FormattedSearch]]</strong> for usage </td>
           <td> Results in table </td>
         </tr>
       </table> Example: <code><b>%<nop>SEARCH{"wiki" web="%MAINWEB%" scope="topic"}%</nop></b></code></td>
@@ -451,7 +451,7 @@ Most predefined variables return values that were either defined when TWiki was
           <td> Text the is pre-pended to any search results </td>
           <td> required </td>
         </tr>
-      </table> Example: <code><b>%<nop>METASEARCH{type="topicmoved" web="%<nop>WEB%" topic="%<nop>TOPIC%" title="This topic used to exist and was moved to: "}%</nop></nop></nop></b></code>, you may want to use this in <span style="background:"><font color="">Web Topic View Template</font></span><a href="http://LOCATION/WebTopicViewTemplate">?</a> and <span style="background:"><font color="">Web Topic Non Wiki Template</font></span><a href="http://LOCATION/WebTopicNonWikiTemplate">?</a><br /><code><b>%<nop>METASEARCH{type="parent" web="%<nop>WEB%" topic="%<nop>TOPIC%" title="Children: "}%</nop></nop></nop></b></code></td>
+      </table> Example: <code><b>%<nop>METASEARCH{type="topicmoved" web="%<nop>WEB%" topic="%<nop>TOPIC%" title="This topic used to exist and was moved to: "}%</nop></nop></nop></b></code>, you may want to use this in [[WebTopicViewTemplate]] and [[WebTopicNonWikiTemplate]]<br /><code><b>%<nop>METASEARCH{type="parent" web="%<nop>WEB%" topic="%<nop>TOPIC%" title="Children: "}%</nop></nop></nop></b></code></td>
   </tr>
   <tr>
     <td><code>%<nop>VAR{"NAME" web="Web"}%</nop></code></td>
@@ -530,12 +530,12 @@ Additional variables are defined in the preferences ( site-level ( **_SL_** ) in
   <tr>
     <td><code>%<nop>RELEASEEDITLOCKCHECKBOX%</nop></code></td>
     <td><strong><em>SL</em></strong> , <strong><em>UL</em></strong></td>
-    <td> Default state of the "Release edit lock" (<span style="background:"><font color="">Unlock Topic</font></span><a href="http://LOCATION/UnlockTopic">?</a>) check box in preview. Checkbox is initially checked if <code>Set RELEASEEDITLOCKCHECKBOX = checked="checked"</code>, or unchecked if empty. If checked, make sure to click on <u>Edit</u> to do more changes; do <strong>not</strong> go back in your browser to the edit page, or you risk that someone else will edit the topic at the same time! Value is: <b><code>%RELEASEEDITLOCKCHECKBOX%</code></b></td>
+    <td> Default state of the "Release edit lock" ([[UnlockTopic]]) check box in preview. Checkbox is initially checked if <code>Set RELEASEEDITLOCKCHECKBOX = checked="checked"</code>, or unchecked if empty. If checked, make sure to click on <u>Edit</u> to do more changes; do <strong>not</strong> go back in your browser to the edit page, or you risk that someone else will edit the topic at the same time! Value is: <b><code>%RELEASEEDITLOCKCHECKBOX%</code></b></td>
   </tr>
   <tr>
     <td><code>%<nop>DONTNOTIFYCHECKBOX%</nop></code></td>
     <td><strong><em>SL</em></strong> , <strong><em>UL</em></strong></td>
-    <td> Default state of the "Minor Changes, Don't Notify" (<span style="background:"><font color="">Dont Notify</font></span><a href="http://LOCATION/DontNotify">?</a>) check box in preview. Check box is initially checked if <code>Set DONTNOTIFYCHECKBOX = checked="checked"</code>, or unchecked if empty. Value is: <b><code>%DONTNOTIFYCHECKBOX%</code></b></td>
+    <td> Default state of the "Minor Changes, Don't Notify" ([[DontNotify]]) check box in preview. Check box is initially checked if <code>Set DONTNOTIFYCHECKBOX = checked="checked"</code>, or unchecked if empty. Value is: <b><code>%DONTNOTIFYCHECKBOX%</code></b></td>
   </tr>
   <tr>
     <td><code>%<nop>ATTACHLINKBOX%</nop></code></td>
@@ -560,42 +560,42 @@ Additional variables are defined in the preferences ( site-level ( **_SL_** ) in
   <tr>
     <td><code>%<nop>DENYWEBCHANGE%</nop></code></td>
     <td><strong><em>WL</em></strong></td>
-    <td> List of users and groups who are <strong>not allowed</strong> to change topics in the %WIKITOOLNAME% web. (More in <span style="background:"><font color="">TWiki Access Control</font></span><a href="http://LOCATION/TWikiAccessControl">?</a>) </td>
+    <td> List of users and groups who are <strong>not allowed</strong> to change topics in the %WIKITOOLNAME% web. (More in [[TWikiAccessControl]]) </td>
   </tr>
   <tr>
     <td><code>%<nop>ALLOWWEBCHANGE%</nop></code></td>
     <td><strong><em>WL</em></strong></td>
-    <td> List of users and groups who are <strong>allowed</strong> to change topics in the %WIKITOOLNAME% web. (More in <span style="background:"><font color="">TWiki Access Control</font></span><a href="http://LOCATION/TWikiAccessControl">?</a>) </td>
+    <td> List of users and groups who are <strong>allowed</strong> to change topics in the %WIKITOOLNAME% web. (More in [[TWikiAccessControl]]) </td>
   </tr>
   <tr>
     <td><code>%<nop>DENYTOPICCHANGE%</nop></code></td>
     <td><strong><em>(any topic)</em></strong></td>
-    <td> List of users and groups who are <strong>not allowed</strong> to change the current topic. (More in <span style="background:"><font color="">TWiki Access Control</font></span><a href="http://LOCATION/TWikiAccessControl">?</a>) </td>
+    <td> List of users and groups who are <strong>not allowed</strong> to change the current topic. (More in [[TWikiAccessControl]]) </td>
   </tr>
   <tr>
     <td><code>%<nop>ALLOWTOPICCHANGE%</nop></code></td>
     <td><strong><em>(any topic)</em></strong></td>
-    <td> List of users and groups who are <strong>allowed</strong> to change the current topic. (More in <span style="background:"><font color="">TWiki Access Control</font></span><a href="http://LOCATION/TWikiAccessControl">?</a>) </td>
+    <td> List of users and groups who are <strong>allowed</strong> to change the current topic. (More in [[TWikiAccessControl]]) </td>
   </tr>
   <tr>
     <td><code>%<nop>DENYWEBRENAME%</nop></code></td>
     <td><strong><em>WL</em></strong></td>
-    <td> List of users and groups who are <strong>not allowed</strong> to rename topics in the %WIKITOOLNAME% web. (More in <span style="background:"><font color="">TWiki Access Control</font></span><a href="http://LOCATION/TWikiAccessControl">?</a>) </td>
+    <td> List of users and groups who are <strong>not allowed</strong> to rename topics in the %WIKITOOLNAME% web. (More in [[TWikiAccessControl]]) </td>
   </tr>
   <tr>
     <td><code>%<nop>ALLOWWEBRENAME%</nop></code></td>
     <td><strong><em>WL</em></strong></td>
-    <td> List of users and groups who are <strong>allowed</strong> to rename topics in the %WIKITOOLNAME% web. (More in <span style="background:"><font color="">TWiki Access Control</font></span><a href="http://LOCATION/TWikiAccessControl">?</a>) </td>
+    <td> List of users and groups who are <strong>allowed</strong> to rename topics in the %WIKITOOLNAME% web. (More in [[TWikiAccessControl]]) </td>
   </tr>
   <tr>
     <td><code>%<nop>DENYTOPICRENAME%</nop></code></td>
     <td><strong><em>(any topic)</em></strong></td>
-    <td> List of users and groups who are <strong>not allowed</strong> to rename the current topic. (More in <span style="background:"><font color="">TWiki Access Control</font></span><a href="http://LOCATION/TWikiAccessControl">?</a>) </td>
+    <td> List of users and groups who are <strong>not allowed</strong> to rename the current topic. (More in [[TWikiAccessControl]]) </td>
   </tr>
   <tr>
     <td><code>%<nop>ALLOWTOPICRENAME%</nop></code></td>
     <td><strong><em>(any topic)</em></strong></td>
-    <td> List of users and groups who are <strong>allowed</strong> to rename the current topic. (More in <span style="background:"><font color="">TWiki Access Control</font></span><a href="http://LOCATION/TWikiAccessControl">?</a>) </td>
+    <td> List of users and groups who are <strong>allowed</strong> to rename the current topic. (More in [[TWikiAccessControl]]) </td>
   </tr>
   <tr>
     <td>
diff --git a/TWiki/TWikiWebsTable.mdwn b/TWiki/TWikiWebsTable.mdwn
index 858b37b8..b3165bdd 100644
--- a/TWiki/TWikiWebsTable.mdwn
+++ b/TWiki/TWikiWebsTable.mdwn
@@ -4,48 +4,48 @@
     <th> Use to: </th>
   </tr>
   <tr bgcolor="%VAR{" web="Hurd" webbgcolor"="WEBBGCOLOR"" }%"="}%"">
-    <td><b>%WIKITOOLNAME%.<span style="background:"><font color="">Hurd</font></span><a href="http://LOCATIONHurd/HOMETOPIC">?</a></b></td>
-    <td> The GNU/Hurd area. <font size="-2">     <nobr> [ <span style="background:"><font color="">Changes</font></span><a href="http://LOCATIONHurd/WebChanges">?</a> | <span style="background:"><font color="">Search</font></span><a href="http://LOCATIONHurd/WebSearch">?</a> ] </nobr></font></td>
+    <td><b>%WIKITOOLNAME%.[[Hurd/HOMETOPIC]]</b></td>
+    <td> The GNU/Hurd area. <font size="-2">     <nobr> [ [[Hurd/WebChanges]] | [[Hurd/WebSearch]] ] </nobr></font></td>
     <td> Concerns everything directly related to the Hurd (it was the first section). </td>
   </tr>
   <tr bgcolor="%VAR{" web="Distrib" webbgcolor"="WEBBGCOLOR"" }%"="}%"">
-    <td><b>%WIKITOOLNAME%.<span style="background:"><font color="">Distrib</font></span><a href="http://LOCATIONDistrib/HOMETOPIC">?</a></b></td>
-    <td> The distribution area. <font size="-2">     <nobr> [ <span style="background:"><font color="">Changes</font></span><a href="http://LOCATIONDistrib/WebChanges">?</a> | <span style="background:"><font color="">Search</font></span><a href="http://LOCATIONDistrib/WebSearch">?</a> ] </nobr></font></td>
+    <td><b>%WIKITOOLNAME%.[[Distrib/HOMETOPIC]]</b></td>
+    <td> The distribution area. <font size="-2">     <nobr> [ [[Distrib/WebChanges]] | [[Distrib/WebSearch]] ] </nobr></font></td>
     <td> Debian GNU/Hurd distribution related information goes here. </td>
   </tr>
   <tr bgcolor="%VAR{" web="Mach" webbgcolor"="WEBBGCOLOR"" }%"="}%"">
-    <td><b>%WIKITOOLNAME%.<span style="background:"><font color="">Mach</font></span><a href="http://LOCATIONMach/HOMETOPIC">?</a></b></td>
-    <td> The Mach area. <font size="-2">     <nobr> [ <span style="background:"><font color="">Changes</font></span><a href="http://LOCATIONMach/WebChanges">?</a> | <span style="background:"><font color="">Search</font></span><a href="http://LOCATIONMach/WebSearch">?</a> ] </nobr></font></td>
+    <td><b>%WIKITOOLNAME%.[[Mach/HOMETOPIC]]</b></td>
+    <td> The Mach area. <font size="-2">     <nobr> [ [[Mach/WebChanges]] | [[Mach/WebSearch]] ] </nobr></font></td>
     <td> Topics on the GNU Mach microkernel, and the OSKit based Mach (GNUmach 2). </td>
   </tr>
   <tr bgcolor="%VAR{" web="GNU" webbgcolor"="WEBBGCOLOR"" }%"="}%"">
-    <td><b>%WIKITOOLNAME%.<span style="background:"><font color="">GNU</font></span><a href="http://LOCATIONGNU/HOMETOPIC">?</a></b></td>
-    <td> The GNU area. <font size="-2">     <nobr> [ <span style="background:"><font color="">Changes</font></span><a href="http://LOCATIONGNU/WebChanges">?</a> | <span style="background:"><font color="">Search</font></span><a href="http://LOCATIONGNU/WebSearch">?</a> ] </nobr></font></td>
+    <td><b>%WIKITOOLNAME%.[[GNU/HOMETOPIC]]</b></td>
+    <td> The GNU area. <font size="-2">     <nobr> [ [[GNU/WebChanges]] | [[GNU/WebSearch]] ] </nobr></font></td>
     <td> Holds all GNUish related information regarding the Hurd. </td>
   </tr>
   <tr bgcolor="%VAR{" web="Mig" webbgcolor"="WEBBGCOLOR"" }%"="}%"">
-    <td><b>%WIKITOOLNAME%.<span style="background:"><font color="">Mig</font></span><a href="http://LOCATIONMig/HOMETOPIC">?</a></b></td>
-    <td> The MIG area. <font size="-2">     <nobr> [ <span style="background:"><font color="">Changes</font></span><a href="http://LOCATIONMig/WebChanges">?</a> | <span style="background:"><font color="">Search</font></span><a href="http://LOCATIONMig/WebSearch">?</a> ] </nobr></font></td>
+    <td><b>%WIKITOOLNAME%.[[Mig/HOMETOPIC]]</b></td>
+    <td> The MIG area. <font size="-2">     <nobr> [ [[Mig/WebChanges]] | [[Mig/WebSearch]] ] </nobr></font></td>
     <td> Thin section on the Mach interface generator, only for developers. </td>
   </tr>
   <tr bgcolor="%VAR{" web="Hug" webbgcolor"="WEBBGCOLOR"" }%"="}%"">
-    <td><b>%WIKITOOLNAME%.<span style="background:"><font color="">Hug</font></span><a href="http://LOCATIONHug/HOMETOPIC">?</a></b></td>
-    <td> Sandbox for users to play in. <font size="-2">     <nobr> [ <span style="background:"><font color="">Changes</font></span><a href="http://LOCATIONHug/WebChanges">?</a> | <span style="background:"><font color="">Search</font></span><a href="http://LOCATIONHug/WebSearch">?</a> ] </nobr></font></td>
+    <td><b>%WIKITOOLNAME%.[[Hug/HOMETOPIC]]</b></td>
+    <td> Sandbox for users to play in. <font size="-2">     <nobr> [ [[Hug/WebChanges]] | [[Hug/WebSearch]] ] </nobr></font></td>
     <td> Here is where you can play freely and practise your Wiki-Fu. Have fun! </td>
   </tr>
   <tr bgcolor="%VAR{" web="%MAINWEB%" webbgcolor"="WEBBGCOLOR"" }%"="}%"">
-    <td><b>%WIKITOOLNAME%.<span style="background:"><font color="">%MAINWEB%</font></span><a href="http://LOCATION/MAINWEBHOMETOPIC">?</a></b></td>
-    <td> This is where all the <span style="background:"><font color="">Users</font></span><a href="http://LOCATION/MAINWEBWIKIUSERSTOPIC">?</a> home pages are located, - tour this expandable virtual workspace. <font size="-2">     <nobr> [ <span style="background:"><font color="">Changes</font></span><a href="http://LOCATION/MAINWEBWebChanges">?</a> | <span style="background:"><font color="">Search</font></span><a href="http://LOCATION/MAINWEBWebSearch">?</a> ] </nobr></font></td>
+    <td><b>%WIKITOOLNAME%.[[MAINWEBHOMETOPIC]]</b></td>
+    <td> This is where all the [[MAINWEBWIKIUSERSTOPIC]] home pages are located, - tour this expandable virtual workspace. <font size="-2">     <nobr> [ [[MAINWEBWebChanges]] | [[MAINWEBWebSearch]] ] </nobr></font></td>
     <td> Aquaint yourself with the people lurking here. </td>
   </tr>
   <tr bgcolor="%VAR{" web="%TWIKIWEB%" webbgcolor"="WEBBGCOLOR"" }%"="}%"">
-    <td><b>%WIKITOOLNAME%.<span style="background:"><font color="">%TWIKIWEB%</font></span><a href="http://LOCATION/TWIKIWEBHOMETOPIC">?</a></b></td>
-    <td> %TWIKIWEB%.TWikiRegistration; TWiki history &amp;amp; Wiki style; FAQs, Quick Starts, User Guide &amp;amp; Reference Manual. All the info... <font size="-2">     <nobr> [ <span style="background:"><font color="">Changes</font></span><a href="http://LOCATION/TWIKIWEBWebChanges">?</a> | <span style="background:"><font color="">Search</font></span><a href="http://LOCATION/TWIKIWEBWebSearch">?</a> ] </nobr></font></td>
+    <td><b>%WIKITOOLNAME%.[[TWIKIWEBHOMETOPIC]]</b></td>
+    <td> %TWIKIWEB%.TWikiRegistration; TWiki history &amp;amp; Wiki style; FAQs, Quick Starts, User Guide &amp;amp; Reference Manual. All the info... <font size="-2">     <nobr> [ [[TWIKIWEBWebChanges]] | [[TWIKIWEBWebSearch]] ] </nobr></font></td>
     <td> Discover TWiki, and how to start your own site. </td>
   </tr>
   <tr bgcolor="%VAR{" web="Test" webbgcolor"="WEBBGCOLOR"" }%"="}%"">
-    <td><b>%WIKITOOLNAME%.<span style="background:"><font color="">Test</font></span><a href="http://LOCATIONTest/HOMETOPIC">?</a></b></td>
-    <td> Sandbox for users to play in. <font size="-2">     <nobr> [ <span style="background:"><font color="">Changes</font></span><a href="http://LOCATIONTest/WebChanges">?</a> | <span style="background:"><font color="">Search</font></span><a href="http://LOCATIONTest/WebSearch">?</a> ] </nobr></font></td>
+    <td><b>%WIKITOOLNAME%.[[Test/HOMETOPIC]]</b></td>
+    <td> Sandbox for users to play in. <font size="-2">     <nobr> [ [[Test/WebChanges]] | [[Test/WebSearch]] ] </nobr></font></td>
     <td> Here is where you can play freely and practise your Wiki-Fu. Have fun! </td>
   </tr>
   <tr bgcolor="#ffffff">
diff --git a/TWiki/TextFormattingRules.mdwn b/TWiki/TextFormattingRules.mdwn
index 84bbdf4b..40203834 100644
--- a/TWiki/TextFormattingRules.mdwn
+++ b/TWiki/TextFormattingRules.mdwn
@@ -25,7 +25,7 @@ Working in TWiki is as easy as typing in text - exactly like email. You don't ne
     </td>
   </tr>
   <tr bgcolor="#ffffff">
-    <td valign="top"><strong>Headings:</strong><br /> At least three dashes at the beginning of a line, followed by plus signs and the heading text. One plus creates a level 1 heading (most important), two pluses a level 2 heading; the maximum is level 6. <strong><em>Note:</em></strong> A Table of Content can be created automatically with the <code>%<nop>TOC%</nop></code> variable, see <span style="background:"><font color="">TWiki Variables</font></span><a href="http://LOCATION/TWikiVariables">?</a>. </td>
+    <td valign="top"><strong>Headings:</strong><br /> At least three dashes at the beginning of a line, followed by plus signs and the heading text. One plus creates a level 1 heading (most important), two pluses a level 2 heading; the maximum is level 6. <strong><em>Note:</em></strong> A Table of Content can be created automatically with the <code>%<nop>TOC%</nop></code> variable, see [[TWikiVariables]]. </td>
     <td valign="top"><span style="background: #FFFFCC"><font color="#990000"> <pre>
 <nop>---++ Sushi
 
@@ -204,37 +204,37 @@ class CatAnimal {
     </td>
   </tr>
   <tr bgcolor="#ffffff">
-    <td valign="top"><strong><nop>WikiWord Links:</nop></strong><br /><nop>CapitalizedWordsStuckTogether (or <span style="background:"><font color="">Wiki Words</font></span><a href="http://LOCATION/WikiWords">?</a>) will produce a link automatically. <br /><strong><em>Note:</em></strong> In case you want to link to a topic in a different %WIKITOOLNAME% web write <code>Webname.TopicName</code>. </nop></td>
+    <td valign="top"><strong><nop>WikiWord Links:</nop></strong><br /><nop>CapitalizedWordsStuckTogether (or [[WikiWords]]) will produce a link automatically. <br /><strong><em>Note:</em></strong> In case you want to link to a topic in a different %WIKITOOLNAME% web write <code>Webname.TopicName</code>. </nop></td>
     <td valign="top"><span style="background: #FFFFCC"><font color="#990000"> <pre>
 WebNotify
 
 Know.ReadmeFirst
 </pre> </font></span></td>
-    <td valign="top"><span style="background:"><font color="">Web Notify</font></span><a href="http://LOCATION/WebNotify">?</a><p><span style="background:"><font color="">Readme First</font></span><a href="http://LOCATIONKnow/ReadmeFirst">?</a></p>
+    <td valign="top">[[WebNotify]]<p>[[Know/ReadmeFirst]]</p>
     </td>
   </tr>
   <tr bgcolor="#ffffff">
-    <td valign="top">#SquareBrackets <strong>Forced Links:</strong><br /> You can create a forced internal link by enclosing words in double square brackets. <br /><strong><em>Note:</em></strong> Text within the brackets may contain optional spaces; the topic name is formed by capitalizing the initial letter and by removing the spaces; i.e. <code>[<nop>[text formatting FAQ]]</nop></code> links to topic <span style="background:"><font color="">Text Formatting FAQ</font></span><a href="http://LOCATION/TextFormattingFAQ">?</a>. You can also refer to a different web and use anchors. </td>
+    <td valign="top">#SquareBrackets <strong>Forced Links:</strong><br /> You can create a forced internal link by enclosing words in double square brackets. <br /><strong><em>Note:</em></strong> Text within the brackets may contain optional spaces; the topic name is formed by capitalizing the initial letter and by removing the spaces; i.e. <code>[<nop>[text formatting FAQ]]</nop></code> links to topic [[TextFormattingFAQ]]. You can also refer to a different web and use anchors. </td>
     <td valign="top"><span style="background: #FFFFCC"><font color="#990000"> <pre>
 [[wiki syntax]]
 
 [[%MAINWEB%.TWiki users]]
 </pre> </font></span></td>
-    <td valign="top"><span style="background:"><font color="">wiki syntax</font></span><a href="http://LOCATION/WikiSyntax">?</a><p><span style="background:"><font color="">%MAINWEB%.TWiki users</font></span><a href="http://LOCATION/MAINWEBTWikiUsers">?</a></p>
+    <td valign="top">[[WikiSyntax]]<p>[[MAINWEBTWikiUsers]]</p>
     </td>
   </tr>
   <tr bgcolor="#ffffff">
-    <td valign="top"><strong>Specific Links:</strong><br /> Create a link where you can specify the link text and the link reference separately, using nested square brackets like <code>[<nop>[reference][text]]</nop></code>. Internal link references (i.e. <span style="background:"><font color="">Wiki Syntax</font></span><a href="http://LOCATION/WikiSyntax">?</a>) and external link references (i.e. <a href="http://TWiki.org/)" target="_top">http://TWiki.org/)</a> are supported. The same <strong><em>Forced Links</em></strong> rules apply for internal link references. Anchor names can be added as well, like <code>[<nop>[WebHome#MyAnchor][go home]]</nop></code> and <code>[<nop>[http://www.yahoo.com/#somewhere][Yahoo!]]</nop></code>. </td>
+    <td valign="top"><strong>Specific Links:</strong><br /> Create a link where you can specify the link text and the link reference separately, using nested square brackets like <code>[<nop>[reference][text]]</nop></code>. Internal link references (i.e. [[WikiSyntax]]) and external link references (i.e. <a href="http://TWiki.org/)" target="_top">http://TWiki.org/)</a> are supported. The same <strong><em>Forced Links</em></strong> rules apply for internal link references. Anchor names can be added as well, like <code>[<nop>[WebHome#MyAnchor][go home]]</nop></code> and <code>[<nop>[http://www.yahoo.com/#somewhere][Yahoo!]]</nop></code>. </td>
     <td valign="top"><span style="background: #FFFFCC"><font color="#990000"> <pre>
 [[WikiSyntax][syntax]]
 
 [[http://gnu.org][GNU]]
 </pre> </font></span></td>
-    <td valign="top"><span style="background:"><font color="">syntax</font></span><a href="http://LOCATION/WikiSyntax">?</a><p><a href="http://gnu.org" target="_top">GNU</a></p>
+    <td valign="top">[[WikiSyntax]]<p><a href="http://gnu.org" target="_top">GNU</a></p>
     </td>
   </tr>
   <tr bgcolor="#ffffff">
-    <td valign="top"><strong>Anchors:</strong><br /> You can define a link reference inside a %WIKITOOLNAME% topic (called an anchor name) and link to that. To <strong><em>define</em></strong> an anchor write <code>#AnchorName</code> at the beginning of a line. The anchor name must be a <span style="background:"><font color="">Wiki Word</font></span><a href="http://LOCATION/WikiWord">?</a>. To <strong><em>link to</em></strong> an anchor name use the <code>[<nop>[MyTopic#MyAnchor]]</nop></code> syntax. You can omit the topic name if you want to link within the same topic. </td>
+    <td valign="top"><strong>Anchors:</strong><br /> You can define a link reference inside a %WIKITOOLNAME% topic (called an anchor name) and link to that. To <strong><em>define</em></strong> an anchor write <code>#AnchorName</code> at the beginning of a line. The anchor name must be a [[WikiWord]]. To <strong><em>link to</em></strong> an anchor name use the <code>[<nop>[MyTopic#MyAnchor]]</nop></code> syntax. You can omit the topic name if you want to link within the same topic. </td>
     <td valign="top"><span style="background: #FFFFCC"><font color="#990000"> <pre>
 [[WebHome#NotThere]]
 
@@ -242,12 +242,12 @@ Know.ReadmeFirst
 
 #MyAnchor To here
 </pre> </font></span></td>
-    <td valign="top"><span style="background:"><font color="">Web Home#Not There</font></span><a href="http://LOCATION/WebHome">?</a><p> Jump </p>
+    <td valign="top">[[WebHome]]<p> Jump </p>
       <p><a name="MyAnchor"></a> To here </p>
     </td>
   </tr>
   <tr bgcolor="#ffffff">
-    <td valign="top"><strong>Prevent a Link:</strong><br /> Prevent a <span style="background:"><font color="">Wiki Word</font></span><a href="http://LOCATION/WikiWord">?</a> from being linked by prepending it with the <code>&amp;lt;nop&amp;gt;</code> tag. </td>
+    <td valign="top"><strong>Prevent a Link:</strong><br /> Prevent a [[WikiWord]] from being linked by prepending it with the <code>&amp;lt;nop&amp;gt;</code> tag. </td>
     <td valign="top"><span style="background: #FFFFCC"><font color="#990000"> <pre>
 &amp;lt;nop&amp;gt;SunOS
 </pre> </font></span></td>
diff --git a/TWiki/TigerSkin/RCS/menuscript.js b/TWiki/TigerSkin/RCS/menuscript.js
new file mode 100644
index 00000000..6b30f176
--- /dev/null
+++ b/TWiki/TigerSkin/RCS/menuscript.js
@@ -0,0 +1,289 @@
+// Determine browser type (Netscape 6 or IE 5.5).
+
+
+var isIE5 = (navigator.userAgent.indexOf("MSIE 5.5") > 0) ? 1 : 0;
+var isIE5 = (navigator.userAgent.indexOf("MSIE 5") > 0) ? 1 : 0;
+var isNS6 = (navigator.userAgent.indexOf("Gecko")    > 0) ? 1 : 0;
+var isNS4 = ((navigator.appName.indexOf("Netscape")==0)
+			&&(navigator.userAgent.indexOf("Mozilla/4")  == 0)) ? 1 : 0;
+
+//if (isNS4==0)
+// alert("This skin has been designed for Netscape 4.x.");
+
+// For IE, adjust menu bar styling.
+
+if (isIE5) {
+  document.styleSheets[document.styleSheets.length - 1].addRule("#menuBar", "padding-top:3px");
+  document.styleSheets[document.styleSheets.length - 1].addRule("#menuBar", "padding-bottom:3px");
+}
+
+// Global variable for tracking the currently active button.
+
+var activeButton = null;
+
+if (isIE5)
+  document.onmousedown = pageMousedown;
+if (isNS6)
+  document.addEventListener("mousedown", pageMousedown, true);
+
+function pageMousedown(event) {
+
+  var className;
+
+  // If the object clicked on was not a menu button or item, close any active
+  // menu.
+
+  if (isIE5)
+    className = window.event.srcElement.className;
+  if (isNS6)
+    className = (event.target.className ?
+      event.target.className : event.target.parentNode.className);
+
+  //Top menu mouseover
+  if (className != "menuButton" && className != "menuItem" && className != "menuItemDiff" && activeButton)
+    resetButton(activeButton);
+    
+
+  //Left menu show hide
+  var eSrc = window.event.srcElement;
+  window.event.cancelBubble = true;
+  if ("clsShowHide" == eSrc.className) return contentsHeading_click(eSrc);
+  
+  //Original version of this (with frames support)
+  //while ("BODY" != eSrc.tagName) {
+  //  if ("clsItem" == eSrc.className || "clsItemSelect" == eSrc.className) return contentsItem_click(eSrc);
+  //  else if ("clsShowHide" == eSrc.className || "clsHeading" == eSrc.className) return contentsHeading_click(eSrc);
+  //  eSrc = eSrc.parentElement;
+  //}
+}
+
+function buttonClick(button, menuName) {
+
+  // Blur focus from the link to remove that annoying outline.
+
+  if (!isNS4)
+   button.blur();
+
+  // Associate the named menu to this button if not already done.
+
+  if (!button.menu)
+  {
+   if (isNS4)
+    button.menu = document.layers[menuName];
+   else
+    button.menu = document.getElementById(menuName);
+  }
+
+
+  // Reset the currently active button, if any.
+
+  if (activeButton && activeButton != button)
+    resetButton(activeButton);
+
+  // Toggle the button's state.
+
+  if (button.isDepressed)
+    resetButton(button);
+  else
+    depressButton(button);
+
+  return false;
+}
+
+function buttonMouseover(button, menuName) {
+
+  // If any other button menu is active, deactivate it and activate this one.
+  // Note: if this button has no menu, leave the active menu alone.
+
+  if (activeButton) {
+    if (activeButton != button) {
+      resetButton(activeButton);
+      if (menuName)
+        buttonClick(button, menuName);
+    }
+    else {
+    }
+  }
+  else {
+    if (menuName)
+      buttonClick(button, menuName);
+  }
+}
+
+function depressButton(button) {
+
+  // Save current style values so they can be restored later.
+  // Only needs to be done once.
+
+  if (!button.oldBackgroundColor) {
+    button.oldBackgroundColor = button.style.backgroundColor;
+    button.oldBorderBottomColor = button.style.borderBottomColor;
+    button.oldBorderRightColor = button.style.borderRightColor;
+    button.oldBorderTopColor = button.style.borderTopColor;
+    button.oldBorderLeftColor = button.style.borderLeftColor;
+    button.oldColor = button.style.color;
+    button.oldLeft = button.style.left;
+    button.oldPosition = button.style.position;
+    button.oldTop = button.style.top;
+  }
+
+  // Change style value to make the button looks like it's
+  // depressed.
+
+  button.style.backgroundColor = "#99CC99";
+  button.style.borderBottomColor = "#99CC99";
+  button.style.borderRightColor = "#99CC99";
+  button.style.borderTopColor = "#99CC99";
+  button.style.borderLeftColor = "#99CC99";
+  button.style.color = "#E9E9E9";
+  button.style.left = "0px";
+  button.style.position = "relative";
+  button.style.top = "0px";
+
+  // For IE, force first menu item to the width of the parent menu,
+  // this causes mouseovers work for all items even when cursor is
+  // not over the link text.
+
+  if (isIE5 && !button.menu.firstChild.style.width)
+    button.menu.firstChild.style.width =
+      button.menu.offsetWidth + "px";
+
+if (isNS4)
+{
+  button.menu.left = (window.innerWidth-100);
+  button.menu.top  = 0;
+  button.menu.visibility = "show";
+}
+else
+{
+
+
+  // Position the associated drop down menu under the button and
+  // show it. Note that the position must be adjusted according to
+  // browser, styling and positioning.
+
+  //x = getPageOffsetLeft(button);
+  x = getPageOffsetLeft(button);
+  y = getPageOffsetTop(button) + button.offsetHeight;
+  if (isIE5)
+    y += 2;
+  if (isNS6) {
+    x--;
+    y--;
+  }
+  x -= 20;
+  y -= 10;
+  button.menu.style.left = x + "px";
+  button.menu.style.top  = y + "px";
+  button.menu.style.visibility = "visible";
+}
+
+  // Set button state and let the world know which button is
+  // active.
+
+  button.isDepressed = true;
+  activeButton = button;
+}
+
+function resetButton(button) {
+
+  // Restore the button's style settings.
+
+  button.style.backgroundColor = button.oldBackgroundColor;
+  button.style.borderBottomColor = button.oldBorderBottomColor;
+  button.style.borderRightColor = button.oldBorderRightColor;
+  button.style.borderTopColor = button.oldBorderTopColor;
+  button.style.borderLeftColor = button.oldBorderLeftColor;
+  button.style.color = button.oldColor;
+  button.style.left = button.oldLeft;
+  button.style.position = button.oldPosition;
+  button.style.top = button.oldTop;
+
+  // Hide the button's menu.
+
+  if (button.menu)
+  {
+   if (isNS4)
+    button.menu.visibility = "hide";
+   else
+    button.menu.style.visibility = "hidden";
+
+  }
+
+
+  // Set button state and clear active menu global.
+
+  button.isDepressed = false;
+  activeButton = null;
+}
+
+function getPageOffsetLeft(el) {
+
+  // Return the true x coordinate of an element relative to the page.
+
+  return el.offsetLeft + (el.offsetParent ? getPageOffsetLeft(el.offsetParent) : 0);
+}
+
+
+function getPageOffsetTop(el) {
+
+  // Return the true y coordinate of an element relative to the page.
+
+  return el.offsetTop + (el.offsetParent ? getPageOffsetTop(el.offsetParent) : 0);
+}
+
+
+// Swap background colour
+function bgcolour(obj, Colour) {
+	obj.style.backgroundColor=Colour
+}
+
+//Pop up window
+function MM_openBrWindow(theURL,winName,features) { //v2.0
+  window.open(theURL,winName,features);
+}
+
+function MM_findObj(n, d) { //v3.0
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document); return x;
+}
+/* Functions that swaps %PUBURLPATH%/skins/tiger. */
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+
+//Left menu folders
+var eSelected = null;
+function contentsHeading_click(eSrc)  {
+	if ("clsShowHide" == eSrc.className) eSrc = document.all[eSrc.sourceIndex + 1];
+	var iNumElements = document.all.length;
+	for (var i=eSrc.sourceIndex+1;i<iNumElements;i++) {
+		var eTemp = document.all[i];
+		if ("clsHeading" == eTemp.className) return;
+		else if ("clsItemsHide" == eTemp.className)  {
+			eTemp.className = "clsItemsShow";
+			//No image url in .js - not subject to wiki vars
+			//eSrc.style.listStyleImage = "url('images/blueminus.gif')";
+			return eSrc.blur();
+		}
+		else if("clsItemsShow" == eTemp.className)  {
+			eTemp.className = "clsItemsHide";
+			//No image url in .js - not subject to wiki vars
+			//eSrc.style.listStyleImage = "url('images/blueplus.gif')";
+			return eSrc.blur();
+		}
+	}
+}
+function contentsItem_click(eSrc)  {
+	if (document.all["styleView"]) eSrc.target = document.all["styleView"].checked ? "_blank" : "TEXT";
+	else if ("" == eSrc.target) eSrc.target = "TEXT"
+	if(null != eSelected) eSelected.className = "clsItem";
+	eSrc.className = "clsItemSelect";
+	eSelected = eSrc;
+}
+
+
+
diff --git a/TWiki/TigerSkin/new_logo.gif b/TWiki/TigerSkin/new_logo.gif
new file mode 100644
index 00000000..6f149e1f
--- /dev/null
+++ b/TWiki/TigerSkin/new_logo.gif
diff --git a/TWiki/WebHome.mdwn b/TWiki/WebHome.mdwn
index 86d534af..15957b8b 100644
--- a/TWiki/WebHome.mdwn
+++ b/TWiki/WebHome.mdwn
@@ -57,9 +57,9 @@ Documentation for webmasters, system administrators, project managers, team lead
 
 <table>
   <tr>
-    <td> Welcome to <nop>TeamworkWiki (or, Take-Five Wiki), a flexible, powerful, and simple Web-based collaboration platform. Use TWiki to run a project development space, a document management system, a knowledge base, or any other groupware tool, on an intranet or on the Web. <p> This web is the place to learn about the TWiki software (<span style="background:"><font color="">TWiki Tutorial</font></span><a href="http://LOCATION/TWikiTutorial">?</a>, <span style="background:"><font color="">TWiki FAQ</font></span><a href="http://LOCATION/TWikiFAQ">?</a>), learn about TWiki features (<span style="background:"><font color="">Wiki Syntax</font></span><a href="http://LOCATION/WikiSyntax">?</a>, <span style="background:"><font color="">TWiki Shorthand</font></span><a href="http://LOCATION/TWikiShorthand">?</a>), find TWiki documentation and find links to download it yourself. Here's the <a href="http://twiki.org/cgi-bin/view/Codev/TWikiMission" target="_top">Mission Statement</a> for TWiki. </p>
-        <p> Meta discussion about the TWiki web itself can take place in the <span style="background:"><font color="">Web Discuss</font></span><a href="http://LOCATION/WebDiscuss">?</a> topic. </p>
-        <p> Meta discussion about the Hurd Wiki installation can take place in the <span style="background:"><font color="">TWiki Discuss</font></span><a href="http://LOCATION/TWikiDiscuss">?</a> topic. </p>
+    <td> Welcome to <nop>TeamworkWiki (or, Take-Five Wiki), a flexible, powerful, and simple Web-based collaboration platform. Use TWiki to run a project development space, a document management system, a knowledge base, or any other groupware tool, on an intranet or on the Web. <p> This web is the place to learn about the TWiki software ([[TWikiTutorial]], [[TWikiFAQ]]), learn about TWiki features ([[WikiSyntax]], [[TWikiShorthand]]), find TWiki documentation and find links to download it yourself. Here's the <a href="http://twiki.org/cgi-bin/view/Codev/TWikiMission" target="_top">Mission Statement</a> for TWiki. </p>
+        <p> Meta discussion about the TWiki web itself can take place in the [[WebDiscuss]] topic. </p>
+        <p> Meta discussion about the Hurd Wiki installation can take place in the [[TWikiDiscuss]] topic. </p>
         <p>
         </p></nop></td>
     <td width="25"> </td>
@@ -77,8 +77,8 @@ Documentation for webmasters, system administrators, project managers, team lead
         </p>
         <ul>
           <li><strong>TWiki Quick Start</strong> - the fast track approach <ul>
-              <li><span style="background:"><font color="">Welcome Guest</font></span><a href="http://LOCATION/WelcomeGuest">?</a>: A fast track intro covering all the basics </li>
-              <li><span style="background:"><font color="">TWiki Registration</font></span><a href="http://LOCATION/TWikiRegistration">?</a>: Sign up so you can edit pages and select options </li>
+              <li>[[WelcomeGuest]]: A fast track intro covering all the basics </li>
+              <li>[[TWikiRegistration]]: Sign up so you can edit pages and select options </li>
             </ul>
           </li>
         </ul>
@@ -86,15 +86,15 @@ Documentation for webmasters, system administrators, project managers, team lead
         </p>
         <ul>
           <li><strong>One-Page Primers</strong> cover TWiki basics <ul>
-              <li><span style="background:"><font color="">TWiki Tutorial</font></span><a href="http://LOCATION/TWikiTutorial">?</a>: A compact, 20-minute TWiki primer </li>
-              <li><span style="background:"><font color="">TWiki Site</font></span><a href="http://LOCATION/TWikiSite">?</a>: Instant overview - first, there was Wiki </li>
-              <li><span style="background:"><font color="">TWiki Pages</font></span><a href="http://LOCATION/TWikiPages">?</a>: Customize, rename, move, or delete TWiki topics </li>
-              <li><span style="background:"><font color="">Wiki Syntax</font></span><a href="http://LOCATION/WikiSyntax">?</a>: TWiki shorthand basics </li>
-              <li><span style="background:"><font color="">Good Style</font></span><a href="http://LOCATION/GoodStyle">?</a>: Working tips for an open collaboration environment </li>
-              <li><span style="background:"><font color="">TWiki Shorthand</font></span><a href="http://LOCATION/TWikiShorthand">?</a>: The complete TWiki text formatting syntax on one page </li>
-              <li><span style="background:"><font color="">TWiki Variables</font></span><a href="http://LOCATION/TWikiVariables">?</a>: How to easily embed text, graphics, dynamic content </li>
-              <li><span style="background:"><font color="">File Attachments</font></span><a href="http://LOCATION/FileAttachments">?</a>: Use your browser to upload files for distribution or display </li>
-              <li><span style="background:"><font color="">Web Changes Alert</font></span><a href="http://LOCATION/WebChangesAlert">?</a>: Subscribe to email alerts linking to the latest page changes </li>
+              <li>[[TWikiTutorial]]: A compact, 20-minute TWiki primer </li>
+              <li>[[TWikiSite]]: Instant overview - first, there was Wiki </li>
+              <li>[[TWikiPages]]: Customize, rename, move, or delete TWiki topics </li>
+              <li>[[WikiSyntax]]: TWiki shorthand basics </li>
+              <li>[[GoodStyle]]: Working tips for an open collaboration environment </li>
+              <li>[[TWikiShorthand]]: The complete TWiki text formatting syntax on one page </li>
+              <li>[[TWikiVariables]]: How to easily embed text, graphics, dynamic content </li>
+              <li>[[FileAttachments]]: Use your browser to upload files for distribution or display </li>
+              <li>[[WebChangesAlert]]: Subscribe to email alerts linking to the latest page changes </li>
             </ul>
           </li>
         </ul>
@@ -102,8 +102,8 @@ Documentation for webmasters, system administrators, project managers, team lead
         </p>
         <ul>
           <li><strong>TWiki Help FAQs</strong><ul>
-              <li><span style="background:"><font color="">TWiki FAQ</font></span><a href="http://LOCATION/TWikiFAQ">?</a>: The first things people ask about TWiki </li>
-              <li><span style="background:"><font color="">Text Formatting FAQ</font></span><a href="http://LOCATION/TextFormattingFAQ">?</a>: Common how-to questions about posting in TWiki </li>
+              <li>[[TWikiFAQ]]: The first things people ask about TWiki </li>
+              <li>[[TextFormattingFAQ]]: Common how-to questions about posting in TWiki </li>
             </ul>
           </li>
         </ul>
@@ -124,7 +124,7 @@ Documentation for webmasters, system administrators, project managers, team lead
         </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>Hot Topics <font size="-1">([[WebStatistics]])</font></strong></th>
             <th bgcolor="#99CCCC"><strong>Top Contributors</strong></th>
           </tr>
         </table> %INCLUDE{"WebStatistics" pattern=".*?\-\-statTopContributors\-\-\&amp;gt;[^\|]+\|[^\|]+\|[^\|]+\|[^\|]+\|[^\|]+\|[^\|]+(\|[^\|]+\|[^\|]+\|).*"}% <p>
diff --git a/TWiki/WebHome/new_logo.gif b/TWiki/WebHome/new_logo.gif
new file mode 100644
index 00000000..6f149e1f
--- /dev/null
+++ b/TWiki/WebHome/new_logo.gif
diff --git a/TWiki/WebPreferences/logo.gif b/TWiki/WebPreferences/logo.gif
new file mode 100644
index 00000000..6f149e1f
--- /dev/null
+++ b/TWiki/WebPreferences/logo.gif
diff --git a/TWiki/WebStatistics.mdwn b/TWiki/WebStatistics.mdwn
index f85c4226..d1751fa0 100644
--- a/TWiki/WebStatistics.mdwn
+++ b/TWiki/WebStatistics.mdwn
@@ -28,64 +28,64 @@
     <td align="right"> 683 </td>
     <td align="right"> 11 </td>
     <td align="right"> 0 </td>
-    <td> 206 <span style="background:"><font color="">Select Skin</font></span><a href="http://LOCATION/SelectSkin">?</a><br />  95 <span style="background:"><font color="">Web Home</font></span><a href="http://LOCATION/WebHome">?</a><br />  24 <span style="background:"><font color="">Welcome Guest</font></span><a href="http://LOCATION/WelcomeGuest">?</a><br />  21 <span style="background:"><font color="">TWiki Registration</font></span><a href="http://LOCATION/TWikiRegistration">?</a><br />  20 <span style="background:"><font color="">Wiki Syntax</font></span><a href="http://LOCATION/WikiSyntax">?</a><br />  19 <span style="background:"><font color="">Managing Webs</font></span><a href="http://LOCATION/ManagingWebs">?</a><br />  17 <span style="background:"><font color="">TWiki Tutorial</font></span><a href="http://LOCATION/TWikiTutorial">?</a><br />  13 <span style="background:"><font color="">TWiki Installation Guide</font></span><a href="http://LOCATION/TWikiInstallationGuide">?</a><br />  13 <span style="background:"><font color="">Managing Topics</font></span><a href="http://LOCATION/ManagingTopics">?</a><br />  12 <span style="background:"><font color="">Web Changes Alert</font></span><a href="http://LOCATION/WebChangesAlert">?</a><br />  11 <span style="background:"><font color="">Web Menu</font></span><a href="http://LOCATION/WebMenu">?</a></td>
-    <td>  11 <span style="background:"><font color="">Grant Bow</font></span><a href="http://LOCATIONMain/GrantBow">?</a></td>
+    <td> 206 [[SelectSkin]]<br />  95 [[WebHome]]<br />  24 [[WelcomeGuest]]<br />  21 [[TWikiRegistration]]<br />  20 [[WikiSyntax]]<br />  19 [[ManagingWebs]]<br />  17 [[TWikiTutorial]]<br />  13 [[TWikiInstallationGuide]]<br />  13 [[ManagingTopics]]<br />  12 [[WebChangesAlert]]<br />  11 [[WebMenu]]</td>
+    <td>  11 [[Main/GrantBow]]</td>
   </tr>
   <tr>
     <td> Nov 2002 </td>
     <td align="right"> 1344 </td>
     <td align="right"> 25 </td>
     <td align="right"> 0 </td>
-    <td> 289 <span style="background:"><font color="">Select Skin</font></span><a href="http://LOCATION/SelectSkin">?</a><br /> 115 <span style="background:"><font color="">Web Home</font></span><a href="http://LOCATION/WebHome">?</a><br />  41 <span style="background:"><font color="">TWiki Variables</font></span><a href="http://LOCATION/TWikiVariables">?</a><br />  39 <span style="background:"><font color="">Web Statistics</font></span><a href="http://LOCATION/WebStatistics">?</a><br />  30 <span style="background:"><font color="">TWiki Access Control</font></span><a href="http://LOCATION/TWikiAccessControl">?</a><br />  28 <span style="background:"><font color="">Welcome Guest</font></span><a href="http://LOCATION/WelcomeGuest">?</a><br />  27 <span style="background:"><font color="">TWiki Webs Table</font></span><a href="http://LOCATION/TWikiWebsTable">?</a><br />  27 <span style="background:"><font color="">Good Style</font></span><a href="http://LOCATION/GoodStyle">?</a><br />  26 <span style="background:"><font color="">Web Menu</font></span><a href="http://LOCATION/WebMenu">?</a><br />  25 <span style="background:"><font color="">Web Discuss</font></span><a href="http://LOCATION/WebDiscuss">?</a><br />  24 <span style="background:"><font color="">TWiki Site</font></span><a href="http://LOCATION/TWikiSite">?</a></td>
-    <td>  18 <span style="background:"><font color="">Joachim Nilsson</font></span><a href="http://LOCATIONMain/JoachimNilsson">?</a><br />   7 <span style="background:"><font color="">Grant Bow</font></span><a href="http://LOCATIONMain/GrantBow">?</a></td>
+    <td> 289 [[SelectSkin]]<br /> 115 [[WebHome]]<br />  41 [[TWikiVariables]]<br />  39 [[WebStatistics]]<br />  30 [[TWikiAccessControl]]<br />  28 [[WelcomeGuest]]<br />  27 [[TWikiWebsTable]]<br />  27 [[GoodStyle]]<br />  26 [[WebMenu]]<br />  25 [[WebDiscuss]]<br />  24 [[TWikiSite]]</td>
+    <td>  18 [[Main/JoachimNilsson]]<br />   7 [[Main/GrantBow]]</td>
   </tr>
   <tr>
     <td> Oct 2002 </td>
     <td align="right"> 765 </td>
     <td align="right"> 16 </td>
     <td align="right"> 0 </td>
-    <td> 231 <span style="background:"><font color="">Select Skin</font></span><a href="http://LOCATION/SelectSkin">?</a><br />  40 <span style="background:"><font color="">Web Home</font></span><a href="http://LOCATION/WebHome">?</a><br />  37 <span style="background:"><font color="">TWiki Variables</font></span><a href="http://LOCATION/TWikiVariables">?</a><br />  35 <span style="background:"><font color="">TWiki History</font></span><a href="http://LOCATION/TWikiHistory">?</a><br />  26 <span style="background:"><font color="">TWiki Access Control</font></span><a href="http://LOCATION/TWikiAccessControl">?</a><br />  19 <span style="background:"><font color="">Welcome Guest</font></span><a href="http://LOCATION/WelcomeGuest">?</a><br />  18 <span style="background:"><font color="">TWiki Tutorial</font></span><a href="http://LOCATION/TWikiTutorial">?</a><br />  17 <span style="background:"><font color="">Web Menu</font></span><a href="http://LOCATION/WebMenu">?</a><br />  17 <span style="background:"><font color="">TWiki Forms</font></span><a href="http://LOCATION/TWikiForms">?</a><br />  15 <span style="background:"><font color="">TWiki User Authentication</font></span><a href="http://LOCATION/TWikiUserAuthentication">?</a><br />  14 <span style="background:"><font color="">Wiki Syntax</font></span><a href="http://LOCATION/WikiSyntax">?</a></td>
-    <td>  16 <span style="background:"><font color="">Joachim Nilsson</font></span><a href="http://LOCATIONMain/JoachimNilsson">?</a></td>
+    <td> 231 [[SelectSkin]]<br />  40 [[WebHome]]<br />  37 [[TWikiVariables]]<br />  35 [[TWikiHistory]]<br />  26 [[TWikiAccessControl]]<br />  19 [[WelcomeGuest]]<br />  18 [[TWikiTutorial]]<br />  17 [[WebMenu]]<br />  17 [[TWikiForms]]<br />  15 [[TWikiUserAuthentication]]<br />  14 [[WikiSyntax]]</td>
+    <td>  16 [[Main/JoachimNilsson]]</td>
   </tr>
   <tr>
     <td> Sep 2002 </td>
     <td align="right"> 1230 </td>
     <td align="right"> 16 </td>
     <td align="right"> 0 </td>
-    <td> 151 <span style="background:"><font color="">Select Skin</font></span><a href="http://LOCATION/SelectSkin">?</a><br />  87 <span style="background:"><font color="">Web Home</font></span><a href="http://LOCATION/WebHome">?</a><br />  42 <span style="background:"><font color="">TWiki Preferences</font></span><a href="http://LOCATION/TWikiPreferences">?</a><br />  40 <span style="background:"><font color="">Web Statistics</font></span><a href="http://LOCATION/WebStatistics">?</a><br />  33 <span style="background:"><font color="">Good Style</font></span><a href="http://LOCATION/GoodStyle">?</a><br />  30 <span style="background:"><font color="">TWiki Registration</font></span><a href="http://LOCATION/TWikiRegistration">?</a><br />  24 <span style="background:"><font color="">Managing Webs</font></span><a href="http://LOCATION/ManagingWebs">?</a><br />  23 <span style="background:"><font color="">TWiki Site</font></span><a href="http://LOCATION/TWikiSite">?</a><br />  22 <span style="background:"><font color="">Text Formatting FAQ</font></span><a href="http://LOCATION/TextFormattingFAQ">?</a><br />  20 <span style="background:"><font color="">Web Preferences</font></span><a href="http://LOCATION/WebPreferences">?</a><br />  20 <span style="background:"><font color="">Text Formatting Rules</font></span><a href="http://LOCATION/TextFormattingRules">?</a></td>
-    <td>  11 <span style="background:"><font color="">Joachim Nilsson</font></span><a href="http://LOCATIONMain/JoachimNilsson">?</a><br />   4 <span style="background:"><font color="">Michal Suchanek</font></span><a href="http://LOCATIONMain/MichalSuchanek">?</a><br />   1 <span style="background:"><font color="">Grant Bow</font></span><a href="http://LOCATIONMain/GrantBow">?</a></td>
+    <td> 151 [[SelectSkin]]<br />  87 [[WebHome]]<br />  42 [[TWikiPreferences]]<br />  40 [[WebStatistics]]<br />  33 [[GoodStyle]]<br />  30 [[TWikiRegistration]]<br />  24 [[ManagingWebs]]<br />  23 [[TWikiSite]]<br />  22 [[TextFormattingFAQ]]<br />  20 [[WebPreferences]]<br />  20 [[TextFormattingRules]]</td>
+    <td>  11 [[Main/JoachimNilsson]]<br />   4 [[Main/MichalSuchanek]]<br />   1 [[Main/GrantBow]]</td>
   </tr>
   <tr>
     <td> Aug 2002 </td>
     <td align="right"> 1239 </td>
     <td align="right"> 3 </td>
     <td align="right"> 0 </td>
-    <td>  89 <span style="background:"><font color="">Web Home</font></span><a href="http://LOCATION/WebHome">?</a><br />  66 <span style="background:"><font color="">Web Statistics</font></span><a href="http://LOCATION/WebStatistics">?</a><br />  55 <span style="background:"><font color="">TWiki Documentation</font></span><a href="http://LOCATION/TWikiDocumentation">?</a><br />  40 <span style="background:"><font color="">Text Formatting Rules</font></span><a href="http://LOCATION/TextFormattingRules">?</a><br />  35 <span style="background:"><font color="">TWiki History</font></span><a href="http://LOCATION/TWikiHistory">?</a><br />  34 <span style="background:"><font color="">TWiki Preferences</font></span><a href="http://LOCATION/TWikiPreferences">?</a><br />  29 <span style="background:"><font color="">Good Style</font></span><a href="http://LOCATION/GoodStyle">?</a><br />  25 <span style="background:"><font color="">TWiki Tutorial</font></span><a href="http://LOCATION/TWikiTutorial">?</a><br />  24 <span style="background:"><font color="">TWiki Registration</font></span><a href="http://LOCATION/TWikiRegistration">?</a><br />  23 <span style="background:"><font color="">Web Preferences</font></span><a href="http://LOCATION/WebPreferences">?</a><br />  19 <span style="background:"><font color="">Text Formatting FAQ</font></span><a href="http://LOCATION/TextFormattingFAQ">?</a></td>
-    <td>   3 <span style="background:"><font color="">Joachim Nilsson</font></span><a href="http://LOCATIONMain/JoachimNilsson">?</a></td>
+    <td>  89 [[WebHome]]<br />  66 [[WebStatistics]]<br />  55 [[TWikiDocumentation]]<br />  40 [[TextFormattingRules]]<br />  35 [[TWikiHistory]]<br />  34 [[TWikiPreferences]]<br />  29 [[GoodStyle]]<br />  25 [[TWikiTutorial]]<br />  24 [[TWikiRegistration]]<br />  23 [[WebPreferences]]<br />  19 [[TextFormattingFAQ]]</td>
+    <td>   3 [[Main/JoachimNilsson]]</td>
   </tr>
   <tr>
     <td> Jul 2002 </td>
     <td align="right"> 1279 </td>
     <td align="right"> 42 </td>
     <td align="right"> 0 </td>
-    <td>  95 <span style="background:"><font color="">Select Skin</font></span><a href="http://LOCATION/SelectSkin">?</a><br />  54 <span style="background:"><font color="">Web Home</font></span><a href="http://LOCATION/WebHome">?</a><br />  46 <span style="background:"><font color="">TWiki History</font></span><a href="http://LOCATION/TWikiHistory">?</a><br />  39 <span style="background:"><font color="">TWiki Registration</font></span><a href="http://LOCATION/TWikiRegistration">?</a><br />  33 <span style="background:"><font color="">Welcome Guest</font></span><a href="http://LOCATION/WelcomeGuest">?</a><br />  33 <span style="background:"><font color="">Gnu Skin Plugin</font></span><a href="http://LOCATION/GnuSkinPlugin">?</a><br />  29 <span style="background:"><font color="">Gnu Skin</font></span><a href="http://LOCATION/GnuSkin">?</a><br />  27 <span style="background:"><font color="">Good Style</font></span><a href="http://LOCATION/GoodStyle">?</a><br />  26 <span style="background:"><font color="">TWiki Tutorial</font></span><a href="http://LOCATION/TWikiTutorial">?</a><br />  25 <span style="background:"><font color="">TWiki Preferences</font></span><a href="http://LOCATION/TWikiPreferences">?</a><br />  24 <span style="background:"><font color="">TWiki FAQ</font></span><a href="http://LOCATION/TWikiFAQ">?</a></td>
-    <td>  41 <span style="background:"><font color="">Joachim Nilsson</font></span><a href="http://LOCATIONMain/JoachimNilsson">?</a><br />   1 <span style="background:"><font color="">TWiki Guest</font></span><a href="http://LOCATIONMain/TWikiGuest">?</a></td>
+    <td>  95 [[SelectSkin]]<br />  54 [[WebHome]]<br />  46 [[TWikiHistory]]<br />  39 [[TWikiRegistration]]<br />  33 [[WelcomeGuest]]<br />  33 [[GnuSkinPlugin]]<br />  29 [[GnuSkin]]<br />  27 [[GoodStyle]]<br />  26 [[TWikiTutorial]]<br />  25 [[TWikiPreferences]]<br />  24 [[TWikiFAQ]]</td>
+    <td>  41 [[Main/JoachimNilsson]]<br />   1 [[Main/TWikiGuest]]</td>
   </tr>
   <tr>
     <td> Jun 2002 </td>
     <td align="right"> 238 </td>
     <td align="right"> 28 </td>
     <td align="right"> 4 </td>
-    <td>  36 <span style="background:"><font color="">Web Home</font></span><a href="http://LOCATION/WebHome">?</a><br />  23 <span style="background:"><font color="">TWiki Registration</font></span><a href="http://LOCATION/TWikiRegistration">?</a><br />  21 <span style="background:"><font color="">Web Preferences</font></span><a href="http://LOCATION/WebPreferences">?</a><br />  14 <span style="background:"><font color="">Tiger Skin</font></span><a href="http://LOCATION/TigerSkin">?</a><br />  13 <span style="background:"><font color="">Welcome Guest</font></span><a href="http://LOCATION/WelcomeGuest">?</a><br />  11 <span style="background:"><font color="">Good Style</font></span><a href="http://LOCATION/GoodStyle">?</a><br />   8 <span style="background:"><font color="">Gnu Skin</font></span><a href="http://LOCATION/GnuSkin">?</a><br />   8 <span style="background:"><font color="">Gnu Skin Plugin</font></span><a href="http://LOCATION/GnuSkinPlugin">?</a><br />   7 <span style="background:"><font color="">Text Formatting Rules</font></span><a href="http://LOCATION/TextFormattingRules">?</a><br />   6 <span style="background:"><font color="">Wiki Name</font></span><a href="http://LOCATION/WikiName">?</a><br />   6 <span style="background:"><font color="">Tiger Skin Plugin</font></span><a href="http://LOCATION/TigerSkinPlugin">?</a></td>
-    <td>  32 <span style="background:"><font color="">Joachim Nilsson</font></span><a href="http://LOCATIONMain/JoachimNilsson">?</a></td>
+    <td>  36 [[WebHome]]<br />  23 [[TWikiRegistration]]<br />  21 [[WebPreferences]]<br />  14 [[TigerSkin]]<br />  13 [[WelcomeGuest]]<br />  11 [[GoodStyle]]<br />   8 [[GnuSkin]]<br />   8 [[GnuSkinPlugin]]<br />   7 [[TextFormattingRules]]<br />   6 [[WikiName]]<br />   6 [[TigerSkinPlugin]]</td>
+    <td>  32 [[Main/JoachimNilsson]]</td>
   </tr>
   <tr>
     <td> May 2002 </td>
     <td align="right"> 309 </td>
     <td align="right"> 13 </td>
     <td align="right"> 0 </td>
-    <td>  27 <span style="background:"><font color="">Web Home</font></span><a href="http://LOCATION/WebHome">?</a><br />  26 <span style="background:"><font color="">TWiki Registration</font></span><a href="http://LOCATION/TWikiRegistration">?</a><br />  25 <span style="background:"><font color="">TWiki Preferences</font></span><a href="http://LOCATION/TWikiPreferences">?</a><br />  14 <span style="background:"><font color="">Good Style</font></span><a href="http://LOCATION/GoodStyle">?</a><br />  13 <span style="background:"><font color="">Welcome Guest</font></span><a href="http://LOCATION/WelcomeGuest">?</a><br />  12 <span style="background:"><font color="">Web Search</font></span><a href="http://LOCATION/WebSearch">?</a><br />  12 <span style="background:"><font color="">Text Formatting Rules</font></span><a href="http://LOCATION/TextFormattingRules">?</a><br />   8 <span style="background:"><font color="">TWiki Variables</font></span><a href="http://LOCATION/TWikiVariables">?</a><br />   7 <span style="background:"><font color="">TWiki Documentation</font></span><a href="http://LOCATION/TWikiDocumentation">?</a><br />   6 <span style="background:"><font color="">Comment Plugin</font></span><a href="http://LOCATION/CommentPlugin">?</a><br />   6 <span style="background:"><font color="">Change Password</font></span><a href="http://LOCATION/ChangePassword">?</a></td>
-    <td>   7 <span style="background:"><font color="">Joachim Nilsson</font></span><a href="http://LOCATIONMain/JoachimNilsson">?</a><br />   6 <span style="background:"><font color="">TWiki Guest</font></span><a href="http://LOCATIONMain/TWikiGuest">?</a></td>
+    <td>  27 [[WebHome]]<br />  26 [[TWikiRegistration]]<br />  25 [[TWikiPreferences]]<br />  14 [[GoodStyle]]<br />  13 [[WelcomeGuest]]<br />  12 [[WebSearch]]<br />  12 [[TextFormattingRules]]<br />   8 [[TWikiVariables]]<br />   7 [[TWikiDocumentation]]<br />   6 [[CommentPlugin]]<br />   6 [[ChangePassword]]</td>
+    <td>   7 [[Main/JoachimNilsson]]<br />   6 [[Main/TWikiGuest]]</td>
   </tr>
 </table>
 
diff --git a/TWiki/WebTopicNonWikiTemplate.mdwn b/TWiki/WebTopicNonWikiTemplate.mdwn
index 8fbfca1b..8e4f245b 100644
--- a/TWiki/WebTopicNonWikiTemplate.mdwn
+++ b/TWiki/WebTopicNonWikiTemplate.mdwn
@@ -10,4 +10,4 @@
 
 ### <a name="If_you_intended_to_do_a_full_tex"> If you intended to do a full text search: </a>
 
-> <form action="%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%WEB%/" name="search"> Use the <a href="WebSearch">Search</a> link on top of this page, or do a simple <br /><input name="search" size="32" type="text" value="%TOPIC%" /> <input type="submit" value="Search" /> <input name="scope" type="hidden" value="text" /> <input name="ignorecase" type="hidden" value="on" />    (More options in <span style="background:"><font color="">Web Search</font></span><a href="http://LOCATION/WebSearch">?</a>) </form>
+> <form action="%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%WEB%/" name="search"> Use the <a href="WebSearch">Search</a> link on top of this page, or do a simple <br /><input name="search" size="32" type="text" value="%TOPIC%" /> <input type="submit" value="Search" /> <input name="scope" type="hidden" value="text" /> <input name="ignorecase" type="hidden" value="on" />    (More options in [[WebSearch]]) </form>
diff --git a/TWiki/WebTopicViewTemplate.mdwn b/TWiki/WebTopicViewTemplate.mdwn
index 0fc06eb0..bc21fcfe 100644
--- a/TWiki/WebTopicViewTemplate.mdwn
+++ b/TWiki/WebTopicViewTemplate.mdwn
@@ -16,4 +16,4 @@
 
 ### <a name="If_you_intend_to_do_a_full_text_"> If you intend to do a full text search: </a>
 
-> <form action="%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%WEB%/" name="search"> Use the <a href="WebSearch">Search</a> link on top of this page, or do a simple <br /><input name="search" size="32" type="text" value="%TOPIC%" /> <input type="submit" value="Search" /> <input name="scope" type="hidden" value="text" /> <input name="ignorecase" type="hidden" value="on" />    (More options in <span style="background:"><font color="">Web Search</font></span><a href="http://LOCATION/WebSearch">?</a>) </form>
+> <form action="%SCRIPTURLPATH%/search%SCRIPTSUFFIX%/%WEB%/" name="search"> Use the <a href="WebSearch">Search</a> link on top of this page, or do a simple <br /><input name="search" size="32" type="text" value="%TOPIC%" /> <input type="submit" value="Search" /> <input name="scope" type="hidden" value="text" /> <input name="ignorecase" type="hidden" value="on" />    (More options in [[WebSearch]]) </form>
diff --git a/TWiki/WikiNotation/XF86Config b/TWiki/WikiNotation/XF86Config
new file mode 100644
index 00000000..08a241df
--- /dev/null
+++ b/TWiki/WikiNotation/XF86Config
@@ -0,0 +1,469 @@
+# File generated by xf86config.
+
+#
+# Copyright (c) 1999 by The XFree86 Project, Inc.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+# THE XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+# OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+# 
+# Except as contained in this notice, the name of the XFree86 Project shall
+# not be used in advertising or otherwise to promote the sale, use or other
+# dealings in this Software without prior written authorization from the
+# XFree86 Project.
+#
+
+# **********************************************************************
+# Refer to the XF86Config(4/5) man page for details about the format of 
+# this file.
+# **********************************************************************
+
+# **********************************************************************
+# Module section -- this  section  is used to specify
+# which dynamically loadable modules to load.
+# **********************************************************************
+#
+Section "Module"
+
+# This loads the DBE extension module.
+
+    Load        "dbe"  	# Double buffer extension
+
+# This loads the miscellaneous extensions module, and disables
+# initialisation of the XFree86-DGA extension within that module.
+    SubSection  "extmod"
+      Option    "omit xfree86-dga"   # don't initialise the DGA extension
+    EndSubSection
+
+# This loads the Type1 and FreeType font modules
+    Load        "type1"
+    Load        "speedo"
+#    Load        "freetype"
+#    Load        "xtt"
+
+# This loads the GLX module
+    Load       "glx"
+# This loads the DRI module
+#    Load       "dri"
+
+EndSection
+
+# **********************************************************************
+# Files section.  This allows default font and rgb paths to be set
+# **********************************************************************
+
+Section "Files"
+
+# The location of the RGB database.  Note, this is the name of the
+# file minus the extension (like ".txt" or ".db").  There is normally
+# no need to change the default.
+
+    RgbPath	"/usr/X11R6/lib/X11/rgb"
+
+# Multiple FontPath entries are allowed (which are concatenated together),
+# as well as specifying multiple comma-separated entries in one FontPath
+# command (or a combination of both methods)
+# 
+# If you don't have a floating point coprocessor and emacs, Mosaic or other
+# programs take long to start up, try moving the Type1 and Speedo directory
+# to the end of this list (or comment them out).
+#
+
+#    FontPath   "/usr/X11R6/lib/X11/fonts/TTF/"
+    FontPath   "/usr/X11R6/lib/X11/fonts/cyrillic/"
+    FontPath   "/usr/X11R6/lib/X11/fonts/local/"
+    FontPath   "/usr/X11R6/lib/X11/fonts/misc/"
+    FontPath   "/usr/X11R6/lib/X11/fonts/75dpi/:unscaled"
+    FontPath   "/usr/X11R6/lib/X11/fonts/100dpi/:unscaled"
+    FontPath   "/usr/X11R6/lib/X11/fonts/Speedo/"
+    FontPath   "/usr/X11R6/lib/X11/fonts/Type1/"
+#    FontPath   "/usr/X11R6/lib/X11/fonts/TrueType/"
+#    FontPath   "/usr/X11R6/lib/X11/fonts/freefont/"
+    FontPath   "/usr/X11R6/lib/X11/fonts/75dpi/"
+    FontPath   "/usr/X11R6/lib/X11/fonts/100dpi/"
+
+# The module search path.  The default path is shown here.
+
+#    ModulePath "/usr/X11R6/lib/modules"
+
+EndSection
+
+# **********************************************************************
+# Server flags section.
+# **********************************************************************
+
+Section "ServerFlags"
+
+# Uncomment this to cause a core dump at the spot where a signal is 
+# received.  This may leave the console in an unusable state, but may
+# provide a better stack trace in the core dump to aid in debugging
+
+#    Option "NoTrapSignals"
+
+# Uncomment this to disable the <Crtl><Alt><Fn> VT switch sequence
+# (where n is 1 through 12).  This allows clients to receive these key
+# events.
+
+#    Option "DontVTSwitch"
+
+# Uncomment this to disable the <Crtl><Alt><BS> server abort sequence
+# This allows clients to receive this key event.
+
+#    Option "DontZap"
+
+# Uncomment this to disable the <Crtl><Alt><KP_+>/<KP_-> mode switching
+# sequences.  This allows clients to receive these key events.
+
+#    Option "Dont Zoom"
+
+# Uncomment this to disable tuning with the xvidtune client. With
+# it the client can still run and fetch card and monitor attributes,
+# but it will not be allowed to change them. If it tries it will
+# receive a protocol error.
+
+#    Option "DisableVidModeExtension"
+
+# Uncomment this to enable the use of a non-local xvidtune client. 
+
+#    Option "AllowNonLocalXvidtune"
+
+# Uncomment this to disable dynamically modifying the input device
+# (mouse and keyboard) settings. 
+
+#    Option "DisableModInDev"
+
+# Uncomment this to enable the use of a non-local client to
+# change the keyboard or mouse settings (currently only xset).
+
+#    Option "AllowNonLocalModInDev"
+
+EndSection
+
+# **********************************************************************
+# Input devices
+# **********************************************************************
+
+# **********************************************************************
+# Core keyboard's InputDevice section
+# **********************************************************************
+
+Section "InputDevice"
+
+    Identifier	"Keyboard1"
+    Driver	"Keyboard"
+    Option "AutoRepeat" "500 30"
+    Option "XkbRules" "xfree86"
+    Option "XkbModel" "pc105"
+    Option "XkbLayout" "us,ru(winkeys)"
+    Option "XkbOptions" "grp:alt_shift_toggle,grp_led:scroll"
+    
+# For most OSs the protocol can be omitted (it defaults to "Standard").
+# When using XQUEUE (only for SVR3 and SVR4, but not Solaris),
+# uncomment the following line.
+
+#    Option     "Protocol"      "Xqueue"
+
+#    Option "AutoRepeat" "500 30"
+
+# Specify which keyboard LEDs can be user-controlled (eg, with xset(1))
+#    Option	"Xleds"      "1 2 3"
+
+#    Option "LeftAlt"     "Meta"
+#    Option "RightAlt"    "ModeShift"
+
+# To customise the XKB settings to suit your keyboard, modify the
+# lines below (which are the defaults).  For example, for a non-U.S.
+# keyboard, you will probably want to use:
+#    Option "XkbModel"    "pc102"
+# If you have a US Microsoft Natural keyboard, you can use:
+#    Option "XkbModel"    "microsoft"
+#
+# Then to change the language, change the Layout setting.
+# For example, a german layout can be obtained with:
+#    Option "XkbLayout"   "de"
+# or:
+#    Option "XkbLayout"   "de"
+#    Option "XkbVariant"  "nodeadkeys"
+#
+# If you'd like to switch the positions of your capslock and
+# control keys, use:
+#    Option "XkbOptions"  "ctrl:swapcaps"
+
+# These are the default XKB settings for XFree86
+#    Option "XkbRules"    "xfree86"
+#    Option "XkbModel"    "pc101"
+#    Option "XkbLayout"   "us"
+#    Option "XkbVariant"  ""
+#    Option "XkbOptions"  ""
+
+#    Option "XkbDisable"
+
+#    Option "XkbRules"	"xfree86"
+#    Option "XkbModel"	"pc101"
+#    Option "XkbLayout"	"us"
+
+EndSection
+
+
+# **********************************************************************
+# Core Pointer's InputDevice section
+# **********************************************************************
+
+Section "InputDevice"
+
+# Identifier and driver
+
+    Identifier	"Mouse1"
+    Driver	"mouse"
+    Option "ZAxisMapping" "4 5"
+    Option "Protocol"    "IMPS/2"
+    Option "Device"      "/dev/psaux"
+
+# Mouse-speed setting for PS/2 mouse.
+
+#    Option "Resolution"	"256"
+
+# When using XQUEUE, comment out the above two lines, and uncomment
+# the following line.
+
+#    Option "Protocol"	"Xqueue"
+
+# Baudrate and SampleRate are only for some Logitech mice. In
+# almost every case these lines should be omitted.
+
+#    Option "BaudRate"	"9600"
+#    Option "SampleRate"	"150"
+
+# Emulate3Buttons is an option for 2-button Microsoft mice
+# Emulate3Timeout is the timeout in milliseconds (default is 50ms)
+
+#    Option "Emulate3Buttons"
+#    Option "Emulate3Timeout"    "50"
+
+# ChordMiddle is an option for some 3-button Logitech mice
+
+#    Option "ChordMiddle"
+
+EndSection
+
+
+# **********************************************************************
+# Other input device sections 
+# this is optional and is required only if you
+# are using extended input devices.  This is for example only.  Refer
+# to the XF86Config man page for a description of the options.
+# **********************************************************************
+#
+# Section "InputDevice" 
+#    Identifier  "Mouse2"
+#    Driver      "mouse"
+#    Option      "Protocol"      "MouseMan"
+#    Option      "Device"        "/dev/mouse2"
+# EndSection
+#
+# Section "InputDevice"
+#    Identifier "spaceball"
+#    Driver     "magellan"
+#    Option     "Device"        "/dev/cua0"
+# EndSection
+#
+# Section "InputDevice"
+#    Identifier "spaceball2"
+#    Driver     "spaceorb"
+#    Option     "Device"        "/dev/cua0"
+# EndSection
+#
+# Section "InputDevice"
+#    Identifier "touchscreen0"
+#    Driver     "microtouch"
+#    Option     "Device"        "/dev/ttyS0"
+#    Option     "MinX"          "1412"
+#    Option     "MaxX"          "15184"
+#    Option     "MinY"          "15372"
+#    Option     "MaxY"          "1230"
+#    Option     "ScreenNumber"  "0"
+#    Option     "ReportingMode" "Scaled"
+#    Option     "ButtonNumber"  "1"
+#    Option     "SendCoreEvents"
+# EndSection
+#
+# Section "InputDevice"
+#    Identifier "touchscreen1"
+#    Driver     "elo2300"
+#    Option     "Device"        "/dev/ttyS0"
+#    Option     "MinX"          "231"
+#    Option     "MaxX"          "3868"
+#    Option     "MinY"          "3858"
+#    Option     "MaxY"          "272"
+#    Option     "ScreenNumber"  "0"
+#    Option     "ReportingMode" "Scaled"
+#    Option     "ButtonThreshold"       "17"
+#    Option     "ButtonNumber"  "1"
+#    Option     "SendCoreEvents"
+# EndSection
+
+# **********************************************************************
+# Monitor section
+# **********************************************************************
+
+# Any number of monitor sections may be present
+
+Section "Monitor"
+
+    Identifier  "My Monitor"
+
+# HorizSync is in kHz unless units are specified.
+# HorizSync may be a comma separated list of discrete values, or a
+# comma separated list of ranges of values.
+# NOTE: THE VALUES HERE ARE EXAMPLES ONLY.  REFER TO YOUR MONITOR'S
+# USER MANUAL FOR THE CORRECT NUMBERS.
+
+#    HorizSync   31.5, 35.15, 35.5
+
+    HorizSync	30-64         # multisync
+#    HorizSync	31.5, 35.2    # multiple fixed sync frequencies
+#    HorizSync	15-25, 30-50  # multiple ranges of sync frequencies
+
+# VertRefresh is in Hz unless units are specified.
+# VertRefresh may be a comma separated list of discrete values, or a
+# comma separated list of ranges of values.
+# NOTE: THE VALUES HERE ARE EXAMPLES ONLY.  REFER TO YOUR MONITOR'S
+# USER MANUAL FOR THE CORRECT NUMBERS.
+
+    VertRefresh 50-70
+
+EndSection
+
+
+# **********************************************************************
+# Graphics device section
+# **********************************************************************
+
+# Any number of graphics device sections may be present
+
+# Standard VGA Device:
+
+Section "Device"
+    Identifier	"Standard VGA"
+    VendorName	"Unknown"
+    BoardName	"Unknown"
+
+# The chipset line is optional in most cases.  It can be used to override
+# the driver's chipset detection, and should not normally be specified.
+
+#    Chipset	"generic"
+
+# The Driver line must be present.  When using run-time loadable driver
+# modules, this line instructs the server to load the specified driver
+# module.  Even when not using loadable driver modules, this line
+# indicates which driver should interpret the information in this section.
+
+    Driver     "vga"
+# The BusID line is used to specify which of possibly multiple devices
+# this section is intended for.  When this line isn't present, a device
+# section can only match up with the primary video device.  For PCI
+# devices a line like the following could be used.  This line should not
+# normally be included unless there is more than one video device
+# intalled.
+
+#    BusID      "PCI:0:10:0"
+
+#    VideoRam	256
+
+#    Clocks	25.2 28.3
+
+EndSection
+
+# Device configured by xf86config:
+
+Section "Device"
+    Identifier  "RIVA TNT"
+    Driver      "nvidia"
+    #VideoRam    131072
+    # Insert Clocks lines here if appropriate
+EndSection
+
+
+# **********************************************************************
+# Screen sections
+# **********************************************************************
+
+# Any number of screen sections may be present.  Each describes
+# the configuration of a single screen.  A single specific screen section
+# may be specified from the X server command line with the "-screen"
+# option.
+Section "Screen"
+    Identifier  "Screen 1"
+    Device      "RIVA TNT"
+    Monitor     "My Monitor"
+    DefaultDepth 24
+
+    Subsection "Display"
+        Depth       8
+        Modes       "1280x1024" "1024x768" "800x600" "640x480"
+        ViewPort    0 0
+    EndSubsection
+    Subsection "Display"
+        Depth       16
+        Modes       "1280x1024" "1024x768" "800x600" "640x480"
+        ViewPort    0 0
+    EndSubsection
+    Subsection "Display"
+        Depth       24
+        Modes       "1024x768"
+        ViewPort    0 0
+    EndSubsection
+EndSection
+
+# **********************************************************************
+# ServerLayout sections.
+# **********************************************************************
+
+# Any number of ServerLayout sections may be present.  Each describes
+# the way multiple screens are organised.  A specific ServerLayout
+# section may be specified from the X server command line with the
+# "-layout" option.  In the absence of this, the first section is used.
+# When now ServerLayout section is present, the first Screen section
+# is used alone.
+
+Section "ServerLayout"
+
+# The Identifier line must be present
+    Identifier  "Simple Layout"
+
+# Each Screen line specifies a Screen section name, and optionally
+# the relative position of other screens.  The four names after
+# primary screen name are the screens to the top, bottom, left and right
+# of the primary screen.  In this example, screen 2 is located to the
+# right of screen 1.
+
+    Screen "Screen 1"
+
+# Each InputDevice line specifies an InputDevice section name and
+# optionally some options to specify the way the device is to be
+# used.  Those options include "CorePointer", "CoreKeyboard" and
+# "SendCoreEvents".
+
+    InputDevice "Mouse1" "CorePointer"
+    InputDevice "Keyboard1" "CoreKeyboard"
+
+EndSection
+
+# Section "DRI"
+#    Mode 0666
+# EndSection
+