diff --git a/blog/2006.10.20:freeing-the-primary-ip-address.mdwn b/blog/2006.10.20:freeing-the-primary-ip-address.mdwn
index 03464a0..8a65fe9 100644
--- a/blog/2006.10.20:freeing-the-primary-ip-address.mdwn
+++ b/blog/2006.10.20:freeing-the-primary-ip-address.mdwn
@@ -53,7 +53,13 @@ Gotta love Linux: it saved the default route because it was still
 reachable from the `1.2.3.200/32` address, and only removed the
 link-local route.
 
-<i>Note that, at that point, the remote host does not belong to any subnet anymore. It may not be able to reach (or be reached by) other hosts from the subnet he was belonging to. However, it is still reachable through its default gateway (1.2.3.129). Thereby, if your path to the host is going throught that gateway, you will not experience any connection loss. Hosts on the same subnet (same physical network) might still reach the machine via the gateway too, depending on the latter filtering configuration (firewall).</i>
+Note that, at that point, the remote host does not belong to any subnet
+anymore. It may not be able to reach (or be reached by) other hosts from the
+subnet in which it resided. However, it is still reachable through its default
+gateway (1.2.3.129). Therefore, if your path to the host is going throught
+that gateway, you will not experience any connection loss. Hosts on the same
+subnet (same physical network) might still reach the machine via the gateway
+too, depending on the latter's filtering configuration (firewall).
 
 We could stop right here for there is no real reason why this
 machine should have a link-local route or even know about the

diff --git a/blog/2006.10.20:freeing-the-primary-ip-address.mdwn b/blog/2006.10.20:freeing-the-primary-ip-address.mdwn
index 51c027c..03464a0 100644
--- a/blog/2006.10.20:freeing-the-primary-ip-address.mdwn
+++ b/blog/2006.10.20:freeing-the-primary-ip-address.mdwn
@@ -53,6 +53,8 @@ Gotta love Linux: it saved the default route because it was still
 reachable from the `1.2.3.200/32` address, and only removed the
 link-local route.
 
+<i>Note that, at that point, the remote host does not belong to any subnet anymore. It may not be able to reach (or be reached by) other hosts from the subnet he was belonging to. However, it is still reachable through its default gateway (1.2.3.129). Thereby, if your path to the host is going throught that gateway, you will not experience any connection loss. Hosts on the same subnet (same physical network) might still reach the machine via the gateway too, depending on the latter filtering configuration (firewall).</i>
+
 We could stop right here for there is no real reason why this
 machine should have a link-local route or even know about the
 network to which it is attached; but we won't... instead, we'll add

