none

1 files changed, 4 insertions, 4 deletions

diff --git a/TWiki/TextFormattingFAQ.mdwn b/TWiki/TextFormattingFAQ.mdwn
index 12b439ee..c28d6d9b 100644
--- a/TWiki/TextFormattingFAQ.mdwn
+++ b/TWiki/TextFormattingFAQ.mdwn
@@ -51,11 +51,11 @@ There are two work arounds if you want to display angle brackets:
 
 <a name="ques">Q:</a> **Some words (like [[WinAPI]]) have an unwanted question mark at the end. How can I prevent that?**
 
-A question mark after a word is a link to a not yet existing topic. For example, [[WinAPI]] is a valid [[WikiTopic]] name in [[WikiNotation]], but the actual topic _WinAPI_ does not exist.
+A question mark after a word is a link to a not yet existing topic. For example, [[WinAPI]] is a valid [[WikiName]], but the actual topic _WinAPI_ does not exist.
 
-If you do not intend to create a topic for a valid TWiki topic name, you can prevent it being linked by putting an HTML tag in front of it. I usually use &lt;NOP&gt;. This is a non existing HTML tag, so a browser just ignores it.
+If you do not intend to create a topic for a valid [[WikiWord]], you can prevent it being linked by putting an HTML tag in front of it. I usually use &lt;nop&gt;. This is a non existing HTML tag, so a browser just ignores it.
 
-* Example text: <br /><code>WinAPI as it is, &lt;NOP&gt;WinAPI with preceeding NOP.</code>
+* Example text: <br /><code>WinAPI as it is, &lt;nop&gt;WinAPI with preceeding NOP.</code>
 * Example output: <br />[[WinAPI]] as it is, WinAPI with preceeding NOP.
 
 ----
@@ -227,4 +227,4 @@ Place text you would like to specify a color inside &lt;FONT COLOR="colorCode"&g
 
 ----
 
--- [[Main/PeterThoeny]] - 08 Aug 1999
+-- [[Main/PeterThoeny]] - 18 Aug 2000