Remove doubled text w.r.t. in-wiki links. Again I hope I didn't break anything

else.

1 files changed, 18 insertions, 18 deletions

diff --git a/TWiki/TWikiVariables.mdwn b/TWiki/TWikiVariables.mdwn
index ee6c7685..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>[[HOMETOPIC]]</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>[[NOTIFYTOPIC]]</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>[[IncludeTopicsAndWebPages]]. 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>[[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">
+    <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>[[RegularExpression]] 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>[[BookView]] 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>[[FormattedSearch]]</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>[[WebTopicViewTemplate]] and <span style="background:"><font color="">Web Topic Non Wiki Template</font></span>[[WebTopicNonWikiTemplate]]<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>[[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>
+    <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>[[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>
+    <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>[[TWikiAccessControl]]) </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>[[TWikiAccessControl]]) </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>[[TWikiAccessControl]]) </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>[[TWikiAccessControl]]) </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>[[TWikiAccessControl]]) </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>[[TWikiAccessControl]]) </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>[[TWikiAccessControl]]) </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>[[TWikiAccessControl]]) </td>
+    <td> List of users and groups who are <strong>allowed</strong> to rename the current topic. (More in [[TWikiAccessControl]]) </td>
   </tr>
   <tr>
     <td>