Merge branch 'master' of ssh://trinity.codewiz.org/~/public_html/wiki/git/wiki

diff --combined GeekiGeeki
index 6e7af9a66f055543a6139c160f4f52217e48fd86,425731c89141e53449f2dd01758586e386284495..bfbaa955708ab8618db6e1ea6f7367302e9f476c
--- 1/GeekiGeeki
--- 2/GeekiGeeki
+++ b/GeekiGeeki
@@@ -1,16 -1,16 +1,16 @@@
 -== 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!
+ **The** stupid choice for your geeky wiki needs!
  </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 ==
@@@ -66,7 -66,7 +66,7 @@@ 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 =====
  
@@@ -76,41 -76,13 +76,13 @@@
   * [[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 ==
+ == Installation and upgrade ==
  
- 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}
- }}}
- 
- where '##{tree-ish}## could be a tag, a branch name, or a specific commit.
+ See [[geeki/install]] for new installations, [[geeki/upgrade]] if you are already running a previous version of GeekiGeeki.
  
  == Contributing ==
  
- Please send your patches!  See the GeekiGeekiToDo list for ideas.
+ Please send your patches!  See the [[geeki/TODO]] list for ideas.
  
  Bugfixes and cute hacks welcome.  BloatWare //will// be rejected: this is
  a minimalistic wiki, damn'it!