X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=EditingTips;h=b77e9d6e1dbe9c0559f9a047ace85984b7e4c99c;hb=371ddb560b568550d7a3a1fc9c1f0f4a179c7b72;hp=75b58baa877e0fa9bf005f2b0053d5a02e950217;hpb=0e0add8757fe9088b2c6e1cc916570b0ffea64fb;p=wiki.git

diff --git a/EditingTips b/EditingTips
index 75b58ba..b77e9d6 100644
--- a/EditingTips
+++ b/EditingTips
@@ -1,30 +1,33 @@
 Note: You should use formatting sparingly, WikiWikiWeb is about content, not look.
 
-Click '''Raw''''''Text''' in the header to see the markup for this page, and try it yourself in WikiSandBox.
+Click '''Raw Text''' in the header to see the markup for this page, and try it
+yourself in WikiSandBox.
 
-==Text Styles==
+This wiki syntax is deliberately similar to MoinMoin and WikiCreole.
 
-You can also write ''italics'' and '''bold'''.
-To write italics, enclose the text in double single quotes.
-To write bold, enclose the text in triple single quotes.
+== Text Styles ==
 
 Leave blank lines between paragraphs.
 
+To write //italics//, enclose the text in double slashes: /''''''/word/''''''/.  
+To write **bold**, enclose the text in double stars: *''''''*word*''''''*.
+Double and triple quotes are also supported for backwards compatiblity with other wiki's.
+These keywords are highlighted: FIXME, TODO, DONE.  
 
-==Links==
+== Links ==
 
 Names of pages have to LookLikeThis.
 It's called a WikiName.
 If you write a word that LooksLikeThis, it will be automatically turned into a link.
 
-You can use URLs directly: http://www.codewiz.org/ , or you can make descriptive links with [[http://www.codewiz.org/ some anchor text]]. Links to images will appear inline: http://www.w3.org/Icons/valid-css.png
+You can use URLs directly: http://www.codewiz.org/ ,
+or you can make descriptive links with [[http://www.codewiz.org/ | some anchor text]].
+Links to images will appear inline: http://www.w3.org/Icons/valid-css.png
 
+Anchored links also work with [[FrontPage|wiki pages]], [[/index.html | local paths]], and [[non_wiki_words]].
 
-Anchored links also work with [[FrontPage wiki pages]]
-and [[/index.html local paths]].
 
-
-==Block elements==
+== Block elements ==
 
 If you indent text
   like this, then it is indented in the output
@@ -48,27 +51,39 @@ To insert program source without reformatting in a monospace font, use three cur
 
 Just like that.
 
-==Rulers==
+== Rulers ==
 
 ---
 ----
 -----
 ------
 
-==Headings==
+
+== Headings ==
 
 ===Level 2===
 ====Level 3====
 =====Level 4=====
 ======Level 5======
 
+
 == Tables ==
 
-TODO
+|| Table cell 1 || Table cell 2 || Table cell 3 ||
+|| Table cell 4 || Table cell 5 || Table cell 6 ||
+|| Table cell 7 || Table cell 8 || Table cell 9 ||
+
+TODO: support table headers
+
+
+== Inline HTML ==
+
+<div style="align:right; clear:right; font-size:24px; width:20em; max-width:60%; margin:1ex 0ex 1ex 1ex; border:3px outset #969; background-color:#faf; color: #f00; padding:.3em; text-align:center;">You can use {{div}}, {{span}} and {{iframe}} elements with any attribute.</div>
+
+== Access Control Lists ==
 
-|| cell1 || cell2 || cell3 ||
-|| cell4 || cell5 || cell6 ||
+TODO: document
 
-==Final Notes==
+== Final Notes ==
 
-Be aware that PikiPiki does not lock pages during editing, so if you pause for a long time on the edit screen you may overwrite somebody else's changes.
+Be aware that GeekiGeeki does not lock pages during editing, so if you pause for a long time on the edit screen you may overwrite somebody else's changes.