Add changes from giskard

[wiki.git] / EditingTips

diff --git a/EditingTips b/EditingTips
index fc3462b07ad2e47cd4fcc497efb6daa13c2e7f5d..045579605b3e3adee4c07251074b4ba4740efab8 100644 (file)
--- a/EditingTips
+++ b/EditingTips
@@ -1,5 +1,4 @@
-Click '''Raw Text''' to see the markup for this page, and try it
-yourself in WikiSandBox.
+Click **Raw Text** to see the markup for this page, and try it yourself in WikiSandBox.
 
 ---
 
@@ -18,8 +17,18 @@ 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 ==
 
@@ -54,13 +63,17 @@ Just like that.
 
 == 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. \\
+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 prevent the syntax. :-)
+way to escape the syntax. :-)
 
 
 == Rulers ==
@@ -89,7 +102,7 @@ way to prevent the syntax. :-)
 == 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
+You can use ##div##, ##span## and ##iframe## elements with any attribute, including
 <span style="color: green">CSS</span>, of course.
 </div>