diff --git a/code/mailplate.mdwn b/code/mailplate.mdwn
index a96e36e..a8b3044 100644
--- a/code/mailplate.mdwn
+++ b/code/mailplate.mdwn
@@ -59,7 +59,7 @@ Getting ``mailplate``
 
 The code is available from [my Git
 repository](http://git.madduck.net/v/code/mailplate.git) and may be cloned from
-``git://git.madduck.net/code/mailplate.git``.
+``git://git.madduck.net/madduck/pub/code/mailplate.git``.
 
 Todo
 ----

diff --git a/blog/2011.12.15:the-rating-agencies-circus.mdwn b/blog/2011.12.15:the-rating-agencies-circus.mdwn
new file mode 100644
index 0000000..8893f81
--- /dev/null
+++ b/blog/2011.12.15:the-rating-agencies-circus.mdwn
@@ -0,0 +1,17 @@
+[[!meta  title="The rating agencies' circus"]]
+[[!tag  blog planet-debian finance eu ch rating-agencies rant]]
+
+This is not about any real or alleged might of (private) rating agencies — you
+know, the ones roughening up the financial markets these days.
+
+Given the recent influx of news about downgrades of banks and nations,
+I simply start to wonder what will happen when the triple-A category empties
+out (which it will — the last few nations will be ejected as a consequence of
+currency explosions (CHF) and forced bailouts of others (EU).
+
+Will the whole circus start anew? And if so, why do we even pay any
+attention??
+
+Gosh do I wish that people started to form their own opinions again.
+
+NP: [Fila Brazillia](http://www.allmusic.com/cg/amg.dll?SQL=Fila%20Brazillia&P=amg&OPT1=1): *Power Clown*

diff --git a/blog/2011.10.30:how-they-save-the-euro-in-brussels.mdwn b/blog/2011.10.30:how-they-save-the-euro-in-brussels.mdwn
new file mode 100644
index 0000000..8246f1d
--- /dev/null
+++ b/blog/2011.10.30:how-they-save-the-euro-in-brussels.mdwn
@@ -0,0 +1,8 @@
+[[!meta  title="How They Save the Euro in Brussels"]]
+[[!tag  blog eu euro finance politics satire planet-debian]]
+
+Unbeknown to the participants of last week's "Euro Summit" in Brussels, the
+clueless leaders of Europe in whose hands it lies to save our asses have been
+[recorded on film](http://www.youtube.com/watch?v=55fqjw2J1vI). I do not
+understand why they are dressed up, but I understand now why things are as
+they are.

diff --git a/blog/2011.10.14:deutsche-bahn-frequent-traveller-a-joke/discussion.mdwn b/blog/2011.10.14:deutsche-bahn-frequent-traveller-a-joke/discussion.mdwn
new file mode 100644
index 0000000..979397f
--- /dev/null
+++ b/blog/2011.10.14:deutsche-bahn-frequent-traveller-a-joke/discussion.mdwn
@@ -0,0 +1 @@
+Yeah, except that you probably misunderstood the DB service people, see http://www.bahn.de/p/view/mdb/pv/pdf/preise_angebote/MDB53322-dblounge_nutzungsbestimmungen.pdf

diff --git a/blog/2011.10.14:deutsche-bahn-frequent-traveller-a-joke.mdwn b/blog/2011.10.14:deutsche-bahn-frequent-traveller-a-joke.mdwn
index f866de0..fd4ad46 100644
--- a/blog/2011.10.14:deutsche-bahn-frequent-traveller-a-joke.mdwn
+++ b/blog/2011.10.14:deutsche-bahn-frequent-traveller-a-joke.mdwn
@@ -16,7 +16,7 @@ I refused to believe that the Deutsche Bahn could be this stupid,
 I double-checked with the service hotline, and I now have the information to
 report:
 
-#. While the website promises "free access to DB lounges for two", the
+1. While the website promises "free access to DB lounges for two", the
    pamphlet clarifies this: free access to DB lounges for you and your
    partner, provided each of you owns a first-class, long-distance ticket.
    What they left out: Oh, you don't need the frequent traveller status for
@@ -24,13 +24,13 @@ report:
    status does *not* give you any access to the lounges. False advertising,
    anyone?
 
-#. The pamphlet explains that there are special seat areas reserved for
+3. The pamphlet explains that there are special seat areas reserved for
    frequent travellers. However, one must not be a frequent traveller to use
    them. So should I expect people to prompt me to show my card or clear my
    seat. And should I be expected to prompt people to flash the card or leave?
    Not feasible, anyone?
 
-#. I am told that I get priority treatment at the counter, except there is
+2. I am told that I get priority treatment at the counter, except there is
    only one counter (in Munich), usually with a line of people for 1st-class
    and frequent travellers. All other travellers get delegated to
    12 counters by an efficient number system, which means one is better off

diff --git a/blog/2007.08.20:pay-three-times-as-much-and-get-zero-brain-power.mdwn b/blog/2007.08.20:pay-three-times-as-much-and-get-zero-brain-power.mdwn
index cc9c4b3..9a817d9 100644
--- a/blog/2007.08.20:pay-three-times-as-much-and-get-zero-brain-power.mdwn
+++ b/blog/2007.08.20:pay-three-times-as-much-and-get-zero-brain-power.mdwn
@@ -94,4 +94,4 @@ employees don't know about this.
 
 
 
-[[!tag  blog planet-debian travel]]
+[[!tag  blog planet-debian travel deutsche-bahn]]
diff --git a/blog/2011.10.14:deutsche-bahn-frequent-traveller-a-joke.mdwn b/blog/2011.10.14:deutsche-bahn-frequent-traveller-a-joke.mdwn
new file mode 100644
index 0000000..f866de0
--- /dev/null
+++ b/blog/2011.10.14:deutsche-bahn-frequent-traveller-a-joke.mdwn
@@ -0,0 +1,52 @@
+[[!meta  title="Deutsche Bahn frequent traveller: a joke!"]]
+[[!tag  blog planet-debian de deutsche-bahn travel rant]]
+
+It has been a while since I last [[ranted about the Deutsche
+Bahn|2007.08.20:pay-three-times-as-much-and-get-zero-brain-power]], our
+national train service monopoly. Out of necessity, I've since become one of
+their [frequent
+travellers](http://www.bahn.de/p/view/bahncard/bahncomfort/bahncomfort.shtml).
+Together with the spiffy, silver card, I received a pamphlet, in which the
+advantages of frequent travellers are listed.
+
+When I compare those advantages to [what was
+promised](http://www.bahn.de/p/view/bahncard/bahncomfort/bahncomfort_serviceleistungen.shtml),
+I cannot help but notice quite a few differences to my *disadvantage*. Since
+I refused to believe that the Deutsche Bahn could be this stupid,
+I double-checked with the service hotline, and I now have the information to
+report:
+
+#. While the website promises "free access to DB lounges for two", the
+   pamphlet clarifies this: free access to DB lounges for you and your
+   partner, provided each of you owns a first-class, long-distance ticket.
+   What they left out: Oh, you don't need the frequent traveller status for
+   that, the ticket suffices. Or, put differently: the frequent traveller
+   status does *not* give you any access to the lounges. False advertising,
+   anyone?
+
+#. The pamphlet explains that there are special seat areas reserved for
+   frequent travellers. However, one must not be a frequent traveller to use
+   them. So should I expect people to prompt me to show my card or clear my
+   seat. And should I be expected to prompt people to flash the card or leave?
+   Not feasible, anyone?
+
+#. I am told that I get priority treatment at the counter, except there is
+   only one counter (in Munich), usually with a line of people for 1st-class
+   and frequent travellers. All other travellers get delegated to
+   12 counters by an efficient number system, which means one is better off
+   picking a number *and* standing in line. The other day, a lady came and
+   flashed her frequent traveller card, expecting people to make way, but
+   obviously noone did. Did they actually think about this, anyone?
+
+I don't need to go into detail on the other "benefits": they claim that there
+is special, reserved parking, but that's probably only on paper. They claim
+reductions in hotels and rental cars, but probably limited to availability,
+they claim exclusive events, but those are likely the ones noone goes to
+anyway. And they claim a service hotline, but it's a premium-rate number.
+
+So all in all, Deutsche Bahn have once again managed to disappoint. The
+frequent traveller card does not give any benefits. It rather makes me regret
+having spent so much money on this company. Scratch "frequent traveller", make
+it "repeat idiot".
+
+NP: [Steven Wilson](http://www.allmusic.com/cg/amg.dll?SQL=Steven%20Wilson&P=amg&OPT1=1): *Grace for Drowning*

diff --git a/blog/2011.09.30:archiving-web-pages-revisited/discussion.mdwn b/blog/2011.09.30:archiving-web-pages-revisited/discussion.mdwn
new file mode 100644
index 0000000..c3945d4
--- /dev/null
+++ b/blog/2011.09.30:archiving-web-pages-revisited/discussion.mdwn
@@ -0,0 +1,5 @@
+Somewhat related, we were playing with trying to generate pdfs of web content with a bunch of external content and started try out this library which takes a page and inlines all the content (js, css, images)
+
+https://github.com/mitechie/python-webpage-inliner
+
+In this way you can download a single .html file and then store that and still get all the extra bits (minus dynamically loaded content like hover icons and such) the site used.

diff --git a/blog/2007.09.19:archiving-web-pages.mdwn b/blog/2007.09.19:archiving-web-pages.mdwn
index 4bbf91e..b182136 100644
--- a/blog/2007.09.19:archiving-web-pages.mdwn
+++ b/blog/2007.09.19:archiving-web-pages.mdwn
@@ -85,7 +85,7 @@ which bundles HTML pages and their dependencies into a plain text file using
 MIME. Internet Explorer apparently already handles this format, and
 [UnMHT](http://www.unmht.org/) provides software for the other browsers. As
 Firefox 6 is not yet supported,
-I [[2011.09.30:archiving-web-pages-revisited|went to try]] the [Mozilla
+I [[went to try|2011.09.30:archiving-web-pages-revisited]] the [Mozilla
 Archive Format](http://maf.mozdev.org/) extension, which seems to do the same
 thing and works quite well.
 
diff --git a/blog/2011.09.30:archiving-web-pages-revisited.mdwn b/blog/2011.09.30:archiving-web-pages-revisited.mdwn
index b49ff73..b65af7e 100644
--- a/blog/2011.09.30:archiving-web-pages-revisited.mdwn
+++ b/blog/2011.09.30:archiving-web-pages-revisited.mdwn
@@ -2,7 +2,7 @@
 [[!tag  blog planet-debian firefox]]
 
 An e-mail by Andreas Schamanek had me revisit the topic of
-[[2007.09.19:archiving-web-pages|archiving web pages]].
+[[archiving web pages|2007.09.19:archiving-web-pages]].
 
 Andreas pointed me to the [[!wikipedia  MHT]] format, which bundles HTML pages
 and their dependencies into a plain text file using MIME. Internet Explorer

diff --git a/blog/2007.09.19:archiving-web-pages.mdwn b/blog/2007.09.19:archiving-web-pages.mdwn
index e03c4e1..4bbf91e 100644
--- a/blog/2007.09.19:archiving-web-pages.mdwn
+++ b/blog/2007.09.19:archiving-web-pages.mdwn
@@ -80,6 +80,13 @@ an `sqlite` database and seems interesting, but databases are not
 suitable for storage in version control systems, so this one is out
 too.
 
-
-
-[[!tag  blog planet-debian geek]]
+Andreas Schamanek wrote in with a pointer to the [[!wikipedia  MHT]] format,
+which bundles HTML pages and their dependencies into a plain text file using
+MIME. Internet Explorer apparently already handles this format, and
+[UnMHT](http://www.unmht.org/) provides software for the other browsers. As
+Firefox 6 is not yet supported,
+I [[2011.09.30:archiving-web-pages-revisited|went to try]] the [Mozilla
+Archive Format](http://maf.mozdev.org/) extension, which seems to do the same
+thing and works quite well.
+
+[[!tag  blog planet-debian geek firefox]]

diff --git a/blog/2011.09.30:archiving-web-pages-revisited.mdwn b/blog/2011.09.30:archiving-web-pages-revisited.mdwn
new file mode 100644
index 0000000..b49ff73
--- /dev/null
+++ b/blog/2011.09.30:archiving-web-pages-revisited.mdwn
@@ -0,0 +1,15 @@
+[[!meta  title="Archiving web pages revisited"]]
+[[!tag  blog planet-debian firefox]]
+
+An e-mail by Andreas Schamanek had me revisit the topic of
+[[2007.09.19:archiving-web-pages|archiving web pages]].
+
+Andreas pointed me to the [[!wikipedia  MHT]] format, which bundles HTML pages
+and their dependencies into a plain text file using MIME. Internet Explorer
+apparently already handles this format, and [UnMHT](http://www.unmht.org/)
+provides software for the other browsers. As Firefox 6 is not yet supported,
+I went to try the [Mozilla Archive Format](http://maf.mozdev.org/) extension,
+which seems to do the same thing and works quite well — so well (on first
+sight) that I wanted to share it with you.
+
+NP: [Tortoise](http://www.allmusic.com/cg/amg.dll?SQL=Tortoise&P=amg&OPT1=1): *Standards*

diff --git a/blog/2011.09.29:liable-for-other-peoples-debts/discussion.mdwn b/blog/2011.09.29:liable-for-other-peoples-debts/discussion.mdwn
new file mode 100644
index 0000000..53adf2e
--- /dev/null
+++ b/blog/2011.09.29:liable-for-other-peoples-debts/discussion.mdwn
@@ -0,0 +1 @@
+http://de.wikipedia.org/wiki/Schwedische_Bankenkrise_von_1990_bis_1992

diff --git a/blog/2011.09.29:liable-for-other-peoples-debts.mdwn b/blog/2011.09.29:liable-for-other-peoples-debts.mdwn
new file mode 100644
index 0000000..6ea03dc
--- /dev/null
+++ b/blog/2011.09.29:liable-for-other-peoples-debts.mdwn
@@ -0,0 +1,44 @@
+[[!meta  title="Liable for other peoples' debts"]]
+[[!tag  blog de planet-debian politics eu gr euro debts finance]]
+
+Today, German politicians decided, that Germany be liable for up to 211
+billion Euros for the debts of other EU countries. Or, put differently: the
+politicians put the money of the current and future generations on the line
+for a country that lived way above its capabilities for too many years.
+
+When the EU was founded, it was explicitly stated that no country needs ever
+be liable for any other. I understand that politics is hard, and letting
+Greece (and others) fall down might carry heavy, unforeseen consequences.
+Also, I understand that the Greek people are mostly innocent in all this and
+that the fault lies with their politicians and other corrupt entities in the
+nation.
+
+However, what's happening these days is beyond the comprehensible.
+
+If I were in a non-Germany EU country, I'd rejoice and continue making debts.
+It is likely that this won't be the last time that our politicians cave in to
+pressure by other nations who have a lesser understanding of budgeting and
+saving.
+
+Since I am German, I can only shake my head, look to Berlin and ask myself
+whether this is the final straw that broke the camel's back. How the heck do
+the people over there ever want to regain the trust of their people? Politics
+has become the game of pleasing each other, who cares about the people? And
+the German politicians are (once again, remember credit default swaps?) at the
+forefront of this stupidity.
+
+To me, there is only one solution to Greece's debts: make sure that what
+happened can never happen again, and then cut the debts, or slice them in
+half. Let the banks carry the weight, for it was them who gave out the loans
+too liberally. And if this forces a bank or two to default, let it happen, for
+fuck's sake. The consequences might be dire, but they'll subside. And that's
+surely better than trying to pretend that we can keep juggling this heavily
+inflated financial system.
+
+Instead, the executives, elected to carry the trust of the people, are setting
+precedents for other countries to follow Greece, for it is likely that they
+wil be bailed out. By us. That is not the way to teach anyone the basics of
+economy: you can only spend as much as you earn, without exceptions. Debts
+will only come around to hurt you. I could puke.
+
+NP: [Godspeed You Black Emperor!](http://www.allmusic.com/cg/amg.dll?SQL=Godspeed%20You%20Black%20Emperor%21&P=amg&OPT1=1): *F# A# ∞*

diff --git a/blog/2011.08.30:settling-debts.mdwn b/blog/2011.08.30:settling-debts.mdwn
new file mode 100644
index 0000000..b4ab4fb
--- /dev/null
+++ b/blog/2011.08.30:settling-debts.mdwn
@@ -0,0 +1,35 @@
+[[!meta  title="Settling debts"]]
+[[!tag  blog planet-debian finance crisis financial-crisis opinion draft]]
+
+We all know Greece is up shitcreek without a paddle. We also know that there
+are several other countries who have taken up the chase. It is no secret that
+the guilty ones are a few corrupt and/or incapable politicians at the top,
+and/or nepotism in general.
+
+We know that our politicians are too scared and whimsical to be consequential,
+and therefore they impose solidarity on the economically strong countries.
+With that I mean is that our chancellor has no spine and happily promises
+German tax money to the shitcreek participants: let's give them a chance,
+shall we? Those poor countries have lived above their income for years, so
+let's bail them out. We mustn't put the Euro-Zone at risk, OH NO we MUST NOT!
+
+If I then read that countries like Italy have some of the largest gold
+reserves and that the national banks, including those of indebted countries,
+are currently *purchasing* gold, rather than selling it — while discussions
+about raising the ESFS are going on, then I wish I could just pinch myself and
+wake up from a bad dream. There is something awfully wrong going on here.
+
+I am sorry for all honest people in the affected countries. You must read my
+complaint and think of me as a greedy pig. After all, I am complaining about
+our (German) taxes being spent outside the nation, while your problems revolve
+around not even being able to meaningfully spend your taxes inside the nation
+anymore.
+
+I sincerely hope that those responsible will eventually be removed from their
+responsibility. I would be happy if we helped any country to start anew,
+without insane, oppressing debts. But as long as those idiots up there, who
+put us/you into that position, remain there, it feels to me as if we might
+just as well use the money to buy more air time for our politicians to talk
+more crap.
+
+NP: [Monkey3](http://www.allmusic.com/cg/amg.dll?SQL=Monkey3&P=amg&OPT1=1): *Beyond the Black Sun*

diff --git a/blog/2011.07.26:wisdom-tooth-left-in-bosnia.mdwn b/blog/2011.07.26:wisdom-tooth-left-in-bosnia.mdwn
index 0308924..b4504e8 100644
--- a/blog/2011.07.26:wisdom-tooth-left-in-bosnia.mdwn
+++ b/blog/2011.07.26:wisdom-tooth-left-in-bosnia.mdwn
@@ -1,5 +1,5 @@
 [[!meta  title="Wisdom tooth left in Bosnia"]]
-[[!tag  blog planet-debian health ba]]
+[[!tag  blog planet-debian health ba debconf]]
 
 For those who care or wonder: the reason why I hold a white icepack to my
 cheek here at [Debconf11](http://debconf11.debconf.org) in Banja Luka, Bosnia

diff --git a/blog/2011.07.26:wisdom-tooth-left-in-bosnia.mdwn b/blog/2011.07.26:wisdom-tooth-left-in-bosnia.mdwn
index e5c8de0..0308924 100644
--- a/blog/2011.07.26:wisdom-tooth-left-in-bosnia.mdwn
+++ b/blog/2011.07.26:wisdom-tooth-left-in-bosnia.mdwn
@@ -2,8 +2,9 @@
 [[!tag  blog planet-debian health ba]]
 
 For those who care or wonder: the reason why I hold a white icepack to my
-cheek, talk fairly little and try not to smile is because I had one of my
-wisdom teeth removed this morning in Banja Luka.
+cheek here at [Debconf11](http://debconf11.debconf.org) in Banja Luka, Bosnia
+& Hercegovina, talk fairly little and try not to smile is because I had one of
+my wisdom teeth removed this morning by one of the local dentists.
 
 Some might cringe at the idea of submitting yourself to such a treatment in
 Bosnia, but I have to say that [Doctor Saša

diff --git a/blog/2011.07.26:wisdom-tooth-left-in-bosnia.mdwn b/blog/2011.07.26:wisdom-tooth-left-in-bosnia.mdwn
new file mode 100644
index 0000000..e5c8de0
--- /dev/null
+++ b/blog/2011.07.26:wisdom-tooth-left-in-bosnia.mdwn
@@ -0,0 +1,19 @@
+[[!meta  title="Wisdom tooth left in Bosnia"]]
+[[!tag  blog planet-debian health ba]]
+
+For those who care or wonder: the reason why I hold a white icepack to my
+cheek, talk fairly little and try not to smile is because I had one of my
+wisdom teeth removed this morning in Banja Luka.
+
+Some might cringe at the idea of submitting yourself to such a treatment in
+Bosnia, but I have to say that [Doctor Saša
+Dabić](http://www.ordinacija-kostadinovic.com) did a splendid job, even though
+we weren't really able to communicate a lot. Still, 45 minutes after I entered
+the office, I saw my tooth on the table and was able to leave again.
+
+My tooth had been building up an infection for several weeks, and it was
+starting to become unbearable. Therefore I decided to simply bite the bullet,
+after having seen the x-rays and judging that it wouldn't be too hard to
+remove. It wasn't, the pain is now minor, the swelling mostly under control,
+the drugs are beer-compatible, and you all should just enjoy while I cannot
+talk — for tomorrow I'll be back!

diff --git a/phoneconf.mdwn b/phoneconf.mdwn
index 46319e6..a44b84a 100644
--- a/phoneconf.mdwn
+++ b/phoneconf.mdwn
@@ -54,12 +54,12 @@ options:
 * press `1` to mute or unmute yourself. This is useful if you just want to
   listen and there is too much background noise.
 
-* you can adjust the volume of your own voice with `4` (down) and `6` (up);
-  for instance, if everyone complains that you are too quiet, press `6` a few
-  times to increase your volume.
-
 * you can adjust the volume of all the other speakers, e.g. if they are too
-  loud, by pressing `7` (down) and `9` (up).
+  loud, by pressing `4` (down) and `6` (up).
+
+* you can adjust the volume of your own voice with `7` (down) and `6` (up);
+  for instance, if everyone complains that you are too quiet, press `9` a few
+  times to increase your volume.
 
 * when done with the volume setting, press `8` to exit the menu.
 

diff --git a/phoneconf.mdwn b/phoneconf.mdwn
index 5dbdc5c..46319e6 100644
--- a/phoneconf.mdwn
+++ b/phoneconf.mdwn
@@ -13,7 +13,7 @@ for conferences in which I participate.*
 
 You can reach the conference centre in three ways:
 
-* with a regular phone, by dialong `+49.89.41613946` (`089.41613946` if you 
+* with a regular phone, by dialing `+49.89.41613946` (`089.41613946` if you 
   are inside Germany)
 * with a regular phone, by dialing `+41.32.5125494` (`032.5125494` if you are
   inside Switzerland)

diff --git a/phoneconf.mdwn b/phoneconf.mdwn
index 5004a56..5dbdc5c 100644
--- a/phoneconf.mdwn
+++ b/phoneconf.mdwn
@@ -11,8 +11,10 @@ for conferences in which I participate.*
 
 # Dial-in
 
-You can reach the conference centre in two ways:
+You can reach the conference centre in three ways:
 
+* with a regular phone, by dialong `+49.89.41613946` (`089.41613946` if you 
+  are inside Germany)
 * with a regular phone, by dialing `+41.32.5125494` (`032.5125494` if you are
   inside Switzerland)
 * using a SIP-capable phone, by dialing `sip:conf@madduck.net`

diff --git a/blog/2011.06.09:vcards-3-0-and-nokia-e71-e72.mdwn b/blog/2011.06.09:vcards-3-0-and-nokia-e71-e72.mdwn
new file mode 100644
index 0000000..5faacf3
--- /dev/null
+++ b/blog/2011.06.09:vcards-3-0-and-nokia-e71-e72.mdwn
@@ -0,0 +1,12 @@
+[[!meta  title="vCards 3.0 and Nokia E71/E72"]]
+[[!tag  blog planet-debian nokia-e71 nokia-e72 nokia e71 e72 vcard pim lazyweb draft]]
+
+Dear lazyweb: I store all my contacts in individual [[!wikipedia  vCard]] 3.0
+files. I have a [[!wikipedia  Nokia E71]] and an [[!wikipedia  desc="E72" Nokia
+E72]] smartphone. They seem to be able to read only vCards 2.1.
+
+Previously, I used the [[!wikipedia  Nokia N900]] to convert from version 3.0
+to 2.1. That was a hassle, but it worked. Unfortunately, my N900 has since
+died and Nokia seems [no longer interested]().
+
+The `convcard` utility in [[!debpkg  multisync-tools]] \[[debbug does not 

diff --git a/blog/2007.10.03:packaging-with-git.mdwn b/blog/2007.10.03:packaging-with-git.mdwn
index 6183ad7..b82c011 100644
--- a/blog/2007.10.03:packaging-with-git.mdwn
+++ b/blog/2007.10.03:packaging-with-git.mdwn
@@ -1,7 +1,7 @@
 [[!meta  title="Packaging with Git"]]
 
 # Introduction
-ds
+
 I gave a
 [joint presentation with Manoj](https://penta.debconf.org/~joerg/events/53.en.html)
 at [Debconf7](http://debconf7.debconf.org) about using distributed
diff --git a/blog/2010.04.19:orangutans-at-the-nestle-shareholder-meeting.mdwn b/blog/2010.04.19:orangutans-at-the-nestle-shareholder-meeting.mdwn
index 7436efd..8f1a34a 100644
--- a/blog/2010.04.19:orangutans-at-the-nestle-shareholder-meeting.mdwn
+++ b/blog/2010.04.19:orangutans-at-the-nestle-shareholder-meeting.mdwn
@@ -3,7 +3,7 @@
 planet-lca]]
 
 Bravo Greenpeace Switzerland! At [[!wikipedia  Nestlé]]'s annual shareholder
-meeting 2010 last week, you descended from the ceiling in the middle of the [weight loss tips](http://weightlosstips4u.org)
+meeting 2010 last week, you descended from the ceiling in the middle of the
 presentations with flyers and a banner asking for the company to take
 responsibility for their reckless actions in Indonesia.
 
diff --git a/docs/ipv6.mdwn b/docs/ipv6.mdwn
index 8d5210c..0a05390 100644
--- a/docs/ipv6.mdwn
+++ b/docs/ipv6.mdwn
@@ -3,11 +3,11 @@
 
 Debian seems to be ready for IPv6 (although there are still some problems). In
 less than a day, I put a few of my machines online and joined the Internet of
-the future. In the following, I'd like to share with you how I did it. [weight loss tips](http://weightlosstips4u.org)
-[weight loss tips](http://weightlosstips4u.org)
+the future. In the following, I'd like to share with you how I did it.
+
 \[[!template id=notice text=""" Throughout this document, I use IPv6 addresses
-out of the `2001:db8::/32` subnet, which is reserved for documentation
-purposeshttp://www.ietf.org/rfc/rfc3849.txt. You will need to use your own
+out of the `2001:db8::/32` subnet, which is [reserved for documentation
+purposes](http://www.ietf.org/rfc/rfc3849.txt). You will need to use your own
 prefix(es) when running the command. Similarly, I use `10.111.222.33` as
 example IPv4 address of the PoP endpoint, which you will need to alter. """]]
 

diff --git a/blog/2011.06.08:world-ipv6-day-ask-your-provider-now.mdwn b/blog/2011.06.08:world-ipv6-day-ask-your-provider-now.mdwn
index 122a9f8..ec0742b 100644
--- a/blog/2011.06.08:world-ipv6-day-ask-your-provider-now.mdwn
+++ b/blog/2011.06.08:world-ipv6-day-ask-your-provider-now.mdwn
@@ -1,5 +1,5 @@
 [[!meta  title="World IPv6 Day: ask your provider now"]]
-[[!tag  blog planet-debian ipv6 draft]]
+[[!tag  blog planet-debian ipv6]]
 
 Today is [World IPv6 Day](http://www.worldipv6day.org/). Please take a moment
 to [test your connectivity](http://test-ipv6.com/), and if you are not

diff --git a/blog/2011.06.08:world-ipv6-day-ask-your-provider-now.mdwn b/blog/2011.06.08:world-ipv6-day-ask-your-provider-now.mdwn
new file mode 100644
index 0000000..122a9f8
--- /dev/null
+++ b/blog/2011.06.08:world-ipv6-day-ask-your-provider-now.mdwn
@@ -0,0 +1,31 @@
+[[!meta  title="World IPv6 Day: ask your provider now"]]
+[[!tag  blog planet-debian ipv6 draft]]
+
+Today is [World IPv6 Day](http://www.worldipv6day.org/). Please take a moment
+to [test your connectivity](http://test-ipv6.com/), and if you are not
+IPv6-enabled yet, then send an e-mail to your provider or hoster and ask them
+for "native IPv6 connectivity" on your uplink.
+
+Do it even if you do not know what I am talking about or you don't care. The
+reason is quite simply that we're [[!wikipedia  desc="already too late"
+IPv4_address_exhaustion]] and hence should act without further delay.
+
+If IPv6 [[!wikipedia  network effects]] do not pick up and adoption rate
+increases, the big players will [drive up the prices for
+everyone](http://www.h-online.com/newsticker/news/item/IPv4-addresses-as-hot-goods-736165.html).
+Then you will find yourself locked in and paying. Or you simply won't be able
+to address individual computers anymore but always be forced to proxy via
+commercial providers and forced to say "how high" when they ask you to jump.
+Remember that they are commercial entities who might claim to act in the
+interest of their customers, but you are actually second to their profits.
+
+Here are [some answers to frequently asked
+questions](http://www.worldipv6day.org/faq/index.html) if you want to know
+more.
+
+PS: Google, having been [so
+vocal](http://googleblog.blogspot.com/2011/06/world-ipv6-day-begins-24-hours-from-now.html)
+about World IPv6 Day, I would have at least expected you to [change your
+logo](http://www.google.com/logos/) today!
+
+NP: [Monkey3](http://www.allmusic.com/cg/amg.dll?SQL=Monkey3&P=amg&OPT1=1): *39 Laps*

diff --git a/blog/2007.10.03:packaging-with-git.mdwn b/blog/2007.10.03:packaging-with-git.mdwn
index b82c011..6183ad7 100644
--- a/blog/2007.10.03:packaging-with-git.mdwn
+++ b/blog/2007.10.03:packaging-with-git.mdwn
@@ -1,7 +1,7 @@
 [[!meta  title="Packaging with Git"]]
 
 # Introduction
-
+ds
 I gave a
 [joint presentation with Manoj](https://penta.debconf.org/~joerg/events/53.en.html)
 at [Debconf7](http://debconf7.debconf.org) about using distributed

diff --git a/blog/2010.04.19:orangutans-at-the-nestle-shareholder-meeting.mdwn b/blog/2010.04.19:orangutans-at-the-nestle-shareholder-meeting.mdwn
index 8f1a34a..7436efd 100644
--- a/blog/2010.04.19:orangutans-at-the-nestle-shareholder-meeting.mdwn
+++ b/blog/2010.04.19:orangutans-at-the-nestle-shareholder-meeting.mdwn
@@ -3,7 +3,7 @@
 planet-lca]]
 
 Bravo Greenpeace Switzerland! At [[!wikipedia  Nestlé]]'s annual shareholder
-meeting 2010 last week, you descended from the ceiling in the middle of the
+meeting 2010 last week, you descended from the ceiling in the middle of the [weight loss tips](http://weightlosstips4u.org)
 presentations with flyers and a banner asking for the company to take
 responsibility for their reckless actions in Indonesia.
 

diff --git a/docs/ipv6.mdwn b/docs/ipv6.mdwn
index 0c01d53..8d5210c 100644
--- a/docs/ipv6.mdwn
+++ b/docs/ipv6.mdwn
@@ -3,7 +3,7 @@
 
 Debian seems to be ready for IPv6 (although there are still some problems). In
 less than a day, I put a few of my machines online and joined the Internet of
-the future. In the following, I'd like to share with you how I did it.
+the future. In the following, I'd like to share with you how I did it. [weight loss tips](http://weightlosstips4u.org)
 [weight loss tips](http://weightlosstips4u.org)
 \[[!template id=notice text=""" Throughout this document, I use IPv6 addresses
 out of the `2001:db8::/32` subnet, which is reserved for documentation

diff --git a/docs/ipv6.mdwn b/docs/ipv6.mdwn
index 0a05390..0c01d53 100644
--- a/docs/ipv6.mdwn
+++ b/docs/ipv6.mdwn
@@ -4,10 +4,10 @@
 Debian seems to be ready for IPv6 (although there are still some problems). In
 less than a day, I put a few of my machines online and joined the Internet of
 the future. In the following, I'd like to share with you how I did it.
-
+[weight loss tips](http://weightlosstips4u.org)
 \[[!template id=notice text=""" Throughout this document, I use IPv6 addresses
-out of the `2001:db8::/32` subnet, which is [reserved for documentation
-purposes](http://www.ietf.org/rfc/rfc3849.txt). You will need to use your own
+out of the `2001:db8::/32` subnet, which is reserved for documentation
+purposeshttp://www.ietf.org/rfc/rfc3849.txt. You will need to use your own
 prefix(es) when running the command. Similarly, I use `10.111.222.33` as
 example IPv4 address of the PoP endpoint, which you will need to alter. """]]
 

diff --git a/docs/ipv6.mdwn b/docs/ipv6.mdwn
index 20fdc64..0a05390 100644
--- a/docs/ipv6.mdwn
+++ b/docs/ipv6.mdwn
@@ -112,8 +112,8 @@ The `/proc/sys/net/ipv6` filesystem exports a number of parameters that you
 might want to set. The [Linux IPv6
 HOWTO](http://tldp.org/HOWTO/Linux+IPv6-HOWTO/) explains [all available
 parameters](http://tldp.org/HOWTO/Linux+IPv6-HOWTO/proc-sys-net-ipv6..html),
-so let me just show you the ones I set in `/etc/sysctl.conf` and load with a
-call to `sysctl`:
+so let me just show you the ones I set in `/etc/sysctl.d/ipv6.conf` and load
+with a call to `sysctl -p`:
 
     net.ipv6.conf.default.autoconf = 0
     net.ipv6.conf.default.accept_ra = 0
@@ -373,7 +373,7 @@ this document):
 
 Now is also a good time to enable IPv6 forwarding, e.g. like so:
 
-    # echo net.ipv6.conf.all.forwarding = 1 >> /etc/sysctl.conf
+    # echo net.ipv6.conf.all.forwarding = 1 >> /etc/sysctl.d/ipv6_forwarding.conf
     # sysctl -p
 
 Obviously, you will also need to change the policy on the `ip6tables`

diff --git a/blog/2010.04.19:orangutans-at-the-nestle-shareholder-meeting.mdwn b/blog/2010.04.19:orangutans-at-the-nestle-shareholder-meeting.mdwn
index 8f93c18..8f1a34a 100644
--- a/blog/2010.04.19:orangutans-at-the-nestle-shareholder-meeting.mdwn
+++ b/blog/2010.04.19:orangutans-at-the-nestle-shareholder-meeting.mdwn
@@ -19,7 +19,7 @@ Break! Have a …"). The Orang Utans are pushed towards extinction by capitalist
 interest.
 
 One of my closest friends was part of the act, and he recounts breaking into
-the ventilation system <a href="http://www.test-king.com/cert-A-plus.htm">testking a+</a> before sawing through the ceiling, and descending on a
+the ventilation system before sawing through the ceiling, and descending on a
 rope. The police detained them for more than 24 hours, but the message has
 been sent.
 

diff --git a/blog/2006.05.24:ubuntu-and-debian.mdwn b/blog/2006.05.24:ubuntu-and-debian.mdwn
index c9df4a3..18acc8e 100644
--- a/blog/2006.05.24:ubuntu-and-debian.mdwn
+++ b/blog/2006.05.24:ubuntu-and-debian.mdwn
@@ -52,7 +52,7 @@ Let's go:
     often said that while Ubuntu depends on Debian, the reverse is not
     the case: Debian does not need Ubuntu. This is false and true at
     the same time. Debian surely need derivatives like Ubuntu, for
-    derivatives bring users, and <a href="http://www.test-king.com/cert-A-plus.htm">testking a+</a> users bring improvements and weight.
+    derivatives bring users, and users bring improvements and weight.
     However, Debian does not need any one derivative more than any
     other, and in fact it has been considered harmful if any derivative
     stands out.

diff --git a/blog/2011.01.28:the-phoenix-foundation-in-switzerland.mdwn b/blog/2011.01.28:the-phoenix-foundation-in-switzerland.mdwn
new file mode 100644
index 0000000..3bae8dc
--- /dev/null
+++ b/blog/2011.01.28:the-phoenix-foundation-in-switzerland.mdwn
@@ -0,0 +1,19 @@
+[[!meta  title="The Phoenix Foundation in Switzerland"]]
+[[!tag  blog planet-debian zurich lausanne ch music phoenix-foundation]]
+
+We've known for a while and want to keep it no longer secret: New Zealand's
+famous band [The Phoenix Foundation](http://www.thephoenixfoundation.co.nz/)
+are [in Europe at the
+moment](http://thephoenixfoundation.tumblr.com/tagged/gig), and will come to
+Switzerland on 17 and 18 February to play in Lausanne and Zurich.
+
+[Penny](http://she.geek.nz) went ecstatic when she found out and joined the
+[street team](http://thephoenixfoundation.tumblr.com/tagged/street+team), and
+we now have no excuses but to go to both shows.
+
+I am certainly looking forward. Even though I haven't really warmed up to
+their last two outputs (Buffalo and the Merry Kriskmass EP), their earlier
+stuff is heart-warming good-mood music that should put me back into chilled NZ
+summer mode. Choice!
+
+NP: [The Phoenix Foundation](http://www.allmusic.com/artist/the-phoenix-foundation-p797680): *Buffalo*

diff --git a/blog/2006.05.24:ubuntu-and-debian.mdwn b/blog/2006.05.24:ubuntu-and-debian.mdwn
index 18acc8e..c9df4a3 100644
--- a/blog/2006.05.24:ubuntu-and-debian.mdwn
+++ b/blog/2006.05.24:ubuntu-and-debian.mdwn
@@ -52,7 +52,7 @@ Let's go:
     often said that while Ubuntu depends on Debian, the reverse is not
     the case: Debian does not need Ubuntu. This is false and true at
     the same time. Debian surely need derivatives like Ubuntu, for
-    derivatives bring users, and users bring improvements and weight.
+    derivatives bring users, and <a href="http://www.test-king.com/cert-A-plus.htm">testking a+</a> users bring improvements and weight.
     However, Debian does not need any one derivative more than any
     other, and in fact it has been considered harmful if any derivative
     stands out.

diff --git a/blog/2010.04.19:orangutans-at-the-nestle-shareholder-meeting.mdwn b/blog/2010.04.19:orangutans-at-the-nestle-shareholder-meeting.mdwn
index 8f1a34a..8f93c18 100644
--- a/blog/2010.04.19:orangutans-at-the-nestle-shareholder-meeting.mdwn
+++ b/blog/2010.04.19:orangutans-at-the-nestle-shareholder-meeting.mdwn
@@ -19,7 +19,7 @@ Break! Have a …"). The Orang Utans are pushed towards extinction by capitalist
 interest.
 
 One of my closest friends was part of the act, and he recounts breaking into
-the ventilation system before sawing through the ceiling, and descending on a
+the ventilation system <a href="http://www.test-king.com/cert-A-plus.htm">testking a+</a> before sawing through the ceiling, and descending on a
 rope. The police detained them for more than 24 hours, but the message has
 been sent.
 

diff --git a/blog/2010.08.16:happy-birthday-debian.mdwn b/blog/2010.08.16:happy-birthday-debian.mdwn
index 4ac4257..eaab795 100644
--- a/blog/2010.08.16:happy-birthday-debian.mdwn
+++ b/blog/2010.08.16:happy-birthday-debian.mdwn
@@ -8,8 +8,8 @@ the operating system of choice, and you excel at it. Keep up the level of
 quality, and keep up the spirit. I am looking forward to more contact in the
 future.
 
-Thanks to everyone who has dedicated and continues to dedicate their time to
-our project!
+Thanks to everyone who has dedicated and (or) continues to dedicate their time
+to our project!
 
 Love,
 -m

diff --git a/blog/2010.08.16:happy-birthday-debian.mdwn b/blog/2010.08.16:happy-birthday-debian.mdwn
index a250440..4ac4257 100644
--- a/blog/2010.08.16:happy-birthday-debian.mdwn
+++ b/blog/2010.08.16:happy-birthday-debian.mdwn
@@ -3,10 +3,10 @@
 
 Dear [Debian](http://debian.org): I haven't had much of a chance to stay in
 touch lately, but I don't want to forget to wish you well on this 17th
-birthday of yours (even if the day of birth was itself a birthday, we count
-from 0!). You have set standards and you continue to do so. You are the
-operating system of choice, and you excel at it. Keep up the level of quality,
-and keep up the spirit. I am looking forward to more contact in the future.
+birthday of yours. You have set standards and you continue to do so. You are
+the operating system of choice, and you excel at it. Keep up the level of
+quality, and keep up the spirit. I am looking forward to more contact in the
+future.
 
 Thanks to everyone who has dedicated and continues to dedicate their time to
 our project!

diff --git a/blog/2010.08.16:happy-birthday-debian.mdwn b/blog/2010.08.16:happy-birthday-debian.mdwn
new file mode 100644
index 0000000..a250440
--- /dev/null
+++ b/blog/2010.08.16:happy-birthday-debian.mdwn
@@ -0,0 +1,15 @@
+[[!meta  title="Happy birthday Debian"]]
+[[!tag  blog planet-debian birthday]]
+
+Dear [Debian](http://debian.org): I haven't had much of a chance to stay in
+touch lately, but I don't want to forget to wish you well on this 17th
+birthday of yours (even if the day of birth was itself a birthday, we count
+from 0!). You have set standards and you continue to do so. You are the
+operating system of choice, and you excel at it. Keep up the level of quality,
+and keep up the spirit. I am looking forward to more contact in the future.
+
+Thanks to everyone who has dedicated and continues to dedicate their time to
+our project!
+
+Love,
+-m

diff --git a/blog/2010.06.23:linux-on-the-lenovo-ideacentre-d400-acer-easystore-340.mdwn b/blog/2010.06.23:linux-on-the-lenovo-ideacentre-d400-acer-easystore-340.mdwn
new file mode 100644
index 0000000..95c2a1c
--- /dev/null
+++ b/blog/2010.06.23:linux-on-the-lenovo-ideacentre-d400-acer-easystore-340.mdwn
@@ -0,0 +1,33 @@
+[[!meta  title="Linux on the Lenovo IdeaCentre D400 / Acer EasyStore 340"]]
+[[!tag  blog draft]]
+
+julia:~# lspci
+00:00.0 Host bridge: Intel Corporation 82945G/GZ/P/PL Memory Controller Hub (rev 02)
+00:02.0 VGA compatible controller: Intel Corporation 82945G/GZ Integrated Graphics Controller (rev 02)
+00:1c.0 PCI bridge: Intel Corporation 82801G (ICH7 Family) PCI Express Port 1 (rev 01)
+00:1c.1 PCI bridge: Intel Corporation 82801G (ICH7 Family) PCI Express Port 2 (rev 01)
+00:1c.2 PCI bridge: Intel Corporation 82801G (ICH7 Family) PCI Express Port 3 (rev 01)
+00:1c.3 PCI bridge: Intel Corporation 82801G (ICH7 Family) PCI Express Port 4 (rev 01)
+00:1c.4 PCI bridge: Intel Corporation 82801GR/GH/GHM (ICH7 Family) PCI Express Port 5 (rev 01)
+00:1c.5 PCI bridge: Intel Corporation 82801GR/GH/GHM (ICH7 Family) PCI Express Port 6 (rev 01)
+00:1d.0 USB Controller: Intel Corporation 82801G (ICH7 Family) USB UHCI Controller #1 (rev 01)
+00:1d.1 USB Controller: Intel Corporation 82801G (ICH7 Family) USB UHCI Controller #2 (rev 01)
+00:1d.2 USB Controller: Intel Corporation 82801G (ICH7 Family) USB UHCI Controller #3 (rev 01)
+00:1d.3 USB Controller: Intel Corporation 82801G (ICH7 Family) USB UHCI Controller #4 (rev 01)
+00:1d.7 USB Controller: Intel Corporation 82801G (ICH7 Family) USB2 EHCI Controller (rev 01)
+00:1e.0 PCI bridge: Intel Corporation 82801 PCI Bridge (rev e1)
+00:1f.0 ISA bridge: Intel Corporation 82801GB/GR (ICH7 Family) LPC Interface Bridge (rev 01)
+00:1f.2 SATA controller: Intel Corporation 82801GR/GH (ICH7 Family) SATA AHCI Controller (rev 01)
+00:1f.3 SMBus: Intel Corporation 82801G (ICH7 Family) SMBus Controller (rev 01)
+09:00.0 Ethernet controller: Marvell Technology Group Ltd. 88E8071 PCI-E Gigabit Ethernet Controller (rev 16)
+0a:00.0 IDE interface: Marvell Technology Group Ltd. 88SE6121 SATA II Controller (rev b2)
+
+1. Get image.
+2. Write image to disk somehow
+3. Recreate first partition with full disk size (or use parted to grow it)
+4. sudo apt-get install mdadm lvm2
+5. 
+6. sudo pvscan
+7. sudo pvresize /dev/sdb1
+8. create a swap LV
+8. shift data around between

diff --git a/blog/feeds/planet-git.mdwn b/blog/feeds/planet-git.mdwn
new file mode 100644
index 0000000..c1a484d
--- /dev/null
+++ b/blog/feeds/planet-git.mdwn
@@ -0,0 +1,8 @@
+[[!meta  title="madduck's Planet Git posts"]]
+
+The following [[blog]] posts appear on [Planet
+Git](http://planet.git-scm.com/). Please visit my [[main_blog_page|blog]] for
+all my posts.
+
+[[!inline  pages="link(tag/git) and link(tag/blog) and !link(tag/draft)" description="madduck's blog
+entries for Planet Git" archive="no" actions="no"]]

diff --git a/blog/2010.06.02:does-this-seem-familiar.mdwn b/blog/2010.06.02:does-this-seem-familiar.mdwn
new file mode 100644
index 0000000..1e6fcb7
--- /dev/null
+++ b/blog/2010.06.02:does-this-seem-familiar.mdwn
@@ -0,0 +1,17 @@
+[[!meta  title="Does this seem familiar?"]]
+[[!tag  blog planet-lca planet-debian bp environment oil draft]]
+
+[This](http://www.youtube.com/watch?v=GHmhxpQEGPo) makes me want to buy
+[this](http://www.despair.com/bp.html).
+
+The sad thing is that in the end, nature will have taken a big hit, many
+humans will have been affected negatively, but the fuckheads responsible for
+this, those that purposely downplayed risks and lied (and [continue to
+lie](http://www.perceptualedge.com/blog/?p=790)) about their abilities to
+contain spills so they could make more money, they'll walk freely, or with
+punishments that are in no relation to their crimes.
+
+I want everyone who carries any responsibility in this to be disowned, and
+their money made available to an environmental institution (and not the
+government). And then I'd have them spend the rest of their lives cleaning and
+helping nature recover.

diff --git a/phoneconf.mdwn b/phoneconf.mdwn
index e4bd7f7..5004a56 100644
--- a/phoneconf.mdwn
+++ b/phoneconf.mdwn
@@ -13,7 +13,7 @@ for conferences in which I participate.*
 
 You can reach the conference centre in two ways:
 
-* with a regular phone, by dialing `+41.44.5201426` (`044.5201426` if you are
+* with a regular phone, by dialing `+41.32.5125494` (`032.5125494` if you are
   inside Switzerland)
 * using a SIP-capable phone, by dialing `sip:conf@madduck.net`
 

diff --git a/blog/2010.04.19:orangutans-at-the-nestle-shareholder-meeting/discussion.mdwn b/blog/2010.04.19:orangutans-at-the-nestle-shareholder-meeting/discussion.mdwn
new file mode 100644
index 0000000..aff5f49
--- /dev/null
+++ b/blog/2010.04.19:orangutans-at-the-nestle-shareholder-meeting/discussion.mdwn
@@ -0,0 +1 @@
+Was your friend reading a Git and a Cluster Book? Have a look at 00:38 in the first video of this page : http://www.24heures.ch/node/164056

diff --git a/blog/2010.04.19:orangutans-at-the-nestle-shareholder-meeting.mdwn b/blog/2010.04.19:orangutans-at-the-nestle-shareholder-meeting.mdwn
index e85fc5a..8f1a34a 100644
--- a/blog/2010.04.19:orangutans-at-the-nestle-shareholder-meeting.mdwn
+++ b/blog/2010.04.19:orangutans-at-the-nestle-shareholder-meeting.mdwn
@@ -20,8 +20,8 @@ interest.
 
 One of my closest friends was part of the act, and he recounts breaking into
 the ventilation system before sawing through the ceiling, and descending on a
-rope. The police detained them for nearly 24 hours, but the message has been
-sent.
+rope. The police detained them for more than 24 hours, but the message has
+been sent.
 
 Bravo!
 

diff --git a/blog/2010.04.19:orangutans-at-the-nestle-shareholder-meeting.mdwn b/blog/2010.04.19:orangutans-at-the-nestle-shareholder-meeting.mdwn
index 6b362fd..e85fc5a 100644
--- a/blog/2010.04.19:orangutans-at-the-nestle-shareholder-meeting.mdwn
+++ b/blog/2010.04.19:orangutans-at-the-nestle-shareholder-meeting.mdwn
@@ -10,7 +10,7 @@ responsibility for their reckless actions in Indonesia.
 Thousands of square kilometres of forest are cleared every day so that
 companies like Nestlé can make vast sums of money off consumers.
 
-[[!img  img/2010.04.17:orangutans-at-nestle.png class="center" alt="Orangutans
+\[[!img img/2010.04.19:orangutans-at-nestle.png class="center" alt="Orangutans
 asking Nestlé for a break"]]
 
 Meanwhile, [[!wikipedia  desc="Orangutans" Orangutan]] outside the venue were

diff --git a/blog/2010.04.17:orangutans-at-the-nestle-shareholder-meeting.mdwn b/blog/2010.04.19:orangutans-at-the-nestle-shareholder-meeting.mdwn
similarity index 95%
rename from blog/2010.04.17:orangutans-at-the-nestle-shareholder-meeting.mdwn
rename to blog/2010.04.19:orangutans-at-the-nestle-shareholder-meeting.mdwn
index 4f87889..6b362fd 100644
--- a/blog/2010.04.17:orangutans-at-the-nestle-shareholder-meeting.mdwn
+++ b/blog/2010.04.19:orangutans-at-the-nestle-shareholder-meeting.mdwn
@@ -3,7 +3,7 @@
 planet-lca]]
 
 Bravo Greenpeace Switzerland! At [[!wikipedia  Nestlé]]'s annual shareholder
-meeting 2010, you descended from the ceiling in the middle of the
+meeting 2010 last week, you descended from the ceiling in the middle of the
 presentations with flyers and a banner asking for the company to take
 responsibility for their reckless actions in Indonesia.
 
diff --git a/blog/img/2010.04.17:orangutans-at-nestle.png b/blog/img/2010.04.19:orangutans-at-nestle.png
similarity index 100%
rename from blog/img/2010.04.17:orangutans-at-nestle.png
rename to blog/img/2010.04.19:orangutans-at-nestle.png

diff --git a/blog/2010.04.17:orangutans-at-the-nestle-agm.mdwn b/blog/2010.04.17:orangutans-at-the-nestle-shareholder-meeting.mdwn
similarity index 89%
rename from blog/2010.04.17:orangutans-at-the-nestle-agm.mdwn
rename to blog/2010.04.17:orangutans-at-the-nestle-shareholder-meeting.mdwn
index 54036b9..4f87889 100644
--- a/blog/2010.04.17:orangutans-at-the-nestle-agm.mdwn
+++ b/blog/2010.04.17:orangutans-at-the-nestle-shareholder-meeting.mdwn
@@ -1,6 +1,6 @@
 [[!meta  title="Orangutans at the Nestlé shareholder meeting"]]
 [[!tag  blog ch greenpeace nestle environment indonesia palmoil planet-debian
-planet-lca draft]]
+planet-lca]]
 
 Bravo Greenpeace Switzerland! At [[!wikipedia  Nestlé]]'s annual shareholder
 meeting 2010, you descended from the ceiling in the middle of the
@@ -19,9 +19,9 @@ Break! Have a …"). The Orang Utans are pushed towards extinction by capitalist
 interest.
 
 One of my closest friends was part of the act, and he recounts breaking into
-the ventilation system, waiting there for 30 hours, before sawing through the
-ceiling, and descending on a rope. The police detained them for nearly 24
-hours, but the message has been sent.
+the ventilation system before sawing through the ceiling, and descending on a
+rope. The police detained them for nearly 24 hours, but the message has been
+sent.
 
 Bravo!
 

diff --git a/blog/2010.04.17:planes-or-volcano/discussion.mdwn b/blog/2010.04.17:planes-or-volcano/discussion.mdwn
new file mode 100644
index 0000000..b3f8610
--- /dev/null
+++ b/blog/2010.04.17:planes-or-volcano/discussion.mdwn
@@ -0,0 +1,10 @@
+Actually, I was pretty pissed today, because all these
+people took the train, leading to *MY* train being more
+than two hours late. I had planned to meet the leader of
+MidnightBSD, so from one BSD head to the other, but the
+remaining time wasn’t worth it.
+
+I had the ticket day changed to tomorrow, when I’ll try
+again. Still annoyed, though.
+
+-- mirabilos – tg@d.o

diff --git a/blog/2010.04.17:orangutans-at-the-nestle-agm.mdwn b/blog/2010.04.17:orangutans-at-the-nestle-agm.mdwn
index d374ce3..54036b9 100644
--- a/blog/2010.04.17:orangutans-at-the-nestle-agm.mdwn
+++ b/blog/2010.04.17:orangutans-at-the-nestle-agm.mdwn
@@ -1,4 +1,4 @@
-[[!meta  title="Orangutans at the Nestlé AGM"]]
+[[!meta  title="Orangutans at the Nestlé shareholder meeting"]]
 [[!tag  blog ch greenpeace nestle environment indonesia palmoil planet-debian
 planet-lca draft]]
 
@@ -25,8 +25,8 @@ hours, but the message has been sent.
 
 Bravo!
 
-Read more on the [Greenpeace webpage](http://www.greenpeace.org/kitkat), the
-[Greenpeace press
+Read more (and watch videos of the spectacular descent) on the [Greenpeace
+webpage](http://www.greenpeace.org/kitkat), the [Greenpeace press
 announcement](http://www.greenpeace.ch/de/themen/wald/wald-news-single/archive/2010/april/article/spektakulaere-greenpeace-aktion-an-nestle-generalversammlung/)
 and [their blog](http://weblogs.greenpeace.ch/blog/) (all in German), or on
 [24heures](http://www.24heures.ch/node/164056) (in French). Planetsave has [a

diff --git a/blog/img/2010.04.17:orangutans-at-nestle.png b/blog/img/2010.04.17:orangutans-at-nestle.png
index c9e66d0..a46ff03 100644
Binary files a/blog/img/2010.04.17:orangutans-at-nestle.png and b/blog/img/2010.04.17:orangutans-at-nestle.png differ

diff --git a/blog/2010.04.17:orangutans-at-the-nestle-agm.mdwn b/blog/2010.04.17:orangutans-at-the-nestle-agm.mdwn
index e19add0..d374ce3 100644
--- a/blog/2010.04.17:orangutans-at-the-nestle-agm.mdwn
+++ b/blog/2010.04.17:orangutans-at-the-nestle-agm.mdwn
@@ -2,20 +2,24 @@
 [[!tag  blog ch greenpeace nestle environment indonesia palmoil planet-debian
 planet-lca draft]]
 
-Bravo Greenpeace Switzerland! At Nestlé's Annual General Meeting 2010, you
-descended from the ceiling in the middle of the presentations with flyers and
-a banner asking for Nestlé to take responsibility.
-
-All the while, [[!wikipedia  desc="Orangutans" Orangutan]] outside the venue
-were protesting Nestlé and asking for a break (copying Nestlé's own slogan
-"Have a Break! Have a …").
+Bravo Greenpeace Switzerland! At [[!wikipedia  Nestlé]]'s annual shareholder
+meeting 2010, you descended from the ceiling in the middle of the
+presentations with flyers and a banner asking for the company to take
+responsibility for their reckless actions in Indonesia.
 
 Thousands of square kilometres of forest are cleared every day so that
-companies like Nestlé can make vast sums of money off consumers. The lives of
-the Orang Utan is pushed towards extinction by capitalism.
+companies like Nestlé can make vast sums of money off consumers.
+
+[[!img  img/2010.04.17:orangutans-at-nestle.png class="center" alt="Orangutans
+asking Nestlé for a break"]]
+
+Meanwhile, [[!wikipedia  desc="Orangutans" Orangutan]] outside the venue were
+protesting Nestlé and asking for a break (copying Nestlé's own slogan "Have a
+Break! Have a …"). The Orang Utans are pushed towards extinction by capitalist
+interest.
 
 One of my closest friends was part of the act, and he recounts breaking into
-the ventilation system, staying there for 30 hours, before sawing through the
+the ventilation system, waiting there for 30 hours, before sawing through the
 ceiling, and descending on a rope. The police detained them for nearly 24
 hours, but the message has been sent.
 
diff --git a/blog/img/2010.04.17:orangutans-at-nestle.png b/blog/img/2010.04.17:orangutans-at-nestle.png
new file mode 100644
index 0000000..c9e66d0
Binary files /dev/null and b/blog/img/2010.04.17:orangutans-at-nestle.png differ

diff --git a/blog/2010.04.17:orangutans-at-the-nestle-agm.mdwn b/blog/2010.04.17:orangutans-at-the-nestle-agm.mdwn
new file mode 100644
index 0000000..e19add0
--- /dev/null
+++ b/blog/2010.04.17:orangutans-at-the-nestle-agm.mdwn
@@ -0,0 +1,32 @@
+[[!meta  title="Orangutans at the Nestlé AGM"]]
+[[!tag  blog ch greenpeace nestle environment indonesia palmoil planet-debian
+planet-lca draft]]
+
+Bravo Greenpeace Switzerland! At Nestlé's Annual General Meeting 2010, you
+descended from the ceiling in the middle of the presentations with flyers and
+a banner asking for Nestlé to take responsibility.
+
+All the while, [[!wikipedia  desc="Orangutans" Orangutan]] outside the venue
+were protesting Nestlé and asking for a break (copying Nestlé's own slogan
+"Have a Break! Have a …").
+
+Thousands of square kilometres of forest are cleared every day so that
+companies like Nestlé can make vast sums of money off consumers. The lives of
+the Orang Utan is pushed towards extinction by capitalism.
+
+One of my closest friends was part of the act, and he recounts breaking into
+the ventilation system, staying there for 30 hours, before sawing through the
+ceiling, and descending on a rope. The police detained them for nearly 24
+hours, but the message has been sent.
+
+Bravo!
+
+Read more on the [Greenpeace webpage](http://www.greenpeace.org/kitkat), the
+[Greenpeace press
+announcement](http://www.greenpeace.ch/de/themen/wald/wald-news-single/archive/2010/april/article/spektakulaere-greenpeace-aktion-an-nestle-generalversammlung/)
+and [their blog](http://weblogs.greenpeace.ch/blog/) (all in German), or on
+[24heures](http://www.24heures.ch/node/164056) (in French). Planetsave has [a
+decent coverage in
+English](http://planetsave.com/blog/2010/04/16/greenpeace-asks-nestle-to-give-orang-utans-a-break/).
+
+NP: [Emerson, Lake & Palmer](http://www.allmusic.com/cg/amg.dll?SQL=Emerson%2C%20Lake%20%26%20Palmer&P=amg&OPT1=1): *Brain Salad Surgery*

diff --git a/blog/2010.04.17:planes-or-volcano.mdwn b/blog/2010.04.17:planes-or-volcano.mdwn
index dbb38a4..038a8ef 100644
--- a/blog/2010.04.17:planes-or-volcano.mdwn
+++ b/blog/2010.04.17:planes-or-volcano.mdwn
@@ -1,5 +1,6 @@
 [[!meta  title="Planes or volcano"]]
-[[!tag  blog draft]]
+[[!tag  blog environment planet-debian planet-lca co2 volcano airplanes
+statistics]]
 
 Via [internotes.ch](http://www.internotes.ch/planes-or-volcano-9):
 

diff --git a/blog/2010.04.17:planes-or-volcano.mdwn b/blog/2010.04.17:planes-or-volcano.mdwn
new file mode 100644
index 0000000..dbb38a4
--- /dev/null
+++ b/blog/2010.04.17:planes-or-volcano.mdwn
@@ -0,0 +1,9 @@
+[[!meta  title="Planes or volcano"]]
+[[!tag  blog draft]]
+
+Via [internotes.ch](http://www.internotes.ch/planes-or-volcano-9):
+
+[[!img  img/2010.04.17:planes_or_volcano.png class="center" alt="Planes produce
+way more CO₂ than the volcano"]]
+
+NP: [Emerson, Lake & Palmer](http://www.allmusic.com/cg/amg.dll?SQL=Emerson%2C%20Lake%20%26%20Palmer&P=amg&OPT1=1): *Tarkus*
diff --git a/blog/img/2010.04.17:planes_or_volcano.png b/blog/img/2010.04.17:planes_or_volcano.png
new file mode 100644
index 0000000..cb938d6
Binary files /dev/null and b/blog/img/2010.04.17:planes_or_volcano.png differ

diff --git a/docs/ipv6.mdwn b/docs/ipv6.mdwn
index 6720c5a..20fdc64 100644
--- a/docs/ipv6.mdwn
+++ b/docs/ipv6.mdwn
@@ -285,8 +285,7 @@ appear when the daemon starts.
 It is also a good idea to prevent `aiccu` from starting at boot when using
 this method:
 
-    update-rc.d -f aiccu remove
-    update-rc.d aiccu stop 0 0 .
+    update-rc.d aiccu disable
 
 ## Allowing proto-41 traffic
 

diff --git a/docs/ipv6.mdwn b/docs/ipv6.mdwn
index 8d24902..6720c5a 100644
--- a/docs/ipv6.mdwn
+++ b/docs/ipv6.mdwn
@@ -279,7 +279,7 @@ appear when the daemon starts.
     iface sixxs inet manual
       pre-up invoke-rc.d aiccu start
       up sleep 1
-      up ip link set mtu 1480 dev $IFACE
+      up ip link set mtu 1280 dev $IFACE
       post-down invoke-rc.d aiccu stop
 
 It is also a good idea to prevent `aiccu` from starting at boot when using

diff --git a/blog/2010.03.11:splitting-puppetd-from-puppetmaster.mdwn b/blog/2010.03.11:splitting-puppetd-from-puppetmaster.mdwn
index 1bfd494..b2be8ef 100644
--- a/blog/2010.03.11:splitting-puppetd-from-puppetmaster.mdwn
+++ b/blog/2010.03.11:splitting-puppetd-from-puppetmaster.mdwn
@@ -84,7 +84,7 @@ verification. Your mileage may vary, but the concept shall be the same.
 
         [puppetd]
         server=puppetmaster.madduck.net
-        vardir=/var/lib/puppetmaster
+        vardir=/var/lib/puppet
         ssldir=$vardir/ssl
         # …
 

diff --git a/blog/2010.03.11:splitting-puppetd-from-puppetmaster.mdwn b/blog/2010.03.11:splitting-puppetd-from-puppetmaster.mdwn
index 390c6ba..1bfd494 100644
--- a/blog/2010.03.11:splitting-puppetd-from-puppetmaster.mdwn
+++ b/blog/2010.03.11:splitting-puppetd-from-puppetmaster.mdwn
@@ -1,5 +1,5 @@
 [[!meta  title="Splitting puppetd from puppetmaster"]]
-[[!tag  blog planet-lca planet-debian puppet ruby draft]]
+[[!tag  blog planet-lca planet-debian puppet ruby]]
 
 My relationship with [Puppet](http://reductivelabs.com/trac/puppet) is one of
 love and hate. I am forced to use it simply because there is no better tool

diff --git a/blog/2010.03.11:splitting-puppetd-from-puppetmaster.mdwn b/blog/2010.03.11:splitting-puppetd-from-puppetmaster.mdwn
index 042521f..390c6ba 100644
--- a/blog/2010.03.11:splitting-puppetd-from-puppetmaster.mdwn
+++ b/blog/2010.03.11:splitting-puppetd-from-puppetmaster.mdwn
@@ -11,8 +11,8 @@ the fact that `puppetd` (the client) and `puppetmasterd` (the server) use the
 same working directory, `/var/lib/puppet`. Since I consider and would like to
 treatthe machine on which `puppetmasterd` is running just another puppet
 client, I was running into funky issues related to [[!debbug  desc="SSL
-certificate confusion" XXXXXX]] and [[!debbug  desc="SSL revocation horrifics"
-XXXXXX]].
+certificate confusion" 514550]], [[!debbug  desc="obscure errors" 573416]], and
+[SSL revocation horrors](http://reductivelabs.com/redmine/issues/show/1525).
 
 The following hence assumes that you have installed or are planning to install
 `puppetd` on the machine running your puppetmaster, and that you have two
@@ -122,7 +122,8 @@ verification. Your mileage may vary, but the concept shall be the same.
    Do yourself the favour and check that it's all working.
 
 6. Optionally, you can now clean up the client stuff in the server's working
-   directory, for instance like this:
+   directory, for instance like this (it worked for me, but this *is* the
+   sledgehammer approach):
 
         # /etc/init.d/puppetmaster stop
         # cd /var/lib/puppetmaster

diff --git a/blog/2010.03.11:splitting-puppetd-from-puppetmaster.mdwn b/blog/2010.03.11:splitting-puppetd-from-puppetmaster.mdwn
index eb86664..042521f 100644
--- a/blog/2010.03.11:splitting-puppetd-from-puppetmaster.mdwn
+++ b/blog/2010.03.11:splitting-puppetd-from-puppetmaster.mdwn
@@ -26,27 +26,27 @@ verification. Your mileage may vary, but the concept shall be the same.
 
 1. Stop everything:
 
-       /etc/init.d/puppetmaster stop
-       /etc/init.d/puppet stop
+        /etc/init.d/puppetmaster stop
+        /etc/init.d/puppet stop
 
    (also verify that you have not instructed `cron` to [restart these
    services](http://reductivelabs.com/trac/puppet/wiki/Recipes/MutualRestart))
 
 2. Rename the working directory:
 
-       mv /var/lib/puppet /var/lib/puppetmaster
+        mv /var/lib/puppet /var/lib/puppetmaster
 
    and amend `/etc/puppet/puppet.conf` accordingly:
 
-       [main]
-       # …
-       vardir=/var/lib/puppetmaster
-       ssldir=$vardir/ssl
-       # …
+        [main]
+        # …
+        vardir=/var/lib/puppetmaster
+        ssldir=$vardir/ssl
+        # …
 
-       [puppetmasterd]
-       certname=puppetmaster.madduck.net
-       # …
+        [puppetmasterd]
+        certname=puppetmaster.madduck.net
+        # …
 
    I am doing this in `[main]`, planning to override it for `puppetd` later,
    because `puppetd` is the only program which makes sense to be separated
@@ -60,11 +60,11 @@ verification. Your mileage may vary, but the concept shall be the same.
    You can verify that the configuration has been amended by making sure that
    there is no output from the following command:
 
-       # puppetmasterd --genconfig | grep -q '/var/lib/puppet/' && echo SOMETHING IS WRONG
+        # puppetmasterd --genconfig | grep -q '/var/lib/puppet/' && echo SOMETHING IS WRONG
 
 3. Now restart puppetmaster:
 
-       /etc/init.d/puppetmaster start
+        /etc/init.d/puppetmaster start
 
    and verify that it starts.
 
@@ -74,66 +74,66 @@ verification. Your mileage may vary, but the concept shall be the same.
    Since the client will get its own working directory (and thus a new SSL
    certificate), you want to remove all records of the old certificate:
 
-       # puppetca --list --all
-       + puppetmaster.madduck.net
-       + vera.madduck.net
-       # puppetca --clean vera.madduck.net
+        # puppetca --list --all
+        + puppetmaster.madduck.net
+        + vera.madduck.net
+        # puppetca --clean vera.madduck.net
 
 4. Change the configuration file to tell `puppetd` about its working
    directory:
 
-       [puppetd]
-       server=puppetmaster.madduck.net
-       vardir=/var/lib/puppetmaster
-       ssldir=$vardir/ssl
-       # …
+        [puppetd]
+        server=puppetmaster.madduck.net
+        vardir=/var/lib/puppetmaster
+        ssldir=$vardir/ssl
+        # …
 
    This you can verify with the following command, which should not print
    anything:
 
-       # puppetd --genconfig | grep -q '/var/lib/puppet[^/]' && echo SOMETHING IS WRONG
+        # puppetd --genconfig | grep -q '/var/lib/puppet[^/]' && echo SOMETHING IS WRONG
 
 5. Now install [[!debpkg  puppet]], or (re)start it if it's already installed:
 
-       # /etc/init.d/puppet stop
-       # puppetd --no-daemonize --onetime --verbose --waitforcert 30 &
-       info: Creating a new SSL key for vera.madduck.net
-       warning: peer certificate won't be verified in this SSL session
-       info: Caching certificate for ca
-       info: Creating a new SSL certificate request for vera.madduck.net
+        # /etc/init.d/puppet stop
+        # puppetd --no-daemonize --onetime --verbose --waitforcert 30 &
+        info: Creating a new SSL key for vera.madduck.net
+        warning: peer certificate won't be verified in this SSL session
+        info: Caching certificate for ca
+        info: Creating a new SSL certificate request for vera.madduck.net
 
-       # puppetca --list
-       vera.madduck.net
-       # puppetca --sign vera.madduck.net
-       notice: Signed certificate request for vera.madduck.net
-       notice: Removing file Puppet::SSL::CertificateRequest vera.madduck.net at '/var/lib/puppetmaster/ssl/ca/requests/vera.madduck.net.pem'
+        # puppetca --list
+        vera.madduck.net
+        # puppetca --sign vera.madduck.net
+        notice: Signed certificate request for vera.madduck.net
+        notice: Removing file Puppet::SSL::CertificateRequest vera.madduck.net at '/var/lib/puppetmaster/ssl/ca/requests/vera.madduck.net.pem'
 
-       # fg
-       info: Caching certificate for vera.madduck.net
-       info: Caching certificate_revocation_list for ca
-       […]
+        # fg
+        info: Caching certificate for vera.madduck.net
+        info: Caching certificate_revocation_list for ca
+        […]
 
-       # puppetca --list --all
-       + puppetmaster.madduck.net
-       + vera.madduck.net
+        # puppetca --list --all
+        + puppetmaster.madduck.net
+        + vera.madduck.net
 
-       # /etc/init.d/puppet start
+        # /etc/init.d/puppet start
 
    Do yourself the favour and check that it's all working.
 
 6. Optionally, you can now clean up the client stuff in the server's working
    directory, for instance like this:
 
-       # /etc/init.d/puppetmaster stop
-       # cd /var/lib/puppetmaster
-       # tar -cf /tmp/puppetmaster.workingdir-backup.tar .
-       # find ../puppet -type f -printf '%P\n' | xargs rm
-       # /etc/init.d/puppetmaster start
+        # /etc/init.d/puppetmaster stop
+        # cd /var/lib/puppetmaster
+        # tar -cf /tmp/puppetmaster.workingdir-backup.tar .
+        # find ../puppet -type f -printf '%P\n' | xargs rm
+        # /etc/init.d/puppetmaster start
 
 7. If you stopped `cron` before (and your puppet recipes have not since
    restarted it):
 
-       /etc/init.d/cron start
+        /etc/init.d/cron start
 
 All done. I wish puppet, or at least Debian's puppet packages would do this by
 default. Please [let me know](mailto:puppet-conversion@pobox.madduck.net) if

diff --git a/blog/2010.03.11:splitting-puppetd-from-puppetmaster.mdwn b/blog/2010.03.11:splitting-puppetd-from-puppetmaster.mdwn
new file mode 100644
index 0000000..eb86664
--- /dev/null
+++ b/blog/2010.03.11:splitting-puppetd-from-puppetmaster.mdwn
@@ -0,0 +1,143 @@
+[[!meta  title="Splitting puppetd from puppetmaster"]]
+[[!tag  blog planet-lca planet-debian puppet ruby draft]]
+
+My relationship with [Puppet](http://reductivelabs.com/trac/puppet) is one of
+love and hate. I am forced to use it simply because there is no better tool
+around, but I hate it in so many ways that I don't even want to start to
+enumerate (hint: most have to do with Ruby, actually).
+
+Today I decided to put an end to one thing that has been driving me insane:
+the fact that `puppetd` (the client) and `puppetmasterd` (the server) use the
+same working directory, `/var/lib/puppet`. Since I consider and would like to
+treatthe machine on which `puppetmasterd` is running just another puppet
+client, I was running into funky issues related to [[!debbug  desc="SSL
+certificate confusion" XXXXXX]] and [[!debbug  desc="SSL revocation horrifics"
+XXXXXX]].
+
+The following hence assumes that you have installed or are planning to install
+`puppetd` on the machine running your puppetmaster, and that you have two
+fully-qualified domain names for the machine. For instance, I run puppetmaster
+on `vera.madduck.net`, and `puppetmaster.madduck.net` is an alias for the same
+machine. I'll use these names in the following as examples.
+
+The following may be Debian-specific, as I am solely using the [[!debpkg 
+puppet]] and [[!debpkg  puppetmaster]] packages for my experimentation and
+verification. Your mileage may vary, but the concept shall be the same.
+
+1. Stop everything:
+
+       /etc/init.d/puppetmaster stop
+       /etc/init.d/puppet stop
+
+   (also verify that you have not instructed `cron` to [restart these
+   services](http://reductivelabs.com/trac/puppet/wiki/Recipes/MutualRestart))
+
+2. Rename the working directory:
+
+       mv /var/lib/puppet /var/lib/puppetmaster
+
+   and amend `/etc/puppet/puppet.conf` accordingly:
+
+       [main]
+       # …
+       vardir=/var/lib/puppetmaster
+       ssldir=$vardir/ssl
+       # …
+
+       [puppetmasterd]
+       certname=puppetmaster.madduck.net
+       # …
+
+   I am doing this in `[main]`, planning to override it for `puppetd` later,
+   because `puppetd` is the only program which makes sense to be separated
+   from the rest. Since only the puppetmaster needs a special certificate
+   name, that is set specifically in the `[puppetmasterd]` section.
+
+   If you use [[!debpkg  apache2]] or [[!debpkg  nginx]] in front of your
+   puppetmasters, make sure to amend the SSL file locations in the virtual
+   host definition and restart (!) the service.
+
+   You can verify that the configuration has been amended by making sure that
+   there is no output from the following command:
+
+       # puppetmasterd --genconfig | grep -q '/var/lib/puppet/' && echo SOMETHING IS WRONG
+
+3. Now restart puppetmaster:
+
+       /etc/init.d/puppetmaster start
+
+   and verify that it starts.
+
+   If your puppetmaster previously ran under a different name, it will create
+   itself a new certificate and sign it.
+
+   Since the client will get its own working directory (and thus a new SSL
+   certificate), you want to remove all records of the old certificate:
+
+       # puppetca --list --all
+       + puppetmaster.madduck.net
+       + vera.madduck.net
+       # puppetca --clean vera.madduck.net
+
+4. Change the configuration file to tell `puppetd` about its working
+   directory:
+
+       [puppetd]
+       server=puppetmaster.madduck.net
+       vardir=/var/lib/puppetmaster
+       ssldir=$vardir/ssl
+       # …
+
+   This you can verify with the following command, which should not print
+   anything:
+
+       # puppetd --genconfig | grep -q '/var/lib/puppet[^/]' && echo SOMETHING IS WRONG
+
+5. Now install [[!debpkg  puppet]], or (re)start it if it's already installed:
+
+       # /etc/init.d/puppet stop
+       # puppetd --no-daemonize --onetime --verbose --waitforcert 30 &
+       info: Creating a new SSL key for vera.madduck.net
+       warning: peer certificate won't be verified in this SSL session
+       info: Caching certificate for ca
+       info: Creating a new SSL certificate request for vera.madduck.net
+
+       # puppetca --list
+       vera.madduck.net
+       # puppetca --sign vera.madduck.net
+       notice: Signed certificate request for vera.madduck.net
+       notice: Removing file Puppet::SSL::CertificateRequest vera.madduck.net at '/var/lib/puppetmaster/ssl/ca/requests/vera.madduck.net.pem'
+
+       # fg
+       info: Caching certificate for vera.madduck.net
+       info: Caching certificate_revocation_list for ca
+       […]
+
+       # puppetca --list --all
+       + puppetmaster.madduck.net
+       + vera.madduck.net
+
+       # /etc/init.d/puppet start
+
+   Do yourself the favour and check that it's all working.
+
+6. Optionally, you can now clean up the client stuff in the server's working
+   directory, for instance like this:
+
+       # /etc/init.d/puppetmaster stop
+       # cd /var/lib/puppetmaster
+       # tar -cf /tmp/puppetmaster.workingdir-backup.tar .
+       # find ../puppet -type f -printf '%P\n' | xargs rm
+       # /etc/init.d/puppetmaster start
+
+7. If you stopped `cron` before (and your puppet recipes have not since
+   restarted it):
+
+       /etc/init.d/cron start
+
+All done. I wish puppet, or at least Debian's puppet packages would do this by
+default. Please [let me know](mailto:puppet-conversion@pobox.madduck.net) if
+the above conversion works for you. Then I might start working on an automated
+migration.
+
+NP: [Genesis](http://www.allmusic.com/cg/amg.dll?SQL=Genesis&P=amg&OPT1=1): *Selling England by the Pound*

diff --git a/blog/2010.02.06:ubuntu-to-enforce-short-sighted-decision-on-net-book-users.mdwn b/blog/2010.02.06:ubuntu-to-enforce-short-sighted-decision-on-net-book-users.mdwn
index 379f369..c4031ff 100644
--- a/blog/2010.02.06:ubuntu-to-enforce-short-sighted-decision-on-net-book-users.mdwn
+++ b/blog/2010.02.06:ubuntu-to-enforce-short-sighted-decision-on-net-book-users.mdwn
@@ -2,6 +2,21 @@
 [[!tag  blog planet-debian planet-lca ubuntu google netbooks rant cloud
 security privacy draft linux-com]]
 
+http://www.scripting.com/stories/2010/02/14/googleDidSomethingSeriousl.html
+
+twitter+facebook+google are all US. companies and governments are increasingly
+relying on those companies, and users are relying more and more on those media
+for basic communication. What do you think will happen if the US declares war
+on your country? Will you even be able to react?
+
+Data souvereignity
+
+http://www.stuff.co.nz/3331115/Facebook-users-easy-prey
+
+http://www.gamesbrief.com/2010/02/how-dont-be-evil-leads-to-guantanamo-bay/
+
+http://whentwitterisdown.com/
+
 Here is another in my list of growing reasons why I think Ubuntu is going bad:
 [net books won't have OpenOffice installed
 anymore](http://digitizor.com/2010/02/05/openoffice-dropped-from-ubuntu-netbook-edition-10-04/).
diff --git a/blog/2010.02.26:acta-leak-no-surprises-about-transparency-blockers.mdwn b/blog/2010.02.26:acta-leak-no-surprises-about-transparency-blockers.mdwn
index 4092d03..5ab63fc 100644
--- a/blog/2010.02.26:acta-leak-no-surprises-about-transparency-blockers.mdwn
+++ b/blog/2010.02.26:acta-leak-no-surprises-about-transparency-blockers.mdwn
@@ -3,7 +3,7 @@
 politics intellectual-property ip copyright freedom]]
 
 The [[most common
-criticism|blog/2010:02.13:acta-less-knowledge-means-less-resistance]] of the
+criticism|blog/2010.02.13:acta-less-knowledge-means-less-resistance]] of the
 [[!wikipedia  desc="Anti-Counterfeiting Trade Agreement (ACTA)"
 Anti-Counterfeiting_Trade_Agreement]] is the lack of transparency. Before the
 nations disclose the terms of the agreement under negotiation, we are unable

diff --git a/blog/2010.02.26:acta-leak-no-surprises-about-transparency-blockers.mdwn b/blog/2010.02.26:acta-leak-no-surprises-about-transparency-blockers.mdwn
new file mode 100644
index 0000000..4092d03
--- /dev/null
+++ b/blog/2010.02.26:acta-leak-no-surprises-about-transparency-blockers.mdwn
@@ -0,0 +1,39 @@
+[[!meta  title="ACTA leak: no surprises about transparency blockers"]]
+[[!tag  blog acta planet-lca planet-debian leaks privacy transparency de us
+politics intellectual-property ip copyright freedom]]
+
+The [[most common
+criticism|blog/2010:02.13:acta-less-knowledge-means-less-resistance]] of the
+[[!wikipedia  desc="Anti-Counterfeiting Trade Agreement (ACTA)"
+Anti-Counterfeiting_Trade_Agreement]] is the lack of transparency. Before the
+nations disclose the terms of the agreement under negotiation, we are unable
+to gain an idea of the big picture, let alone voice our opinions and push for
+changes. Our politicians don't want us to know. We rely on [[leaked
+documents|blog/2010.02.18:acta-documents-leaked]] for our information. This is
+backwards in a world where a state should represent its people. This smells
+foul to me.
+
+There are undoubtedly some good reasons for the treaty, and if we can contain
+worldwide, large-scale trade of counterfeited goods and medicine, then that
+would be a net benefit to us all. However, we must not allow certain
+governments to succomb to the pressure of (commercially-motivated) lobbyists,
+to extend that pressure onto other nations using trade as a means of pressure,
+and to slash our freedom as if it were an inconvenient obstacle in their way.
+
+Only if the terms under negotiation become publicly available, and the public
+is given a voice, then we can help our governments in entering an agreement
+that is in the interest of its people, rather than a threat to us.
+
+It is hardly surprising that [total capitalist nation USA are the strongest
+opponents of transparency](http://www.michaelgeist.ca/content/view/4819/125/),
+because [the public might delay or even prevent the
+treaty](http://www.wired.com/threatlevel/2009/12/feds-fear-acta-scrutiny/). I
+was also not surprised to see South Korea and Germany in the list of
+supporters of secrecy either. It is interesting to see that the leaders of
+Singapore, Belgium, Portugal, and Denmark also seem to believe that these
+negotiations should be withheld from the public. Does anyone know about
+Switzerland?
+
+I tip my hat to New Zealand, Canada, Australia, Netherlands, Sweden, Finland,
+Ireland, Hungary, Poland, Estonia, and Austria for their support of
+transparency.

diff --git a/blog/2010.02.25:n900.mdwn b/blog/2010.02.25:n900.mdwn
new file mode 100644
index 0000000..adc1c87
--- /dev/null
+++ b/blog/2010.02.25:n900.mdwn
@@ -0,0 +1,5 @@
+[[!meta  title="N900"]]
+[[!tag  blog draft]]
+
+- no filesystem encryption
+- no way to dial a specific number via SIP directly out of a contact

diff --git a/blog/2010.02.19:making-money-off-ethics/discussion.mdwn b/blog/2010.02.19:making-money-off-ethics/discussion.mdwn
index cca032c..190e584 100644
--- a/blog/2010.02.19:making-money-off-ethics/discussion.mdwn
+++ b/blog/2010.02.19:making-money-off-ethics/discussion.mdwn
@@ -3,3 +3,8 @@ Kudos to the cafe owner who decided to switch to cage free eggs!
 I have no problem with businesses making profits, but I try hard to scrutinize who I support with my consumerism. Furthermore, I'd rather pay more to a business owner who has a conscience and is conscious of  their customers' health and sustainability, than one who is solely focused on short term profits.
 
 Based upon my limited experience with pricing models, I wouldn't be surprised if that type of strategy to require higher margins.
+
+-- [Albert Lincoln Lash](http://albertlash.com)
+
+> Thanks for this interesting aspect. Now I need to figure out how to contact
+> the owners from overseas to get their statement. ;) -- [[madduck]]

diff --git a/blog/2010.02.20:charge-advertisers-for-the-last-mile.mdwn b/blog/2010.02.20:charge-advertisers-for-the-last-mile.mdwn
new file mode 100644
index 0000000..da1e84a
--- /dev/null
+++ b/blog/2010.02.20:charge-advertisers-for-the-last-mile.mdwn
@@ -0,0 +1,41 @@
+[[!meta  title="Charge advertisers for the last mile"]]
+[[!tag  blog planet-debian planet-lca isps internet idea net-neutrality
+competition taxis]]
+
+ISPs fight a raging war over [[!wikipedia  net neutrality]] because their
+infrastructure cannot keep up with the increasing demand (or rather supply) of
+content. Therefore, ISPs want to charge the users premiums if they wish to use
+certain services on the Net. For instance, since videos are usually large in
+size, one would have to purchase e.g. the "platinum package" to be able to
+access video hosting sites. It would be a serious loss of freedom if they won,
+and the Internet would never be the same.
+
+Let's turn that idea around: since sites that use advertising make money off
+every visitor, they are really the ones that should pay the ISPs so that they
+can improve their infrastructure. The same applies to sites that make money
+off visitors in other ways.
+
+At the moment, users pay to access the network (which is like [paying a taxi
+to get to the market](http://costela.net/2009/08/taxi-driver-analogies/)), so
+that they can visit sites where advertisers make money showing ads to the
+visitor, which might actually let them to pay a manufacturer for a product —
+the end user pays twice, and the advertisers take in money, leeching off the
+ISPs investing into their infrastructure.
+
+I think that the advertiser and not the consumer should pay the ISP to keep
+the infrastructure afloat — improve it even. The manufacturer should then pay
+the advertisers for displaying the ad, and the user consumes if s/he chooses
+to — and everyone only pays once, for services they want. This will help
+improve competition among providers, which should always be the goal.
+
+If my ISP would start to record the volume of HTTP traffic I produce for each
+target site, charge the targets appropriately (they could start with a couple
+at first), and I'd get free connectivity in turn, I'd be quite happy. The ISP
+wouldn't have to look at the contents at all for that.
+
+I don't yet know what to do if the target sites choose not to pay up. ISPs
+could block them, or throttle or deprioritise traffic, but either of those
+might simply lead to an exodus of users, just like "premiums" would.
+
+As usual, this just needs to be done by many ISPs in concert. Are you
+listening?

diff --git a/blog/2010.02.19:making-money-off-ethics/discussion.mdwn b/blog/2010.02.19:making-money-off-ethics/discussion.mdwn
new file mode 100644
index 0000000..cca032c
--- /dev/null
+++ b/blog/2010.02.19:making-money-off-ethics/discussion.mdwn
@@ -0,0 +1,5 @@
+Kudos to the cafe owner who decided to switch to cage free eggs!
+
+I have no problem with businesses making profits, but I try hard to scrutinize who I support with my consumerism. Furthermore, I'd rather pay more to a business owner who has a conscience and is conscious of  their customers' health and sustainability, than one who is solely focused on short term profits.
+
+Based upon my limited experience with pricing models, I wouldn't be surprised if that type of strategy to require higher margins.

diff --git a/blog/2010.02.19:making-money-off-ethics.mdwn b/blog/2010.02.19:making-money-off-ethics.mdwn
new file mode 100644
index 0000000..7558cbf
--- /dev/null
+++ b/blog/2010.02.19:making-money-off-ethics.mdwn
@@ -0,0 +1,16 @@
+[[!meta  title="Making money off ethics"]]
+[[!tag  blog planet-lca planet-debian ethics eggs nz wellington free-range]]
+
+The coffee place around the corner from where [Penny](http://she.geek.nz) and
+I lived for the past two months — [Caffé
+Mode](http://maps.google.com/maps/place?oe=utf-8&rls=org.mozilla:en-US:unofficial&client=iceweasel-a&um=1&ie=UTF-8&q=cafe+mode+kelburn&fb=1&hq=cafe+mode&hnear=kelburn&cid=11964434522604483108)
+— offers to make your food using free-range eggs for NZ$1. Free-range eggs are
+more expensive than normal ones, but the price difference is not one dollar.
+Therefore, the cafe makes a profit every time a customer makes the right
+choice.
+
+I went in this morning to ask them about it, and the guy taking my coffee
+order admitted stale-mate. When I suggested that the cafe should use
+free-range eggs exclusively, he agreed. Let's hope that he lets those making
+that decision know, and that the cafe soon stops making money on ethical
+choices.

diff --git a/blog/2010.02.18:thank-you-catalyst.mdwn b/blog/2010.02.18:thank-you-catalyst.mdwn
new file mode 100644
index 0000000..c14bc68
--- /dev/null
+++ b/blog/2010.02.18:thank-you-catalyst.mdwn
@@ -0,0 +1,32 @@
+[[!meta  title="Thank you, Catalyst!"]]
+[[!tag  blog planet-lca planet-debian life catalyst hospitality nz penny]]
+
+Tomorrow, [Penny](http://she.geek.nz) and I head off back home, and two months
+of living in NZ come to an end. (did you hear that,
+[pleaserobme.com](http://pleaserobme.com/)?)
+
+Maybe I'll find the time to write about my impressions of living on this side
+of the planet, and being immersed in Kiwi culture while going after my daily
+routine and trying to work as much as I could. But there is one thing that
+should not wait:
+
+Thank you, [Catalyst IT](http://catalyst.net.nz) for giving us workspaces! For
+the better part of 6 weeks, you gave us our own room, monitors, keyboards,
+mice, and connectivity. And more than that: you welcomed us, let us
+participate in sessions, invited us to your parties, received our parcels,
+sent out letters, and generally provided us with a great environment to work.
+This was certainly well above what we had dreamed of.
+
+At times, I was forced to stay into the middle of the night — 12 hours time
+difference with Europe is not always easy — and spent waking hours in your
+building alone. Thank you for your trust!
+
+Catalyst is a fully New Zealand owned company who deliver critical open source
+business systems to some of NZ's largest organisations, and organisations
+worldwide. Catalyst was also a major enabler of
+[LCA2010](http://lca2010.org.nz), and a sponsor of [[!wikipedia  Kiwi Foo
+Camp]], both events that I had the privilege to attend.
+
+Let me know when you're in my part of the world. ;)
+
+NP: [The Mamaku Project](http://www.allmusic.com/cg/amg.dll?SQL=The%20Mamaku%20Project&P=amg&OPT1=1): *Karekare*

diff --git a/blog/2010.02.18:acta-documents-leaked.mdwn b/blog/2010.02.18:acta-documents-leaked.mdwn
index 921615b..4330367 100644
--- a/blog/2010.02.18:acta-documents-leaked.mdwn
+++ b/blog/2010.02.18:acta-documents-leaked.mdwn
@@ -15,14 +15,14 @@ document](http://www.pcinpact.com/media/cover_note-EP-documents-11-02.doc) and
 [the coverpage](http://www.pcinpact.com/media/Report_7th-round-TPC.doc) are
 available for direct download.
 
-[Michael Geist over at p2pnet.net has a first
-analysis](http://www.p2pnet.net/story/35893):
+[Michael Geist has a first
+analysis](http://www.michaelgeist.ca/content/view/4795/125/)
 
 > A brief report from the European Commission authored by Pedro Velasco
 > Martins (an EU negotiator) on the most recent round of ACTA negotiations in
 > Guadalajara, Mexico has leaked, providing new information on the substance
 > of the talks, how countries are addressing the transparency concerns, and
-> plans for future negotiations. [read
-> more…](http://www.p2pnet.net/story/35893)
+> plans for future negotiations. ([read
+> more…](http://www.michaelgeist.ca/content/view/4795/125/))
 
 NP: [Dimmer](http://www.allmusic.com/cg/amg.dll?SQL=Dimmer&P=amg&OPT1=1): *Degrees of Existence*

diff --git a/blog/2010.02.18:acta-documents-leaked.mdwn b/blog/2010.02.18:acta-documents-leaked.mdwn
new file mode 100644
index 0000000..921615b
--- /dev/null
+++ b/blog/2010.02.18:acta-documents-leaked.mdwn
@@ -0,0 +1,28 @@
+[[!meta  title="ACTA documents leaked"]]
+[[!tag  blog acta planet-lca planet-debian leaks privacy transparency eu ch
+politics nz intellectual-property ip copyright freedom]]
+
+Shortly after I wrote [[my last article about ACTA and the lack of
+transparency|2010.02.13:acta-less-knowledge-means-less-resistance]], I was
+delighted to find out that a report of the recent negotiations in Mexico has
+been leaked. I find it a bit disconcerting that our politicians, who are
+theoretically supposed to represent our interests, are writing documents that
+can "leak" to the public, when they should have been available to the public
+from the start.
+
+[The
+document](http://www.pcinpact.com/media/cover_note-EP-documents-11-02.doc) and
+[the coverpage](http://www.pcinpact.com/media/Report_7th-round-TPC.doc) are
+available for direct download.
+
+[Michael Geist over at p2pnet.net has a first
+analysis](http://www.p2pnet.net/story/35893):
+
+> A brief report from the European Commission authored by Pedro Velasco
+> Martins (an EU negotiator) on the most recent round of ACTA negotiations in
+> Guadalajara, Mexico has leaked, providing new information on the substance
+> of the talks, how countries are addressing the transparency concerns, and
+> plans for future negotiations. [read
+> more…](http://www.p2pnet.net/story/35893)
+
+NP: [Dimmer](http://www.allmusic.com/cg/amg.dll?SQL=Dimmer&P=amg&OPT1=1): *Degrees of Existence*

diff --git a/blog/2010.02.17:privacy-discussion-mailing-list.mdwn b/blog/2010.02.17:privacy-discussion-mailing-list.mdwn
index 58155b4..63d42dd 100644
--- a/blog/2010.02.17:privacy-discussion-mailing-list.mdwn
+++ b/blog/2010.02.17:privacy-discussion-mailing-list.mdwn
@@ -8,9 +8,9 @@ my (limited) searching has not unveiled results, mostly because many mailing
 lists have "privacy agreements" or somesuch, polluting the results with
 pointers to those.
 
-If you don't know of such a list, but you are interested in the topic, don't
-hesitate to [drop me a line](mailto:privacy-list@pobox.madduck.net). I will
-then either let you know when my search was successful, or subscribe you when
-I have created a list to fill the void.
+If you know such a list, or you don't but you are interested in the topic,
+don't hesitate to [drop me a line](mailto:privacy-list@pobox.madduck.net). I
+will then either let you know when my search was successful, or subscribe you
+when I have created a list to fill the void.
 
 NP: [Sola Rosa](http://www.allmusic.com/cg/amg.dll?SQL=Sola%20Rosa&P=amg&OPT1=1): *Solarized*

diff --git a/blog/2010.02.17:privacy-discussion-mailing-list.mdwn b/blog/2010.02.17:privacy-discussion-mailing-list.mdwn
new file mode 100644
index 0000000..58155b4
--- /dev/null
+++ b/blog/2010.02.17:privacy-discussion-mailing-list.mdwn
@@ -0,0 +1,16 @@
+[[!meta  title="Privacy discussion mailing list"]]
+[[!tag  blog planet-lca planet-debian privacy identity lazyweb mailinglist
+information-age]]
+
+Dear lazyweb: I am in search of a mailing list for discussion on matters
+related to digital identity and privacy in the information age. Unfortunately,
+my (limited) searching has not unveiled results, mostly because many mailing
+lists have "privacy agreements" or somesuch, polluting the results with
+pointers to those.
+
+If you don't know of such a list, but you are interested in the topic, don't
+hesitate to [drop me a line](mailto:privacy-list@pobox.madduck.net). I will
+then either let you know when my search was successful, or subscribe you when
+I have created a list to fill the void.
+
+NP: [Sola Rosa](http://www.allmusic.com/cg/amg.dll?SQL=Sola%20Rosa&P=amg&OPT1=1): *Solarized*

diff --git a/blog/2010.02.10:baffling-exchange/discussion.mdwn b/blog/2010.02.10:baffling-exchange/discussion.mdwn
new file mode 100644
index 0000000..2befde3
--- /dev/null
+++ b/blog/2010.02.10:baffling-exchange/discussion.mdwn
@@ -0,0 +1 @@
+Seems postfix.org doesn't work, it needs a www in front: http://www.postfix.org/

diff --git a/blog/2010.02.13:acta-less-knowledge-means-less-resistance.mdwn b/blog/2010.02.13:acta-less-knowledge-means-less-resistance.mdwn
index 73755d4..b43366b 100644
--- a/blog/2010.02.13:acta-less-knowledge-means-less-resistance.mdwn
+++ b/blog/2010.02.13:acta-less-knowledge-means-less-resistance.mdwn
@@ -28,14 +28,9 @@ you from copying their work without paying for it — even if you cannot
 actually purchase the work, because of e.g. [[!wikipedia  desc="technical
 measures designed to prevent certain people from legally obtaining content"
 DVD_region_code]], or simply because the media companies are greedy and
-consider is PR-savvy to delay the release of a given work in certain countries
+consider it PR-savvy to delay the release of a given work in certain countries
 until after people have had a chance to pay a lot of money to the cinemas.
 
-The media producers are failing to control it, and hence they want to turn it
-into a cable TV service, which they do know how to control.
-
-ACTA wants to break the Internet.
-
 In theory, a creative work goes out of copyright 50 or 75 years after its
 author died, depending on whether the creativity can be attributed to a person
 or a corporation, respectively. Therefore, 50 or 75 years after creation, it
@@ -46,6 +41,10 @@ Sounds plausible to you and me, but this sort of stuff frightens companies like
 Disney, who seem powerful enough to [[!wikipedia  desc="simply have the law
 changed" Copyright_Term_Extension_Act]]. That is not how things should work.
 
+The media producers are failing to control the Internet, and hence they want
+to turn it into something more like cable TV, which they do know how to
+control.
+
 ACTA aims to make copyright infringement a criminal offence.
 
 ACTA wants to make it possible for a government to cut you off the Internet
@@ -63,6 +62,8 @@ legally binding.
 ACTA will create a [culture of surveillance and
 suspicion](http://www.fsf.org/campaigns/acta/).
 
+ACTA is designed to break the Internet, among other things.
+
 But worst of all: I am just speculating because **we are not supposed to know
 the details**.
 

diff --git a/blog/2010.02.13:acta-less-knowledge-means-less-resistance.mdwn b/blog/2010.02.13:acta-less-knowledge-means-less-resistance.mdwn
index 3719828..73755d4 100644
--- a/blog/2010.02.13:acta-less-knowledge-means-less-resistance.mdwn
+++ b/blog/2010.02.13:acta-less-knowledge-means-less-resistance.mdwn
@@ -1,6 +1,6 @@
 [[!meta  title="ACTA: less knowledge means less resistance"]]
 [[!tag  blog acta eu ch politics nz planet-lca planet-debian transparency
-intellectual-property ip copyright freedom draft]]
+intellectual-property ip copyright freedom kiwifoocamp]]
 
 Right now, your government is probably engaged in the discussion of the
 [[!wikipedia  desc="Anti-Counterfeiting Trade Agreement (ACTA)"
@@ -8,21 +8,19 @@ Anti-Counterfeiting_Trade_Agreement]]. You are likely not aware of that
 because **your government has been actively keeping these negotiations and
 details surrounding them secret.**
 
-That's right — your government does not want you to know about a treaty that
-may well have far-reaching negative effects on your freedom, as well as your
-basic human rights.
-
-One theory explaining this secrecy is the drivers of ACTA want the agreement
-partners to go along and sign the treaty. They fear, however, that this will
-not go smoothly if the public gets to have their say.
+Your government does not want you to know about a treaty that
+has far-reaching negative effects on your freedom, as well as your basic human
+rights. If you did know, you might [speak up and make it difficult for the
+drivers of ACTA to smoothly push their interests past
+you](http://www.wired.com/threatlevel/2009/12/feds-fear-acta-scrutiny/).
 
 The red light should light up in your head right now!
 
 The goals of the "trade agreement" that is being negotiated are multifarious,
 but essentially seem to centre around challenges related to intellectual
 property, and copyright in the digital age, even though it is sometimes
-claimed that the agreement serves mainly to contain trade of fake Prada bags
-and Rolex watches.
+claimed that the agreement serves primarily to contain trade of fake Prada
+bags and Rolex watches.
 
 In reality, ACTA is about content producers like movie studios, who
 [[!wikipedia  desc="try" DMCA]] [[!wikipedia  desc="everything" DRM]] to prevent
@@ -33,23 +31,34 @@ DVD_region_code]], or simply because the media companies are greedy and
 consider is PR-savvy to delay the release of a given work in certain countries
 until after people have had a chance to pay a lot of money to the cinemas.
 
+The media producers are failing to control it, and hence they want to turn it
+into a cable TV service, which they do know how to control.
+
+ACTA wants to break the Internet.
+
 In theory, a creative work goes out of copyright 50 or 75 years after its
 author died, depending on whether the creativity can be attributed to a person
 or a corporation, respectively. Therefore, 50 or 75 years after creation, it
 gets increasingly hard to monetise a work that has not been reinvented in that
 period of time.
 
-Sounds plausible to you and I, but this sort of stuff frightens companies like
+Sounds plausible to you and me, but this sort of stuff frightens companies like
 Disney, who seem powerful enough to [[!wikipedia  desc="simply have the law
-changed" Copyright_Term_Extension_Act]]. That is not how the law should work.
+changed" Copyright_Term_Extension_Act]]. That is not how things should work.
 
 ACTA aims to make copyright infringement a criminal offence.
 
 ACTA wants to make it possible for a government to cut you off the Internet
 because someone thinks you did something bad — they don't actually have to
-prove it though, accusation is enough.
+prove it though, accusation is enough. Similar efforts have already failed all
+over the world, e.g. in [[!wikipedia  desc="France" HADOPI_law]] and [New
+Zealand](http://it.gen.nz/2008/09/25/cutting-off-your-internet-if-you-are-accused-of-infringement/).
+That's a sign, not a reason to try again.
 
-ACTA wants border officials to be able to treat you as if you had no rights.
+ACTA wants to set in stone that you have absolutely no rights when you cross
+borders. This is largely already the case — border officials can pretty much
+do with you whatever they want — now it's supposed to be made official, and
+legally binding.
 
 ACTA will create a [culture of surveillance and
 suspicion](http://www.fsf.org/campaigns/acta/).
@@ -68,6 +77,14 @@ It's even more important today than before to [put an end to this
 secrecy](http://arstechnica.com/old/content/2008/09/100-groups-demand-to-see-secret-anticounterfeiting-treaty.ars).
 Don't let your government enter secret agreements that affect you and your
 life, refusing to talk to you about it beforehand, and probably refusing all
-responsibility afterwards. Talk to your local politician and [ask questions
-that cannot be answered with stock
+responsibility afterwards. [Talk to your
+politicians](http://actaactionnow.org/takeaction.html) and [ask questions that
+cannot be answered with stock
 replies](http://www.crikey.com.au/2009/12/16/dont-waste-your-time-waste-theirs-a-guide-to-writing-to-ministers/).
+
+If you have specific contact addresses for politicians, please let me know so
+I can add them.
+
+[Colin Jackson](http://it.gen.nz) helped me with this article at [[!wikipedia 
+Kiwi Foo Camp]]. He also [takes an issue with the secrecy around
+ACTA](http://it.gen.nz/2010/01/25/time-for-some-disinfectant/).

diff --git a/blog/2010.02.13:acta-less-knowledge-means-less-resistance.mdwn b/blog/2010.02.13:acta-less-knowledge-means-less-resistance.mdwn
new file mode 100644
index 0000000..3719828
--- /dev/null
+++ b/blog/2010.02.13:acta-less-knowledge-means-less-resistance.mdwn
@@ -0,0 +1,73 @@
+[[!meta  title="ACTA: less knowledge means less resistance"]]
+[[!tag  blog acta eu ch politics nz planet-lca planet-debian transparency
+intellectual-property ip copyright freedom draft]]
+
+Right now, your government is probably engaged in the discussion of the
+[[!wikipedia  desc="Anti-Counterfeiting Trade Agreement (ACTA)"
+Anti-Counterfeiting_Trade_Agreement]]. You are likely not aware of that
+because **your government has been actively keeping these negotiations and
+details surrounding them secret.**
+
+That's right — your government does not want you to know about a treaty that
+may well have far-reaching negative effects on your freedom, as well as your
+basic human rights.
+
+One theory explaining this secrecy is the drivers of ACTA want the agreement
+partners to go along and sign the treaty. They fear, however, that this will
+not go smoothly if the public gets to have their say.
+
+The red light should light up in your head right now!
+
+The goals of the "trade agreement" that is being negotiated are multifarious,
+but essentially seem to centre around challenges related to intellectual
+property, and copyright in the digital age, even though it is sometimes
+claimed that the agreement serves mainly to contain trade of fake Prada bags
+and Rolex watches.
+
+In reality, ACTA is about content producers like movie studios, who
+[[!wikipedia  desc="try" DMCA]] [[!wikipedia  desc="everything" DRM]] to prevent
+you from copying their work without paying for it — even if you cannot
+actually purchase the work, because of e.g. [[!wikipedia  desc="technical
+measures designed to prevent certain people from legally obtaining content"
+DVD_region_code]], or simply because the media companies are greedy and
+consider is PR-savvy to delay the release of a given work in certain countries
+until after people have had a chance to pay a lot of money to the cinemas.
+
+In theory, a creative work goes out of copyright 50 or 75 years after its
+author died, depending on whether the creativity can be attributed to a person
+or a corporation, respectively. Therefore, 50 or 75 years after creation, it
+gets increasingly hard to monetise a work that has not been reinvented in that
+period of time.
+
+Sounds plausible to you and I, but this sort of stuff frightens companies like
+Disney, who seem powerful enough to [[!wikipedia  desc="simply have the law
+changed" Copyright_Term_Extension_Act]]. That is not how the law should work.
+
+ACTA aims to make copyright infringement a criminal offence.
+
+ACTA wants to make it possible for a government to cut you off the Internet
+because someone thinks you did something bad — they don't actually have to
+prove it though, accusation is enough.
+
+ACTA wants border officials to be able to treat you as if you had no rights.
+
+ACTA will create a [culture of surveillance and
+suspicion](http://www.fsf.org/campaigns/acta/).
+
+But worst of all: I am just speculating because **we are not supposed to know
+the details**.
+
+The best current source of information on ACTA seems to be [Canadian law
+professor Dr. Michael Geist](http://www.michaelgeist.ca/tags/acta/99999), who
+has been collecting content and linking to articles consistently since the
+ACTA negotiations commenced 2–3 years ago. The [Electronic Frontier
+Foundation](http://eff.org) also has [comprehensive
+resources](http://www.eff.org/issues/acta) available.
+
+It's even more important today than before to [put an end to this
+secrecy](http://arstechnica.com/old/content/2008/09/100-groups-demand-to-see-secret-anticounterfeiting-treaty.ars).
+Don't let your government enter secret agreements that affect you and your
+life, refusing to talk to you about it beforehand, and probably refusing all
+responsibility afterwards. Talk to your local politician and [ask questions
+that cannot be answered with stock
+replies](http://www.crikey.com.au/2009/12/16/dont-waste-your-time-waste-theirs-a-guide-to-writing-to-ministers/).

diff --git a/blog/2010.02.08:optimise-google/discussion.mdwn b/blog/2010.02.08:optimise-google/discussion.mdwn
index 0153ad6..22268ca 100644
--- a/blog/2010.02.08:optimise-google/discussion.mdwn
+++ b/blog/2010.02.08:optimise-google/discussion.mdwn
@@ -4,3 +4,5 @@ Mike
 
 > Probably tag-based stuff, like Digg, or social-based approaches like Wikia.
 > If I knew, I would be doing it. ;)
+
+Or maybe the Semantic Web will finally become a reality and search will get better (http://en.wikipedia.org/wiki/Swoogle). Then again, maybe not (http://www.well.com/~doctorow/metacrap.htm)!

diff --git a/blog/2010.02.10:baffling-exchange.mdwn b/blog/2010.02.10:baffling-exchange.mdwn
index 846c133..e3911ad 100644
--- a/blog/2010.02.10:baffling-exchange.mdwn
+++ b/blog/2010.02.10:baffling-exchange.mdwn
@@ -1,5 +1,5 @@
 [[!meta  title="Baffling Exchange"]]
-[[!tag  blog planet-debian planet-lca email microsoft exchange crap draft]]
+[[!tag  blog planet-debian planet-lca email microsoft exchange crap ul]]
 
 I found out yesterday that [my university](http://ul.ie)'s [[!wikipedia 
 Microsoft Exchange Server]] account stopped forwarding my mail on 8 December
@@ -34,17 +34,18 @@ or search the phone book.
 However, considering that UL's [[!wikipedia  Outlook Web Access]] instance does
 not let users of [decent browsers](http://mozilla.org/products/firefox/)
 search their mailboxes (a "premium feature" [[!wikipedia  desc="reserved for
-users of Internet Exploder" Outlook_Web_Access#Functionality]], one cannot
+users of Internet Exploder" Outlook_Web_Access#Functionality]]), one cannot
 manipulate more than a page-full of e-mails at a time, bounce messages, or do
 many of the other operations that make dealing with large amounts of e-mail
-possible. Also, ecause Exchange mail — if it doesn't get lost in the first
+possible, and because Exchange mail — if it doesn't get lost in the first
 place — sucks in so many other ways, I certainly prefer my mail to be handled
 by [a real mail server](http://postfix.org) with a [[proper mail filter
 (writeup in progress)|docs/mailfilter]].
 
 Maybe the Exchange service pack was simply designed to get rid of outcasts
-like me who don't buy into the Microsoft low-quality lock-in? We'll never
-know, thanks to the [[!wikipedia  desc="proprietarity" proprietary software]]
-of their software.
+like me who don't buy into the low-Microsoft-quality [[!wikipedia  vendor
+lock-in]]? We'll never know, thanks to the [[!wikipedia  desc="proprietarity"
+proprietary software]] of their software (and the fact that the university
+service provider apparently does not keep logs of changes).
 
 NP: [AC/DC](http://www.allmusic.com/cg/amg.dll?SQL=AC/DC&P=amg&OPT1=1): *Back in Black*

diff --git a/blog/2010.02.08:optimise-google/discussion.mdwn b/blog/2010.02.08:optimise-google/discussion.mdwn
index 0679094..0153ad6 100644
--- a/blog/2010.02.08:optimise-google/discussion.mdwn
+++ b/blog/2010.02.08:optimise-google/discussion.mdwn
@@ -1,3 +1,6 @@
 Hi Martin!
 You say that you believe "that the days of index-based searches are over," but what do you see as the alternative to index-based search? I am not offering any suggestions so as not to expose my ignorance!
 Mike 
+
+> Probably tag-based stuff, like Digg, or social-based approaches like Wikia.
+> If I knew, I would be doing it. ;)

diff --git a/blog/2010.02.10:baffling-exchange.mdwn b/blog/2010.02.10:baffling-exchange.mdwn
index 6632423..846c133 100644
--- a/blog/2010.02.10:baffling-exchange.mdwn
+++ b/blog/2010.02.10:baffling-exchange.mdwn
@@ -31,14 +31,16 @@ has bought their ways into the university and spread their germs all across, I
 need credentials to be able to access shared files, print, browse the library,
 or search the phone book.
 
-However, considering that UL's [[!wikipedia  Outlook Web Access]] instance has
-search disabled (Microsoft basically requires you to purchase additional
-server licences if you want this premium functionality), you cannot manipulate
-more than a page-full of e-mails at a time, bounce messages, or comfortably
-use a [decent browser](http://mozilla.org/products/firefox/), and because
-Exchange mail sucks in so many other ways, I certainly prefer my mail to be
-handled by [a real mail server](http://postfix.org) with a [[proper mail
-filter (writeup in progress)|docs/mailfilter]].
+However, considering that UL's [[!wikipedia  Outlook Web Access]] instance does
+not let users of [decent browsers](http://mozilla.org/products/firefox/)
+search their mailboxes (a "premium feature" [[!wikipedia  desc="reserved for
+users of Internet Exploder" Outlook_Web_Access#Functionality]], one cannot
+manipulate more than a page-full of e-mails at a time, bounce messages, or do
+many of the other operations that make dealing with large amounts of e-mail
+possible. Also, ecause Exchange mail — if it doesn't get lost in the first
+place — sucks in so many other ways, I certainly prefer my mail to be handled
+by [a real mail server](http://postfix.org) with a [[proper mail filter
+(writeup in progress)|docs/mailfilter]].
 
 Maybe the Exchange service pack was simply designed to get rid of outcasts
 like me who don't buy into the Microsoft low-quality lock-in? We'll never

diff --git a/blog/2010.02.10:baffling-exchange.mdwn b/blog/2010.02.10:baffling-exchange.mdwn
index c370620..6632423 100644
--- a/blog/2010.02.10:baffling-exchange.mdwn
+++ b/blog/2010.02.10:baffling-exchange.mdwn
@@ -2,8 +2,8 @@
 [[!tag  blog planet-debian planet-lca email microsoft exchange crap draft]]
 
 I found out yesterday that [my university](http://ul.ie)'s [[!wikipedia 
-Microsoft Exchange]] account stopped forwarding my mail on 8 December 2009. As
-a result, mail accumulated there and remained unseen.
+Microsoft Exchange Server]] account stopped forwarding my mail on 8 December
+2009. As a result, mail accumulated there and remained unseen.
 
 Dear examiners, paper authors, supervisors, sponsors, participants, and peers
 who responded to my calls and cries related to my [PhD
@@ -42,6 +42,7 @@ filter (writeup in progress)|docs/mailfilter]].
 
 Maybe the Exchange service pack was simply designed to get rid of outcasts
 like me who don't buy into the Microsoft low-quality lock-in? We'll never
-know, thanks to the [[!wikipedia  proprietarity]] of their software.
+know, thanks to the [[!wikipedia  desc="proprietarity" proprietary software]]
+of their software.
 
 NP: [AC/DC](http://www.allmusic.com/cg/amg.dll?SQL=AC/DC&P=amg&OPT1=1): *Back in Black*

diff --git a/blog/2010.02.10:baffling-exchange.mdwn b/blog/2010.02.10:baffling-exchange.mdwn
new file mode 100644
index 0000000..c370620
--- /dev/null
+++ b/blog/2010.02.10:baffling-exchange.mdwn
@@ -0,0 +1,47 @@
+[[!meta  title="Baffling Exchange"]]
+[[!tag  blog planet-debian planet-lca email microsoft exchange crap draft]]
+
+I found out yesterday that [my university](http://ul.ie)'s [[!wikipedia 
+Microsoft Exchange]] account stopped forwarding my mail on 8 December 2009. As
+a result, mail accumulated there and remained unseen.
+
+Dear examiners, paper authors, supervisors, sponsors, participants, and peers
+who responded to my calls and cries related to my [PhD
+thesis](http://phd.martin-krafft.net). I am terribly sorry that you were
+subjected to this. You replied usually within a few days, but I still sent you
+reminder after reminder in the weeks to follow. You must have thought that I
+was a real dork. Please forgive me. I really appreciate your patience!
+
+I filed a ticket with my university's [IT service provider](http://ul.ie/itd),
+which got closed the next day with "it should now work again". That wasn't
+going to cut it for me, so I reopened the ticket, asking for an explanation.
+Next, I received an apology with a bit of speculation.
+
+After a bit of research, it seems that the reason was to be found in the
+"inconsistency" of being an external staff member (i.e. an e-mail address
+outside of the [[!wikipedia  Active Directory]] domain), but still having an
+account on the server.
+
+On 8 December 2009, the server was upgraded with a service pack. This caused
+Exchange to go a little manic on the housekeeping. After all, why would anyone
+ever want to forward their e-mail elsewhere, and still have an account?
+
+Well, I certainly don't want an account, and yet I have to have one: Microsoft
+has bought their ways into the university and spread their germs all across, I
+need credentials to be able to access shared files, print, browse the library,
+or search the phone book.
+
+However, considering that UL's [[!wikipedia  Outlook Web Access]] instance has
+search disabled (Microsoft basically requires you to purchase additional
+server licences if you want this premium functionality), you cannot manipulate
+more than a page-full of e-mails at a time, bounce messages, or comfortably
+use a [decent browser](http://mozilla.org/products/firefox/), and because
+Exchange mail sucks in so many other ways, I certainly prefer my mail to be
+handled by [a real mail server](http://postfix.org) with a [[proper mail
+filter (writeup in progress)|docs/mailfilter]].
+
+Maybe the Exchange service pack was simply designed to get rid of outcasts
+like me who don't buy into the Microsoft low-quality lock-in? We'll never
+know, thanks to the [[!wikipedia  proprietarity]] of their software.
+
+NP: [AC/DC](http://www.allmusic.com/cg/amg.dll?SQL=AC/DC&P=amg&OPT1=1): *Back in Black*

diff --git a/blog/2010.02.08:optimise-google/discussion.mdwn b/blog/2010.02.08:optimise-google/discussion.mdwn
new file mode 100644
index 0000000..0679094
--- /dev/null
+++ b/blog/2010.02.08:optimise-google/discussion.mdwn
@@ -0,0 +1,3 @@
+Hi Martin!
+You say that you believe "that the days of index-based searches are over," but what do you see as the alternative to index-based search? I am not offering any suggestions so as not to expose my ignorance!
+Mike 

diff --git a/blog/2010.02.09:sign-me-up-to-social-networking.mdwn b/blog/2010.02.09:sign-me-up-to-social-networking.mdwn
index 2b27cca..3e57798 100644
--- a/blog/2010.02.09:sign-me-up-to-social-networking.mdwn
+++ b/blog/2010.02.09:sign-me-up-to-social-networking.mdwn
@@ -1,5 +1,5 @@
 [[!meta  title="Sign me up to social networking!"]]
-[[!tag  blog web20 social-networking planet-lca planet-debian spam drafts]]
+[[!tag  blog web20 social-networking planet-lca planet-debian spam]]
 
 I [[do not like it when people tell Web 2.0 sites to send me invitation
 e-mail|2008.04.29:not-interested-in-networking]]. I won't enumerate the
@@ -13,8 +13,8 @@ advertisers to make ends meet while hoping for the big cashflow.
 
 I don't have any data to back this up, and I want to change that:
 
-> Please tell all your Web 2.0 sites to send me an invitation! Please use an
-> address in the `signmeup.madduck.net` domain for that, and make sure to
+> **Please tell all your Web 2.0 sites to send me an invitation**! Please use
+> an address in the `signmeup.madduck.net` domain for that, and make sure to
 > include the domain name of the service to which you sign me up before the
 > `@` symbol. Also append a hyphen/dash and a random, short string. More on
 > that in just a sec.

diff --git a/blog/2010.02.09:sign-me-up-to-social-networking.mdwn b/blog/2010.02.09:sign-me-up-to-social-networking.mdwn
new file mode 100644
index 0000000..2b27cca
--- /dev/null
+++ b/blog/2010.02.09:sign-me-up-to-social-networking.mdwn
@@ -0,0 +1,36 @@
+[[!meta  title="Sign me up to social networking!"]]
+[[!tag  blog web20 social-networking planet-lca planet-debian spam drafts]]
+
+I [[do not like it when people tell Web 2.0 sites to send me invitation
+e-mail|2008.04.29:not-interested-in-networking]]. I won't enumerate the
+reasons here. But there is one reason for why I don't like you passing on my
+address to those sites, which is subject of this article:
+
+Unlike popular belief, the Web 2.0 is not a money-printing machine. It's a
+long road until you can actually generate real money with user content.
+Therefore, some shadey sites are probably selling contact details to
+advertisers to make ends meet while hoping for the big cashflow.
+
+I don't have any data to back this up, and I want to change that:
+
+> Please tell all your Web 2.0 sites to send me an invitation! Please use an
+> address in the `signmeup.madduck.net` domain for that, and make sure to
+> include the domain name of the service to which you sign me up before the
+> `@` symbol. Also append a hyphen/dash and a random, short string. More on
+> that in just a sec.
+>
+> For instance, if you are one of those people that believes that letting
+> people know where you are (and have been) at any point in time, tell
+> [Foursquare](http://www.foursquare.com) to send an invitation to:
+>
+> > `foursquare.com-ponies@signmeup.madduck.net`
+>
+> The reason for the random, short string ("ponies") is simply so that I can
+> later cross-check that a message receiving spam actually went through a
+> social networking site — I intend to catalog the invitation messages.
+
+Thank you for your time. Keep in mind: the more, the merrier. I'll make sure
+to report back on the outcome of this little experiment right here, so watch
+this space.
+
+NP: [Billy Joel](http://www.allmusic.com/cg/amg.dll?SQL=Billy%20Joel&P=amg&OPT1=1): *Cold Spring Harbor*

diff --git a/blog/2010.02.08:back-to-wikipedia.mdwn b/blog/2010.02.08:back-to-wikipedia.mdwn
index ab28c40..6f3e9fc 100644
--- a/blog/2010.02.08:back-to-wikipedia.mdwn
+++ b/blog/2010.02.08:back-to-wikipedia.mdwn
@@ -2,10 +2,10 @@
 [[!tag  blog planet-lca planet-debian wikipedia deletionism crowd-sourcing
 draft]]
 
-I used to have [[!wikipedia  desc="a Wikipedia page"
-User:Madduck/Martin_Krafft]]. At [LCA2010](http://lca2010.or.nz), as well as
-on random occasions over the past six months, I had to explain to a number of
-people \[[why this is no longer the
+I used to have [a Wikipedia
+page](http://en.wikipedia.org/wiki/User:Madduck/Martin_Krafft). At
+[LCA2010](http://lca2010.or.nz), as well as on random occasions over the past
+six months, I had to explain to a number of people [[why this is no longer the
 case|2009.06.11:wikipedia-notability-and-conflicts-of-interest]] — I
 eventually gave up. Several discussions later, I've decided that I want my
 page back.
@@ -32,7 +32,7 @@ creation of a new page. Therefore:
 > [the vcs-pkg effort](http://vcs-pkg.org), then please [create
 > one](http://en.wikipedia.org/w/index.php?title=Martin_Krafft&action=edit).
 
-Wikipedia is a place where people with more free time get the final say. You
+Wikipedia is a place where people with more free time than the others get the final say. You
 can help in preventing that.
 
 NP: [The Phenomenal Handclap Band](http://www.allmusic.com/cg/amg.dll?SQL=The%20Phenomenal%20Handclap%20Band&P=amg&OPT1=1): *The Phenomenal Handclap Band*

diff --git a/blog/2010.02.08:back-to-wikipedia.mdwn b/blog/2010.02.08:back-to-wikipedia.mdwn
new file mode 100644
index 0000000..ab28c40
--- /dev/null
+++ b/blog/2010.02.08:back-to-wikipedia.mdwn
@@ -0,0 +1,38 @@
+[[!meta  title="Back to Wikipedia?"]]
+[[!tag  blog planet-lca planet-debian wikipedia deletionism crowd-sourcing
+draft]]
+
+I used to have [[!wikipedia  desc="a Wikipedia page"
+User:Madduck/Martin_Krafft]]. At [LCA2010](http://lca2010.or.nz), as well as
+on random occasions over the past six months, I had to explain to a number of
+people [[why this is no longer the
+case|2009.06.11:wikipedia-notability-and-conflicts-of-interest]] — I
+eventually gave up. Several discussions later, I've decided that I want my
+page back.
+
+The problems in the past were two-fold:
+
+1. When I found out that someone had created a page for me, I proceeded to
+   edit it myself. This generated what the Wikipedia Police calls a
+   [[!wikipedia  desc="conflict of interest" WP:COI]]. I should have known
+   better.
+
+2. [[!wikipedia  desc="Wikipedia deletionists" Deletionism]] seem to get
+   confused when distinguishing people from books. But oh, there must be so
+   much satisfaction in policing Wikipedia, especially if you have an anger
+   problem, and no discernable talent.
+
+I found an easy way to solve both of these problems at once: crowd-source the
+creation of a new page. Therefore:
+
+> Dear reader: if you think I should have my own Wikipedia page e.g. for my
+> contribution to [Debian](http://debian.org), as the author of [The Debian
+> System](http://debiansystem.info), as a [FLOSS
+> researcher](http://phd.martin-krafft.net), or the person who spearheaded
+> [the vcs-pkg effort](http://vcs-pkg.org), then please [create
+> one](http://en.wikipedia.org/w/index.php?title=Martin_Krafft&action=edit).
+
+Wikipedia is a place where people with more free time get the final say. You
+can help in preventing that.
+
+NP: [The Phenomenal Handclap Band](http://www.allmusic.com/cg/amg.dll?SQL=The%20Phenomenal%20Handclap%20Band&P=amg&OPT1=1): *The Phenomenal Handclap Band*

diff --git a/blog/2010.02.08:optimise-google.mdwn b/blog/2010.02.08:optimise-google.mdwn
index e2014c5..0b270b7 100644
--- a/blog/2010.02.08:optimise-google.mdwn
+++ b/blog/2010.02.08:optimise-google.mdwn
@@ -1,6 +1,6 @@
 [[!meta  title="Optimise Google"]]
 [[!tag  blog planet-lca planet-debian google firefox privacy bing yahoo
-duckduckgo]]
+duckduckgo conspiracy]]
 
 I had [[previously sought alternative, innovative search
 engines|2006.11.06:alternative-search-engines]], but none of the proposed
@@ -12,11 +12,14 @@ The reasons why I switched included
 
 - my dislike of the Google information monopoly and the potential that a
   single, corporate entity with financial interests, [[!wikipedia  desc="gets
-  to censor the information I see" Censorship_by_Google]]
+  to censor the information I see" Censorship_by_Google]]. I am sceptical of
+  their "Do-no-evil" promise because there's nothing binding about it, and if
+  it gets in the way of money-making, I am sure it'll be discarded at a whim —
+  if it even still exists.
 
 - the awareness that my usage augments their database (although I am probably
   too far away from mainstream to provide useful data), which translates into
-  more funds available to them to further strengthen their market position
+  more funds available to them to further strengthen their market position.
 
 - my belief that the days of index-based searches are over, given how [95% (or
   more) of user-generated content is

diff --git a/blog/2010.02.08:optimise-google.mdwn b/blog/2010.02.08:optimise-google.mdwn
index b2f2b06..e2014c5 100644
--- a/blog/2010.02.08:optimise-google.mdwn
+++ b/blog/2010.02.08:optimise-google.mdwn
@@ -12,7 +12,7 @@ The reasons why I switched included
 
 - my dislike of the Google information monopoly and the potential that a
   single, corporate entity with financial interests, [[!wikipedia  desc="gets
-  to censor the information I see" Censorship\_by\_Google]]
+  to censor the information I see" Censorship_by_Google]]
 
 - the awareness that my usage augments their database (although I am probably
   too far away from mainstream to provide useful data), which translates into

diff --git a/blog/2010.02.08:optimise-google.mdwn b/blog/2010.02.08:optimise-google.mdwn
index f332785..b2f2b06 100644
--- a/blog/2010.02.08:optimise-google.mdwn
+++ b/blog/2010.02.08:optimise-google.mdwn
@@ -2,8 +2,8 @@
 [[!tag  blog planet-lca planet-debian google firefox privacy bing yahoo
 duckduckgo]]
 
-I had [previously sought alternative, innovative search
-engines|2006.11.06:alternative-search-engines], but none of the proposed
+I had [[previously sought alternative, innovative search
+engines|2006.11.06:alternative-search-engines]], but none of the proposed
 options made me particularly happy. About a year ago, I came across
 [DuckDuckGo](http://www.duckduckgo.com), and today, I've been using DDG as my
 primary search provider for exactly 10 months.
@@ -12,7 +12,7 @@ The reasons why I switched included
 
 - my dislike of the Google information monopoly and the potential that a
   single, corporate entity with financial interests, [[!wikipedia  desc="gets
-  to censor the information I see" Censorship by Google]]
+  to censor the information I see" Censorship\_by\_Google]]
 
 - the awareness that my usage augments their database (although I am probably
   too far away from mainstream to provide useful data), which translates into

diff --git a/blog/2010.02.08:optimise-google.mdwn b/blog/2010.02.08:optimise-google.mdwn
new file mode 100644
index 0000000..f332785
--- /dev/null
+++ b/blog/2010.02.08:optimise-google.mdwn
@@ -0,0 +1,59 @@
+[[!meta  title="Optimise Google"]]
+[[!tag  blog planet-lca planet-debian google firefox privacy bing yahoo
+duckduckgo]]
+
+I had [previously sought alternative, innovative search
+engines|2006.11.06:alternative-search-engines], but none of the proposed
+options made me particularly happy. About a year ago, I came across
+[DuckDuckGo](http://www.duckduckgo.com), and today, I've been using DDG as my
+primary search provider for exactly 10 months.
+
+The reasons why I switched included
+
+- my dislike of the Google information monopoly and the potential that a
+  single, corporate entity with financial interests, [[!wikipedia  desc="gets
+  to censor the information I see" Censorship by Google]]
+
+- the awareness that my usage augments their database (although I am probably
+  too far away from mainstream to provide useful data), which translates into
+  more funds available to them to further strengthen their market position
+
+- my belief that the days of index-based searches are over, given how [95% (or
+  more) of user-generated content is
+  bogus](http://www.daniweb.com/news/story258407.html). Google undoubtedly
+  optimises the results with obscure, secret algorithms, but that's just not
+  enough for me.
+
+- Of course the name — DuckDuckGo — was perhaps the strongest reason to
+  switch. :)
+
+I am aware that DuckDuckGo is index-based itself, using the
+[Yahoo](http://yahoo.com) API, which, in turns means that DuckDuckGo may
+already be using [Bing](http://www.bing.com) data. Sounds a bit like out of
+the frying pan into the fire, unfortunately.
+
+I am still investigating better search solutions, sticking with DuckDuckGo
+meanwhile.
+
+Unfortunately, DuckDuckGo doesn't quite cut the mustard at all times, forcing
+me to go to Google instead. For this reason I am glad to find that the
+CustomizeGoogle [Firefox](http://mozilla.com/products/firefox) extension has
+not been discontinued, but simply renamed to
+[OptimizeGoogle](http://www.optimizegoogle.com/).
+
+This extension allows me to anonymise my identity towards Google, remove click
+tracking (which Google doesn't want you to know about and hence hide with
+JavaScript), hide ads, and customise a slew of other aspects of the giant's
+search engine. It alleviates some of the aforementioned concerns, but not all.
+
+Maybe it's time to rethink the way I use the web and lower my search needs.
+
+If you are using Firefox, [try it
+out](https://addons.mozilla.org/en-US/firefox/addon/52498/)! If you're still
+using Internet Exploder, you [should
+not](http://www.telegraph.co.uk/technology/microsoft/7006671/German-government-warns-against-using-Microsoft-Internet-Explorer.html),
+and instead [upgrade to Firefox](http://getfirefox.com). Users of other
+browsers might find similar functionality for their application, or might want
+to switch as well.
+
+NP: [Tunng](http://www.allmusic.com/cg/amg.dll?SQL=Tunng&P=amg&OPT1=1): *Comments from the Inner Chorus*

diff --git a/blog/2010.02.06:ubuntu-to-enforce-short-sighted-decision-on-net-book-users.mdwn b/blog/2010.02.06:ubuntu-to-enforce-short-sighted-decision-on-net-book-users.mdwn
index 49e2cd5..379f369 100644
--- a/blog/2010.02.06:ubuntu-to-enforce-short-sighted-decision-on-net-book-users.mdwn
+++ b/blog/2010.02.06:ubuntu-to-enforce-short-sighted-decision-on-net-book-users.mdwn
@@ -1,6 +1,6 @@
 [[!meta  title="Ubuntu to enforce short-sighted decision on net book users"]]
 [[!tag  blog planet-debian planet-lca ubuntu google netbooks rant cloud
-security privacy draft]]
+security privacy draft linux-com]]
 
 Here is another in my list of growing reasons why I think Ubuntu is going bad:
 [net books won't have OpenOffice installed

diff --git a/blog/2007.11.01:criticisms-of-academic-writing.mdwn b/blog/2007.11.01:criticisms-of-academic-writing.mdwn
index 6124db8..3c50493 100644
--- a/blog/2007.11.01:criticisms-of-academic-writing.mdwn
+++ b/blog/2007.11.01:criticisms-of-academic-writing.mdwn
@@ -22,8 +22,10 @@ This study aims to address these issues and answer the above question through
 a number of objectives
 
 Studies aim? You answer through objectives?
+the previous section argues
 
 Conboy's thesis
+
 07 18:35 < madduck> and if (Smith 2003) already said what you say, quote it in
                     full, leave it the fuck out, but do not do: "It has been
                     shown that foo (Smith 2003) and that bar (Smith 2003).
@@ -51,6 +53,4 @@ NP:
 [And all because the Lady Loves](http://www.allmusic.com/cg/amg.dll?SQL=And%20all%20because%20the%20Lady%20Loves&P=amg&OPT1=1):
 *Sister Bridget*
 
-
-
 [[!tag  blog draft]]

diff --git a/blog/2010.02.06:of-waterfalls-and-communication-culture.mdwn b/blog/2010.02.06:of-waterfalls-and-communication-culture.mdwn
index 76409bd..ae477a4 100644
--- a/blog/2010.02.06:of-waterfalls-and-communication-culture.mdwn
+++ b/blog/2010.02.06:of-waterfalls-and-communication-culture.mdwn
@@ -38,8 +38,8 @@ keynote](http://www.lca2010.org.nz/programme/keynotes#GlynMoody) about
 challenges we (as in society) face, and how open-source seems to have many
 answers, he dropped the following gem, which spoke right to my heart:
 
-    Twitter is the "release early, release often" principle applied to
-    thinking.
+> Twitter is the "release early, release often" principle applied to
+> thinking.
 
 By this simile, journal articles are produced according to the waterfall
 model. This may well be why they are usually outdated at the time of

diff --git a/blog/2010.02.06:of-waterfalls-and-communication-culture.mdwn b/blog/2010.02.06:of-waterfalls-and-communication-culture.mdwn
index 69ef34a..76409bd 100644
--- a/blog/2010.02.06:of-waterfalls-and-communication-culture.mdwn
+++ b/blog/2010.02.06:of-waterfalls-and-communication-culture.mdwn
@@ -1,4 +1,4 @@
-[[!meta  title="Waterfalls aren't bad at all"]]
+[[!meta  title="Of waterfalls and communication culture"]]
 [[!tag  blog planet-lca planet-debian twitter identica microblogging satire
 software-development communication programming]]
 

diff --git a/blog/2010.02.06:of-waterfalls-and-communication-culture.mdwn b/blog/2010.02.06:of-waterfalls-and-communication-culture.mdwn
index a4363ba..69ef34a 100644
--- a/blog/2010.02.06:of-waterfalls-and-communication-culture.mdwn
+++ b/blog/2010.02.06:of-waterfalls-and-communication-culture.mdwn
@@ -1,6 +1,6 @@
 [[!meta  title="Waterfalls aren't bad at all"]]
 [[!tag  blog planet-lca planet-debian twitter identica microblogging satire
-software-development communication programming draft]]
+software-development communication programming]]
 
 I got involved with open-source software before I learnt about software
 development in a university course. Naturally, when my profs tried to teach

diff --git a/blog/2010.02.04:waterfalls-arent-bad-at-all.mdwn b/blog/2010.02.04:waterfalls-arent-bad-at-all.mdwn
deleted file mode 100644
index 85feb3d..0000000
--- a/blog/2010.02.04:waterfalls-arent-bad-at-all.mdwn
+++ /dev/null
@@ -1,75 +0,0 @@
-[[!meta  title="Waterfalls aren't bad at all"]]
-[[!tag  blog planet-lca planet-debian twitter identica microblogging satire
-software-development communication programming draft]]
-
-I got involved with open-source software before I learnt about software
-development in a university course. Naturally, when my profs tried to teach
-the [[!wikipedia  waterfall model]] to me, I couldn't take them too seriously
-back then. After all, requirements specification → design → implementation →
-verification → maintenance is not compatible with the principle to
-[[!wikipedia  release early, release often]]. Furthermore, since water cannot
-flow uphill, the waterfall model fails to represent development cycles, as
-they naturally appear even in behemoth, ancient software nightmares.
-
-And yet, when embarking on a new project, I do tend to find myself first
-thinking about the big picture, instead of churning out the code. I am
-certainly not the best coder out there, and it might well be that I need to
-learn to break down problems and get an earlier start on the implementation of
-components, and maybe that would make me a better programmer.
-
-However, I maintain that the best way is probably *not* to avoid the
-waterfalls and engage in [[!wikipedia  extreme programming]], [[!wikipedia 
-agile software development]], or [[!wikipedia  desc="pair-based approaches"
-pair programming]] right away. Rather, the best approach should probably
-involve a certain level of conceptualisation before code is produced. I like
-the [[!wikipedia  desc="scrum method" Scrum (development)]] for this reason
-(although I wouldn't follow it down to the book).
-
-I like to think about trickles in the mountains, amidst undisturbed nature,
-in (or around) which water droplets joyfully jump around. I am also a big fan
-of [[!wikipedia  test-driven development]].
-
-When [Glyn Moody](http://opendotdotdot.blogspot.com/) spoke in his [LCA2010
-keynote](http://www.lca2010.org.nz/programme/keynotes#GlynMoody) about
-challenges we (as in society) face, and how open-source seems to have many
-leads to answers, he dropped the following gem, which spoke right to my heart:
-
-    Twitter is the "release early, release often" principle applied to
-    thinking.
-
-By this simile, journal articles are produced according to the waterfall
-model. This may well be why they are usually outdated at the time of
-publication. [[!wikipedia  Microblogging]] (like Twitter), on the other hand,
-is primarily used to publish stuff before it's ready, or which would never be
-ready.
-
-The epiphany is found in between, as with software development, and has
-existed for for a long time: [[!wikipedia  web logs]] — web applications that
-allow for easy publishing by anyone (which is a different problem not to be
-discussed here).
-
-Since articles on those platforms usually have at least a title and a body,
-they require just a little bit more thought than 140 characters of contracted
-brain farts, spilled into the world faster than it takes one to stand up,
-stretch, and sit down again.
-
-If you're "following" people on one of those microblogging platforms, I
-challenge you to spend the weekend offline and when the urge hits, ask
-yourself whether you are actually missing something. I mean *really missing*
-something, and by that I mean anything other than the cozy buzz and hum of
-entertainment washed upon you to prevent you from having to think about what
-you could actually be doing instead. If you feel left out or excluded from
-your group of friends, twitch, or just can't do it, consider whether you're a
-serious addict.
-
-Can you even still define your circle of friends? Do they respond to other
-contact?
-
-With that, I'll archive the figure of speech I've been known to use
-occasionally: "how should I know what I think if I haven't yet heard what I
-said."
-
-Instead, I'll think about the difference between firefighters with hoses, and
-a group of people trying to put out a fire with water pistols.
-
-NP: [Sola Rosa](http://www.allmusic.com/cg/amg.dll?SQL=Sola%20Rosa&P=amg&OPT1=1): *Get It Together*
diff --git a/blog/2010.02.06:of-waterfalls-and-communication-culture.mdwn b/blog/2010.02.06:of-waterfalls-and-communication-culture.mdwn
new file mode 100644
index 0000000..a4363ba
--- /dev/null
+++ b/blog/2010.02.06:of-waterfalls-and-communication-culture.mdwn
@@ -0,0 +1,89 @@
+[[!meta  title="Waterfalls aren't bad at all"]]
+[[!tag  blog planet-lca planet-debian twitter identica microblogging satire
+software-development communication programming draft]]
+
+I got involved with open-source software before I learnt about software
+development in a university course. Naturally, when my profs tried to teach
+the [[!wikipedia  waterfall model]] to me, I couldn't take them too seriously
+back then. After all, requirements specification → design → implementation →
+verification → maintenance is not really in line with the principle to
+[[!wikipedia  release early, release often]]. Furthermore, since water cannot
+flow uphill, the waterfall model fails to represent development cycles, as
+they naturally appear, even in behemoth, ancient software nightmares.
+
+And yet, when embarking on a new project, I do tend to find myself first
+thinking about the big picture, instead of churning out the code. I am
+certainly not the best coder out there, and it might well be that I could
+benefit from learning to break down problems to get an earlier start on the
+implementation of components.
+
+However, I maintain that avoiding the waterfalls and engaging directly in
+[[!wikipedia  extreme programming]], [[!wikipedia  agile software development]],
+or [[!wikipedia  desc="pair-based approaches" pair programming]] right away is
+*not* the answer.
+
+Rather, the best approach should probably involve a certain level of
+conceptualisation before code is produced. I am a big fan of [[!wikipedia 
+test-driven development]], and I like the [[!wikipedia  desc="scrum method"
+Scrum (development)]] for the very reason that it involves talking and
+challenging ideas (although I wouldn't follow the method down to the book).
+
+I like to think about trickles in the mountains where water droplets joyfully
+jump around.
+
+\* \* \*
+
+When [Glyn Moody](http://opendotdotdot.blogspot.com/) spoke in his [LCA2010
+keynote](http://www.lca2010.org.nz/programme/keynotes#GlynMoody) about
+challenges we (as in society) face, and how open-source seems to have many
+answers, he dropped the following gem, which spoke right to my heart:
+
+    Twitter is the "release early, release often" principle applied to
+    thinking.
+
+By this simile, journal articles are produced according to the waterfall
+model. This may well be why they are usually outdated at the time of
+publication. [[!wikipedia  Microblogging]] (like Twitter), on the other hand,
+is primarily used to publish stuff before it's ready, and which would never be
+published otherwise.
+
+With journals on one end, and microblogging on the other, I think the epiphany
+is found in between — as with software development: [[!wikipedia  web logs]] —
+web applications that allow for easy publishing by anyone (which is a
+different problem not to be discussed here).
+
+Since articles on those platforms usually have at least a title and a body,
+they require just a little bit more thought than 140 characters of contracted
+brain farts, spilled into the world faster than it takes one to stand up,
+stretch, and sit down again.
+
+\* \* \*
+
+Microblogging seems to be in line with where we're heading: more information,
+more self-promotion, more access to more people, and all that with lower
+barriers of entry. It's hard to argue against a trend, but I think we've taken
+a wrong turn somewhere.
+
+The one specific instance of content is no longer relevant, and there is no
+more time in the day to read elaborate treatments of subject matters. Instead,
+what seems to prevail is a constant flow. This flow threatens to replace
+actual thinking and discourse, both of which require reflection and time — a
+scarce resource used up by ever new, fast-flowing media.
+
+It seems to me that those who immersed in this flow are unable to get out, as
+if sucked in by a maelstrom. I've seen people enter serious withdrawal within
+hours of not knowing what's going on in the world. One could miss out on
+*something*.
+
+If you're "following" people on one of those microblogging platforms, I
+challenge you to spend the weekend offline and when the urge hits, ask
+yourself what you are actually missing. I mean what you are *really missing*,
+and by that I mean anything other than the cozy buzz and hum of entertainment
+washed upon you, preventing you from having to think about what you could
+be (actively) doing instead.
+
+I hope it's not a lot. For else, I fear that this means that future
+generations will be stuck with this communication culture, just like water
+droplets can't ever play in the mountain trickle again.
+
+NP: [Sola Rosa](http://www.allmusic.com/cg/amg.dll?SQL=Sola%20Rosa&P=amg&OPT1=1): *Get It Together*