X-Git-Url: https://codewiz.org/gitweb?p=wiki.git;a=blobdiff_plain;f=GeekiGeeki;h=53e292714016fafb0c95ac057d8560d50a4d0db4;hp=8d08a8d9e86fc67fcd642212a81375e2a981fbd4;hb=4f68c532c3fbbb5c8fb9e94dd2b416a4de2cbb91;hpb=088cabaffa61906acc9bbe099865dc926ea75002

diff --git a/GeekiGeeki b/GeekiGeeki
index 8d08a8d..53e2927 100644
--- a/GeekiGeeki
+++ b/GeekiGeeki
@@ -1,18 +1,24 @@
-<div style="float: right">GerryStich.jpg</div>
+<div style="float: right">GerryStich.png</div>
 
-==== What is Geeki Geeki? ====
+== 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 similar to WikiCreole.
-Check the EditingTips to get an idea the supported wiki syntax.
+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!
+</div>
+
+Tags: [[Tags/fast|fast]], [[Tags/stupid|stupid]], [[Tags/!bloated|!bloated]], [[Tags/h4x0r|h4x0r]] [[Tags/cheapasincheapbeer|cheapasincheapbeer]]
 
-GeekiGeeki is a descendant of PikiWiki, like MoinMoin, and it is written
-in Python.
 
 == Features ==
 
- * Git versioned backend
- * Interfaces with Gitweb for history browsing, RSS...
+ * S^3: Simple, Small, Stupid
+ * Rich, clean markup syntax highly compatible with WikiCreole and MoinMoin
+ * Git versioned storage backend
+ * Interfaces with GitWeb for history browsing, RSS...
  * Consistent use of CSS for easy theming
  * HTML pass-through for powerful formatting
  * Pluggable macros
@@ -27,18 +33,29 @@ in Python.
  * Easy CGI installation (no WSGI, mod_python, FCGI...)
  * Fast!
  * Only 800 LOCs!
+ * Derived from PikiWiki, like MoinMoin
+ * FreeSoftware and OpenSource, to please everybody
  * GuruMeditation alerts :-)
 
-==== Download ====
+== License ==
+
+Geeki Geeki is Gratis Software as in Gratuitous Speech, not Cheap as in Cheap Beer.
+Consult your lawyer before using to check whether this is compatible with your current
+brand of beer.
+
+Naa! Geeki Geeki is really distributed under the [[http://www.fsf.org/licensing/licenses/agpl-3.0.html|GNU General Public License]], version 3.0 or later.
 
-===== Releases =====
+== Download ==
+
+==== Releases ====
 
 || 11-Dec-2008 || **v3.0** || http://www.codewiz.org/wikigit/geekigeeki.git?a=snapshot;h=v3.0;sf=tbz2 ||
 || 23-Sep-2008 || **v2.0** || http://www.codewiz.org/wikigit/geekigeeki.git?a=snapshot;h=v2.0;sf=tbz2 ||
 
-===== Source repository ====
 
-You can obtain the latest source snapshot through git:
+==== Source ====
+
+You can obtain the latest version -- actually ''any'' version -- through git:
 
 {{{
 git clone http://www.codewiz.org/~bernie/git/geekigeeki.git/
@@ -57,7 +74,7 @@ Browse it online with GitWeb: http://www.codewiz.org/wikigit/geekigeeki.git
  * [[../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
 
-==== Installation ====
+== Installation ==
 
 The easiest way is:
 
@@ -73,7 +90,7 @@ The easiest way is:
  }}}
  * reload Apache
 
-==== Update procedure ====
+== Update procedure ==
 
 If you cloned the repository as suggested, updating and downgrading is easy:
 
@@ -87,7 +104,9 @@ to switch to a different version of GeekiGeeki:
 git checkout {tree-ish}
 }}}
 
-==== Contributing ====
+where '##{tree-ish}## could be a tag, a branch name, or a specific commit.
+
+== Contributing ==
 
 Please send your patches!  See the GeekiGeekiToDo list for ideas.