X-Git-Url: https://codewiz.org/gitweb?p=wiki.git;a=blobdiff_plain;f=EditingTips;h=4f397adc9f9f2ba4963e4876bf4c6c4df7a97f54;hp=d22946cf1cc693e612bf61d380aac7aac69d3b6e;hb=0a79696d4989d18bf23532c9e6c5d1a4aaaddd19;hpb=f71e84646a581871e6eb075a657405e5e91ebd30

diff --git a/EditingTips b/EditingTips
index d22946c..4f397ad 100644
--- a/EditingTips
+++ b/EditingTips
@@ -21,6 +21,31 @@ Anchored links also work with [[FrontPage|wiki pages]], [[/index.html | local pa
 
 Image links: [[http://www.laptopgiving.org/|GiveOneGetOne.jpg]]
 
+== Inline media ==
+
+==== Images ====
+{{GerryStich.jpg}}
+
+==== Images with thumbnails ====
+{{GerryStich.jpg|Stich!}}
+
+==== Scaled images ====
+{{GerryStich.jpg|tiny|maxwidth=48}}
+
+
+==== Including other wiki pages ====
+{{IncludedPage}}
+
+TODO: one day this will let you pass argument as a templating engine
+
+==== Including external resources inline ====
+{{http://www.codewiz.org/wikigit/geekigeeki.git/blob_plain/HEAD:/geekigeeki.py}}
+
+== Macros ==
+
+<<TitleSearch>>
+<<NonexistentMacro | param1 | param2 >>
+
 == Block elements ==
 
 Leave blank lines between paragraphs.
@@ -54,9 +79,12 @@ 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/****/. \\
-To write ##monospace text##, enclose the text in double hashes: #****#some word#****#. \\
+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.