X-Git-Url: https://codewiz.org/gitweb?p=wiki.git;a=blobdiff_plain;f=EditingTips;h=7847d78530c58a9a564aa9b7ff6b1c4a91ffb4cf;hp=b7c53b5d2202f106f33b45c9dde062c1afd176b4;hb=813dc31c6bac2f9e7c578cc917c649951adccc57;hpb=513115227210f8050a10780c085a770ea1c963a8

diff --git a/EditingTips b/EditingTips
index b7c53b5..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,11 +31,14 @@ Image links: [[http://www.laptopgiving.org/|GiveOneGetOne.jpg]]
 
 
 ==== Including other wiki pages ====
-{{IncludedPage}}
 
-You can also pass arguments to included pages!  It works like a template 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:
 
-{{IncludedPage | hello=Ciao }}
+  {{TemplatePage | hello=Ciao | world=mondo}}
 
 
 ==== Including external resources inline ====
@@ -134,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;
+}}}
 
-TODO: document
+=== Access Control Lists ===
 
-== Final Notes ==
+{{{
+# acl SomeUser:read,write OtherUser:read All:none
+}}}
+
+Limit read or write access to specific authenticated users
+
+=== Custom cascading style sheets ===
+
+{{{
+# 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).