Edit page EditingTips

[wiki.git] / EditingTips

diff --git a/EditingTips b/EditingTips
index 4f397adc9f9f2ba4963e4876bf4c6c4df7a97f54..9b6f6ed22599e18aef1139276e5eb68e5bb71074 100644 (file)
--- a/EditingTips
+++ b/EditingTips
@@ -19,6 +19,8 @@ Links to images will appear inline: http://www.w3.org/Icons/valid-css.png
 
 Anchored links also work with [[FrontPage|wiki pages]], [[/index.html | local paths]], and [[non_wiki_words]].
 
+If you link to a directory, GeekiGeeki will automatically generate an index for it: [[sys/macros]]
+
 Image links: [[http://www.laptopgiving.org/|GiveOneGetOne.jpg]]
 
 == Inline media ==
@@ -34,17 +36,24 @@ Image links: [[http://www.laptopgiving.org/|GiveOneGetOne.jpg]]
 
 
 ==== Including other wiki pages ====
-{{IncludedPage}}
 
-TODO: one day this will let you pass argument as a templating engine
+Use the same syntax to embed wiki pages inside other wiki pages:
+
+  {{IncludedPage}}
+
+You can also pass arguments to included pages!  It works like a simple template system:
+
+  {{TemplatePage | hello=Ciao | world=mondo}}
+
 
 ==== Including external resources inline ====
 {{http://www.codewiz.org/wikigit/geekigeeki.git/blob_plain/HEAD:/geekigeeki.py}}
 
 == Macros ==
 
-<<TitleSearch>>
-<<NonexistentMacro | param1 | param2 >>
+ * Your remote IP: <<CgiVar | REMOTE_ADDR>>
+ * Query string: <<CgiVar | QUERY_STRING>>
+ * <<NonexistentMacro | param1 | param2 >>
 
 == Block elements ==
 
@@ -58,14 +67,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:
 
 {{{
@@ -76,6 +77,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 ==