Merge branch 'master' of ../geekigeeki_data

[wiki.git] / GeekiGeeki

diff --git a/GeekiGeeki b/GeekiGeeki
index 9676cb28037f3882b0c9403536dbbad164ee4bb7..bfbaa955708ab8618db6e1ea6f7367302e9f476c 100644 (file)
--- a/GeekiGeeki
+++ b/GeekiGeeki
@@ -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 @@ 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 [[GeekiGeeki/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!