X-Git-Url: https://codewiz.org/gitweb?p=wiki.git;a=blobdiff_plain;f=EditingTips;h=4f397adc9f9f2ba4963e4876bf4c6c4df7a97f54;hp=8b89604adbc958089db06ce4f0d0c446dfd88633;hb=1c65645a3e0ad4c8e65387a976b5dd1ba110c5d2;hpb=f6834e0a33db82b74fb1eca6bf09609475601d0c

diff --git a/EditingTips b/EditingTips
index 8b89604..4f397ad 100644
--- a/EditingTips
+++ b/EditingTips
@@ -21,7 +21,30 @@ Anchored links also work with [[FrontPage|wiki pages]], [[/index.html | local pa
 
 Image links: [[http://www.laptopgiving.org/|GiveOneGetOne.jpg]]
 
-[[GerryStich.jpg|images with captions]]
+== 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 ==