X-Git-Url: https://codewiz.org/gitweb?p=wiki.git;a=blobdiff_plain;f=EditingTips;h=7847d78530c58a9a564aa9b7ff6b1c4a91ffb4cf;hp=5963c4a8fc74e96318c20d2238dee36afda3f483;hb=baeb370da99334d99655b129e6e2f7998dea29ce;hpb=078bf51686ba3f0bbe0ab3f99cfeb9d4c437d264

diff --git a/EditingTips b/EditingTips
index 5963c4a..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,15 @@ 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 minimal templating system:
+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}}
 
-{{TemplatePage | hello=Ciao | world=mondo }}
 
 ==== Including external resources inline ====
 {{http://www.codewiz.org/wikigit/geekigeeki.git/blob_plain/HEAD:/geekigeeki.py}}
@@ -133,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).