none

diff --git a/TWiki/TWikiHistory.mdwn b/TWiki/TWikiHistory.mdwn
index 68af5c3..6538bb0 100644 (file)
--- a/TWiki/TWikiHistory.mdwn
+++ b/TWiki/TWikiHistory.mdwn
@@ -80,6 +80,7 @@
 - [[PeterThoeny]] - 29 Jul 2000: New variables `%GMTIME{"..."}%` and `%SERVERTIME{"..."}%` . More in [[TWikiVariables]].
 - [[PeterThoeny]] - 16 Aug 2000: New [[TWikiPreferences]] variables `%HTTP_EQUIV_ON_VIEW%` , `%HTTP_EQUIV_ON_EDIT%` and `%HTTP_EQUIV_ON_PREVIEW%` that define the `<meta http-equiv="...">` meta tags for the TWiki templates. This can be used for example to set a document expiration time.
 - [[PeterThoeny]] - 19 Aug 2000: Ref-By link searches all webs (not just the current web.)
+- [[AlWilliams]], [[ManpreetSingh]] - 18 Sep 2000: Added forced internal links. Write `[[text formatting FAQ]]` to get the link [[text formatting FAQ|Main/TextFormattingFAQ]] that points to topic [[TextFormattingFAQ]].
 
 **Related Topics**
 
@@ -87,4 +88,4 @@
 - [[TWikiPlannedFeatures]] has a list of planned features.
 - [[TWikiEnhancementRequests]] is the place where you can add your enhancement requests.
 
--- [[PeterThoeny]] - 20 Aug 2000 <br />
+-- [[PeterThoeny]] - 18 Sep 2000 <br />

diff --git a/TWiki/TWikiVariables.mdwn b/TWiki/TWikiVariables.mdwn
index abe93d4..fe7a3a8 100644 (file)
--- a/TWiki/TWikiVariables.mdwn
+++ b/TWiki/TWikiVariables.mdwn
@@ -58,6 +58,10 @@ TWiki expands the following variables enclosed in % percent signs:
     <td> The current topic name, is <b>%TOPIC%</b></td>
   </tr>
   <tr>
+    <td><code>%SPACEDTOPIC%</code></td>
+    <td> The current topic name with added spaces, for regular expression search of Ref-By, is <b></b></td>
+  </tr>
+  <tr>
     <td><code>%GMTIME%</code></td>
     <td> GM time, is <b>29 Jun 2010 - 15:24</b></td>
   </tr>
@@ -234,4 +238,4 @@ Additional variables are defined in the preferences ( site-level ( **_SL_** ) in
   </tr>
 </table>
 
--- [[PeterThoeny]] - 17 Aug 2000 <br />
+-- [[PeterThoeny]] - 18 Sep 2000 <br />

diff --git a/TWiki/TextFormattingRules.mdwn b/TWiki/TextFormattingRules.mdwn
index 6941040..43c6dce 100644 (file)
--- a/TWiki/TextFormattingRules.mdwn
+++ b/TWiki/TextFormattingRules.mdwn
@@ -4,13 +4,14 @@ It is easy to collaborate, just type your text. You don't need to know HTML at a
 
 The Collaborative Work Area is a bunch of related links that are editable through your web browser.
 
-The TWiki web has the following types of internal links:
+The TWiki web has the following types of **_internal links:_**
 
 - [[GoodStyle]] is a topic that is part of the current TWiki web.
 - [[NotExistingYet]] is a topic waiting to be written. You could create that topic by clicking on the question mark. (Do not create that topic, you would wreck this example!)
 - [[ReadmeFirst]] is a topic in a different TWiki web. (You write it as _Web.TopicName_ , but it will show up as _TopicName_ )
+- You can create a forced internal link by enclosing words in double square brackets, i.e. write `[[text formatting FAQ]]` to get [[text formatting FAQ|Main/TextFormattingFAQ]] that links to topic [[TextFormattingFAQ]]. Text within the brackets may contain optional spaces. You can also refer to a different web, i.e. `[[Main.TWiki users]]` points to [[TWikiUsers]] in the Main web.
 
-External links:
+**_External links:_**
 
 - `http://...`, `https://...`, `ftp://...` and `mailto:...@...` are linked automatically.
 - Email addresses like <code> <name@domain.com> </code> are linked automatically.