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

diff --git a/BodyMeasures b/BodyMeasures
index dc263149cca587ba40ea77211b495b0fea01a11b..354226f9f11cc9b743a7e4b9b53e414669270d7f 100644 (file)
--- a/BodyMeasures
+++ b/BodyMeasures
@@ -1,6 +1,6 @@
-== My body measures ==
+== Bernardometry ==
 
-Back off, pervs!  This is just in case someone wants to buy me clothes!
+Back off, pervs!  This is just in case someone wants to buy me clothes, or a new brain.
 
  Height: 1.63cm (5ft + 4in)
 
@@ -12,4 +12,8 @@ Back off, pervs!  This is just in case someone wants to buy me clothes!
 
  Shirt: 14.5
 
+ Vision ((24 Sep 2009):
+  Right eye: sph -1.75, cyl -1.75, axis 180
+  Left  eye: sph -1.75, cyl -1.50, axis 005
+
  IQ: uh?

diff --git a/ContactInformation b/ContactInformation
index ee86d4b04497999f94d170085c5a8caacc3643e8..bb5e69dd6b6895761eb9bb6e44d6dfd7fd0a9a84 100644 (file)
--- a/ContactInformation
+++ b/ContactInformation
@@ -1,17 +1,38 @@
 #acl bernie:read,write All:read
 
+== Bernie Innocenti's contact information ==
+
+=== Internet contact info ===
+
  * e-mail: bernie-nospam@codewiz.org (**remove -nospam**)
  * Home page: http://codewiz.org/
- * OpenID: http://codewiz.org/ (yes, I run my own OpenID provider!)
- * Jabber: bernie-nospam@codewiz.org (**remove -nospam**, and, yes I run my own Jabber server!)
- * IRC: ##bernie## on ##irc.freenode.org## (always online, sometimes afk)
+
+
+=== Geeky contact info ===
+
+ * IRC: ##bernie## on ##irc.freenode.org## (my proxy is always online, but I might be afk)
+ * Jabber: bernie-nospam@codewiz.org (**remove -nospam** and, yes, I run my own Jabber server!)
+ * OpenID: http://codewiz.org/ (yes, I run my own OpenID provider too!)
  * Public SSH keys: https://www.develer.com/~bernie/pub/authorized_keys
  * Public GPG key: ##71FF4BAC##: https://www.develer.com/~bernie/pub/bernie_pgp_pubkey.asc
  * hCard: http://codewiz.org/wiki
- * Snail mail:
+
+=== Retro contact info ===
+
+ * Mobile (Italy): +39-377-1436808 or +39-329-4008545
+ * Mobile (USA): +1-781-BIG-FITK (+1-781-244-3485)
+ * Snail mail (Italy):
  {{{
 Bernie Innocenti
 Via Ventiquattro Maggio, 14
 50129 Firenze
 ITALY
- }}}
+}}}
+ * Snail mail (USA):
+ {{{
+Bernie Innocenti
+265-4 Elm Sr.
+c/o Hill
+02144 Somerville MA
+USA
+}}}

diff --git a/EditingTips b/EditingTips
index 4f397adc9f9f2ba4963e4876bf4c6c4df7a97f54..79fa3761715bebe6353c4039af2dfefe56ab4549 100644 (file)
--- a/EditingTips
+++ b/EditingTips
@@ -19,6 +19,8 @@ Links to images will appear inline: http://www.w3.org/Icons/valid-css.png
 
 Anchored links also work with [[FrontPage|wiki pages]], [[/index.html | local paths]], and [[non_wiki_words]].
 
