From 86ec052fa50aed4131486ea26d8284751ed9fe36 Mon Sep 17 00:00:00 2001
From: sam_marshall <sam_marshall>
Date: Wed, 27 Sep 2006 11:18:40 +0000
Subject: [PATCH] Changed wiki help to clarify that the wiki markup only works
 when not using the WYSIWYG editor. (This was seriously confusing our users!)

---
 lang/en_utf8/help/wiki/howtowiki.html | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lang/en_utf8/help/wiki/howtowiki.html b/lang/en_utf8/help/wiki/howtowiki.html
index 0eccdc60e5..66a120efae 100644
--- a/lang/en_utf8/help/wiki/howtowiki.html
+++ b/lang/en_utf8/help/wiki/howtowiki.html
@@ -58,8 +58,10 @@ enter edit mode for that page. Enter your text, save and you have a new wiki pag
 
 <p><a name="wikimarkup"></a><b>Wiki Markup</b>:<br />
 
-Each page inside a Wiki can be edited easily, using wiki markup.
-
+If you are using the WYSIWYG HTML editor with ordinary word-processor style controls, then you 
+should use those controls to format your entry. Otherwise (when the edit box is just a normal 
+text box with no special controls) you can use the following wiki markup. 
+<b>These features do not apply when using the WYSIWYG editor</b>.   
 </p>
 
 <h4> Paragraphs</h4>
-- 
2.39.5