Edit page GeekiGeeki

[wiki.git] / GeekiGeeki

diff --git a/GeekiGeeki b/GeekiGeeki
index 4a24304e36c74eb9df5d140695117d944ac8f855..17c237a4385c586d04853be351389572223feaa3 100644 (file)
--- a/GeekiGeeki
+++ b/GeekiGeeki
@@ -2,11 +2,30 @@
 
 ==== 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 of your choice as a versioning backend.
+GeekiGeeki is a minimalistic wiki with a  [[http://git.or.cz/ | git]] backend,
+a high features/complexity ratio and a clean syntax similar to WikiCreole.
 
 Check the EditingTips to get an idea the supported wiki syntax.
 
+GeekiGeeki is yet another fork of PikiWiki, like MoinMoin, and it is written
+in Python.
+
+== Features ==
+
+ * Git versioned backend
+ * Interfaces with Gitweb for history browsing, RSS...
+ * Consistent use of CSS for easy theming
+ * Pluggable macros
+ * Page includes (templates with parameters coming)
+ * Usable for blogging
+ * Directory listing
+ * [[Picture]] gallery
+ * Easy to interface with other SCMs through a glue script
+ * User accounts supported through HTTP basic auth done by web server
+ * Per-page ACLs
+ * Simple title and full text search
+ * GuruMeditation alerts :-)
+
 ==== Download ====
 
 ===== Source repository ====
@@ -14,8 +33,8 @@ 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 =====
@@ -37,11 +56,11 @@ 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:
+ * create a git repository for your wiki:
  {{{
  mkdir data
  cd data
- git-init --shared=group
+ git init --shared=group
  chgrp -R apache .
  }}}
  * reload Apache
@@ -51,18 +70,18 @@ The easiest way is:
 If you cloned the repository as suggested, updating and downgrading is easy:
 
 {{{
-git-pull
+git pull
 }}}
 
 to switch to a different version of GeekiGeeki:
 
 {{{
-git-checkout <tag>
+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
+Bugfixes and cute hacks welcome.  BloatWare //will// be rejected: this is
 a minimalistic wiki, damn'it!