Edit page blog/2009/April

[wiki.git] / EditingTips

diff --git a/EditingTips b/EditingTips
index 0351f0d1552fcd0a3393bb45648f90a622cebf51..4f397adc9f9f2ba4963e4876bf4c6c4df7a97f54 100644 (file)
--- a/EditingTips
+++ b/EditingTips
@@ -17,12 +17,35 @@ 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: 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 ==
 
 Leave blank lines between paragraphs.