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

diff --git a/EditingTips b/EditingTips
index 8b89604..52d062b 100644
--- a/EditingTips
+++ b/EditingTips
@@ -21,7 +21,29 @@ 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: this will let you specify arguments one day, 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 ==