Edit page IncludedPage

[wiki.git] / EditingTips

diff --git a/EditingTips b/EditingTips
index 045579605b3e3adee4c07251074b4ba4740efab8..b7c53b5d2202f106f33b45c9dde062c1afd176b4 100644 (file)
--- a/EditingTips
+++ b/EditingTips
@@ -17,18 +17,38 @@ 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
 
 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]]
 
 Anchored links also work with [[FrontPage|wiki pages]], [[/index.html | local paths]], and [[non_wiki_words]].
 
 Image links: [[http://www.laptopgiving.org/|GiveOneGetOne.jpg]]
 

-== Macros ==
+== Inline media ==
+
+==== Images ====
+{{GerryStich.jpg}}
+
+==== Images with thumbnails ====
+{{GerryStich.jpg|Stich!}}
+
+==== Scaled images ====
+{{GerryStich.jpg|tiny|maxwidth=48}}
+

 
 

-<<TitleSearch>>
-<<NonexistentMacro | param1 | param2 >>
+==== Including other wiki pages ====
+{{IncludedPage}}

 
 

-Included text: <<Include | IncludedPage>>
+You can also pass arguments to included pages!  It works like a template engine:
+
+{{IncludedPage | hello=Ciao }}
+
+
+==== Including external resources inline ====
+{{http://www.codewiz.org/wikigit/geekigeeki.git/blob_plain/HEAD:/geekigeeki.py}}
+
+== Macros ==
+
+ * Your remote IP: <<CgiVar | REMOTE_ADDR>>
+ * Query string: <<CgiVar | QUERY_STRING>>
+ * <<NonexistentMacro | param1 | param2 >>

 
 == Block elements ==
 
 
 == Block elements ==
 


@@ -42,14 +62,6 @@ If you indent text
   like this, then it is indented in the output
     you can have multiple levels of indent
 
   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:
 
 {{{
 To insert program source without reformatting in a monospace font, use three curly braces:
 
 {{{


@@ -60,6 +72,22 @@ To insert program source without reformatting in a monospace font, use three cur
 
 Just like that.
 
 
 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 ==
 
 
 == Text Styles ==