Edit page TwoHundredDollarLaptop

[wiki.git] / GeekiGeeki

diff --git a/GeekiGeeki b/GeekiGeeki
index 511e6a3bcb67111899e71da4b2b403be4ea36f74..ca7bcbfe3d556e669dfbfd87ef87c27291b8408b 100644 (file)
--- a/GeekiGeeki
+++ b/GeekiGeeki
@@ -1,11 +1,13 @@
 <div style="float: right">GerryStich.jpg</div>
 
+==== What is Geeki Geeki? ====
+
 GeekiGeeki is yet another fork of PikiWiki.  Its most important feature is of course the GuruMeditation alerts :-).
-It can also use [[http://git.or.cz/ | git]] or any other SCM as a versioning backend.
+It can also use [[http://git.or.cz/ | git]] or any other SCM of your choice as a versioning backend.
 
 Check the EditingTips to get an idea the supported wiki syntax.
 
-=== Download ===
+==== Download ====
 
 ===== Source repository ====
 
@@ -16,11 +18,11 @@ git-clone http://www.codewiz.org/~bernie/git/geekigeeki.git/
 git-clone git://www.codewiz.org/~bernie/geekigeeki.git/
 }}}
 
-==== Revision history ====
+===== Revision history =====
 
 Browse it online with GitWeb: http://www.codewiz.org/wikigit/geekigeeki.git
 
-==== Individual source files ====
+===== Individual source files =====
 
  * [[../wikidata/geekigeeki.py      | geekigeeki.py]]      -- The CGI itself
  * [[../wikidata/geekigeeki.conf.py | geekigeeki.conf.py]] -- Sample site config
@@ -28,17 +30,39 @@ 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:
 
  * clone the git repository anywhere you like
  * edit **wiki_apache.conf** to adapt it to your system, and move or link it to your Apache configuration directory.
  * customize the wiki through geekigeeki.conf.py
+ * Create a git repository for your wiki:
+ {{{
+ mkdir data
+ cd data
+ git-init --shared=group
+ chgrp -R apache .
+ }}}
  * reload Apache
 
-=== Contributing ===
+==== Update procedure ====
+
+If you cloned the repository as suggested, updating and downgrading is easy:
+
+{{{
+git-pull
+}}}
+
+to switch to a different version of GeekiGeeki:
+
+{{{
+git-checkout VERSION
+}}}
+
+==== Contributing ====
 
 Please send your patches!  See the GeekiGeekiToDo list for ideas.
 
-Bugfixes and cute hacks welcome.  BloatWare ''will'' be rejected: this is a minimalistic wiki, damn'it!
+Bugfixes and cute hacks welcome.  BloatWare ''will'' be rejected: this is
+a minimalistic wiki, damn'it!