X-Git-Url: https://codewiz.org/gitweb?p=wiki.git;a=blobdiff_plain;f=EditingTips;h=045579605b3e3adee4c07251074b4ba4740efab8;hp=b77e9d6e1dbe9c0559f9a047ace85984b7e4c99c;hb=99f920ca86018ecda47cb60d2374d4ebb98d81c8;hpb=371ddb560b568550d7a3a1fc9c1f0f4a179c7b72

diff --git a/EditingTips b/EditingTips
index b77e9d6..0455796 100644
--- a/EditingTips
+++ b/EditingTips
@@ -1,18 +1,11 @@
-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.
-
-This wiki syntax is deliberately similar to MoinMoin and WikiCreole.
+Click **Raw Text** to see the markup for this page, and try it yourself in WikiSandBox.
 
-== Text Styles ==
+---
 
-Leave blank lines between paragraphs.
+Our wiki syntax is deliberately similar to MoinMoin and WikiCreole.
 
-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.  
+Note: You should use formatting sparingly, WikiWikiWeb is about content, not look.
+See WikiDesignPrinciples.
 
 == Links ==
 
@@ -24,11 +17,27 @@ 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
 
+{{GerryStich.jpg|Stich!}}
+
 Anchored links also work with [[FrontPage|wiki pages]], [[/index.html | local paths]], and [[non_wiki_words]].
 
+Image links: [[http://www.laptopgiving.org/|GiveOneGetOne.jpg]]
+
+== Macros ==
+
+<<TitleSearch>>
+<<NonexistentMacro | param1 | param2 >>
+
+Included text: <<Include | IncludedPage>>
 
 == Block elements ==
 
+Leave blank lines between paragraphs.
+
+You can insert line\\
+breaks\\
+with double backslashes: \****\.
+
 If you indent text
   like this, then it is indented in the output
     you can have multiple levels of indent
@@ -51,6 +60,22 @@ To insert program source without reformatting in a monospace font, use three cur
 
 Just like that.
 
+
+== Text Styles ==
+
+To write **bold text**, enclose it in double stars: *////*some word*////*. \\
+To write //italic text//, enclose it in double slashes: /****/some word/****/. \\
+To write ##monospace text##, enclose it in double hashes: #****#some word#****#. \\
+To write __underlined text__, enclose it in double underscores: _****_some word_****_. \\
+To write ^^superscript text^^, enclose it in double carets: ^****^some word^****^. \\
+To write ,,subscript text,,, enclose it in double commas: ,****,some word,****,. \\
+''Double'' and '''triple''' quotes are also supported for compatiblity with other wikis. \\
+These keywords are highlighted: FIXME, TODO, DONE.
+
+TIP: four consecutive stars (*////*////*////*) or slashes (/****/****/****/****) are a good
+way to escape the syntax. :-)
+
+
 == Rulers ==
 
 ---
@@ -69,16 +94,17 @@ Just like that.
 
 == Tables ==
 
-|| 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
+||= 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    ||
 
 
 == 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>
+<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 ==