X-Git-Url: https://codewiz.org/gitweb?p=wiki.git;a=blobdiff_plain;f=EditingTips;h=fc3462b07ad2e47cd4fcc497efb6daa13c2e7f5d;hp=d195ae2466c5edf34962f8a4624f3b3817973fcb;hb=54d50c5367a31d2f412986824df18ec681f70d7f;hpb=93e5808f7e45ae33733f7819486e450ca14bde0f

diff --git a/EditingTips b/EditingTips
index d195ae2..fc3462b 100644
--- a/EditingTips
+++ b/EditingTips
@@ -1,32 +1,33 @@
-Note: You should use formatting sparingly, WikiWikiWeb is about content, not look.
-
-Click Edit''''''Text in the header to see the markup for this page, and try it yourself in PikiSandBox.
-
-==Text Styles==
+Click '''Raw Text''' to see the markup for this page, and try it
+yourself in WikiSandBox.
 
-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.
-
-Leave blank lines between paragraphs.
+---
 
-If you can't figure out what I mean, click EditPage to look at the source for this page.
+Our wiki syntax is deliberately similar to MoinMoin and WikiCreole.
 
+Note: You should use formatting sparingly, WikiWikiWeb is about content, not look.
+See WikiDesignPrinciples.
 
-==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 ==
 
+Leave blank lines between paragraphs.
 
-==Block elements==
+You can insert line\\
+breaks\\
+with double backslashes: \****\.
 
 If you indent text
   like this, then it is indented in the output
@@ -50,14 +51,27 @@ To insert program source without reformatting in a monospace font, use three cur
 
 Just like that.
 
-==Rulers==
+
+== Text Styles ==
+
+To write **bold text**, enclose the text in double stars: *''''''*some word*''''''*. \\
+To write //italic text//, enclose the text in double slashes: /****/some word/****/. \\
+Double quotes are also supported for backwards compatiblity with other wikis. \\
+These keywords are highlighted: FIXME, TODO, DONE.
+
+TIP: four consecutive stars (*////*////*////*) or slashes (/****/****/****/****) are a good
+way to prevent the syntax. :-)
+
+
+== Rulers ==
 
 ---
 ----
 -----
 ------
 
-==Headings==
+
+== Headings ==
 
 ===Level 2===
 ====Level 3====
@@ -65,9 +79,24 @@ Just like that.
 ======Level 5======
 
 
-==Final Notes==
+== Tables ==
 
-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.
+||= Table Heading 1 ||= Table heading 2 ||= Table heading 3||
+||  Table cell 4    ||  Table cell 5    || Table cell 6    ||
+||  Table cell 7    ||  Table cell 8    || Table cell 9    ||
 
-----
-Contributors and PikiGurus: JohnFarrell, MartinPool, BernardoInnocenti
+
+== 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, including
+<span style="color: green">CSS</span>, of course.
+</div>
+
+== Access Control Lists ==
+
+TODO: document
+
+== Final Notes ==
+
+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.