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

diff --git a/EditingTips b/EditingTips
index 7b5c7ee..52d062b 100644
--- a/EditingTips
+++ b/EditingTips
@@ -17,20 +17,34 @@ You can use URLs directly: http://www.codewiz.org/ ,
 or you can make descriptive links with [[http://www.codewiz.org/ | some anchor text]].
 Links to images will appear inline: http://www.w3.org/Icons/valid-css.png
 
-{{GerryStich.jpg|Stich!}}
-
 Anchored links also work with [[FrontPage|wiki pages]], [[/index.html | local paths]], and [[non_wiki_words]].
 
 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: 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 >>
 
-Included text:
-{{IncludedPage}}
-
 == Block elements ==
 
 Leave blank lines between paragraphs.