Merge branch 'master' of ../geekigeeki_data

[wiki.git] / GeekiGeeki

diff --git a/GeekiGeeki b/GeekiGeeki
index 7cf85b7a683c94f9ddc676f17251599aed512235..bfbaa955708ab8618db6e1ea6f7367302e9f476c 100644 (file)
--- a/GeekiGeeki
+++ b/GeekiGeeki
@@ -1,6 +1,6 @@
-== 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.
@@ -66,7 +66,7 @@ git clone git://www.codewiz.org/~bernie/geekigeeki.git/
 
 ===== 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,13 +76,13 @@ Browse it online with GitWeb: http://www.codewiz.org/wikigit/geekigeeki.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 ==
+== Installation and upgrade ==
 
-See [[geeki/install]].
+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!