none

1 files changed, 4 insertions, 4 deletions

diff --git a/TWiki/TextFormattingRules.mdwn b/TWiki/TextFormattingRules.mdwn
index 27a722b1..3c0aa3ca 100644
--- a/TWiki/TextFormattingRules.mdwn
+++ b/TWiki/TextFormattingRules.mdwn
@@ -4,7 +4,7 @@ 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 %WIKITOOLNAME% web has the following types of **_internal links:_**
 
 * [[GoodStyle]] is a [[WikiWord]] that links to the GoodStyle topic located in the current %WIKITOOLNAME% 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!)
@@ -12,12 +12,12 @@ The TWiki web has the following types of **_internal links:_**
 **_External links:_**
 
 * `http://...`, `https://...`, `ftp://...` and `mailto:...@...` are linked automatically.
-* Email addresses like <code> <name@domainNOSPAM.com> </code> are linked automatically.
+* Email addresses like `name@domain.com` are linked automatically.
 
 **EDITING**
 
 * CapitalizedWordsStuckTogether (or [[WikiWords]]) will produce a link automatically. In case you want to link to a topic in a different %WIKITOOLNAME% web write `Web.TopicName`, i.e. write `Know.ReadmeFirst` to link to [[Know/ReadmeFirst]] located in the Know web.
-* You can create a forced internal link by enclosing words in double square brackets, i.e. write <code>[[text formatting FAQ]]</code> to get [[TextFormattingFAQ]] that links to topic [[TextFormattingFAQ]]. Text within the brackets may contain optional spaces; the topic name is formed by capitalizing the initial letter and by removing the spaces. You can also refer to a different web, i.e. <code>[[Main.TWiki users]]</code> points to [[Main/TWikiUsers]] in the Main web.
+* You can create a forced internal link by enclosing words in double square brackets, i.e. write <code>[[text formatting FAQ]]</code> to get [[TextFormattingFAQ]] that links to topic [[TextFormattingFAQ]]. Text within the brackets may contain optional spaces; the topic name is formed by capitalizing the initial letter and by removing the spaces. You can also refer to a different web, i.e. <code>[[%MAINWEB%.TWiki users]]</code> points to %MAINWEB%.TWikiUsers in the %MAINWEB% web.
 * Blank lines will create new paragraphs.
 * Words get **bold** by enclosing them in **\*** asterisks
 * Words get _italic_ by enclosing them in **\_** underscores
@@ -52,5 +52,5 @@ Variables are names that are enclosed in percent signs; they get expanded on the
 * <code>%WEB%</code> : The current web, is **%WEB%** .
 * <code>%TOPIC%</code> : The current topic name, is **%TOPIC%** .
 * <code>%ATTACHURL%</code> : The attachment URL of the current topic. Example usage: If you attach a file to a topic you can refer to it as <code>**%ATTACHURL%/image.gif**</code> to show the URL of the file or the image in your text.
-* <code>%INCLUDE\{"SomeTopic"\}%</code> : Server side include, includes another topic. The current %WIKITOOLNAME% web is the default web. Example: <code>**%INCLUDE\{"TWiki.TWikiWebsTable"\}%**</code>
+* <code>%INCLUDE\{"SomeTopic"\}%</code> : Server side include, includes another topic. The current %WIKITOOLNAME% web is the default web. Example: <code>**%INCLUDE\{"%TWIKIWEB%.TWikiWebsTable"\}%**</code>
 * There are many more variables, see [[TWikiVariables]].