+If you link to a directory, GeekiGeeki will automatically generate an index for it: [[sys/macros]]
+
 Image links: [[http://www.laptopgiving.org/|GiveOneGetOne.jpg]]
 
 == Inline media ==
@@ -34,17 +36,24 @@ Image links: [[http://www.laptopgiving.org/|GiveOneGetOne.jpg]]
 
 
 ==== Including other wiki pages ====
-{{IncludedPage}}
 
-TODO: one day this will let you pass argument as a templating engine
+Use the same syntax to embed wiki pages inside other wiki pages:
+
+  {{IncludedPage}}
+
+You can also pass arguments to included pages!  It works like a simple template system:
+
+  {{TemplatePage | hello=Ciao | world=mondo}}
+
 
 ==== Including external resources inline ====
 {{http://www.codewiz.org/wikigit/geekigeeki.git/blob_plain/HEAD:/geekigeeki.py}}
 
 == Macros ==
 
-<<TitleSearch>>
-<<NonexistentMacro | param1 | param2 >>
+ * Your remote IP: <<CgiVar | REMOTE_ADDR>>
+ * Query string: <<CgiVar | QUERY_STRING>>
+ * <<NonexistentMacro | param1 | param2 >>
 
 == Block elements ==
 
@@ -58,14 +67,6 @@ If you indent text
   like this, then it is indented in the output
     you can have multiple levels of indent
 
-And if you put asterisks at the start of the line
-
-  * you get a 
-  * bulleted
-  * list
-    * which can also be indented
-      * to several levels
-
 To insert program source without reformatting in a monospace font, use three curly braces:
 
 {{{
@@ -76,6 +77,22 @@ To insert program source without reformatting in a monospace font, use three cur
 
 Just like that.
 
+== Itemized lists ==
+
+If you put asterisks (*) at the start of the line
+
+  * you get a 
+  * bulleted
+  * list
+    * which can also be indented
+      * to several levels
+
+You can also have numbered lists, using the number (#) sign:
+ # first item
+ # second item
+   # first indented item
+   # second indented item
+ # third item
 
 == Text Styles ==
 
@@ -122,10 +139,26 @@ You can use ##div##, ##span## and ##iframe## elements with any attribute, includ
 <span style="color: green">CSS</span>, of course.
 </div>
 
-== Access Control Lists ==
+== Pragmas ==
+
+Wiki pages can specify special-purpose commands in their header.  In the form:
+
+{{{
+# &lt;keyword&gt; &lt;values&gt;
+}}}
 
-TODO: document
+=== Access Control Lists ===
 
-== Final Notes ==
+{{{
+# acl SomeUser:read,write OtherUser:read All:none
+}}}
+
+Limit read or write access to specific authenticated users
+
+=== Custom cascading style sheets ===
+
+{{{
+# css my_style.css
+}}}
 
-Be aware that GeekiGeeki does not lock pages during editing, so if you pause for a long time on the edit screen you may overwrite somebody else's changes.
+Include a user-specified custom CSS before the default one(s).

diff --git a/FrontPage b/FrontPage
index 861704006978d28873abdc5fc32f18580eddedfc..db2fe3d7fe310f941dc435ed39572b9c28fe13b9 100644 (file)
--- a/FrontPage
+++ b/FrontPage
@@ -38,7 +38,7 @@ Tags:
 
  * BrainDump -- My personal blog. You don't care. Really.
  * BernardoInnocenti -- My [real] picture
- * [[pictures|Pictures]] -- Photos of my life (or lack thereof)
+ * [[pictures|Codew'z]] -- Photos of my life; or lack thereof
 
  * ContactInformation -- My full contact infornmation, no spam please
  * AbridgedResume -- For the impatient
@@ -62,5 +62,3 @@ login as '''Anonymous''''''Coward''' with empty password.
  * [[GeekiGeeki]] -- Learn more about this wiki engine
 
 <a href="http://sunjammer.sugarlabs.org/resultpermeable.php"><!-- this is for spammers --></a>
-
-<div style="text-align: center; font-size:24px;">[[http://www.codewiz.org/projects/amiga/index.html|AmigaCheckmark.png]] **// [[http://www.codewiz.org/projects/amiga/index.html | Only Amiga Makes It Possible!]] //**</div>

diff --git a/IncludedPage b/IncludedPage
index af5626b4a114abcb82d63db7c8082c3c4756e51b..5dd01c177f5d7d1be5346a5bc18a569a7410c2ef 100644 (file)
--- a/IncludedPage
+++ b/IncludedPage
@@ -1 +1 @@
-Hello, world!
+Hello, world!
\ No newline at end of file

diff --git a/MicrosoftTactics b/MicrosoftTactics
index 5f11c655228b04873bb358283cc9d9e2e6ac4e6a..c4ced7528afe8ec88d3e57e4d7e626a7897185fb 100644 (file)
--- a/MicrosoftTactics
+++ b/MicrosoftTactics
@@ -12,7 +12,9 @@ steve_ballmer_bill_gates_i_wish_i_knew_how_to_quit_you.jpg
 
 === Targeting GNU/Linux ===
 
- * [[http://www.ditii.com/2009/09/08/microsoft-linux-vs-windows-7-slideshow-for-retailers-targets-linux/ | Linux vs Windows 7 slides for retailers]] (2009)
+ * [[http://arstechnica.com/open-source/news/2009/09/linux-foundation-to-microsoft-stop-secretly-attacking-linux.ars | Selling Linux related patents to trolls ]] (Sep 2009)
+
+ * [[http://www.ditii.com/2009/09/08/microsoft-linux-vs-windows-7-slideshow-for-retailers-targets-linux/ | Linux vs Windows 7 slides for retailers]] (Aug 2009)
 
 
  * [[http://www.theregister.co.uk/2001/06/02/ballmer_linux_is_a_cancer/ | Linux is a Cancer]] -- Steve Ballmer, CEO (2001)
@@ -91,6 +93,7 @@ steve_ballmer_bill_gates_i_wish_i_knew_how_to_quit_you.jpg
 
  * Microsoft claims that [[http://news.zdnet.com/2100-3513_22-152099.html | OSS violates 235 (unspecified) patents]] (FUD)
 
+ * [[http://www.codeplex.org/|CodePlex foundation]] -- Motivation behind this initiative is still unclear (as of Sep 2009)
 
 == Help wanted! ==
 

diff --git a/OldProjects b/OldProjects
index 292bee90aec216215c57644bfb5575803632140c..89d930b947e14395b0d93c2c72a0768f7c8e854d 100644 (file)
--- a/OldProjects
+++ b/OldProjects
@@ -8,3 +8,5 @@ Some stuff I'm linking here to let The Net remember:
  * [[SystemShockBBS]] -- My old FidoNet and AmigaNet BBS
 
  * Random temporary junk: [[http://www.codewiz.org/pub/]]
+
+<div style="text-align: center; font-size:24px;">[[http://www.codewiz.org/projects/amiga/index.html|AmigaCheckmark.png]] **// [[http://www.codewiz.org/projects/amiga/index.html | Only Amiga Makes It Possible!]] //**</div>

diff --git a/SugarLabs b/SugarLabs
index 5783b015ccaf1d66ee8609c6bcf1e06c35888ec7..0a2b7d759d38e66c9e3a9f41171de55f2f06beda 100644 (file)
--- a/SugarLabs
+++ b/SugarLabs
@@ -1 +1,3 @@
-See http://www.sugarlabs.org/
\ No newline at end of file
+See http://sugarlabs.org/
+
+Actually, don't. See instead: http://wiki.sugarlabs.org/
\ No newline at end of file

diff --git a/TemplatePage b/TemplatePage
new file mode 100644 (file)
index 0000000..6f9b176
--- /dev/null
+++ b/TemplatePage
@@ -0,0 +1 @@
+<<hello>>, <<world>>!

diff --git a/blog/2008/November b/blog/2008/November
new file mode 100644 (file)
index 0000000..a735e17
--- /dev/null
+++ b/blog/2008/November
@@ -0,0 +1 @@
+It is excellent idea. I support you., <a href="http://forum.slysoft.com/member.php?u=50460">VIAGRA BON MARCHE OU 100MG X 20 COMPRIMES EN LIGNE</a>, [url="http://forum.slysoft.com/member.php?u=50460"]VIAGRA BON MARCHE OU 100MG X 20 COMPRIMES EN LIGNE[/url], http://forum.slysoft.com/member.php?u=50460 VIAGRA BON MARCHE OU 100MG X 20 COMPRIMES EN LIGNE,  ckgoyo, <a href="http://forum.moldova.org/index.php?showuser=4248">acheter du viagra</a>, [url="http://forum.moldova.org/index.php?showuser=4248"]acheter du viagra[/url], http://forum.moldova.org/index.php?showuser=4248 acheter du viagra,  =O, <a href="http://www.stade.fr/forum/member.php?u=32239">acheter viagra</a>, [url="http://www.stade.fr/forum/member.php?u=32239"]acheter viagra[/url], http://www.stade.fr/forum/member.php?u=32239 acheter viagra,  dyraoe, <a href="http://forum.muc72.fr/member.php?u=4064">acheter viagra</a>, [url="http://forum.muc72.fr/member.php?u=4064"]acheter viagra[/url], http://forum.muc72.fr/member.php?u=4064 acheter viagra,  096, <a href="http://www.livenplay.fr/forum/member.php?u=28828">acheter viagra</a>, [url="http://www.livenplay.fr/forum/member.php?u=28828"]acheter viagra[/url], http://www.livenplay.fr/forum/member.php?u=28828 acheter viagra,  pkteya, <a href="http://www.livenplay.fr/forum/member.php?u=28828">VIAGRA COUPON</a>, [url="http://www.livenplay.fr/forum/member.php?u=28828"]VIAGRA COUPON[/url], http://www.livenplay.fr/forum/member.php?u=28828 VIAGRA COUPON,  757, <a href="http://www.crazymoto.net/index.php?showuser=111373">generique viagra</a>, [url="http://www.crazymoto.net/index.php?showuser=111373"]generique viagra[/url], http://www.crazymoto.net/index.php?showuser=111373 generique viagra,  760731, <a href="http://www.n-europe.com/forum/member.php?u=4495">acheter generique viagra</a>, [url="http://www.n-europe.com/forum/member.php?u=4495"]acheter generique viagra[/url], http://www.n-europe.com/forum/member.php?u=4495 acheter generique viagra,  652, <a href="http://www.blablaland.com/site/membres.php?p=482470">acheter viagra</a>, [url="http://www.blablaland.com/site/membres.php?p=482470"]acheter viagra[/url], http://www.blablaland.com/site/membres.php?p=482470 acheter viagra,  817411, 
\ No newline at end of file

diff --git a/blog/2009/09 b/blog/2009/09
index 52f0da7ae67df69e04ebaed7854a039cb624e85d..32d041ae7ff7c5be8c50e08d0bf0c86782f47131 100644 (file)
--- a/blog/2009/09
+++ b/blog/2009/09
@@ -1,5 +1,37 @@
 == Bernie's brain dump as of September 2009 ==
 
+=== The Yard ===
+
+I've not been blogging much lately... at least not here!  Now I'm supposed to blog
+weekly for my [[http://isites.harvard.edu/icb/icb.do?keyword=k63125 | Educational Technologies]] class:
+
+ * [[http://cte.dce.harvard.edu/elgg10/pg/blog/bernie | my blog posts]]
+ * [[http://cte.dce.harvard.edu/elgg10/pg/blog/bernie/friends | my classmates' posts]] 
+
+=== Sep 15th: Yet another geek party ===
+
+I'm really too busy to go to parties... but the parties come to me all the time! ([[pictures/home/acetarium/20090916-star-party/ | see all photos ]])
+
+{{pictures/home/acetarium/20090916-star-party/00022.jpeg|maxwidth=480}}
+{{pictures/home/acetarium/20090916-star-party/00009.jpeg|maxwidth=480}}
+{{pictures/home/acetarium/20090916-star-party/00006.jpeg|maxwidth=480}}
+{{pictures/home/acetarium/20090916-star-party/00003.jpeg|maxwidth=480}}
+
+Let's party arriba!
+
+=== Sep 9th: XO-1.5 unveiling ===
+
+{{http://farm3.static.flickr.com/2542/3919811479_fd68350f71.jpg | "I void warranties" | class=thumbright}}
+
+I joined the XO-1.5 unveiling ceremony in DC... and got the opportunity to rip one of
+the prototypes apart.  [[http://www.olpcnews.com/mt/mt-cp.cgi?__mode=view&blog_id=4&username=wayan | Wayan]]
+of [[http://oplcnews.com | OLPCNews]] was next to me, so this enjoyable operation made the news!
+
+ * [[http://www.olpcnews.com/laptops/xo15/olpc_news_exclusive_xo-15_laptop.html | OLPCNews article ]]
+ * [[http://www.flickr.com/photos/dcmetroblogger/sets/72157594232448993/        | Filckr photo stream ]]
+ * [[http://www.youtube.com/v/9N4PD219fcE&hl=en&fs=1                            | XO-1.5 vs XO-1 boot comparison]] (You Tube)
+{{http://farm4.static.flickr.com/3524/3919814287_4eef4b64e6.jpg}}
+
 === Sep 7th: Class Acts ===
 
 I'm in DC for a sprint called [[http://wiki.laptop.org/go/ClassActs | Class Acts]]
@@ -14,9 +46,9 @@ Our housemate [[Adelaida]] (aka Aids for reasons we don't care to know) is
 going back to Hampshire college tomorrow so we organized a great party at
 the [[Acetarium]].
 
-{{pictures/party/Goodbye_Adelaida_2009/00043.jpg|maxwidth=800|The usual bunch of weirdos}}
+{{pictures/home/acetarium/20090905-goodbye-aids/00043.jpg|maxwidth=800|The usual bunch of weirdos}}
 
-Photos here: [[pictures/party/Goodbye_Adelaida_2009]]
+Photos here: [[pictures/home/acetarium/20090905-goodbye-aids]]
 
 === Sep 3rd: Calculus ===
 

diff --git a/sys/info b/sys/info
index 735e0efc783aa8ae33b7e0a5b466d13db7b5d634..016853d86627260813e426373f7da8297203b67a 100644 (file)
--- a/sys/info
+++ b/sys/info
@@ -2,4 +2,4 @@
 || REMOTE_HOST  || <<CgiVar|REMOTE_HOST>>   ||
 || REMOTE_ADDR  || <<CgiVar|REMOTE_ADDR>>   ||
 || QUERY_STRING || <<CgiVar|QUERY_STRING>>  ||
-|| HTTP_IF_MODIFIED_SINCE || <<CgiVar|HTTP_IF_MODIFIED_SINCE>> ||
+|| HTTP_IF_MODIFIED_SINCE || <<CgiVar|HTTP_IF_MODIFIED_SINCE>> ||
\ No newline at end of file

diff --git a/user/bernie b/user/bernie
index 7f3662b2ebd836a45f9d57ef1ef78d047d859d70..c8352917ab2b71a25924ab2945b19557c8ac0067 100644 (file)
--- a/user/bernie
+++ b/user/bernie
@@ -2,7 +2,8 @@
 
 (the [[FrontPage]] contains my hCard)
 
-{{BernieXo.jpg | maxwidth=640 | Bernie Innocenti with a B2-test XO laptop}}
+{{BernieXo.jpg | maxwidth=640 | Bernie Innocenti with a B2-test XO laptop (Nov 2008)}}
+{{BernieX200s.jpg | maxwidth=640 | Bernie Innocenti with his trusty Lenovo X200s (Aug 2009)}}
 
 More pictures here: [[http://www.flickr.com/search/?q=Bernardo+Innocenti]]