none

1 files changed, 44 insertions, 17 deletions

diff --git a/TWiki/TextFormattingRules.mdwn b/TWiki/TextFormattingRules.mdwn
index 481ba697..d49447d4 100644
--- a/TWiki/TextFormattingRules.mdwn
+++ b/TWiki/TextFormattingRules.mdwn
@@ -25,9 +25,9 @@ The %WIKITOOLNAME% web has the following types of **_internal links:_**
   <tr>
     <td valign="top"><strong>Paragraphs:</strong><br /> Blank lines will create new paragraphs. </td>
     <td valign="top"><span style="background: #FFFFCC"><font color="#990000"> <pre>
- 1st paragraph
+1st paragraph
 
- 2nd paragraph
+2nd paragraph
 </pre> </font></span></td>
     <td valign="top"> 1st paragraph <p> 2nd paragraph </p>
     </td>
@@ -35,43 +35,43 @@ The %WIKITOOLNAME% web has the following types of **_internal links:_**
   <tr>
     <td valign="top"><strong>Bold Text:</strong><br /> Words get <strong>bold</strong> by enclosing them in <code>*</code> asterisks. </td>
     <td valign="top"><span style="background: #FFFFCC"><font color="#990000"> <pre>
- *Bold*
+*Bold*
 </pre> </font></span></td>
     <td valign="top"><strong>Bold</strong></td>
   </tr>
   <tr>
     <td valign="top"><strong>Italic Text:</strong><br /> Words get <em>italic</em> by enclosing them in <code>_</code> underscores. </td>
     <td valign="top"><span style="background: #FFFFCC"><font color="#990000"> <pre>
- _Italic_
+_Italic_
 </pre> </font></span></td>
     <td valign="top"><em>Italic</em></td>
   </tr>
   <tr>
     <td valign="top"><strong>Bold Italic:</strong><br /> Words get <em>_bold italic</em> by enclosing them in <code>_</code> double-underscores. </td>
     <td valign="top"><span style="background: #FFFFCC"><font color="#990000"> <pre>
- __Bold italic__
+__Bold italic__
 </pre> </font></span></td>
     <td valign="top"><strong><em>Bold italic</em></strong></td>
   </tr>
   <tr>
     <td valign="top"><strong>Fixed Font:</strong><br /> Words get shown in <code>fixed font</code> by enclosing them in <code><nop>=<nop></nop></nop></code> equal signs. </td>
     <td valign="top"><span style="background: #FFFFCC"><font color="#990000"> <pre>
- =Fixed font=
+=Fixed font=
 </pre> </font></span></td>
     <td valign="top"><code>Fixed font</code></td>
   </tr>
   <tr>
     <td valign="top"><strong>Bold Fixed Font:</strong><br /> Words get shown in <code><b>bold fixed font</b></code> by enclosing them in <code><b><nop></nop></b></code> double equal signs. </td>
     <td valign="top"><span style="background: #FFFFCC"><font color="#990000"> <pre>
- ==Bold fixed==
+==Bold fixed==
 </pre> </font></span></td>
     <td valign="top"><code><b>Bold fixed</b></code></td>
   </tr>
   <tr>
     <td valign="top"><strong><em>Note:</em></strong> Make sure to "stick" the <code>* _ = <nop>==<nop></nop></nop></code> signs to the words, e.g. take away spaces. </td>
     <td valign="top"><span style="background: #FFFFCC"><font color="#990000"> <pre>
- _This works_,
- _this not _
+_This works_,
+_this not _
 </pre> </font></span></td>
     <td valign="top"><em>This works</em>, _this not _ </td>
   </tr>
@@ -189,23 +189,50 @@ class CatAnimal {
   <tr>
     <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"><span style="background: #FFFFCC"><font color="#990000"> <pre>
- WebNotify,
- Know.ReadmeFirst
+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>, <span style="background:"><font color="">Readme First</font></span><a href="http://LOCATIONKnow/ReadmeFirst">?</a></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>
   </tr>
   <tr>
-    <td valign="top"><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. </td>
+    <td valign="top"><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"><span style="background: #FFFFCC"><font color="#990000"> <pre>
- [[wiki syntax]],
- [[%MAINWEB%.TWiki users]]
+[[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>
+  </tr>
+  <tr>
+    <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>[text][reference]]</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>[go home][WebHome@MyAnchor]]</nop></code> and <code>[<nop>[Yahoo!][http://www.yahoo.com/#somewhere]]</nop></code>. </td>
+    <td valign="top"><span style="background: #FFFFCC"><font color="#990000"> <pre>
+[[syntax][WikiSyntax]]
+
+[[GNU][http://gnu.org]]
 </pre> </font></span></td>
-    <td valign="top"><span style="background:"><font color="">wiki syntax</font></span><a href="http://LOCATION/WikiSyntax">?</a>, <span style="background:"><font color="">%MAINWEB%.TWiki users</font></span><a href="http://LOCATION/MAINWEBTWikiUsers">?</a></td>
+    <td valign="top"><span style="background:"><font color="">Wiki Syntax</font></span><a href="http://LOCATION/Syntax">?</a><p><span style="background:"><font color="">http://gnu.org</font></span><a href="http://LOCATION/GNU">?</a></p>
+    </td>
+  </tr>
+  <tr>
+    <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"><span style="background: #FFFFCC"><font color="#990000"> <pre>
+[[WebHome@NotThere]]
+
+[[Jump][@MyAnchor]]
+
+@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/WebHomeNotThere">?</a><p><span style="background:"><font color="">@My Anchor</font></span><a href="http://LOCATION/Jump">?</a></p>
+      <p> @MyAnchor To here </p>
+    </td>
   </tr>
   <tr>
     <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"><span style="background: #FFFFCC"><font color="#990000"> <pre>
- &amp;lt;nop&amp;gt;SunOS
+&amp;lt;nop&amp;gt;SunOS
 </pre> </font></span></td>
     <td valign="top"><nop>SunOS </nop></td>
   </tr>