X-Git-Url: https://codewiz.org/gitweb?p=wiki.git;a=blobdiff_plain;f=HackerFolklore;h=277c5b61b6b5563c2a3ae5df451d6ae6a87d913c;hp=311d8a881327b18053f4e8d00786d529a810dad8;hb=82f85fd5c80fcc1c5d06d3fb8d11dfefbf102bbd;hpb=405b7d8274a6bf0e36dc9eacfccff5ec68f53ae3

diff --git a/HackerFolklore b/HackerFolklore
index 311d8a8..277c5b6 100644
--- a/HackerFolklore
+++ b/HackerFolklore
@@ -1,3 +1,20 @@
- * [[TrueHeroes]] who delivered important ideas to mankind
- * [[MicrosoftTactics]] against [[FreeSoftware]] and [[GnuLinux]]
- * [[RandomLinks]] to some interesting resources
+== Bernie's Hacker Folklore Page ==
+
+=== Hacker Folklore ===
+
+ * The Story of Mel, a Real Programmer: http://www.pbm.com/~lindahl/mel.html
+
+=== Humor (for complete nerds only) ===
+
+ * People defined by what [[FileArchivers]] they use
+ * [[TwoHundredDollarLaptop]]
+
+=== Philosophy and religion ===
+
+ * [[GreatQuotes]]
+ * Church of the Flying Spaghetti Monster: http://www.venganza.org/
+
+=== Politics and ethics ===
+
+ * [[MicrosoftTactics]] against Linux and Open Source
+ * The Technique of the Straw Man: http://www-personal.umich.edu/~lilyth/strawman.html