X-Git-Url: https://codewiz.org/gitweb?p=wiki.git;a=blobdiff_plain;f=EditingTips;h=132aac686102f2f09903f7b833b5ec93e7fc8645;hp=0a95db6eaea4929ca12a53332fbb9111c9155b9b;hb=2118705f068f50f216b36f18ff5a043a2d9ceff7;hpb=96651bc67259efd60359f7d257350265bdd16c62

diff --git a/EditingTips b/EditingTips
index 0a95db6..132aac6 100644
--- 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.
@@ -35,14 +58,6 @@ If you indent text
   like this, then it is indented in the output
     you can have multiple levels of indent
 
-And if you put asterisks at the start of the line
-
-  * you get a 
-  * bulleted
-  * list
-    * which can also be indented
-      * to several levels
-
 To insert program source without reformatting in a monospace font, use three curly braces:
 
 {{{
@@ -53,6 +68,22 @@ To insert program source without reformatting in a monospace font, use three cur
 
 Just like that.
 
+== Itemized lists ==
+
+If you put asterisks (*) at the start of the line
+
+  * you get a 
+  * bulleted
+  * list
+    * which can also be indented
+      * to several levels
+
+You can also have numbered lists, using the number (#) sign:
+ # first item
+ # second item
+   # first indented item
+   # second indented item
+ # third item
 
 == Text Styles ==