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

diff --git a/AmigaBoing16x16.png b/AmigaBoing16x16.png
deleted file mode 100644 (file)
index 15a9983..0000000
Binary files a/AmigaBoing16x16.png and /dev/null differ

diff --git a/FileArchivers b/FileArchivers
new file mode 100644 (file)
index 0000000..78af480
--- /dev/null
+++ b/FileArchivers
@@ -0,0 +1,33 @@
+Tell us what file archiver you use, we'll tell you who you are.
+
+== Mainstream ==
+
+ * .zip -- Conformist who would even run Windows
+ * .dmg -- Conformist who would **not** run Windows
+ * .exe -- Idiot who thinks it's fun to create self-extracting archives
+ * .rar -- Lame pirate who tries to compress MPEG video
+ * .rar, .r00, .r01... -- Complete [[http://en.wikipedia.org/wiki/Lamer | Lamer]]
+ * .7z -- Non-mainstream user of a mainstream OS
+
+
+== Old Skool ==
+
+ * .lzh -- MS-DOS or FidoNET, should probably stop playing with computers
+ * .arj -- Lame FidoNET-era user
+ * .lha -- Conservative Amiga user
+ * .lzx -- Progressive Amiga user
+ * .xpk -- Advanced Amiga user
+
+
+== UN*X family ==
+
+ * .tar.gz -- GNU-aware user
+ * .tar.bz2 -- Modern UNIX OS, usually GNU/Linux
+ * .tar.Z -- Traditional UNIX die-hard
+ * .cpio -- Solaris or someone stuck with an old SVR4 UNIX
+ * .tar -- Lazy person who would waste bits disrespectfully
+ * .tar.lzma -- Compression freak
+ * .tar.xz -- Up-to-date compression freak
+
+----
+Copyright 2009 Bernie Innocenti -- it's a wiki, feel free to add your humor
\ No newline at end of file

diff --git a/FrontPage b/FrontPage
index 65bf787638bc78895a4ceb61be48a80ae4749e98..3d38cdd6b2ea8f16fb7caeaf7213f1d397a2e230 100644 (file)
--- a/FrontPage
+++ b/FrontPage
@@ -38,16 +38,14 @@ Tags:
 
  * BrainDump -- My personal blog. You don't care. Really.
  * BernardoInnocenti -- My [real] picture
- * [[Pictures]] -- Photos of my life (or lack thereof)
+ * [[pictures|Pictures]] -- Photos of my life (or lack thereof)
 
  * ContactInformation -- My full contact infornmation, no spam please
  * AbridgedResume -- For the impatient
  * CurriculumVitae -- The fully detailed story
 
  * [[http://www.codewiz.org/oldindex.html | Ancient home page]] -- Pre-wiki era pages are still available
- * RandomLinks to some interesting resources
- * TrueHeroes who delivered important ideas
- * MicrosoftTactics against FreeSoftware and GnuLinux.
+ * [[HackerFolklore]] -- humor and wisdom from the past, present and future
 
 === About This Wiki ===
 

diff --git a/GeekiGeeki b/GeekiGeeki
index 6e7af9a66f055543a6139c160f4f52217e48fd86..bfbaa955708ab8618db6e1ea6f7367302e9f476c 100644 (file)
--- a/GeekiGeeki
+++ b/GeekiGeeki
@@ -7,10 +7,10 @@ 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 ==
@@ -76,41 +76,13 @@ Browse it with [[http://www.codewiz.org/wikigit/geekigeeki.git|GitWeb]]
  * [[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!

diff --git a/GeekiGeekiToDo b/GeekiGeekiToDo
deleted file mode 100644 (file)
index 0468d6b..0000000
--- a/GeekiGeekiToDo
+++ /dev/null
@@ -1,25 +0,0 @@
-=== Sooner ===
-
- * Page delete
- * Page rename
- * Page redirects (using symlinks)
- * Quick Find box in the navbar
- * Replace ##<****<Include|foo>****>## with ##{****{foo}****}##
- * WikiCreole syntax: ##<****<macro param1 param2>****>##
- * WikiCreole syntax: ##{****{image|title}****}##
-
-=== Later ===
-
- * Ditch repo sandbox, use the versioning backend directly
- * Stage changes by user until committed explicitly (i.e.: wiki changesets)
- * Add simple InterWiki support
- * Find orphaned pages (can be done by combining PageIndex with FindPage)
- * Directory listing
- * Groups/ directory with group lists implemented as wiki pages with unordered lists
- * Includes (aka templates)
- * Syntax highlighting for code blocks
-=== Nice to have ===
-
- * A functionality to have custom merge strategy in git to merge different wiki/GeekiGeeki in a single one
-
- * See also the original PikiToDo

diff --git a/HackerFolklore b/HackerFolklore
new file mode 100644 (file)
index 0000000..1c65959
--- /dev/null
+++ b/HackerFolklore
@@ -0,0 +1,21 @@
+== Philosophy and religion ==
+
+ * [[TrueHeroes]] who delivered important ideas to mankind
+
+ * Church of the FlyingSpaghettiMonster: http://www.venganza.org/
+
+== Politics ==
+
+ * [[MicrosoftTactics]] against [[FreeSoftware]] and [[GnuLinux]]
+
+== Rhetoric ==
+
+ * The Technique of the StrawMan: http://www-personal.umich.edu/~lilyth/strawman.html
+
+== Humor for nerds ==
+
+ * People defined by what FileArchivers they use
+
+== Hacker stories ==
+
+ * The Story of Mel, a RealProgrammer: http://www.pbm.com/~lindahl/mel.html

diff --git a/ManagerRole b/ManagerRole
new file mode 100644 (file)
index 0000000..b5e37ba
--- /dev/null
+++ b/ManagerRole
@@ -0,0 +1 @@
+ * TODO: Develer projects

diff --git a/RandomLinks b/RandomLinks
index 00f8b7327ae97841b81b583d14b2ffc1bbc47854..f7bae0516ad9f02551f9e014f9c735418e436791 100644 (file)
--- a/RandomLinks
+++ b/RandomLinks
@@ -1,11 +1 @@
-== Logic ==
-
- * The Technique of the StrawMan: http://www-personal.umich.edu/~lilyth/strawman.html
-
- * Church of the FlyingSpaghettiMonster: http://www.venganza.org/
-
-== Hacker folklore ==
-
- * The Story of Mel, a RealProgrammer: http://www.pbm.com/~lindahl/mel.html
-
- * TrueHeroes - People with great ideas
+See [[HackerFolklore]].
\ No newline at end of file

diff --git a/TeacherRole b/TeacherRole
new file mode 100644 (file)
index 0000000..ac4af7c
--- /dev/null
+++ b/TeacherRole
@@ -0,0 +1,5 @@
+ * TODO: DLab
+ * TODO: Game Factory
+ * TODO: Marconi Commerce Systems
+ * TODO: Web application developer
+

diff --git a/blog/2009/05 b/blog/2009/05
new file mode 100644 (file)
index 0000000..c108668
--- /dev/null
+++ b/blog/2009/05
@@ -0,0 +1,8 @@
+== Bernie's brain dump as of May 2009 ==
+
+=== May 14 - 24: Sugar Camp Paris ===
+
+I attended the [[http://wiki.sugarlabs.org/go/Marketing_Team/Events/MiniCamp_Paris_2009|Sugar Camp Paris 2009]].
+Great event, great people, great organization.  Simply great.
+
+{{pictures/conf/Sugar_Camp_Paris_2009/day_2/00073.jpg|maxwidth=800}}

diff --git a/blog/2009/06 b/blog/2009/06
new file mode 100644 (file)
index 0000000..44f3522
--- /dev/null
+++ b/blog/2009/06
@@ -0,0 +1,10 @@
+== Bernie's brain dump as of June 2009 ==
+
+=== June 12th: Tuxel Cart 2009 ===
+
+My good friend Massimo of [[http://www.tuxel.com/|Tuxel]] (behind me in the photo) organized a great trip to the
+[[http://www.gokart-siena.it/|Siena Kart Course]].
+
+{{pictures/vacation/Tuxel_Kart_2009/00032.jpg|maxwidth=800}}
+
+[[pictures/vacation/Tuxel_Kart_2009|All the photos]]

diff --git a/geeki/TODO b/geeki/TODO
new file mode 100644 (file)
index 0000000..595c51c
--- /dev/null
+++ b/geeki/TODO
@@ -0,0 +1,24 @@
+=== Sooner ===
+
+ * Page delete
+ * Page rename
+ * Page redirects (using symlinks)
+ * Quick Find box in the navbar
+ * WikiCreole syntax: ##<****<macro param1 param2>****>## (we have <****<macro|param1|param2>****> instead)
+
+=== Later ===
+
+ * Ditch repo sandbox, use the versioning backend directly
+ * Stage changes by user until committed explicitly (i.e.: wiki changesets)
+ * Add simple InterWiki support
+ * Find orphaned pages (can be done by combining PageIndex with FindPage)
+ * Directory listing
+ * Groups/ directory with group lists implemented as wiki pages with unordered lists
+ * Glob for includes: {****{foo/*.c}****}
+ * Variable substitution in includes (aka templates)
+ * Syntax highlighting for code blocks
+=== Nice to have ===
+
+ * A functionality to have custom merge strategy in git to merge different wiki/GeekiGeeki in a single one
+
+ * See also the original PikiToDo

diff --git a/geeki/install b/geeki/install
new file mode 100644 (file)
index 0000000..99d523b
--- /dev/null
+++ b/geeki/install
@@ -0,0 +1,25 @@
+== Quick installation ==
+
+The easiest installation procedure is:
+
+ * clone the git repository of GeekiGeeki anywhere you like:
+ {{{
+ cd public_html
+ git clone git://codewiz.org/~bernie/geekigeeki.git wiki
+ }}}
+
+ * edit ##wiki_apache.conf## to adapt it to your system, then move or symlink it to your Apache configuration directory
+ * customize your wiki instance by editing ##geekigeeki.conf.py##
+ * populate an initial git repository for your wiki:
+ {{{
+  cd wiki
+  git clone --shared git://codewiz.org/~bernie/geekigeeki_data.git data
+  chgrp -R apache data
+ }}}
+ The last command is necessary to let the web server write in the directory.
+ Debian-based distributions use ##www-data## instead of ##apache##.  OpenSUSE
+ uses ##www##.
+ * reload or restart the web server
+
+
+See also [[geeki/upgrade]] for a simplified procedure for existing installations.

diff --git a/geeki/upgrade b/geeki/upgrade
new file mode 100644 (file)
index 0000000..8f167d1
--- /dev/null
+++ b/geeki/upgrade
@@ -0,0 +1,19 @@
+== Update procedure ==
+
+If you cloned the repository as suggested by the [[geeki/install]] procedure,
+updating and downgrading becomes quite straightforward:
+
+{{{
+cd wiki
+git pull
+cd data
+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.

diff --git a/sys/favicon16x16.png b/sys/favicon16x16.png
new file mode 100644 (file)
index 0000000..15a9983
Binary files /dev/null and b/sys/favicon16x16.png differ