Merge commit 'remotes/trinity/master'

Conflicts:
	GeekiGeeki
	sys/geekigeeki.css

diff --combined GeekiGeeki
index 6c8cde1778f6f447bf09a321725f3653009d1c88,b80fdaa3235ddad3c3ead5cc7c58414596fa3857..6e7af9a66f055543a6139c160f4f52217e48fd86
--- 1/GeekiGeeki
--- 2/GeekiGeeki
+++ b/GeekiGeeki
@@@ -1,40 -1,41 +1,41 @@@
 -== Geeki Geeki, the Stupid Stupid Wiki Wiki ==
 +<div style="float: right">{{GerryStich.png}}</div>
  
 -<div style="float: right">GerryStich.png</div>
 +== Geeki Geeki, the Stupid Stupid Wiki Wiki ==
  
  GeekiGeeki is a minimalistic wiki with a [[http://git.or.cz/ | Git]]
  backend, a high features/complexity ratio and a clean syntax.
  Check the EditingTips page for an idea the supported markup.
  
  <div style="font-size: large; color: red;  text-align: center">
- For all your geeky wiki needs, GeekiGeeki is **the** stupid choice you can't avoid making!
+ For all your geeky wiki needs, GeekiGeeki is **the** stupid choice you can't avoid!
  </div>
  
- Tags: [[Tags/fast|fast]], [[Tags/stupid|stupid]], [[Tags/!bloated|!bloated]], [[Tags/h4x0r|h4x0r]] [[Tags/cheapasincheapbeer|cheapasincheapbeer]]
+ Tags: [[tags/fast|fast]], [[tags/stupid|stupid]], [[tags/!bloated|!bloated]], [[tags/h4x0r|h4x0r]] [[tags/cheapasincheapbeer|cheapasincheapbeer]]
  
  
  == Features ==
  
   * S^3: Simple, Small, Stupid
-  * Rich, clean markup syntax highly compatible with WikiCreole and MoinMoin
-  * Git versioned storage backend
+  * Rich, clean markup syntax, highly compatible with WikiCreole and MoinMoin
+  * Versioned and distributed storage backend based on git
+  * Easy to interface with other storage back-ends through a glue script
   * Interfaces with GitWeb for history browsing, RSS...
   * Consistent use of CSS for easy theming
   * HTML pass-through for powerful formatting
   * Pluggable macros
   * Page includes (templates with parameters coming)
-  * Usable for blogging
-  * Directory listing
-  * Automatic [[Pictures]] and video gallery
-  * Easy to interface with other SCMs through a glue script
-  * User accounts supported through HTTP basic auth done by web server
+  * Blogging support
+  * Hierarchical namespace with automatic directory listing
+  * [[Picture]] gallery (poor man's Flick'r)
+  * Video playback (poor man's You Tube)
+  * User accounts supported through web server's HTTP basic auth
   * Per-page ACLs
-  * Simple title and full text search
-  * Easy CGI installation (no WSGI, mod_python, FCGI...)
+  * Title and full-text search with full regex power
+  * Easy drop-in installation (no WSGI, mod_python, FCGI...)
   * Fast!
-  * Only 800 LOCs!
+  * Small! Codebase is just 800 LOCs!
   * Derived from PikiWiki, like MoinMoin
-  * FreeSoftware and OpenSource, to please everybody
+  * OpenSource, FreeSoftware, CheapBeer... pleases anyone
   * GuruMeditation alerts :-)
  
  == License ==
@@@ -49,8 -50,9 +50,9 @@@ Naa! Geeki Geeki is really distributed 
  
  ==== Releases ====
  
- || 11-Dec-2008 || **[[http://www.codewiz.org/wikigit/geekigeeki.git?a=snapshot;h=v3.0;sf=tbz2|v3.0]]** ||
- || 23-Sep-2008 || **[[http://www.codewiz.org/wikigit/geekigeeki.git?a=snapshot;h=v2.0;sf=tbz2|v2.0]]** ||
+ || 01-May-2009 || [[http://www.codewiz.org/wikigit/geekigeeki.git?a=snapshot;h=v4.0|geekigeeki-4.0.tar.gz]] ||
+ || 11-Dec-2008 || [[http://www.codewiz.org/wikigit/geekigeeki.git?a=snapshot;h=v3.0|geekigeeki-3.0.tar.gz]] ||
+ || 23-Sep-2008 || [[http://www.codewiz.org/wikigit/geekigeeki.git?a=snapshot;h=v2.0|geekigeeki-2.0.tar.gz]] ||
  
  
  ==== Source ====
@@@ -64,15 -66,15 +66,15 @@@ git clone git://www.codewiz.org/~bernie
  
  ===== Revision history =====
  
 -Browse it online with GitWeb: http://www.codewiz.org/wikigit/geekigeeki.git
 +Browse it with [[http://www.codewiz.org/wikigit/geekigeeki.git|GitWeb]]
  
  ===== Individual source files =====
  
-  * [[../wikidata/geekigeeki.py      | geekigeeki.py]]      -- The CGI itself
-  * [[../wikidata/geekigeeki.conf.py | geekigeeki.conf.py]] -- Sample site config
-  * [[../wikidata/geekigeeki.css     | geekigeeki.css]]     -- The stylesheet used at this site
-  * [[../wikidata/post_edit_hook.sh  | post_edit_hook.sh]]  -- Some glue to integrate with git
-  * [[../wikidata/wiki_apache.conf   | wiki_apache.conf]]   -- Sample conf file for Apache
+  * [[http://www.codewiz.org/wikigit/geekigeeki.git/blob_plain/HEAD:/geekigeeki.py        | geekigeeki.py      ]] -- The CGI itself
+  * [[http://www.codewiz.org/wikigit/geekigeeki.git/blob_plain/HEAD:/geekigeeki.conf.py.. | geekigeeki.conf.py ]] -- Sample site config
+  * [[http://www.codewiz.org/wikigit/geekigeeki.git/blob_plain/HEAD:/post_edit_hook.sh    | post_edit_hook.sh  ]] -- Some glue to integrate with git
+  * [[http://www.codewiz.org/wikigit/geekigeeki.git/blob_plain/HEAD:/wiki_apache.conf     | wiki_apache.conf   ]] -- Sample conf file for Apache
+  * [[sys/geekigeeki.css                                                                  | geekigeeki.css     ]] -- The stylesheet used at this site
  
  == Installation ==