X-Git-Url: https://codewiz.org/gitweb?p=wiki.git;a=blobdiff_plain;f=EditingTips;h=7847d78530c58a9a564aa9b7ff6b1c4a91ffb4cf;hp=4f397adc9f9f2ba4963e4876bf4c6c4df7a97f54;hb=6a8bf3e18fe0a9a0beba78db44c37119a2710696;hpb=4442d5440294422b2baf60a03513dc67c13e16ce

diff --git a/EditingTips b/EditingTips
index 4f397ad..7847d78 100644
--- a/EditingTips
+++ b/EditingTips
@@ -9,16 +9,13 @@ See WikiDesignPrinciples.
 
 == Links ==
 
-Names of pages have to LookLikeThis.
-It's called a WikiName.
-If you write a word that LooksLikeThis, it will be automatically turned into a link.
-
-You can use URLs directly: http://www.codewiz.org/ ,
+You can Link to URLs by enclosing them in double square brackets: [[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
 
 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 +31,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 +62,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 +72,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 ==
 
@@ -122,10 +134,26 @@ You can use ##div##, ##span## and ##iframe## elements with any attribute, includ
 <span style="color: green">CSS</span>, of course.
 </div>
 
-== Access Control Lists ==
+== Pragmas ==
+
+Wiki pages can specify special-purpose commands in their header.  In the form:
+
+{{{
+# &lt;keyword&gt; &lt;values&gt;
+}}}
+
+=== Access Control Lists ===
+
+{{{
+# acl SomeUser:read,write OtherUser:read All:none
+}}}
+
+Limit read or write access to specific authenticated users
 
-TODO: document
+=== Custom cascading style sheets ===
 
-== Final Notes ==
+{{{
+# css my_style.css
+}}}
 
-Be aware that GeekiGeeki does not lock pages during editing, so if you pause for a long time on the edit screen you may overwrite somebody else's changes.
+Include a user-specified custom CSS before the default one(s).