Edit page EditingTips

[wiki.git] / EditingTips

diff --git a/EditingTips b/EditingTips
index da3111e7744da642288d97d8246de1e3ca62c66f..ae677365e50e9c207e31cc602d69f6c1908da781 100644 (file)
--- a/EditingTips
+++ b/EditingTips
@@ -21,7 +21,22 @@ Anchored links also work with [[FrontPage|wiki pages]], [[/index.html | local pa
 
 Image links: [[http://www.laptopgiving.org/|GiveOneGetOne.jpg]]
 
-[[GerryStich.jpg|Stich!]]
+== 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 ==