Edit page OneLaptopPerChild

[wiki.git] / GeekiGeeki

diff --git a/GeekiGeeki b/GeekiGeeki
index 47cb3117ef1c1cd391ed9f8451b60040f59bbc7e..45e303649711ac465ae99bd6def8983bd9a0b677 100644 (file)
--- a/GeekiGeeki
+++ b/GeekiGeeki
@@ -3,7 +3,7 @@
 ==== 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.
 
@@ -14,15 +14,15 @@ Check the EditingTips to get an idea the supported wiki syntax.
 You can obtain the latest source snapshot through git:
 
 {{{
-git-clone http://www.codewiz.org/~bernie/git/geekigeeki.git/
-git-clone git://www.codewiz.org/~bernie/geekigeeki.git/
+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
@@ -37,10 +37,32 @@ 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
 
+==== 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 {tree-ish}
+}}}
+
 ==== 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!