X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=EditingTips;h=ae677365e50e9c207e31cc602d69f6c1908da781;hb=c3018cf0912798fe01eca90bcc23378cb89a4d33;hp=10932b06378e43d9ea7d5009303ea969eae3fd92;hpb=e1d159af351d42990ec173b054403fe4de3a60a0;p=wiki.git

diff --git a/EditingTips b/EditingTips
index 10932b0..ae67736 100644
--- a/EditingTips
+++ b/EditingTips
@@ -21,6 +21,23 @@ 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|Stich!}}
+
+=== 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 ==
 
 Leave blank lines between paragraphs.