diff --git a/blog/entry/web_minimalism/comment_5_f93d7fa906b1f7c52cb732922217b28e._comment b/blog/entry/web_minimalism/comment_5_f93d7fa906b1f7c52cb732922217b28e._comment
new file mode 100644
index 0000000..98615bd
--- /dev/null
+++ b/blog/entry/web_minimalism/comment_5_f93d7fa906b1f7c52cb732922217b28e._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://hendry.iki.fi/"
+ subject="I'm with you"
+ date="2010-03-11T21:08:17Z"
+ content="""
+I am a huge fan of minimalism and [suck less](http://suckless.org/) design, though most people complain about how crap [my](http://webconverger.com/) [sites](http://natalian.org) look. :)
+
+"""]]

diff --git a/blog/entry/adieu_google/comment_17_dba2337becd1beaaaf102414cd1c5e9e._comment b/blog/entry/adieu_google/comment_17_dba2337becd1beaaaf102414cd1c5e9e._comment
deleted file mode 100644
index b0a19e5..0000000
--- a/blog/entry/adieu_google/comment_17_dba2337becd1beaaaf102414cd1c5e9e._comment
+++ /dev/null
@@ -1,7 +0,0 @@
-[[!comment format=mdwn
- username="http://matt33.myopenid.com/"
- subject="comment 17"
- date="2010-03-11T05:57:19Z"
- content="""
-I'm currently using the python-xgoogle library to do google searches from a machine that has many users. This way I don't need to configure all my machines and browsers to disable cookies/javascript for google.com -- <a href=\"http://www.actual-exams.com/70-640-practice-exam.htm\">70-640 latest dumps</a> I can just use my own UI that uses python-xgoogle for the actual searches. Unfortunately this probably breaks the TOS of www.google.com.
-"""]]

diff --git a/blog/entry/adieu_google/comment_17_dba2337becd1beaaaf102414cd1c5e9e._comment b/blog/entry/adieu_google/comment_17_dba2337becd1beaaaf102414cd1c5e9e._comment
new file mode 100644
index 0000000..b0a19e5
--- /dev/null
+++ b/blog/entry/adieu_google/comment_17_dba2337becd1beaaaf102414cd1c5e9e._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="http://matt33.myopenid.com/"
+ subject="comment 17"
+ date="2010-03-11T05:57:19Z"
+ content="""
+I'm currently using the python-xgoogle library to do google searches from a machine that has many users. This way I don't need to configure all my machines and browsers to disable cookies/javascript for google.com -- <a href=\"http://www.actual-exams.com/70-640-practice-exam.htm\">70-640 latest dumps</a> I can just use my own UI that uses python-xgoogle for the actual searches. Unfortunately this probably breaks the TOS of www.google.com.
+"""]]

diff --git a/blog/entry/aloha_btrfs/comment_3_d416e1c642120e7bebb24d8570055a54._comment b/blog/entry/aloha_btrfs/comment_3_d416e1c642120e7bebb24d8570055a54._comment
new file mode 100644
index 0000000..105296d
--- /dev/null
+++ b/blog/entry/aloha_btrfs/comment_3_d416e1c642120e7bebb24d8570055a54._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="http://csights.myopenid.com/"
+ subject="verifying btrfs"
+ date="2010-03-10T16:38:13Z"
+ content="""
+Is it possible to set up some kind of partition replication where there are two partitions, one formatted with btrfs and the other formatted with a \"trusted\" format.  Then everything written is written to both partitions.  If one has any question about the validity of btrfs, one could check against the \"trusted\" format.  Or periodically check to see if the data is identical on both partitions.
+"""]]

diff --git a/blog/entry/aloha_btrfs/comment_2_deea3c2450906b1ae60291fd912f1010._comment b/blog/entry/aloha_btrfs/comment_2_deea3c2450906b1ae60291fd912f1010._comment
new file mode 100644
index 0000000..52f3d1e
--- /dev/null
+++ b/blog/entry/aloha_btrfs/comment_2_deea3c2450906b1ae60291fd912f1010._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="http://joey.kitenet.net/"
+ subject="comment 2"
+ date="2010-03-09T21:47:26Z"
+ content="""
+no, the hundreds of missing md5sums files were of packages that properly include them, such as my own package of debhelper
+"""]]

diff --git a/blog/entry/aloha_btrfs/comment_1_5a799446094a58b1da8964fda89568b9._comment b/blog/entry/aloha_btrfs/comment_1_5a799446094a58b1da8964fda89568b9._comment
new file mode 100644
index 0000000..a547958
--- /dev/null
+++ b/blog/entry/aloha_btrfs/comment_1_5a799446094a58b1da8964fda89568b9._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="http://gedmin.as/"
+ subject="Missing md5sums files"
+ date="2010-03-09T21:30:45Z"
+ content="""
+It's not mandatory for packages to ship with md5sums files, so many of them don't.  This is quite normal.  The manual page for debsums even provides an example of how to configure an apt post-install hook to generate the missing md5sums files on the fly.
+"""]]

diff --git a/blog/entry/aloha_btrfs.mdwn b/blog/entry/aloha_btrfs.mdwn
new file mode 100644
index 0000000..24f9d12
--- /dev/null
+++ b/blog/entry/aloha_btrfs.mdwn
@@ -0,0 +1,43 @@
+Last month I converted my laptop to btrfs to get some experience using this
+new, still experimental file system. The bugs tell the story:
+
+* [#567065: initramfs-tools: avoid mount -t unknown](http://bugs.debian.org/567065)  
+  I provided a patch which has been accepted. The underlying
+  bug in klibc still remains to be fixed
+  ([#548047](http://bugs.debian.org/548047)).
+* [#540786: update-grub doesn't work with root fs on btrfs](http://bugs.debian.org/540786)  
+  There are patches, but not acceptably clean ones. (For values
+  of "acceptably clean" that are somehow more important than "it boots",
+  anyway.)
+
+At this point I had a booting, working btrfs system. The bugs seen over
+the next weeks were strange:
+
+* [#567135: python-dbus went missing from python-support directory on upgrade](http://bugs.debian.org/567135)  
+  Was the filesystem losing information? Maybe.
+* [#569058: dbus: helper not setuid; breaks gnome-power-manager](http://bugs.debian.org/569058)  
+  Both the package maintainer and I am fairly sure it's not really a bug in
+  the package. And another btrfs user also saw the problem.
+* [#568908: gnome-terminal: uses iceweasel for urls despite gconf being configured to use chromium](http://bugs.debian.org/568908)  
+  Hard to say if btrfs was really involved since I can't point at a file
+  that was wrong.
+
+In the meantime, I did some initial work toward supporting btrfs in
+[[code/d-i]], writing a basic `partman-btrfs`. One of the interesting open
+questions is how best to use subvolumes to split up a single btrfs
+filesystem. If the installer defines the right set of subvolumes, upgrades
+to be rolled back, without also rolling back `/home` and `/srv`. The
+remaining parts needed for d-i to support btrfs are fairly tractable, but
+are waiting until root on btrfs is bootable, and until the filesystem is
+not experimental.
+
+I gave up on the current experiement when I ran `debsums` on my laptop. (So
+that long thread was good for *something*!) It didn't find any corrupt
+files. But it did find a *lot* of md5sums files that were missing. Some of
+the packages with missing md5sums were upgraded just this week, and the
+md5sums files must have gone missing since.
+
+I have not seen anything that I can say with certainty was caused by btrfs,
+and not by some other cause, but since I can't trust the data on this
+laptop now (although git tells me everything in my home directory is
+ok), I'm reinstalling it, and saying aloha to btrfs, for now.

diff --git a/boxen.mdwn b/boxen.mdwn
index 42d6fd0..135ae04 100644
--- a/boxen.mdwn
+++ b/boxen.mdwn
@@ -37,7 +37,7 @@ Mostly birds.
 * [[stork]]
 * [[wren]] {*}
 * [[bluebird]]
-* [[hydra]]
+* [[hydra]] {*}
 * [[box]] {*}
 * [[finch]] {*}
 
diff --git a/sandbox.mdwn b/sandbox.mdwn
index 5e23a6b..c6650ce 100644
--- a/sandbox.mdwn
+++ b/sandbox.mdwn
@@ -1,4 +1,5 @@
+$foo
 Testing 1 2 3!
 [[blog/pics/unicode.png]]
 
-[[!meta title="hi mom"]]
+[[!meta title="$foo{b}"]]

diff --git a/sandbox.mdwn b/sandbox.mdwn
index ede2b26..5e23a6b 100644
--- a/sandbox.mdwn
+++ b/sandbox.mdwn
@@ -1,4 +1,4 @@
 Testing 1 2 3!
 [[blog/pics/unicode.png]]
 
-[[!linkmap pages="link(index)"]]
+[[!meta title="hi mom"]]
diff --git a/who.mdwn b/who.mdwn
deleted file mode 100644
index 0fcc63f..0000000
--- a/who.mdwn
+++ /dev/null
@@ -1,5 +0,0 @@
-hi, this is a template
-
-another line
-
-and, page name is: who!
\ No newline at end of file

diff --git a/code/mpdtoys/news/version_0.18.mdwn b/code/mpdtoys/news/version_0.18.mdwn
deleted file mode 100644
index ff02bba..0000000
--- a/code/mpdtoys/news/version_0.18.mdwn
+++ /dev/null
@@ -1,3 +0,0 @@
-mpdtoys 0.18 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * mprompt: Configure getopt to not ignore case."""]]
\ No newline at end of file
diff --git a/code/mpdtoys/news/version_0.23.mdwn b/code/mpdtoys/news/version_0.23.mdwn
new file mode 100644
index 0000000..52df9fc
--- /dev/null
+++ b/code/mpdtoys/news/version_0.23.mdwn
@@ -0,0 +1,5 @@
+mpdtoys 0.23 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * mplength: New toy to print length of current playlist.
+   * Updated to support change to how conntype is specified in
+     Audio::MPD 1.092950"""]]
\ No newline at end of file

diff --git a/blog/entry/Palm_Pre_privacy/comment_14_3dcc03a23c737eafbbdb5662a8e2da67._comment b/blog/entry/Palm_Pre_privacy/comment_14_3dcc03a23c737eafbbdb5662a8e2da67._comment
deleted file mode 100644
index c1232d4..0000000
--- a/blog/entry/Palm_Pre_privacy/comment_14_3dcc03a23c737eafbbdb5662a8e2da67._comment
+++ /dev/null
@@ -1,7 +0,0 @@
-[[!comment format=mdwn
- username="http://matt34.myopenid.com/"
- subject="comment 14"
- date="2010-03-04T12:21:12Z"
- content="""
-The irrationality of e was proven by Euler in 1737; for the general case, see Hardy and Wright (1979, p. 46). pi^n is irrational for positive integral n. The irrationality of pi itself was proven by Lambert in 1760; for the general case, see Hardy and Wright (1979, p. 47). Apéry's constant zeta(<a href=\"http://www.footcomforts.net/Clarks.html\">clarks shoes</a>) (where zeta(z) is the Riemann zeta function) was proved irrational by Apéry (1979; van der Poorten 1979). In addition, T. Rivoal (2000) recently proved that there are infinitely many integers n such that zeta(2n+1) is irrational. Subsequently, he also showed that at least one of zeta(5), zeta(7), ..., zeta(21) is irrational (Rivoal 2001). 
-"""]]

diff --git a/blog/entry/Palm_Pre_privacy/comment_14_3dcc03a23c737eafbbdb5662a8e2da67._comment b/blog/entry/Palm_Pre_privacy/comment_14_3dcc03a23c737eafbbdb5662a8e2da67._comment
new file mode 100644
index 0000000..c1232d4
--- /dev/null
+++ b/blog/entry/Palm_Pre_privacy/comment_14_3dcc03a23c737eafbbdb5662a8e2da67._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="http://matt34.myopenid.com/"
+ subject="comment 14"
+ date="2010-03-04T12:21:12Z"
+ content="""
+The irrationality of e was proven by Euler in 1737; for the general case, see Hardy and Wright (1979, p. 46). pi^n is irrational for positive integral n. The irrationality of pi itself was proven by Lambert in 1760; for the general case, see Hardy and Wright (1979, p. 47). Apéry's constant zeta(<a href=\"http://www.footcomforts.net/Clarks.html\">clarks shoes</a>) (where zeta(z) is the Riemann zeta function) was proved irrational by Apéry (1979; van der Poorten 1979). In addition, T. Rivoal (2000) recently proved that there are infinitely many integers n such that zeta(2n+1) is irrational. Subsequently, he also showed that at least one of zeta(5), zeta(7), ..., zeta(21) is irrational (Rivoal 2001). 
+"""]]

diff --git a/blog/entry/unix_tools_vidir/comment_1_c5e0c8d62150b0904ea2f890bb6b31d4._comment b/blog/entry/unix_tools_vidir/comment_1_c5e0c8d62150b0904ea2f890bb6b31d4._comment
new file mode 100644
index 0000000..b5bcb90
--- /dev/null
+++ b/blog/entry/unix_tools_vidir/comment_1_c5e0c8d62150b0904ea2f890bb6b31d4._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawndaPGC9zqalwKv8ohuydZYIu2GLp11mAc"
+ subject="You can use vidir recursively"
+ date="2010-03-03T19:25:09Z"
+ content="""
+Vidir support the recursive mode, it even does better than that: it lets find do it:
+> find . -type f | vidir -
+
+So you can do a:
+> find . -iname *.mp3 -ctime +1 -size +2000000 | vidir -
+
+"""]]

diff --git a/grep.mdwn b/grep.mdwn
index 46c8bae..31d10c8 100644
--- a/grep.mdwn
+++ b/grep.mdwn
@@ -9,7 +9,7 @@ List of feeds:
 
 * [[!aggregate expirecount=25 name="music" feedurl="http://alpha.libre.fm/rdf.php?fmt=rss&page=%2Fuser%2Fjoeyhess%2Frecent-tracks" url="http://alpha.libre.fm/user/joeyhess"]]
 * [[!aggregate expirecount=25 name="commits" feedurl="http://cia.navi.cx/stats/author/joeyh/.rss" url="http://cia.navi.cx/stats/author/joeyh"]]
-* [[!aggregate expirecount=25 name="identi.ca posts" feedurl="http://identi.ca/api/statuses/user_timeline/joeyh.atom" url="http://identi.ca/joeyh"]]
+* [[!aggregate expirecount=25 name="identi.ca posts" feedurl="http://identi.ca/api/statuses/user_timeline/14601.rss" url="http://identi.ca/joeyh"]]
 * [[!aggregate expirecount=25 name="identi.ca replies" feedurl="http://identi.ca/joeyh/replies/rss" url="http://identi.ca/joeyh/replies"]]
 * [[!aggregate expirecount=25 name="yelp reviews" feedurl="http://www.yelp.com/syndicate/user/BHBcdcStT9PCHBJpJPgXXg/rss.xml" url="http://joeyh.yelp.com"]]
 * [[!aggregate expirecount=25 name="books" feedurl="http://www.goodreads.com/review/list_rss/2159448?key=afd7e8432b3f9e33edab442a7c94e95849af4527&shelf=currently-reading" url="http://www.goodreads.com/user/show/2159448"]]

diff --git a/code/moreutils/news/version_0.34.mdwn b/code/moreutils/news/version_0.34.mdwn
deleted file mode 100644
index 28fc280..0000000
--- a/code/moreutils/news/version_0.34.mdwn
+++ /dev/null
@@ -1,4 +0,0 @@
-moreutils 0.34 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * vipe: Avoid dying on empty input. Thanks, Anders Kaseorg
-     Closes: #[508491](http://bugs.debian.org/508491)"""]]
\ No newline at end of file
diff --git a/code/moreutils/news/version_0.39.mdwn b/code/moreutils/news/version_0.39.mdwn
new file mode 100644
index 0000000..2e84f1e
--- /dev/null
+++ b/code/moreutils/news/version_0.39.mdwn
@@ -0,0 +1,10 @@
+moreutils 0.39 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * parallel: Fix exit code handling when commands are specified after --
+   * parallel: Make -j 0 do something reasonable (start all jobs at once).
+   * parallel: Fix to really avoid running new jobs when load is too high.
+   * parallel: Fix logic error in code handling -l that could make parallel
+     return a bogus 255 exit code when all jobs succeeded. Closes: #[569617](http://bugs.debian.org/569617)
+   * parallel: Allow a decimal load value to be specified with -l
+   * Caps sillyness. Closes: #[570815](http://bugs.debian.org/570815)
+   * zrun: Add support for .xz files."""]]
\ No newline at end of file

diff --git a/sandbox/foo.mdwn b/sandbox/foo.mdwn
new file mode 100644
index 0000000..257cc56
--- /dev/null
+++ b/sandbox/foo.mdwn
@@ -0,0 +1 @@
+foo

diff --git a/code/debhelper/news/version_7.4.10.mdwn b/code/debhelper/news/version_7.4.10.mdwn
deleted file mode 100644
index 540b51b..0000000
--- a/code/debhelper/news/version_7.4.10.mdwn
+++ /dev/null
@@ -1,7 +0,0 @@
-debhelper 7.4.10 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * Add --parallel option that can be used to enable parallel building
-     without limiting the max number of parallel jobs. (Modestas Vainius)
-   * dh\_makeshlibs: Temporarily revert fix for #557603, as it caused
-     dpkg-gensymbols to see libraries not in the regular search path and
-     broke builds. This will be re-enabled in v8. Closes: #[560217](http://bugs.debian.org/560217)"""]]
\ No newline at end of file
diff --git a/code/debhelper/news/version_7.4.15.mdwn b/code/debhelper/news/version_7.4.15.mdwn
new file mode 100644
index 0000000..adc52ad
--- /dev/null
+++ b/code/debhelper/news/version_7.4.15.mdwn
@@ -0,0 +1,5 @@
+debhelper 7.4.15 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * The fix for #563557 caused some new trouble involving makefile
+     that misbehave when stderr is closed. Reopen it to /dev/null
+     when testing for the existance of a makefile target. Closes: #[570443](http://bugs.debian.org/570443)"""]]
\ No newline at end of file

diff --git a/code/etckeeper/news/version_0.38.mdwn b/code/etckeeper/news/version_0.38.mdwn
deleted file mode 100644
index 26324af..0000000
--- a/code/etckeeper/news/version_0.38.mdwn
+++ /dev/null
@@ -1,5 +0,0 @@
-etckeeper 0.38 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * Use hostname if hostname -f fails. Closes: #[533295](http://bugs.debian.org/533295)
-   * Automatically commit on initial install, so users can
-     begin relying on etckeeper right away. Closes: #[533290](http://bugs.debian.org/533290)"""]]
\ No newline at end of file
diff --git a/code/etckeeper/news/version_0.43.mdwn b/code/etckeeper/news/version_0.43.mdwn
new file mode 100644
index 0000000..a4db971
--- /dev/null
+++ b/code/etckeeper/news/version_0.43.mdwn
@@ -0,0 +1,13 @@
+etckeeper 0.43 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * Fix cleanup of /var/cache/etckeeper/packagelist.pre-install after
+     an upgrade where no conffiles are changed.
+   * Prevent cron job autocommit from happening if pre-install file
+     is present, to avoid committing state in the middle of an apt run.
+     Closes: #[567538](http://bugs.debian.org/567538)
+   * Add /etc/webmin/webmin/oscache to ignore list. Closes: #[567255](http://bugs.debian.org/567255)
+   * Check owner of tty to determine who has su'd to root when committing,
+     based on a patch by Jakov Sosic.
+   * Add apparmor.d/cache/ to default ignores.
+   * Record real committer username in the darcs log, so that the man page
+     can say that for every VCS the username is recorded."""]]
\ No newline at end of file

diff --git a/blog/entry/issues_with_openmicroblogging/comment_3_65dfe915cac9008f4b7b3377269461e2._comment b/blog/entry/issues_with_openmicroblogging/comment_3_65dfe915cac9008f4b7b3377269461e2._comment
deleted file mode 100644
index fa7c25c..0000000
--- a/blog/entry/issues_with_openmicroblogging/comment_3_65dfe915cac9008f4b7b3377269461e2._comment
+++ /dev/null
@@ -1,10 +0,0 @@
-[[!comment format=mdwn
- username="http://william-smith.myopenid.com/"
- subject="comment 3"
- date="2010-02-18T06:58:34Z"
- content="""
-We didn't know it at the time, but that was a subtle part of the early appeal of the web circa 1994. The minimalism sucked you in, it made the web feel like one coherent, unified thing, unlike the constellation of corporate edifices occupying much of it today.In Craigslist, early Google, somewhat in Wikipedia, I see echos of that minimalism, filtered through all the ways that have emerged to enhance, and pollute the original vision of the web.
---------------------------------
-<a href=\"http://www.itilprepare.com\">itil exam</a>
-
-"""]]

diff --git a/blog/entry/issues_with_openmicroblogging/comment_3_65dfe915cac9008f4b7b3377269461e2._comment b/blog/entry/issues_with_openmicroblogging/comment_3_65dfe915cac9008f4b7b3377269461e2._comment
new file mode 100644
index 0000000..fa7c25c
--- /dev/null
+++ b/blog/entry/issues_with_openmicroblogging/comment_3_65dfe915cac9008f4b7b3377269461e2._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="http://william-smith.myopenid.com/"
+ subject="comment 3"
+ date="2010-02-18T06:58:34Z"
+ content="""
+We didn't know it at the time, but that was a subtle part of the early appeal of the web circa 1994. The minimalism sucked you in, it made the web feel like one coherent, unified thing, unlike the constellation of corporate edifices occupying much of it today.In Craigslist, early Google, somewhat in Wikipedia, I see echos of that minimalism, filtered through all the ways that have emerged to enhance, and pollute the original vision of the web.
+--------------------------------
+<a href=\"http://www.itilprepare.com\">itil exam</a>
+
+"""]]

diff --git a/code/debhelper/news/version_7.4.14.mdwn b/code/debhelper/news/version_7.4.14.mdwn
new file mode 100644
index 0000000..0c272f9
--- /dev/null
+++ b/code/debhelper/news/version_7.4.14.mdwn
@@ -0,0 +1,4 @@
+debhelper 7.4.14 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * dh: Disable option bundling to avoid mis-parsing bundled options such
+     as "-Bpython-support". Closes: #[570039](http://bugs.debian.org/570039)"""]]
\ No newline at end of file
diff --git a/code/debhelper/news/version_7.4.9.mdwn b/code/debhelper/news/version_7.4.9.mdwn
deleted file mode 100644
index b6da68d..0000000
--- a/code/debhelper/news/version_7.4.9.mdwn
+++ /dev/null
@@ -1,5 +0,0 @@
-debhelper 7.4.9 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * Typo. Closes: #[558654](http://bugs.debian.org/558654)
-   * dh\_installinit: Fix installation of defaults file when an upstart job is
-     installed. Closes: #[558782](http://bugs.debian.org/558782)"""]]
\ No newline at end of file

diff --git a/blog/entry/web_minimalism/comment_4_ca19ad175697506b7e3f52e4e5dcb4ae._comment b/blog/entry/web_minimalism/comment_4_ca19ad175697506b7e3f52e4e5dcb4ae._comment
new file mode 100644
index 0000000..f7ef69b
--- /dev/null
+++ b/blog/entry/web_minimalism/comment_4_ca19ad175697506b7e3f52e4e5dcb4ae._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="http://madduck.net/"
+ subject="comment 4"
+ date="2010-02-15T23:18:47Z"
+ content="""
+I have give-back-the-web.org and would be happy to put it to use.
+
+-- [[madduck]], web 0.9 activist.
+"""]]

diff --git a/blog/entry/web_minimalism/comment_3_c90de5268e21b93f31ce9c88f08841b0._comment b/blog/entry/web_minimalism/comment_3_c90de5268e21b93f31ce9c88f08841b0._comment
new file mode 100644
index 0000000..073255b
--- /dev/null
+++ b/blog/entry/web_minimalism/comment_3_c90de5268e21b93f31ce9c88f08841b0._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="http://jmtd.livejournal.com/"
+ subject="comment 3"
+ date="2010-02-15T10:29:33Z"
+ content="""
+Whilst I agree more with you than the way the Wired article went, I don't agree that \"Black and white text, that goes all the way across the screen, is readable on any screen, and scrolls all the way down to the end of the document\" is good. For some time now I've been hesitating to propose some style tweaks to the default ikiwiki stylesheet, and I think this is why I was dithering :) -- Jon
+"""]]

diff --git a/blog/entry/web_minimalism/comment_2_c0f057a6ad8d00cf5675e4cdce2469c1._comment b/blog/entry/web_minimalism/comment_2_c0f057a6ad8d00cf5675e4cdce2469c1._comment
new file mode 100644
index 0000000..a593111
--- /dev/null
+++ b/blog/entry/web_minimalism/comment_2_c0f057a6ad8d00cf5675e4cdce2469c1._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="http://1.0ne.org/11/5/openid"
+ subject="KISS the Web"
+ date="2010-02-14T04:47:25Z"
+ content="""
+Amen, Brother!
+"""]]

diff --git a/blog/entry/web_minimalism/comment_1_d4d1f1d15a8e18a421f8e8d15750f70f._comment b/blog/entry/web_minimalism/comment_1_d4d1f1d15a8e18a421f8e8d15750f70f._comment
new file mode 100644
index 0000000..91ca6ca
--- /dev/null
+++ b/blog/entry/web_minimalism/comment_1_d4d1f1d15a8e18a421f8e8d15750f70f._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="http://bugmenot3.myopenid.com/"
+ subject="Dear Santa"
+ date="2010-02-13T23:20:21Z"
+ content="""
+I hate CSS/JavaScript. Please back the Web 0.1 days.
+"""]]

diff --git a/blog/entry/web_minimalism.mdwn b/blog/entry/web_minimalism.mdwn
index 5c3056a..fb43be3 100644
--- a/blog/entry/web_minimalism.mdwn
+++ b/blog/entry/web_minimalism.mdwn
@@ -1,6 +1,6 @@
 After Wired attempted to 
 [redesign Craigslist](http://www.wired.com/entertainment/theweb/magazine/17-09/ff_craigslist_makeover),
-(with predictably abdominal results) a
+(with predictably bad results) a
 [opinion piece (paywalled)](http://online.wsj.com/article/SB10001424052748703808904575025032326755678.html)
 in the WSJ suggests that Craigslist's look is what users really want.
 

diff --git a/blog/entry/web_minimalism.mdwn b/blog/entry/web_minimalism.mdwn
new file mode 100644
index 0000000..5c3056a
--- /dev/null
+++ b/blog/entry/web_minimalism.mdwn
@@ -0,0 +1,33 @@
+After Wired attempted to 
+[redesign Craigslist](http://www.wired.com/entertainment/theweb/magazine/17-09/ff_craigslist_makeover),
+(with predictably abdominal results) a
+[opinion piece (paywalled)](http://online.wsj.com/article/SB10001424052748703808904575025032326755678.html)
+in the WSJ suggests that Craigslist's look is what users really want.
+
+I'd take that a step further...
+
+The original design of HTML 1.1 and its presentation in early web browsers
+gave users what they really wanted. Black and white text, that goes all the
+way across the screen, is readable on any screen, and scrolls all the way down
+to the end of the document. Links. Maybe some images.
+
+No foofaraw of sidebars and mastheads; no bother with zooming to make the
+content part of the page readable, no need to search the cluttered page to
+find the print button so you can read the whole article without clicking 
+"Next" 10 times.
+
+We didn't know it at the time, but that was a subtle part of the early
+appeal of the web circa 1994. The minimalism sucked you in, it made the web
+feel like one coherent, unified thing, unlike the constellation of
+corporate edifices occupying much of it today.
+
+In Craigslist, early Google, somewhat in Wikipedia, I see echos of that
+minimalism, filtered through all the ways that have emerged to enhance, and
+pollute the original vision of the web.
+
+So, how long until a resurgence in web design minimalism?
+
+[[!img pics/snowyurt.jpg align=center]]
+
+PS, It's really no accident, nor is it entirely due to laziness that my
+own site looks like it does.

diff --git a/blog/pics/snowyurt.jpg b/blog/pics/snowyurt.jpg
new file mode 100644
index 0000000..8015386
Binary files /dev/null and b/blog/pics/snowyurt.jpg differ

diff --git a/blog/entry/issues_with_openmicroblogging/comment_2_e21ce33ffa03375542c32c14d0f9b7fc._comment b/blog/entry/issues_with_openmicroblogging/comment_2_e21ce33ffa03375542c32c14d0f9b7fc._comment
new file mode 100644
index 0000000..c755474
--- /dev/null
+++ b/blog/entry/issues_with_openmicroblogging/comment_2_e21ce33ffa03375542c32c14d0f9b7fc._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="http://samat.org/"
+ subject="Facebook's limit is 420 characters"
+ date="2010-02-11T05:46:22Z"
+ content="""
+AFAIK Facebook's status message limit is 420 characters.
+
+...which is long enough that it rarely is a limit for anyone.
+"""]]

diff --git a/blog/entry/money.mdwn b/blog/entry/money.mdwn
index 88c664b..968c821 100644
--- a/blog/entry/money.mdwn
+++ b/blog/entry/money.mdwn
@@ -14,8 +14,7 @@ test, to see if it annoys anyone, and if anyone bothers clicking on it.
 
 I chose <a href="http://kitenet.net/programs/alien">alien</a> since it's
 well known, regularly used by a
-<a href="http://people.debian.org/~igloo/popcon-graphs/index.php?packages=alien&show_installed=on&show_vote=on&want_legend=on&beenhere=1">suprisingly
-large number of people</a> and even appears on the first page of otherwise
+large number of people and even appears on the first page of otherwise
 quite amusing results on a google search for "alien". (I suppose that adding
 google ads to the page would generate more money, but in a probably less
 interesting way.)
diff --git a/code.mdwn b/code.mdwn
index 56854af..5dd4048 100644
--- a/code.mdwn
+++ b/code.mdwn
@@ -10,8 +10,6 @@ The stuff that's swapped into my local cache at the moment.
 [[debian-installer]]
 [[debhelper]]
 [[moreutils]]
-[[nslu2-utils]]
-[[jetring]]
 [[pristine-tar]]
 [[mr]]
 [[etckeeper]]
@@ -34,6 +32,8 @@ have my hands in it somewhat.
 [[os-prober]]
 [[devscripts]]
 [[rootsync]]
+[[nslu2-utils]]
+[[jetring]]
 
 ## Past projects
 
@@ -73,10 +73,10 @@ for interesting metrics.
 [Google code](http://www.google.com/codesearch?as_q=joeyh%7Cjoey+hess&btnG=Search+Code&as_lang=&as_license_restrict=i&as_license=&as_package=&as_filename=&as_case=)
 finds lots of other code that I've written.
 
-[Here](http://people.debian.org/~igloo/popcon-graphs/graph.php?packages=etckeeper+mr+pristine-tar&show_installed=1&want_percent=0&want_legend=1&want_ticks=1&from_date=&to_date=&hlght_date=&date_fmt=%25Y-%25m)
+[Here](http://qa.debian.org/popcon-graph.php?packages=etckeeper+mr+pristine-tar+ikiwiki+mpdtoys&show_installed=on&want_legend=on&want_ticks=on&from_date=&to_date=&hlght_date=&date_fmt=%25Y-%25m&beenhere=1)
 is a graph of Debian popcon stats for my newest projects.
-[Here](http://people.debian.org/~igloo/popcon-graphs/graph.php?packages=nslu2-utils+jetring+moreutils+dpkg-repack+wmbattery+sleepd+filters+satutils+ticker+flashybrid&show_installed=1&want_percent=0&want_legend=1&want_ticks=1&from_date=&to_date=&hlght_date=&date_fmt=%25Y-%25m)
+[Here](http://qa.debian.org/popcon-graph.php?packages=nslu2-utils+lingua-en-words2nums-perl+jetring+moreutils+dpkg-repack+wmbattery+sleepd+filters+satutils+ticker+flashybrid&show_installed=on&want_legend=on&want_ticks=on&from_date=&to_date=&hlght_date=&date_fmt=%25Y-%25m&beenhere=1)
 is a graph for my older, more-established projects, and
-[here](http://people.debian.org/~igloo/popcon-graphs/graph.php?packages=alien+debhelper+debconf+tasksel&show_installed=1&want_percent=0&want_legend=1&want_ticks=1&from_date=&to_date=&hlght_date=&date_fmt=%25Y-%25m)
+[here](http://qa.debian.org/popcon-graph.php?packages=alien+debhelper+debconf+tasksel+os-prober&show_installed=on&want_legend=on&want_ticks=on&from_date=&to_date=&hlght_date=&date_fmt=%25Y-%25m&beenhere=1)
 is a graph for my most popular projects. I assume popcon only reflects 1/10th
 to 1/100th or less of total users.
diff --git a/code/alien.mdwn b/code/alien.mdwn
index bc15a13..a5a218d 100644
--- a/code/alien.mdwn
+++ b/code/alien.mdwn
@@ -52,6 +52,3 @@ I've blogged a few times about alien.
 examines who I think is using alien now, and 
 [[this_post|blog/entry/ten_years_of_free_software_--_part_4_alien]] gives
 some historical background.
-
-Also of interest is my [feature comparison](/~joey/pkg-comp/) of
-the package formats alien supports.

diff --git a/grep.mdwn b/grep.mdwn
index cdc2926..46c8bae 100644
--- a/grep.mdwn
+++ b/grep.mdwn
@@ -13,3 +13,4 @@ List of feeds:
 * [[!aggregate expirecount=25 name="identi.ca replies" feedurl="http://identi.ca/joeyh/replies/rss" url="http://identi.ca/joeyh/replies"]]
 * [[!aggregate expirecount=25 name="yelp reviews" feedurl="http://www.yelp.com/syndicate/user/BHBcdcStT9PCHBJpJPgXXg/rss.xml" url="http://joeyh.yelp.com"]]
 * [[!aggregate expirecount=25 name="books" feedurl="http://www.goodreads.com/review/list_rss/2159448?key=afd7e8432b3f9e33edab442a7c94e95849af4527&shelf=currently-reading" url="http://www.goodreads.com/user/show/2159448"]]
+* [[!aggregate expirecount=25 name="google" feedurl="""http://blogsearch.google.com/blogsearch_feeds?hl=en&c2coff=1&scoring=d&as_drrb=q&as_qdr=a&q=joey.kitenet.net+OR+joey@kitenet.net+OR+joeyh@debian.org+OR+"joey+hess"+OR+kitenet.net/~joey&ie=utf-8&num=10&output=rss""" url="http://blogsearch.google.com/"]]

diff --git a/code/etckeeper/discussion.mdwn b/code/etckeeper/discussion.mdwn
index 631f3dd..03abc7b 100644
--- a/code/etckeeper/discussion.mdwn
+++ b/code/etckeeper/discussion.mdwn
@@ -39,7 +39,7 @@ The idea of managing config files from remote computers sounds interesting to me
 
 Hi.
 
-After using for couple of months my own template system for maintaining and distributing between servers config files I decided to seek for a better solution (my scripts have many limitations, I'd like rather to improve some other tool, then my SVN-basing scripts). etckeeper looks quite nice, I'm just wondering if it would be possible to use it for tracking other directories too - some scripts installed in /usr/local/bin, some configs of out-of-distro applications located in /opt or /srv etc. Actually, what about setting up a repository in / directory and configuring .gitignore to ignore all but some explicit specified dirs? Am I asking for trouble?
+After using for couple of months my own template system for maintaining and distributing config files I decided to seek for a better solution (my scripts have many limitations, I'd like rather to improve some other tool, then my SVN-basing scripts). etckeeper looks quite nice, I'm just wondering if it would be possible to use it for tracking other directories too - some scripts installed in /usr/local/bin, some configs of out-of-distro applications located in /opt or /srv etc. Actually, what about setting up a repository in / directory and configuring .gitignore to ignore all but some explicit specified dirs? Am I asking for trouble?
 Maybe it would make sense to create a repository by default in /, put into ignore file by default
 
 *

diff --git a/code/moreutils/news/version_0.33.mdwn b/code/moreutils/news/version_0.33.mdwn
deleted file mode 100644
index beee4ea..0000000
--- a/code/moreutils/news/version_0.33.mdwn
+++ /dev/null
@@ -1,4 +0,0 @@
-moreutils 0.33 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * Support installing moreutils into prefixes other than /usr (Evan Broder)
-   * Fix zrun breakage introduced last version. Closes: #[504129](http://bugs.debian.org/504129)"""]]
\ No newline at end of file
diff --git a/code/moreutils/news/version_0.38.mdwn b/code/moreutils/news/version_0.38.mdwn
new file mode 100644
index 0000000..6b43e31
--- /dev/null
+++ b/code/moreutils/news/version_0.38.mdwn
@@ -0,0 +1,11 @@
+moreutils 0.38 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * Description improvements. Closes: #[549450](http://bugs.debian.org/549450)
+     (Thanks, Justin B Rye)
+   * parallel: Allow running independent commands,
+     like `parallel -j3 -- ls df "echo hi"`
+   * ifdata: Add FreeBSD kernel support, although some of the more esoteric
+     interface options are not currently supported in FreeBSD.
+   * parallel: Define WEXITED to allow building on FreeBSD kernel.
+   * Thanks Enrico Tassi for the FreeBSD kernel support, which should
+     be enough to get moreutils built on Debian kFreeBSD. Closes: #[562609](http://bugs.debian.org/562609)"""]]
\ No newline at end of file

diff --git a/code/etckeeper/discussion.mdwn b/code/etckeeper/discussion.mdwn
index de721d4..631f3dd 100644
--- a/code/etckeeper/discussion.mdwn
+++ b/code/etckeeper/discussion.mdwn
@@ -33,4 +33,20 @@ Also can you use etckeeper for backing up home directory dotfiles?
 
 The idea of managing config files from remote computers sounds interesting to me. Is it possible to pull and push updates through git without loss of original metadata? Thanks in advance, Chris.
 
-> etckeeper restores the metadata when `etckeeper init` is run. --[[Joey]] 
+> etckeeper restores the metadata when `etckeeper init` is run. --[[Joey]]
+
+==
+
+Hi.
+
+After using for couple of months my own template system for maintaining and distributing between servers config files I decided to seek for a better solution (my scripts have many limitations, I'd like rather to improve some other tool, then my SVN-basing scripts). etckeeper looks quite nice, I'm just wondering if it would be possible to use it for tracking other directories too - some scripts installed in /usr/local/bin, some configs of out-of-distro applications located in /opt or /srv etc. Actually, what about setting up a repository in / directory and configuring .gitignore to ignore all but some explicit specified dirs? Am I asking for trouble?
+Maybe it would make sense to create a repository by default in /, put into ignore file by default
+
+*
+
+!/etc
+
+and then all ignores regarding /etc, thus leaving to the user the choice what else will be tracked?
+
+TIA, Richard.
+

diff --git a/code/words2nums/news/version_0.18.mdwn b/code/words2nums/news/version_0.18.mdwn
new file mode 100644
index 0000000..47948cf
--- /dev/null
+++ b/code/words2nums/news/version_0.18.mdwn
@@ -0,0 +1,3 @@
+liblingua-en-words2nums-perl 0.18 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * Remove the PM\_FILTER to support Windows. (rt.cpan.org #38101)"""]]
\ No newline at end of file

diff --git a/code/mr/news/version_0.43.mdwn b/code/mr/news/version_0.43.mdwn
deleted file mode 100644
index be7e99b..0000000
--- a/code/mr/news/version_0.43.mdwn
+++ /dev/null
@@ -1,9 +0,0 @@
-mr 0.43 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * Set User-Agent to "mr" when downloading the mrconfig file
-     with mr bootstrap. Closes: #[541778](http://bugs.debian.org/541778)
-   * Man page typo. Closes: #[545412](http://bugs.debian.org/545412)
-   * mr bootstrap: Allow a directory to checkout into to be specified,
-     and create it if necessary.
-   * mr bootstrap: If the mrconfig file contains a repository named ".",
-     check it out into the top level of the directory bootstrapped."""]]
\ No newline at end of file
diff --git a/code/mr/news/version_0.48.mdwn b/code/mr/news/version_0.48.mdwn
new file mode 100644
index 0000000..e5e1d90
--- /dev/null
+++ b/code/mr/news/version_0.48.mdwn
@@ -0,0 +1,5 @@
+mr 0.48 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * Fix the hours\_since function built into mr's shell library to
+     not exit, but return a true/false exit status. This allows it to be
+     used outside of skip tests."""]]
\ No newline at end of file

diff --git a/code/mr/news/version_0.42.mdwn b/code/mr/news/version_0.42.mdwn
deleted file mode 100644
index a679b54..0000000
--- a/code/mr/news/version_0.42.mdwn
+++ /dev/null
@@ -1,6 +0,0 @@
-mr 0.42 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * Add support for ~/.mrtrust, which can be used to list trusted mrconfig
-     files. If you create this file, all files not listed in it will be treated
-     as untrusted, and carefully limited in what they can do. This improves
-     security when using mrconfig files provided by others."""]]
\ No newline at end of file
diff --git a/code/mr/news/version_0.47.mdwn b/code/mr/news/version_0.47.mdwn
new file mode 100644
index 0000000..421d603
--- /dev/null
+++ b/code/mr/news/version_0.47.mdwn
@@ -0,0 +1,5 @@
+mr 0.47 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * Pass -L to curl to allow it to follow redirects when bootstrapping.
+     (Pavel Avgustinov)
+   * Allow empty sections to be used in mrconfig files."""]]
\ No newline at end of file

diff --git a/blog/entry/xmonad_layouts_for_netbooks/comment_7_fa8891b876a2a81b9b8f002ecc4c79cd._comment b/blog/entry/xmonad_layouts_for_netbooks/comment_7_fa8891b876a2a81b9b8f002ecc4c79cd._comment
new file mode 100644
index 0000000..46e17db
--- /dev/null
+++ b/blog/entry/xmonad_layouts_for_netbooks/comment_7_fa8891b876a2a81b9b8f002ecc4c79cd._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="http://caffeine.cc/"
+ subject="reading ebooks"
+ date="2010-02-03T15:28:04Z"
+ content="""
+I use Xmonad on an EeePC and love it too.  But just one tip for reading ebooks: you can actually flip your netbook around and use it like a book!
+
+I get acroread running, flip the document 90CCW, and then turn my laptop on its side (so the screen is on the right).  If you then put it into fullscreen mode, you've got a perfect ebook reader.  For bonus points, you can set it so that a left mouse click pages forward and right mouseclick pages backward (when the laptop is turned over, this is top mouse and bottom mouse respectively).  Then it kind of feels like a Kindle..
+"""]]

diff --git a/code/debhelper/news/version_7.4.13.mdwn b/code/debhelper/news/version_7.4.13.mdwn
new file mode 100644
index 0000000..e606a13
--- /dev/null
+++ b/code/debhelper/news/version_7.4.13.mdwn
@@ -0,0 +1,4 @@
+debhelper 7.4.13 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * dh\_compress: Avoid compressing images in /usr/share/info. Closes: #[567586](http://bugs.debian.org/567586)
+   * Fix handling of -O with options specified by commands. Closes: #[568081](http://bugs.debian.org/568081)"""]]
\ No newline at end of file
diff --git a/code/debhelper/news/version_7.4.8.mdwn b/code/debhelper/news/version_7.4.8.mdwn
deleted file mode 100644
index 00a5fb3..0000000
--- a/code/debhelper/news/version_7.4.8.mdwn
+++ /dev/null
@@ -1,8 +0,0 @@
-debhelper 7.4.8 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * Parallel building support is no longer enabled by default. It can still
-     be enabled by using the --max-parallel option. This was necessary because
-     some buildds build with -j2 by default. (See #532805)
-   * dh: Document --no-act. Closes: #[557505](http://bugs.debian.org/557505)
-   * dh\_makeshlibs: Make -X also exclude libraries from the symbols file.
-     Closes: #[557603](http://bugs.debian.org/557603) (Peter Samuelson)"""]]
\ No newline at end of file

diff --git a/blog/entry/xmonad_layouts_for_netbooks/comment_6_a6e4be8ae4e1736d57226e2206ac1817._comment b/blog/entry/xmonad_layouts_for_netbooks/comment_6_a6e4be8ae4e1736d57226e2206ac1817._comment
new file mode 100644
index 0000000..7d955d5
--- /dev/null
+++ b/blog/entry/xmonad_layouts_for_netbooks/comment_6_a6e4be8ae4e1736d57226e2206ac1817._comment
@@ -0,0 +1,34 @@
+[[!comment format=mdwn
+ username="http://mklmklmkl.myopenid.com/"
+ subject="spaces"
+ date="2010-02-02T10:53:29Z"
+ content="""
+I don't like the idea using terminals as spacers. There are at least two ways doing this explicitly. The first is ResizeScreen (I've stripped irrelevent stuff from my config, so the below may or may not compile):
+
+    import XMonad.Layout.ResizeScreen
+    myTabbed = tabbed shrinkText tabTheme
+    layout =
+        onWorkspace \"9\"
+        -- 300 pixels to the left and right
+        ( (resizeHorizontal 300 $ resizeHorizontalRight 300 $ myTabbed)  
+          ||| myTabbed -- full screen
+        )
+        -- Toggle the gaps by switching layouts.
+
+The second way is XMonad.Layout.Gaps, which didn't work nicely with my dual-head setup, but nonetheless:
+
+    import XMonad.Layout.Gaps
+    myTabbed = tabbed shrinkText tabTheme
+    layout screenWidth =
+        onWorkspace \"9\"
+        -- make window 1000 pixels width, depending on screenWidth
+        ( gaps [(L,((screenWidth-1000)`div`2)), (R,((screenWidth-1000)`div`2))]
+              (   noBorders myTabbed
+              ||| Grid
+              )
+    )
+    -- Toggle the gaps by defining keybindings: something like
+    -- ((modMask, xK_m), sendMessage $ ToggleGaps)
+
+Also, for maximizing web browser screen real estate I recommend vimperator.
+"""]]

diff --git a/code/debhelper/news/version_7.4.12.mdwn b/code/debhelper/news/version_7.4.12.mdwn
new file mode 100644
index 0000000..23b16e1
--- /dev/null
+++ b/code/debhelper/news/version_7.4.12.mdwn
@@ -0,0 +1,15 @@
+debhelper 7.4.12 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * dh\_bugfiles: Doc typo. Closes: #[563269](http://bugs.debian.org/563269)
+   * makefile: Support the (asking for trouble) case of MAKE being set to
+     something with a space in it. Closes: #[563557](http://bugs.debian.org/563557)
+   * Fix warning about unknown options passed to commands in override targets.
+   * Add -O option, which can be used to pass options to commands, ignoring
+     options that they do not support.
+   * dh: Use -O to pass user-specified options to the commands it runs.
+     This solves the problem with passing "-Bbuild" to dh, where commands
+     that do not support -B would see a bogus -u option. Closes: #[541773](http://bugs.debian.org/541773)
+     (It also ensures that the commands dh prints out can really be run.)
+   * qmake: New buildsystem contributed by Kel Modderman. Closes: #[566840](http://bugs.debian.org/566840)
+   * Fix typo in call to abs2rel in --builddir sanitize code.
+     Closes: #[567737](http://bugs.debian.org/567737)"""]]
\ No newline at end of file
diff --git a/code/debhelper/news/version_7.4.7.mdwn b/code/debhelper/news/version_7.4.7.mdwn
deleted file mode 100644
index 025cd5d..0000000
--- a/code/debhelper/news/version_7.4.7.mdwn
+++ /dev/null
@@ -1,6 +0,0 @@
-debhelper 7.4.7 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * make: Avoid infinite make recursion that occurrs when testing existence
-     of a target in a certian horribly broken makefile, by making the test stop
-     after it sees one line of output from make. (This may be better replaced
-     with dh's makefile parser in the future.) Closes: #[557307](http://bugs.debian.org/557307)"""]]
\ No newline at end of file

diff --git a/untext.mdwn b/untext.mdwn
index 2d6e5f3..17d8926 100644
--- a/untext.mdwn
+++ b/untext.mdwn
@@ -20,3 +20,4 @@ images.
 * [[!aggregate expireage=7 name="postsecret" feedurl="http://postsecret.blogspot.com/feeds/posts/default" url="http://postsecret.blogspot.com"]]
 * [[!aggregate expireage=7 name="abtruse goose" feedurl="http://feeds.feedburner.com/AbstruseGoose" url="http://abstrusegoose.com/"]]
 * [[!aggregate expireage=7 name="nobody scores" feedurl="http://nobodyscores.loosenutstudio.com/index.php?category=comics&section=comics&rss=1" url="http://nobodyscores.loosenutstudio.com/"]]
+* [[!aggregate expireage=7 name="big fat whale" feedurl="http://blog.bigfatwhale.com/feed/" url="http://www.bigfatwhale.com/"]]

diff --git a/blog/entry/xmonad_layouts_for_netbooks/comment_5_8146d081781bda6ad9de3ac22a324ce4._comment b/blog/entry/xmonad_layouts_for_netbooks/comment_5_8146d081781bda6ad9de3ac22a324ce4._comment
new file mode 100644
index 0000000..674f0bf
--- /dev/null
+++ b/blog/entry/xmonad_layouts_for_netbooks/comment_5_8146d081781bda6ad9de3ac22a324ce4._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="http://joey.kitenet.net/"
+ subject="panel"
+ date="2010-01-29T18:07:09Z"
+ content="""
+@sweisman the panel is just gnome-panel
+"""]]

diff --git a/blog/entry/started_termcasting/comment_2_5c01458943b977ec0f937098ceffe27a._comment b/blog/entry/started_termcasting/comment_2_5c01458943b977ec0f937098ceffe27a._comment
new file mode 100644
index 0000000..5156f2a
--- /dev/null
+++ b/blog/entry/started_termcasting/comment_2_5c01458943b977ec0f937098ceffe27a._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="http://joey.kitenet.net/"
+ subject="comment 2"
+ date="2010-01-29T18:06:26Z"
+ content="""
+I've done several termcasts and the [[termcast]] page links to a feed that I use to announce them. So, see me soon! :)
+"""]]

diff --git a/blog/entry/started_termcasting/comment_1_2d872db305e2b0fd330a1b38ce79cc86._comment b/blog/entry/started_termcasting/comment_1_2d872db305e2b0fd330a1b38ce79cc86._comment
new file mode 100644
index 0000000..e7596f0
--- /dev/null
+++ b/blog/entry/started_termcasting/comment_1_2d872db305e2b0fd330a1b38ce79cc86._comment
@@ -0,0 +1,19 @@
+[[!comment format=mdwn
+ username="http://jcorbier.myopenid.com/"
+ subject="comment 1"
+ date="2010-01-29T14:36:57Z"
+ content="""
+    traceroute to gnu.kitenet.net (2001:4978:f:21a::2), 30 hops max, 40 byte packets
+     1  2a01:e0b:1:24::1 (2a01:e0b:1:24::1)  0.323 ms * *
+     2  th2-crs16-1-be1503-p.intf.routers.proxad.net (2a01:e00:2:6::1)  1.209 ms  1.293 ms  1.291 ms
+     3  2a01:5d8:e000:0:1:403:0:2 (2a01:5d8:e000:0:1:403:0:2)  10.546 ms  10.624 ms  10.691 ms
+     4  2a01:5d8:e000:0:402:403:0:1 (2a01:5d8:e000:0:402:403:0:1)  16.955 ms * *
+     5  ams-ix.he.net (2001:7f8:1::a500:6939:1)  16.966 ms  17.018 ms  17.181 ms
+     6  10g-1-4.core1.lon1.ipv6.he.net (2001:470:0:3f::1)  17.444 ms  16.820 ms  17.002 ms
+     7  10g-2-3.core1.ny4.ipv6.he.net (2001:470:0:3e::1)  91.458 ms  91.373 ms  91.560 ms
+     8  10g-1-2.core1.chi1.ipv6.he.net (2001:470:0:4e::1)  113.327 ms  113.344 ms  113.256 ms
+     9  2001:470:0:7f::2 (2001:470:0:7f::2)  114.795 ms  114.868 ms  114.612 ms
+    10  sixxs.cx01.chi.bb6.your.org (2001:4978:1:400:202:b3ff:feb4:59cb)  114.751 ms !N  114.565 ms !N  114.739 ms !N
+
+Hmpf, dammit, could have been fun to watch :)
+"""]]

diff --git a/blog/entry/xmonad_layouts_for_netbooks/comment_4_3baf9464eca8f83e7771869a52a23fe2._comment b/blog/entry/xmonad_layouts_for_netbooks/comment_4_3baf9464eca8f83e7771869a52a23fe2._comment
new file mode 100644
index 0000000..9822941
--- /dev/null
+++ b/blog/entry/xmonad_layouts_for_netbooks/comment_4_3baf9464eca8f83e7771869a52a23fe2._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="http://sweisman.myopenid.com/"
+ subject="What panel are you using?"
+ date="2010-01-29T12:06:58Z"
+ content="""
+Just curious what panel that is? Can you provide config for it as well?
+"""]]

diff --git a/blog/entry/xmonad_layouts_for_netbooks/comment_3_d804d43109be50098c42911337e326cb._comment b/blog/entry/xmonad_layouts_for_netbooks/comment_3_d804d43109be50098c42911337e326cb._comment
new file mode 100644
index 0000000..4712276
--- /dev/null
+++ b/blog/entry/xmonad_layouts_for_netbooks/comment_3_d804d43109be50098c42911337e326cb._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://vvill.myopenid.com/"
+ subject="when I heard"
+ date="2010-01-29T11:24:46Z"
+ content="""
+When I read that you were using xmonad 6 months to a year ago, I was wondering if I would ever understand how to haskel with it
+and make it do what I like seeing on my desktop...   sidebar: I relate very much to the no locked doors and the sanity of emacs, even though I was not aware it could do that too [...] I added dwm to my list of desktops that I regularly log into, about a year ago, iirc. I have not yet recompiled the source and still use the dwm-xx-debs I get from the debian repos.... I'm not saying dwm is user friendly like gnome or kde, what I am saying is that dwm and uzbl are a tight combination of screen usage... Very much like xmoad seems to be as I look at your examples. I hope to view a termcast very soon too. I've just missed one or two already.
+"""]]

diff --git a/blog/entry/screenshot/comment_1_e1eeb38caa8ea8234611ebf199678cc0._comment b/blog/entry/screenshot/comment_1_e1eeb38caa8ea8234611ebf199678cc0._comment
new file mode 100644
index 0000000..fbb3265
--- /dev/null
+++ b/blog/entry/screenshot/comment_1_e1eeb38caa8ea8234611ebf199678cc0._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="http://vvill.myopenid.com/"
+ subject="running out of room"
+ date="2010-01-29T11:03:49Z"
+ content="""
+looking at the visual, I'm reminded of one of my xsm sessions that has 9 default xterms configured on a 1280x1024 layout with a bit of root window showing between them all..
+"""]]

diff --git a/blog/entry/xmonad_layouts_for_netbooks/comment_2_6e1bca5ace845c396d615fc956e59017._comment b/blog/entry/xmonad_layouts_for_netbooks/comment_2_6e1bca5ace845c396d615fc956e59017._comment
new file mode 100644
index 0000000..2ccf5dd
--- /dev/null
+++ b/blog/entry/xmonad_layouts_for_netbooks/comment_2_6e1bca5ace845c396d615fc956e59017._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="http://claimid.com/ejr"
+ subject="One place where Emacs really shines..."
+ date="2010-01-29T06:16:30Z"
+ content="""
+Your coding desktop could be replaced by a single Emacs session.  While I've fallen away from the tiling WM crew (long story related to living back where door locks don't help much), I have at least one desktop with a full-screen Emacs.  That will be split various ways depending on my tasks.  Shell, ANSI-term, and ssh+directory tracking work wonders when you deal primarily with remote, funky OS development.  Once I have the screen split, it stays the way I want; I've never even set up window registers.
+
+My usage likely is restricted to whatever pattern I've learned, but remote editing and compiling is so ridiculously simple...
+"""]]

diff --git a/blog/entry/xmonad_layouts_for_netbooks/comment_1_caf03299715c5921f11b638b63d4c8a5._comment b/blog/entry/xmonad_layouts_for_netbooks/comment_1_caf03299715c5921f11b638b63d4c8a5._comment
new file mode 100644
index 0000000..166e0ad
--- /dev/null
+++ b/blog/entry/xmonad_layouts_for_netbooks/comment_1_caf03299715c5921f11b638b63d4c8a5._comment
@@ -0,0 +1,16 @@
+[[!comment format=mdwn
+ username="http://thegzeus.myopenid.com/"
+ subject="See Also: Conkeror"
+ date="2010-01-29T05:17:05Z"
+ content="""
+No toolbar, just a mode line and a status bar. Tabs if you want them.
+The main dev is an avid XMonad user (I prefer StumpWM, myself).
+It's in Testing, and there is a daily snapshot archive, as well.
+If you've ever messed with Emacs, the default keybindings are similar, and, like Emacs, customisable to whatever you choose.
+
+Seriously, get your screen real-estate back. Why be almost-elitist? Free yourself from the tyranny of the mouse and run free with us!
+Buy a Kinesis! Start using dark GTK/Qt themes! Live in the shell and/or Emacs!
+
+
+...but in all seriousness, try Conkeror.
+"""]]

diff --git a/blog/entry/xmonad_layouts_for_netbooks.mdwn b/blog/entry/xmonad_layouts_for_netbooks.mdwn
new file mode 100644
index 0000000..55b0ae5
--- /dev/null
+++ b/blog/entry/xmonad_layouts_for_netbooks.mdwn
@@ -0,0 +1,279 @@
+How a window manager with tiling layouts makes a 1024x600 resolution livable.
+
+[[!tag howto screenshot xmonad haskell]]
+[[!img defaults size=380x alt=screenshot]]
+
+I spend a lot of time in front of a screen, and for the past year I have
+used only my netbook. No desktops, no laptops. Just a cheap $200 computer
+that is nearly a kid's toy. The most challenging thing about this is
+dealing with the 1024x600 screen resolution. When I moved to this screen
+from something with many more pixels, it at first seemed very cramped.
+
+After a year, I think that the most important part of coping with the small
+screen is the flexability and customizability of layouts provided by the
+Xmonad window manager. In this post I will explain a few layouts I have
+developed for fitting specific tasks onto the netbook screen.
+
+(I assume that you know maybe 0.1% of Haskell (about what I do),
+and can read Haskell code without having a brain aneurysm.)
+
+[[!toc ]]
+
+### web browsing
+
+[[!template id=note text="""
+It's important that the web browser have as few toolbars and other
+cruft as possible, as horizontal space is especially at a premium. I've
+configured both Epiphany and Firefox to put everything in one tool bar.
+But now I use Chromium, which comes pre-configured that way.
+"""]]
+
+What the netbook is designed for. You just want a web browser, taking up
+the full screen, and with its own tabs. So far, so easy: that's Xmonad's
+`Full` layout.
+
+
+But, you sometimes want to see two websites side-by-side. This layout
+accomplishes that, allowing the sizes to be adjusted as needed. It also
+uses Xmonad's `Magnifier` to zoom the smaller window when it's focused,
+which is useful if you briefly need to see more of a web site.
+
+	mySplit = magnifiercz' 1.4 $ Tall nmaster delta ratio
+	    where
+	        -- The default number of windows in the master pane
+	        nmaster = 1
+	        -- Percent of screen to increment by when resizing panes
+	        delta   = 3/100
+	        -- Default proportion of screen occupied by master pane
+	        ratio   = 60/100
+
+[[!img blog/pics/xmonad_layouts_for_netbooks/web-full.png]]    
+[[!img blog/pics/xmonad_layouts_for_netbooks/web-split.png]]
+
+### web development
+
+If you're doing web development, you'll want probably one big web browser
+window, but also with a nice wide terminal on the same screen, in order to
+see web server logs. A simple way to do this is to mirror Xmonad's `Tall`
+layout by 90 degrees.
+
+	myWide = Mirror $ Tall nmaster delta ratio
+	    where
+	        -- The default number of windows in the master pane
+	        nmaster = 1
+	        -- Percent of screen to increment by when resizing panes
+	        delta   = 3/100
+	        -- Default proportion of screen occupied by master pane
+	        ratio   = 80/100
+
+The `myWide` layout uses the full screen width for a single terminal,
+and splits the width when there are more. This is sufficient for viewing logs
+and doing minor things at the shell prompt, in between testing the result in
+the web browser. Of course a terminal can be temporarily moved to the master
+area by pressing `mod-return`, if you need it to be larger.
+
+[[!img blog/pics/xmonad_layouts_for_netbooks/web-wide-1.png]]    
+[[!img blog/pics/xmonad_layouts_for_netbooks/web-wide-2.png]]
+
+### chat
+
+[[!template id=note text="""
+Tips on configuring Pidgin for a netbook: Set it up to use vertical tabs to
+save horizontal space. Configure the input area to only 1 line tall, and
+turn off as much other cruft as you can. The menu bars, sadly, cannot be
+disabled, nor can the excessively large borders. In my screenshots, you
+can see that stuff wasting space that could be used to show four more lines
+of text.
+"""]]
+
+For chat, you want to put the buddy list on the side of the
+screen, and use the rest for conversation windows. Xmonad's `IM` module
+takes care of allocating a sidebar on the screen for the buddy window. The
+rest of the screen can be occupied by any layout you choose. 
+
+I like to have the conversation windows be as wide as possible, and
+typically only want to see two conversations at a time. But sometimes I
+might have a dozen visible. A good layout to cope with those needs is
+`Grid`.
+
+	myChat' l = withIM size roster l
+	    where
+	        -- Ratio of screen roster will occupy
+	        size = 1%5
+	        -- Match roster window
+	        roster = Title "Buddy List"
+	myChat = myChat' Grid
+
+The `withIM` layout puts the buddy list on the left; I prefer it on the right
+for some reason, so I tweaked my layout to do that. All it took was
+using the `reflectHoriz` layout modifier to get a mirror image of
+the layout. Then I reflect the inner layout back to its normal orientation.
+Being able to throw in a few function calls and mutate a layout like that
+is where Xmonad shines.
+
+	myChat' l = reflectHoriz $ withIM size roster $
+	            reflectHoriz $ l
+
+[[!img blog/pics/xmonad_layouts_for_netbooks/chat-grid-1.png]]    
+[[!img blog/pics/xmonad_layouts_for_netbooks/chat-grid-2.png]]
+
+### logs
+
+[[!template id=note text="""
+Ever notice that `tail -f` wastes the last line of the terminal? On a netbook
+this matters. 
+[shorttail](http://git.kitenet.net/?p=joey/home.git;a=blob_plain;f=bin/shorttail;hb=HEAD)
+lets the last line be used.
+"""]]
+
+I have a dedidated workspace that I use to tail logs, and as a place to
+send long-running tasks (such as compiles). The layout for this needs to
+keep windows wide, to see whole logged lines, but they need only be five
+or so lines tall. And it's convenient to have one bigger window with the
+small ones below. Xmonad has a perfect layout for this, called `Dishes`,
+because it's sorta like a stack of plates.
+
+	myDish = limitWindows 5 $ Dishes nmaster ratio
+	    where
+	        -- The default number of windows in the master pane
+	        nmaster = 1
+	        -- Default proportion of screen occupied by other panes
+	        ratio = 1/5
+
+[[!img blog/pics/xmonad_layouts_for_netbooks/logs.png]]    
+[[!img blog/pics/xmonad_layouts_for_netbooks/logs-2.png]]
+
+[[!template id=note text="""
+In the second screenshot above, I have 6 windows open, but only 5 are
+visible. The `limitWindows 5` accomplishes this. It's handy mostly because 
+`gnome-terminal` has a bad habit of crashing when resized to 0x0.
+(That's gotta be a bug in something!)
+"""]]
+
+Notice that the screenshots above also have Procmeter in a sidebar on
+the right. I (ab)used the `withIM` layout to do that:
+
+	myLogs' l = reflectHoriz $ withIM procmeterSize procmeter $
+	              reflectHoriz $ l
+	    where
+	        -- Ratio of screen procmeter will occupy
+	        procmeterSize = 1%7
+	        -- Match procmeter
+	        procmeter = ClassName "ProcMeter3"
+	myLogs = myLogs' myDish
+
+### coding
+
+Everything above was easy. Doing coding (or writing) on a small screen is
+where it gets hard. When I'm coding I want to have one window that is
+exactly 80 columns wide, and as tall as possible, where I do the main
+development. Then I need a minimum of two other windows also visible: one
+action window for running tests and the like, and one to view references
+(emails, man pages, other files, etc). I may need to view any of these
+windows fullscreen at any time, of course.
+
+[[!template id=note text="""
+As an example of the three window rule:
+While I'm writing this post, I have a reference window open
+with my `.xmonad/xmonad.hs`, and an action window open where I am
+managing screenshots.
+"""]]
+
+Often, deep into something, I will accumulate many other reference and action
+windows. But three seems to be the magic, minimum number for me;
+use of `screen` or anything else doesn't reduce it; if I can't see all
+three at once, I will waste time and concentration flipping back and forth.
+
+The Xmonad layout I've developed to handle this is based on the handy
+`FixedColumn` layout, which automatically keeps the master window 80
+columns wide. I modify this by adding the `Magnifier`, so that my action
+and reference windows "pop out" over the master window when focused.
+
+	myCode = limitWindows 3 $ magnifiercz' 1.4 $ FixedColumn 1 20 80 10
+
+The 1.4 was carefully tuned, to magnify a window to be big enough to be

(Diff truncated)

diff --git a/blog/pics/xmonad_layouts_for_netbooks/book.png b/blog/pics/xmonad_layouts_for_netbooks/book.png
new file mode 100644
index 0000000..21af41e
Binary files /dev/null and b/blog/pics/xmonad_layouts_for_netbooks/book.png differ
diff --git a/blog/pics/xmonad_layouts_for_netbooks/chat-grid-1.png b/blog/pics/xmonad_layouts_for_netbooks/chat-grid-1.png
new file mode 100644
index 0000000..f2f3890
Binary files /dev/null and b/blog/pics/xmonad_layouts_for_netbooks/chat-grid-1.png differ
diff --git a/blog/pics/xmonad_layouts_for_netbooks/chat-grid-2.png b/blog/pics/xmonad_layouts_for_netbooks/chat-grid-2.png
new file mode 100644
index 0000000..5f210b1
Binary files /dev/null and b/blog/pics/xmonad_layouts_for_netbooks/chat-grid-2.png differ
diff --git a/blog/pics/xmonad_layouts_for_netbooks/code-2.png b/blog/pics/xmonad_layouts_for_netbooks/code-2.png
new file mode 100644
index 0000000..a6d4d73
Binary files /dev/null and b/blog/pics/xmonad_layouts_for_netbooks/code-2.png differ
diff --git a/blog/pics/xmonad_layouts_for_netbooks/code.png b/blog/pics/xmonad_layouts_for_netbooks/code.png
new file mode 100644
index 0000000..ccd9b8b
Binary files /dev/null and b/blog/pics/xmonad_layouts_for_netbooks/code.png differ
diff --git a/blog/pics/xmonad_layouts_for_netbooks/logs-2.png b/blog/pics/xmonad_layouts_for_netbooks/logs-2.png
new file mode 100644
index 0000000..e683185
Binary files /dev/null and b/blog/pics/xmonad_layouts_for_netbooks/logs-2.png differ
diff --git a/blog/pics/xmonad_layouts_for_netbooks/logs.png b/blog/pics/xmonad_layouts_for_netbooks/logs.png
new file mode 100644
index 0000000..2fca237
Binary files /dev/null and b/blog/pics/xmonad_layouts_for_netbooks/logs.png differ
diff --git a/blog/pics/xmonad_layouts_for_netbooks/web-full.png b/blog/pics/xmonad_layouts_for_netbooks/web-full.png
new file mode 100644
index 0000000..6941af9
Binary files /dev/null and b/blog/pics/xmonad_layouts_for_netbooks/web-full.png differ
diff --git a/blog/pics/xmonad_layouts_for_netbooks/web-split.png b/blog/pics/xmonad_layouts_for_netbooks/web-split.png
new file mode 100644
index 0000000..b0b9f1c
Binary files /dev/null and b/blog/pics/xmonad_layouts_for_netbooks/web-split.png differ
diff --git a/blog/pics/xmonad_layouts_for_netbooks/web-wide-1.png b/blog/pics/xmonad_layouts_for_netbooks/web-wide-1.png
new file mode 100644
index 0000000..70cff0a
Binary files /dev/null and b/blog/pics/xmonad_layouts_for_netbooks/web-wide-1.png differ
diff --git a/blog/pics/xmonad_layouts_for_netbooks/web-wide-2.png b/blog/pics/xmonad_layouts_for_netbooks/web-wide-2.png
new file mode 100644
index 0000000..b0495d3
Binary files /dev/null and b/blog/pics/xmonad_layouts_for_netbooks/web-wide-2.png differ

diff --git a/termcast.mdwn b/termcast.mdwn
index ffb852f..4ab6e11 100644
--- a/termcast.mdwn
+++ b/termcast.mdwn
@@ -12,8 +12,8 @@ Recent [termcasts](http://identi.ca/tag/termcast):
 
 ## To see my termcasts
 
-* You need to have IPv6 working.
-  (I use a tunnel from [SixXs](http://www.sixxs.net/)).
+* You need to have IPv6 working. The easiest way is probably via Teredo;
+  try `apt-get install miredo`.
 * Make sure your terminal is at least 80x32 in size. (I sometimes use
   127x34 too, so bigger the better.) If you see corruption, try a bigger
   size.
@@ -28,6 +28,9 @@ what I'm doing to users who telnet in. In the meantime, I'm using ttyrec
 to record it, with screen running inside that, and a tweaked screen setup
 that tells me how many people are watching. Here's how to set it up.
 
+* Get a static IPv6 address. For this,
+  I use a tunnel from [SixXs](http://www.sixxs.net/).
+
 * Get [termcast](http://git.kitenet.net/?p=joey/home.git;a=blob_plain;f=bin/termcast)
   and [termcast-play](http://git.kitenet.net/?p=joey/home.git;a=blob_plain;f=bin/termcast-play),
   put in path.

diff --git a/termcast.mdwn b/termcast.mdwn
index 3ebf50a..ffb852f 100644
--- a/termcast.mdwn
+++ b/termcast.mdwn
@@ -5,6 +5,11 @@ people termcast on [termcast.org](http://termcast.org/).
 I sometimes termcast, when I'm doing something I think may be interesting.
 I announce such termcasts at <http://identi.ca/tag/termcast>.
 
+[[!template id=note text="""
+Recent [termcasts](http://identi.ca/tag/termcast):
+[[!inline pages="internal(grep/identi.ca_posts/*termcast*)" template="microblog" show=5 feeds=no]]
+"""]]
+
 ## To see my termcasts
 
 * You need to have IPv6 working.

diff --git a/blog/entry/issues_with_openmicroblogging/comment_1_c03ea91049eb8be9ecbad36dc12b5305._comment b/blog/entry/issues_with_openmicroblogging/comment_1_c03ea91049eb8be9ecbad36dc12b5305._comment
new file mode 100644
index 0000000..c4141ac
--- /dev/null
+++ b/blog/entry/issues_with_openmicroblogging/comment_1_c03ea91049eb8be9ecbad36dc12b5305._comment
@@ -0,0 +1,13 @@
+[[!comment format=mdwn
+ username="http://www.kluenter.de/"
+ subject="forwarding has issues"
+ date="2010-01-26T22:16:20Z"
+ content="""
+Hi joey,
+
+with smtp, forwarding has some weird issues. It is not possible to validate the sender because you can't be sure if the Message was forwarded on the way to you.
+You don't have forwarding in jabber either. And that is good because this makes fighting spam quite easy. You can validate the sender :-)
+So i hope forwarding was deliberately not part of the openmicroblogging protocol.
+Cheers,
+  Christoph
+"""]]

diff --git a/termcast.mdwn b/termcast.mdwn
index dfdd1a9..3ebf50a 100644
--- a/termcast.mdwn
+++ b/termcast.mdwn
@@ -23,17 +23,17 @@ what I'm doing to users who telnet in. In the meantime, I'm using ttyrec
 to record it, with screen running inside that, and a tweaked screen setup
 that tells me how many people are watching. Here's how to set it up.
 
-1. Get [termcast](http://git.kitenet.net/?p=joey/home.git;a=blob_plain;f=bin/termcast)
+* Get [termcast](http://git.kitenet.net/?p=joey/home.git;a=blob_plain;f=bin/termcast)
   and [termcast-play](http://git.kitenet.net/?p=joey/home.git;a=blob_plain;f=bin/termcast-play),
   put in path.
 
-1. Add to `/etc/inetd.conf`, lightly edited:
+* Add to `/etc/inetd.conf`, lightly edited:
 
 <pre>
 	telnet stream tcp4 nowait joey /usr/sbin/tcpd /home/joey/bin/termcast-play
 	telnet stream tcp6 nowait joey /usr/sbin/tcpd /home/joey/bin/termcast-play
 </pre>
 
-1. For now, I also recommend using my patched version of `ttyrec` from 
+* For now, I also recommend using my patched version of `ttyrec` from 
   <http://git.kitenet.net/?p=ttyrec.git>, which fixes many bugs and makes
   significant improvements.

diff --git a/code/etckeeper/news/version_0.37.mdwn b/code/etckeeper/news/version_0.37.mdwn
deleted file mode 100644
index 90547dc..0000000
--- a/code/etckeeper/news/version_0.37.mdwn
+++ /dev/null
@@ -1,8 +0,0 @@
-etckeeper 0.37 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * Make postinst check for the configured VCS before trying to run
-     etckeeper init. Closes: #[530497](http://bugs.debian.org/530497)
-   * Update French debconf translation. Closes: #[530795](http://bugs.debian.org/530795)
-   * Fix typo in cruft file. Closes: #[530819](http://bugs.debian.org/530819)
-   * Update Portuguese debconf translation. Closes: #[528109](http://bugs.debian.org/528109)
-   * Update German debconf translation. Closes: #[532346](http://bugs.debian.org/532346)"""]]
\ No newline at end of file
diff --git a/code/etckeeper/news/version_0.42.mdwn b/code/etckeeper/news/version_0.42.mdwn
new file mode 100644
index 0000000..12914ff
--- /dev/null
+++ b/code/etckeeper/news/version_0.42.mdwn
@@ -0,0 +1,12 @@
+etckeeper 0.42 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * Deal with removal of the cache directory. Closes: #[559418](http://bugs.debian.org/559418)
+   * Add ucf backups to ignore list. (See #462355)
+   * Add webmin fsdump status files to ignore list. Closes: #[567000](http://bugs.debian.org/567000)
+   * Add *.old to ignore list (See #462355)
+   * Add *.elc to ignore list (See #[491401](http://bugs.debian.org/491401))
+   * Add ntp.conf.dhcp and X11/xdm/authdir/authfiles/* to ignore list.
+     Closes: #[491401](http://bugs.debian.org/491401)
+   * Fix handling of "#*#" ignores for git and hg.
+   * Add runit and daemontools supervise files to ignore list.
+     Closes: #[529253](http://bugs.debian.org/529253)"""]]
\ No newline at end of file

diff --git a/termcast.mdwn b/termcast.mdwn
index f6683b5..dfdd1a9 100644
--- a/termcast.mdwn
+++ b/termcast.mdwn
@@ -9,13 +9,20 @@ I announce such termcasts at <http://identi.ca/tag/termcast>.
 
 * You need to have IPv6 working.
   (I use a tunnel from [SixXs](http://www.sixxs.net/)).
-* Make sure your terminal is at least 80x32.
+* Make sure your terminal is at least 80x32 in size. (I sometimes use
+  127x34 too, so bigger the better.) If you see corruption, try a bigger
+  size.
 * telnet [gnu.kitenet.net](telnet://gnu.kitenet.net/)
 
 [[!img screenshot.png]]
 
 ## Setup your own termcast
 
+The general idea is that inetd runs a script that uses ttyplay to display
+what I'm doing to users who telnet in. In the meantime, I'm using ttyrec
+to record it, with screen running inside that, and a tweaked screen setup
+that tells me how many people are watching. Here's how to set it up.
+
 1. Get [termcast](http://git.kitenet.net/?p=joey/home.git;a=blob_plain;f=bin/termcast)
   and [termcast-play](http://git.kitenet.net/?p=joey/home.git;a=blob_plain;f=bin/termcast-play),
   put in path.

diff --git a/blog.mdwn b/blog.mdwn
index 53000f0..4d05ff2 100644
--- a/blog.mdwn
+++ b/blog.mdwn
@@ -2,7 +2,7 @@
 The most recent posts to [[Joey]]'s blog.
 
 [[!template id=note text="""
-Recent [dents](http://identi.ca/joeyh):
+Recent [chatter](http://identi.ca/joeyh):
 [[!inline pages="internal(grep/identi.ca_posts/*)" template="microblog" show=5 feeds=no]]
 
 

diff --git a/blog.mdwn b/blog.mdwn
index e2c9534..53000f0 100644
--- a/blog.mdwn
+++ b/blog.mdwn
@@ -2,8 +2,8 @@
 The most recent posts to [[Joey]]'s blog.
 
 [[!template id=note text="""
-Recent [statuses](http://brainbird.net/joeyh):
-[[!inline pages="internal(grep/brainbird_posts/*)" template="microblog" show=5 feeds=no]]
+Recent [dents](http://identi.ca/joeyh):
+[[!inline pages="internal(grep/identi.ca_posts/*)" template="microblog" show=5 feeds=no]]
 
 
 ----
diff --git a/blog/foo.mdwn b/blog/foo.mdwn
index e4fa2ae..01a2243 100644
--- a/blog/foo.mdwn
+++ b/blog/foo.mdwn
@@ -1,4 +1,4 @@
 My most recent blather that I don't want to show up on my main [[blog]].
 
 [[!inline pages="(blog/entry/* and link(foo) and !*/Discussion) or
-internal(grep/brainbird_posts/*)" actions=yes show=40]]
+internal(grep/identi.ca_posts/*)" actions=yes show=40]]
diff --git a/contact.mdwn b/contact.mdwn
index 36bf1ca..79a2c8a 100644
--- a/contact.mdwn
+++ b/contact.mdwn
@@ -1,3 +1,3 @@
 * email: <joey@kitenet.net> or <joeyh@debian.org>
 * jabber: [joey@kitenet.net](xmpp:joey@kitenet.net)
-* identi.ca: <http://brainbird.net/joeyh>
+* identi.ca: <http://identi.ca/joeyh>
diff --git a/grep.mdwn b/grep.mdwn
index 366c679..cdc2926 100644
--- a/grep.mdwn
+++ b/grep.mdwn
@@ -9,7 +9,7 @@ List of feeds:
 
 * [[!aggregate expirecount=25 name="music" feedurl="http://alpha.libre.fm/rdf.php?fmt=rss&page=%2Fuser%2Fjoeyhess%2Frecent-tracks" url="http://alpha.libre.fm/user/joeyhess"]]
 * [[!aggregate expirecount=25 name="commits" feedurl="http://cia.navi.cx/stats/author/joeyh/.rss" url="http://cia.navi.cx/stats/author/joeyh"]]
-* [[!aggregate expirecount=25 name="brainbird posts" feedurl="http://brainbird.net/api/statuses/user_timeline/joeyh.atom" url="http://brainbird.net/joeyh"]]
-* [[!aggregate expirecount=25 name="brainbird replies" feedurl="http://brainbird.net/joeyh/replies/rss" url="http://brainbird.net/joeyh/replies"]]
+* [[!aggregate expirecount=25 name="identi.ca posts" feedurl="http://identi.ca/api/statuses/user_timeline/joeyh.atom" url="http://identi.ca/joeyh"]]
+* [[!aggregate expirecount=25 name="identi.ca replies" feedurl="http://identi.ca/joeyh/replies/rss" url="http://identi.ca/joeyh/replies"]]
 * [[!aggregate expirecount=25 name="yelp reviews" feedurl="http://www.yelp.com/syndicate/user/BHBcdcStT9PCHBJpJPgXXg/rss.xml" url="http://joeyh.yelp.com"]]
 * [[!aggregate expirecount=25 name="books" feedurl="http://www.goodreads.com/review/list_rss/2159448?key=afd7e8432b3f9e33edab442a7c94e95849af4527&shelf=currently-reading" url="http://www.goodreads.com/user/show/2159448"]]
diff --git a/termcast.mdwn b/termcast.mdwn
index 1ab42f7..f6683b5 100644
--- a/termcast.mdwn
+++ b/termcast.mdwn
@@ -3,6 +3,7 @@ termcasting is on [nethack.alt.org](http://nethack.alt.org/). Some other
 people termcast on [termcast.org](http://termcast.org/).
 
 I sometimes termcast, when I'm doing something I think may be interesting.
+I announce such termcasts at <http://identi.ca/tag/termcast>.
 
 ## To see my termcasts
 

diff --git a/blog/entry/issues_with_openmicroblogging.mdwn b/blog/entry/issues_with_openmicroblogging.mdwn
new file mode 100644
index 0000000..2373aad
--- /dev/null
+++ b/blog/entry/issues_with_openmicroblogging.mdwn
@@ -0,0 +1,46 @@
+I tried switching from [identi.ca](http://identi.ca) to
+[brainbird](http://brainbird.net/) today, when my always present
+frustration with 140 character limit in microblogging boiled over. Again.
+In the process, I've found some warts in the OpenMicroblogging system,
+beyond its obsession with fitting into an [obsolete sideband communication
+medium](http://en.wikipedia.org/wiki/SMS) that I will never actually use.
+Rant mode on.
+
+Let's assume that OpenMicroblogging catches on, in a big way, and we're all
+using it in 10 years. So, it will be something like email. And its
+federated design allows for that; there can be multiple servers that
+communicate, and so on. (Which is a very good thing, compared to the
+twitter monoloth.)
+
+But: How many times have you changed your email address? When you did,
+you probably set up a `.forward` for the old email address, and emailed
+some people from the new address to let them update their address book,
+and it was not a big deal. But the experience when changing an
+OpenMicroblogging site is not the same. You have to go out and re-follow
+everyone. For each person, you have to go through a multiple screen
+(OAUTH) process. This process may not even be automatible.
+
+Second problem is that OpenMicroblogging does not use addresses. So to
+talk to me, one uses ´@joey'. It's not clear to me how sites determine
+whether to direct that to joey@identica or to joey@brainbird. Seemed like,
+if I switched to brainbird, I would need to pick a new username, to avoid
+having to check both places.
+
+Finally, the 
+[OpenMicroblogging spec](http://gitorious.org/openmicroblogging/mainline/blobs/master/openmicroblogging.txt),
+while really quite a neat approach to piggyback on OAUTH,
+has some absurd limits. 140 characters for a *biography*. Even the limit
+for one's full name is longer than that. Absurd. Suprisingly, no 140
+character limit on messages actually exists, that's just a recommendation.
+But it's unclear how a system that sends a longer message interoperates
+with systems that use shorter messages. Probably the message will be
+truncated. And there is no way in the protocol to discover the message
+limit of a remote system.
+
+All in all, I think I prefer RSS, or Google Wave, or even IRC from a protocol
+perspective. And from a usability perspective, Facebook does not have
+absurd message limits, and most people read my messages there anyway.
+
+Meh.
+
+[[!tag rant]]

diff --git a/termcast.mdwn b/termcast.mdwn
index 7c13d6e..1ab42f7 100644
--- a/termcast.mdwn
+++ b/termcast.mdwn
@@ -11,6 +11,8 @@ I sometimes termcast, when I'm doing something I think may be interesting.
 * Make sure your terminal is at least 80x32.
 * telnet [gnu.kitenet.net](telnet://gnu.kitenet.net/)
 
+[[!img screenshot.png]]
+
 ## Setup your own termcast
 
 1. Get [termcast](http://git.kitenet.net/?p=joey/home.git;a=blob_plain;f=bin/termcast)

diff --git a/blog.mdwn b/blog.mdwn
index 53000f0..e2c9534 100644
--- a/blog.mdwn
+++ b/blog.mdwn
@@ -2,8 +2,8 @@
 The most recent posts to [[Joey]]'s blog.
 
 [[!template id=note text="""
-Recent [dents](http://identi.ca/joeyh):
-[[!inline pages="internal(grep/identi.ca_posts/*)" template="microblog" show=5 feeds=no]]
+Recent [statuses](http://brainbird.net/joeyh):
+[[!inline pages="internal(grep/brainbird_posts/*)" template="microblog" show=5 feeds=no]]
 
 
 ----
diff --git a/blog/entry/started_termcasting.mdwn b/blog/entry/started_termcasting.mdwn
new file mode 100644
index 0000000..74409fe
--- /dev/null
+++ b/blog/entry/started_termcasting.mdwn
@@ -0,0 +1,20 @@
+I've hooked one of my laptop's terminals up to the net, so anyone with IPv6
+can telnet in and see it.
+
+I've long wanted to be able to broadcast my terminal sessions on occasions
+when it makes sense. Like when I'm fixing someone's bug, or closely
+collaborating with someone distant.
+
+I am also interested in finding things to host on IPv6. Right now, that means
+only people who care will be able to access it. So it seems the trick is to
+find places where that is a benefit. I plan to keep an eye out for more
+things like this.
+
+(A side benefit of using IPv6 is that it makes it easier to serve content
+from my laptop, that moves from network to network.)
+
+So, [[tune in to my termcast|/termcast]]!
+
+[[!img termcast/screenshot.png link=/termcast]]
+
+[[termcast]]
diff --git a/blog/foo.mdwn b/blog/foo.mdwn
index 01a2243..e4fa2ae 100644
--- a/blog/foo.mdwn
+++ b/blog/foo.mdwn
@@ -1,4 +1,4 @@
 My most recent blather that I don't want to show up on my main [[blog]].
 
 [[!inline pages="(blog/entry/* and link(foo) and !*/Discussion) or
-internal(grep/identi.ca_posts/*)" actions=yes show=40]]
+internal(grep/brainbird_posts/*)" actions=yes show=40]]
diff --git a/contact.mdwn b/contact.mdwn
index 79a2c8a..36bf1ca 100644
--- a/contact.mdwn
+++ b/contact.mdwn
@@ -1,3 +1,3 @@
 * email: <joey@kitenet.net> or <joeyh@debian.org>
 * jabber: [joey@kitenet.net](xmpp:joey@kitenet.net)
-* identi.ca: <http://identi.ca/joeyh>
+* identi.ca: <http://brainbird.net/joeyh>
diff --git a/grep.mdwn b/grep.mdwn
index cdc2926..366c679 100644
--- a/grep.mdwn
+++ b/grep.mdwn
@@ -9,7 +9,7 @@ List of feeds:
 
 * [[!aggregate expirecount=25 name="music" feedurl="http://alpha.libre.fm/rdf.php?fmt=rss&page=%2Fuser%2Fjoeyhess%2Frecent-tracks" url="http://alpha.libre.fm/user/joeyhess"]]
 * [[!aggregate expirecount=25 name="commits" feedurl="http://cia.navi.cx/stats/author/joeyh/.rss" url="http://cia.navi.cx/stats/author/joeyh"]]
-* [[!aggregate expirecount=25 name="identi.ca posts" feedurl="http://identi.ca/api/statuses/user_timeline/joeyh.atom" url="http://identi.ca/joeyh"]]
-* [[!aggregate expirecount=25 name="identi.ca replies" feedurl="http://identi.ca/joeyh/replies/rss" url="http://identi.ca/joeyh/replies"]]
+* [[!aggregate expirecount=25 name="brainbird posts" feedurl="http://brainbird.net/api/statuses/user_timeline/joeyh.atom" url="http://brainbird.net/joeyh"]]
+* [[!aggregate expirecount=25 name="brainbird replies" feedurl="http://brainbird.net/joeyh/replies/rss" url="http://brainbird.net/joeyh/replies"]]
 * [[!aggregate expirecount=25 name="yelp reviews" feedurl="http://www.yelp.com/syndicate/user/BHBcdcStT9PCHBJpJPgXXg/rss.xml" url="http://joeyh.yelp.com"]]
 * [[!aggregate expirecount=25 name="books" feedurl="http://www.goodreads.com/review/list_rss/2159448?key=afd7e8432b3f9e33edab442a7c94e95849af4527&shelf=currently-reading" url="http://www.goodreads.com/user/show/2159448"]]
diff --git a/termcast.mdwn b/termcast.mdwn
index f2c1d01..7c13d6e 100644
--- a/termcast.mdwn
+++ b/termcast.mdwn
@@ -3,7 +3,6 @@ termcasting is on [nethack.alt.org](http://nethack.alt.org/). Some other
 people termcast on [termcast.org](http://termcast.org/).
 
 I sometimes termcast, when I'm doing something I think may be interesting.
-I announce such termcasts at <http://identi.ca/tag/termcast>.
 
 ## To see my termcasts
 
diff --git a/termcast/screenshot.png b/termcast/screenshot.png
new file mode 100644
index 0000000..179da46
Binary files /dev/null and b/termcast/screenshot.png differ

diff --git a/termcast.mdwn b/termcast.mdwn
index d56a12a..f2c1d01 100644
--- a/termcast.mdwn
+++ b/termcast.mdwn
@@ -8,7 +8,7 @@ I announce such termcasts at <http://identi.ca/tag/termcast>.
 ## To see my termcasts
 
 * You need to have IPv6 working.
-  (I use a tunnel from [SixXs](http://www.sixxs.net/).
+  (I use a tunnel from [SixXs](http://www.sixxs.net/)).
 * Make sure your terminal is at least 80x32.
 * telnet [gnu.kitenet.net](telnet://gnu.kitenet.net/)
 

diff --git a/termcast.mdwn b/termcast.mdwn
index 5226b3f..d56a12a 100644
--- a/termcast.mdwn
+++ b/termcast.mdwn
@@ -10,7 +10,7 @@ I announce such termcasts at <http://identi.ca/tag/termcast>.
 * You need to have IPv6 working.
   (I use a tunnel from [SixXs](http://www.sixxs.net/).
 * Make sure your terminal is at least 80x32.
-* `telnet [gnu.kitenet.net](telnet://gnu.kitenet.net/)`
+* telnet [gnu.kitenet.net](telnet://gnu.kitenet.net/)
 
 ## Setup your own termcast
 

diff --git a/termcast.mdwn b/termcast.mdwn
index ad01ecc..5226b3f 100644
--- a/termcast.mdwn
+++ b/termcast.mdwn
@@ -20,8 +20,10 @@ I announce such termcasts at <http://identi.ca/tag/termcast>.
 
 1. Add to `/etc/inetd.conf`, lightly edited:
 
+<pre>
 	telnet stream tcp4 nowait joey /usr/sbin/tcpd /home/joey/bin/termcast-play
 	telnet stream tcp6 nowait joey /usr/sbin/tcpd /home/joey/bin/termcast-play
+</pre>
 
 1. For now, I also recommend using my patched version of `ttyrec` from 
   <http://git.kitenet.net/?p=ttyrec.git>, which fixes many bugs and makes

diff --git a/blog/entry/Southern_borscht.mdwn b/blog/entry/Southern_borscht.mdwn
index 9d9f6b2..6df5415 100644
--- a/blog/entry/Southern_borscht.mdwn
+++ b/blog/entry/Southern_borscht.mdwn
@@ -26,14 +26,14 @@ about 5 minutes. Stir in tomatoes, reduce heat to medium low, cover, and
 simmer for 15 minutes.
 
 Remove half of sauce from skillet into a medium size bowl. Add cabbage to
-remainder of sauce in skillet and cook coverted on medium low heat, stirring
+remainder of sauce in skillet and cook covered on medium low heat, stirring
 occasionally for ten minutes, or until tender.
 
 Reduce heat on pot to a simmer.  Remove beets from pot and set aside to
 cool.
 
-Remove quartered potatoes and add to bowl with sauce. Mash potatoes, adding
-milk, until creamy. Stir mashed potato mixture into soup in pot.
+Remove quartered potatoes and add to bowl with tomato sauce. Mash potatoes,
+adding milk, until creamy. Stir mashed potato mixture into soup in pot.
 
 Grate beets, removing skin if desired, or grating it in. Combine grated
 beets and cabbage into pot. Add vinegar to taste (optional but recommended

diff --git a/boxen.mdwn b/boxen.mdwn
index fd0d403..42d6fd0 100644
--- a/boxen.mdwn
+++ b/boxen.mdwn
@@ -14,9 +14,9 @@ Mostly mythical creatures.
 * wildebeest (spare for gnu)
 * cucurbit {*} (Anna's current)
 * aquamiser {*} (Mark's)
-* grebe {*} (Anna's old laptop)
+* grebe (Anna's old laptop)
 * [[kodama]] {*} (Mom's)
-* [[phoenix]] (Maggie's)
+* [[phoenix]] (Maggie's old laptop)
 * [[dragon]]
 * corvid
 * kraken
@@ -37,7 +37,7 @@ Mostly birds.
 * [[stork]]
 * [[wren]] {*}
 * [[bluebird]]
-* [[hydra]] {*}
+* [[hydra]]
 * [[box]] {*}
 * [[finch]] {*}
 
diff --git a/boxen/hydra.mdwn b/boxen/hydra.mdwn
index e9a6d06..8a8e49b 100644
--- a/boxen/hydra.mdwn
+++ b/boxen/hydra.mdwn
@@ -1,3 +1,5 @@
 Hydra is my Debian installation test machine. Kindly donated and hosted by
 HP (near gluck and merkel). This machine is ridiculously overpowered, and
 will be used to run multiple installation tests in parallel, using qemu.
+
+Currently down (where did it go?)

diff --git a/boxen.mdwn b/boxen.mdwn
index 0e87ba2..fd0d403 100644
--- a/boxen.mdwn
+++ b/boxen.mdwn
@@ -43,7 +43,7 @@ Mostly birds.
 
 ## nslu2 machines
 
-* [[slug]] {*}
+* [[slug]]
 * snail
 * [[stick]]
 
@@ -60,14 +60,14 @@ Flying insects.
 ## desktops
 
 * beaver {*} (Dad's)
-* sparrow {*} (Mom's)
+* sparrow
 * [[penguin]] {*}
 * mouse {*} (Maggie's)
 
 ## functional names
 
 * digi
-* phone {*}
+* phone
 * sat
 * labswitch
 
@@ -75,11 +75,11 @@ Flying insects.
 
 Large herbovores.
 
-* donkey {*}
-* bison {*}
-* zebra {*}
-* elephant {*}
-* cow {*}
+* donkey
+* bison
+* zebra
+* elephant
+* cow
 * pegasus
 * ox
 * frog {*} (bitsyxb)
diff --git a/boxen/dodo.mdwn b/boxen/dodo.mdwn
index 05ba4e2..a51c8c6 100644
--- a/boxen/dodo.mdwn
+++ b/boxen/dodo.mdwn
@@ -1,2 +1,2 @@
-This is a white box, it's in the back server closet, and runs the
-[[code/debian-installer/dilab]].
+This is a white box, it's in the back server closet, and ran the
+[[code/debian-installer/dilab]]. Now mostly powered off.
diff --git a/boxen/penguin.mdwn b/boxen/penguin.mdwn
index e6739ff..d501ae7 100644
--- a/boxen/penguin.mdwn
+++ b/boxen/penguin.mdwn
@@ -1,3 +1,3 @@
-This is a HP thin client, NFS rooted from [[dodo]]. It's in my office as
+This is a HP thin client, NFS rooted from [[turtle]]. It's in my office as
 a guest computer, and I sometimes use it to test d-i (installing to its 1
 gb flash drive). It also is a mpd server, and print server.
diff --git a/boxen/wren.mdwn b/boxen/wren.mdwn
index 5fac235..7f8bdfe 100644
--- a/boxen/wren.mdwn
+++ b/boxen/wren.mdwn
@@ -2,7 +2,7 @@ Wren serves [kitenet.net](http://kitenet.net/) and associated domains, and is
 my main server.
 
 Wren is a KVM instance hosted by Steve Kemp at
-[kvm-hosting.org](http://www.xen-hosting.org/), in London.
+[kvm-hosting.org](http://www.xen-hosting.org/), in the UK.
 For a KVM instance, it's fairly large, with 50 gb of disk and 1 gb ram.
 
 ## Notes

diff --git a/blog/entry/happy_on_a_cloudy_day.mdwn b/blog/entry/happy_on_a_cloudy_day.mdwn
index 56e5cb3..d95513b 100644
--- a/blog/entry/happy_on_a_cloudy_day.mdwn
+++ b/blog/entry/happy_on_a_cloudy_day.mdwn
@@ -60,7 +60,7 @@ link_in_boot = yes
 
 And here is a hook that rsyncs /boot, sending kernels and initrds to
 kvm-hosting, so its interface will let me boot them. This was put in
-`/etc/initramfs-tools/hooks/kvm-hosting-rsync` and made executable.
+`/etc/initramfs-tools/hooks/kvmhostingrsync` and made executable.
 
 <pre>
 #!/bin/sh

diff --git "a/uml\303\244ute.mdwn" "b/uml\303\244ute.mdwn"
deleted file mode 100644
index 47a950f..0000000
--- "a/uml\303\244ute.mdwn"
+++ /dev/null
@@ -1 +0,0 @@
-hii

diff --git "a/uml\303\244ute.mdwn" "b/uml\303\244ute.mdwn"
new file mode 100644
index 0000000..47a950f
--- /dev/null
+++ "b/uml\303\244ute.mdwn"
@@ -0,0 +1 @@
+hii

diff --git a/code/etckeeper/discussion.mdwn b/code/etckeeper/discussion.mdwn
index 083ec0c..de721d4 100644
--- a/code/etckeeper/discussion.mdwn
+++ b/code/etckeeper/discussion.mdwn
@@ -26,9 +26,11 @@ What would you say is the best hosting site to use with etckeeper (git)? It shou
 
 Also can you use etckeeper for backing up home directory dotfiles?
 
-That's not its purpose, though you can find info elsewhere on my site about
-storing home in VCS. --[[Joey]] 
+> That's not its purpose, though you can find info elsewhere on my site about
+> storing home in VCS. --[[Joey]] 
 
 ==
 
 The idea of managing config files from remote computers sounds interesting to me. Is it possible to pull and push updates through git without loss of original metadata? Thanks in advance, Chris.
+
+> etckeeper restores the metadata when `etckeeper init` is run. --[[Joey]] 
diff --git a/code/etckeeper/discussion/discussion.mdwn b/code/etckeeper/discussion/discussion.mdwn
deleted file mode 100644
index a1262d3..0000000
--- a/code/etckeeper/discussion/discussion.mdwn
+++ /dev/null
@@ -1 +0,0 @@
-The idea of managing config files from remote computers sounds interesting to me. Is it possible to pull and push updates through git without loss of original metadata? Thanks in advance, Chris.
diff --git a/termcast.mdwn b/termcast.mdwn
index 0b86bc6..ad01ecc 100644
--- a/termcast.mdwn
+++ b/termcast.mdwn
@@ -1,10 +1,28 @@
-Termcasting means broadcasting a live terminal session. Some other people
-termcast on [termcast.org](http://termcast.org/).
+Termcasting means broadcasting a live terminal session. The best known
+termcasting is on [nethack.alt.org](http://nethack.alt.org/). Some other
+people termcast on [termcast.org](http://termcast.org/).
 
-I sometimes termcast, when I'm working on something I think may
-be interesting. To see it:
+I sometimes termcast, when I'm doing something I think may be interesting.
+I announce such termcasts at <http://identi.ca/tag/termcast>.
+
+## To see my termcasts
 
 * You need to have IPv6 working.
   (I use a tunnel from [SixXs](http://www.sixxs.net/).
 * Make sure your terminal is at least 80x32.
 * `telnet [gnu.kitenet.net](telnet://gnu.kitenet.net/)`
+
+## Setup your own termcast
+
+1. Get [termcast](http://git.kitenet.net/?p=joey/home.git;a=blob_plain;f=bin/termcast)
+  and [termcast-play](http://git.kitenet.net/?p=joey/home.git;a=blob_plain;f=bin/termcast-play),
+  put in path.
+
+1. Add to `/etc/inetd.conf`, lightly edited:
+
+	telnet stream tcp4 nowait joey /usr/sbin/tcpd /home/joey/bin/termcast-play
+	telnet stream tcp6 nowait joey /usr/sbin/tcpd /home/joey/bin/termcast-play
+
+1. For now, I also recommend using my patched version of `ttyrec` from 
+  <http://git.kitenet.net/?p=ttyrec.git>, which fixes many bugs and makes
+  significant improvements.

diff --git a/code/etckeeper/discussion.mdwn b/code/etckeeper/discussion.mdwn
index 314a568..083ec0c 100644
--- a/code/etckeeper/discussion.mdwn
+++ b/code/etckeeper/discussion.mdwn
@@ -28,3 +28,7 @@ Also can you use etckeeper for backing up home directory dotfiles?
 
 That's not its purpose, though you can find info elsewhere on my site about
 storing home in VCS. --[[Joey]] 
+
+==
+
+The idea of managing config files from remote computers sounds interesting to me. Is it possible to pull and push updates through git without loss of original metadata? Thanks in advance, Chris.

diff --git a/code/etckeeper/discussion/discussion.mdwn b/code/etckeeper/discussion/discussion.mdwn
new file mode 100644
index 0000000..a1262d3
--- /dev/null
+++ b/code/etckeeper/discussion/discussion.mdwn
@@ -0,0 +1 @@
+The idea of managing config files from remote computers sounds interesting to me. Is it possible to pull and push updates through git without loss of original metadata? Thanks in advance, Chris.

diff --git a/termcast.mdwn b/termcast.mdwn
index 9a0d2d6..0b86bc6 100644
--- a/termcast.mdwn
+++ b/termcast.mdwn
@@ -1,9 +1,10 @@
 Termcasting means broadcasting a live terminal session. Some other people
 termcast on [termcast.org](http://termcast.org/).
-I sometimes termcast my terminal, when I'm working on something I think may
+
+I sometimes termcast, when I'm working on something I think may
 be interesting. To see it:
 
 * You need to have IPv6 working.
-  (I use a tunnel from [SixXs](http://www.sixxs.net/).)
+  (I use a tunnel from [SixXs](http://www.sixxs.net/).
 * Make sure your terminal is at least 80x32.
 * `telnet [gnu.kitenet.net](telnet://gnu.kitenet.net/)`

diff --git a/termcast.mdwn b/termcast.mdwn
new file mode 100644
index 0000000..9a0d2d6
--- /dev/null
+++ b/termcast.mdwn
@@ -0,0 +1,9 @@
+Termcasting means broadcasting a live terminal session. Some other people
+termcast on [termcast.org](http://termcast.org/).
+I sometimes termcast my terminal, when I'm working on something I think may
+be interesting. To see it:
+
+* You need to have IPv6 working.
+  (I use a tunnel from [SixXs](http://www.sixxs.net/).)
+* Make sure your terminal is at least 80x32.
+* `telnet [gnu.kitenet.net](telnet://gnu.kitenet.net/)`

diff --git a/blog/entry/please_set_up_tor_bridges/comment_2_8629d818758721cfc87849ef9692f6de._comment b/blog/entry/please_set_up_tor_bridges/comment_2_8629d818758721cfc87849ef9692f6de._comment
new file mode 100644
index 0000000..20053c7
--- /dev/null
+++ b/blog/entry/please_set_up_tor_bridges/comment_2_8629d818758721cfc87849ef9692f6de._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="http://joey.kitenet.net/"
+ subject="comment 2"
+ date="2010-01-12T02:09:41Z"
+ content="""
+A user with unfettered internet access can connect directly to the tor network without using a bridge. So the bridge is no benefit to them, and it would be a pain to find a bridge IP, configure tor to use it, etc. And if they did, it would only slow down tor further for them.
+"""]]

diff --git a/blog/entry/please_set_up_tor_bridges/comment_1_92db542d01ccd1e3e49a85226d31cbc4._comment b/blog/entry/please_set_up_tor_bridges/comment_1_92db542d01ccd1e3e49a85226d31cbc4._comment
new file mode 100644
index 0000000..4f9a7f0
--- /dev/null
+++ b/blog/entry/please_set_up_tor_bridges/comment_1_92db542d01ccd1e3e49a85226d31cbc4._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://taniwha-nz.livejournal.com/"
+ subject="comment 1"
+ date="2010-01-12T01:33:08Z"
+ content="""
+can you explain further why a bridge means only end users under repressive governments?
+I've no desire to help pedophiles access content via tor, but i'm keen to help folks in china, iran et al.
+"""]]

diff --git a/blog/entry/Palm_Pre_privacy.mdwn b/blog/entry/Palm_Pre_privacy.mdwn
index b572d3e..d3001f2 100644
--- a/blog/entry/Palm_Pre_privacy.mdwn
+++ b/blog/entry/Palm_Pre_privacy.mdwn
@@ -65,6 +65,11 @@ details or making clear that the above data is being uploaded.
 
 ---
 
+Update: WebOS upgrades do re-enable the spyware; this has to be
+repeated after each upgrade.
+
+---
+
 Previously: [[Debian_chroot_on_Palm_Pre|palm_pre]],
 [[debian_desktop_via_vnc_on_the_palm_pre]]
 
diff --git a/sandbox.mdwn b/sandbox.mdwn
index c168698..ede2b26 100644
--- a/sandbox.mdwn
+++ b/sandbox.mdwn
@@ -1,2 +1,4 @@
 Testing 1 2 3!
 [[blog/pics/unicode.png]]
+
+[[!linkmap pages="link(index)"]]

diff --git a/blog/entry/please_set_up_tor_bridges.mdwn b/blog/entry/please_set_up_tor_bridges.mdwn
new file mode 100644
index 0000000..bf31fd9
--- /dev/null
+++ b/blog/entry/please_set_up_tor_bridges.mdwn
@@ -0,0 +1,20 @@
+Here is a great talk from the Chaos Communication Congress about
+[Tor and censorship: lessons learned](http://media.ccc.de/browse/congress/2009/26c3-3554-de-tor_and_censorship_lessons_learned.html).
+It's the inside scoop from the Tor guys on how they're keeping Tor usable
+inside China, Iran, etc despite attempts to block it.
+
+[[!img pics/clients-per-day.png alt="clients per day"]]
+[[!img pics/chinese-tor-users-via-bridges.png alt="Chinese tor users via bridges"]]
+
+If you're like me, you have resources and would like to help
+[Tor](http://torproject.org/), but the exposure of running a exit node is
+*way* too high, and even running an non-exit node seems risky. Now there's a
+third option, [running a bridge](https://www.torproject.org/bridges#RunningABridge)
+which can be used to get to the Tor network.
+
+The great thing about doing this is that you can be pretty sure anyone
+using your Tor bridge is the kind of person you want to help (and not some
+spammer or worse). There's little reason to use a Tor bridge unless
+your ISP/Government is repressing you. Also, the worst thing that is likely
+to happen to your bridge is that $COUNTRY discovers its IP and blocks it. So
+the benefits seem focused and high, and the risks easily managed.

diff --git a/blog/pics/chinese-tor-users-via-bridges.png b/blog/pics/chinese-tor-users-via-bridges.png
new file mode 100644
index 0000000..d1aa3af
Binary files /dev/null and b/blog/pics/chinese-tor-users-via-bridges.png differ
diff --git a/blog/pics/clients-per-day.png b/blog/pics/clients-per-day.png
new file mode 100644
index 0000000..4797f31
Binary files /dev/null and b/blog/pics/clients-per-day.png differ

diff --git a/sandbox.mdwn b/sandbox.mdwn
index d9e0058..c168698 100644
--- a/sandbox.mdwn
+++ b/sandbox.mdwn
@@ -1 +1,2 @@
 Testing 1 2 3!
+[[blog/pics/unicode.png]]
diff --git a/untext.mdwn b/untext.mdwn
index aaccc65..2d6e5f3 100644
--- a/untext.mdwn
+++ b/untext.mdwn
@@ -19,3 +19,4 @@ images.
 * [[!aggregate expireage=7 name="garfield minus garfield" feedurl="http://garfieldminusgarfield.net/rss" url="http://garfieldminusgarfield.net/"]]
 * [[!aggregate expireage=7 name="postsecret" feedurl="http://postsecret.blogspot.com/feeds/posts/default" url="http://postsecret.blogspot.com"]]
 * [[!aggregate expireage=7 name="abtruse goose" feedurl="http://feeds.feedburner.com/AbstruseGoose" url="http://abstrusegoose.com/"]]
+* [[!aggregate expireage=7 name="nobody scores" feedurl="http://nobodyscores.loosenutstudio.com/index.php?category=comics&section=comics&rss=1" url="http://nobodyscores.loosenutstudio.com/"]]

diff --git a/caving.mdwn b/caving.mdwn
new file mode 100644
index 0000000..d96e2e4
--- /dev/null
+++ b/caving.mdwn
@@ -0,0 +1,25 @@
+I enjoy caving responsibly, though not often. Caves I've been in:
+
+* Unnamed small caves off in the woods near Ot Bay's.
+* Bristol Caverns. Tame & boring.
+* Quarry cave at Steele Creek. I've pushed back through the dirt a few
+  feet.
+* Whatever cave we went to at Cedar Creek. Lots of fun at the time, always
+  wished I went back and did the bit where you plunge underwater to the
+  rest of the cave.
+* J4 in Pennsylvania. Big sprawling cave with lots of tight crawls,
+  (including the initial crawl in through a 2 foot pipe, and "the birth
+  canal"), and some interesting climbs and traverses. At least one really
+  gorgeous room. I've mirrored a map of it from
+  [nodivisions](http://nodivisions.com/excursions/j4/).
+
+  [[!img j4map.jpg size=300x300]]
+* Deerbone in Pennsylvania. Fun rappel entrance, 
+* Coonscat in Pennsylvania. A muddy hole in the bank next to a road, that
+  turns into a suprisingly fun (if muddy all the way) cave.
+* That unnamed cave near Margaret Fierabend's in Bristol that they destroyed
+  most of to make a Wal Mart.
+* Talgua Cave (aka the Cave of the Glowing Skulls) in Honduras, near
+  Catacamas. Only saw the tamed part, including a glimpse up at the burial
+  chamber. Visited with a 60+ year old Nun, to add to the crazy
+  Monkey-Island-ness of it all.

diff --git a/blog/entry/what_am_I_doing_here__63__/comment_2_7c502b314deff8834c7fecfe2bb9d0d0._comment b/blog/entry/what_am_I_doing_here__63__/comment_2_7c502b314deff8834c7fecfe2bb9d0d0._comment
new file mode 100644
index 0000000..378457d
--- /dev/null
+++ b/blog/entry/what_am_I_doing_here__63__/comment_2_7c502b314deff8834c7fecfe2bb9d0d0._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="http://joey.kitenet.net/"
+ subject="test"
+ date="2010-01-05T01:45:08Z"
+ content="""
+test
+"""]]

diff --git a/blog/entry/adieu_google/comment_16_6fb6405bf359f28dca6eb90b4b7e774b._comment b/blog/entry/adieu_google/comment_16_6fb6405bf359f28dca6eb90b4b7e774b._comment
new file mode 100644
index 0000000..2503b9b
--- /dev/null
+++ b/blog/entry/adieu_google/comment_16_6fb6405bf359f28dca6eb90b4b7e774b._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="http://www.w3.org/People/Connolly/"
+ subject="wishing for better competition"
+ date="2010-01-04T15:09:49Z"
+ content="""
+Google's \"personal search for everyone\" gave me the heebie-jeebies too.
+
+I just tried Duck Duck Go... the results page was empty, until I told noscript to allow duckduckgo.com. Why should displaying results require javascript? Sigh.
+"""]]

diff --git a/blog/discussion.mdwn b/blog/discussion.mdwn
index fc4e11a..4346321 100644
--- a/blog/discussion.mdwn
+++ b/blog/discussion.mdwn
@@ -1,5 +1,5 @@
 This is my discussion blog. The way it works is that when any
-posts in this wiki have a discussion page created for them, the discussion
+pages in this wiki have a discussion page created for them, the discussion
 pages show up below. Also, any comments on my blog posts also show up here.
 
-[[!inline pages="*/Discussion or internal(blog/entry/*/comment_*)"]]
+[[!inline pages="*/Discussion or internal(blog/entry/*/comment_*)" show=20]]

diff --git a/blog/entry/The_Man_from_Earth.mdwn b/blog/entry/The_Man_from_Earth.mdwn
index 238896c..f286bb4 100644
--- a/blog/entry/The_Man_from_Earth.mdwn
+++ b/blog/entry/The_Man_from_Earth.mdwn
@@ -25,4 +25,4 @@ cast a few bucks.
 [3] Snip: silly-yet-true-analogy-between-typical-SF-movies-and-bags-of-potato-chips  
 [4] Snip: hating on most CGI  
 
-[[!tag lay review]]
+[[!tag lay film review]]
diff --git a/blog/entry/two_films.mdwn b/blog/entry/two_films.mdwn
index b4be68c..55d42d5 100644
--- a/blog/entry/two_films.mdwn
+++ b/blog/entry/two_films.mdwn
@@ -23,4 +23,4 @@ seen Ramin Bahrani's work before *Solo*, and especially liked
 [Man Push Cart](http://en.wikipedia.org/wiki/Man_Push_Cart). Don't know
 if I will ever find any of Sergei Dvortsevoy's earlier films.
 
-[[!tag lay film]]
+[[!tag lay film review]]

diff --git a/meta.mdwn b/meta.mdwn
index 213c41c..446b3d5 100644
--- a/meta.mdwn
+++ b/meta.mdwn
@@ -6,7 +6,3 @@ pages="*/Discussion"]] are Discussion pages.
 Broken links:
 
 [[!brokenlinks ]]
-
-Linkmap:
-
-[[!linkmap connected=yes pages="* and !*blog/entry/* and !ikiwiki/* and !*/Discussion and !*/*.*"]]

diff --git a/meta.mdwn b/meta.mdwn
index 446b3d5..213c41c 100644
--- a/meta.mdwn
+++ b/meta.mdwn
@@ -6,3 +6,7 @@ pages="*/Discussion"]] are Discussion pages.
 Broken links:
 
 [[!brokenlinks ]]
+
+Linkmap:
+
+[[!linkmap connected=yes pages="* and !*blog/entry/* and !ikiwiki/* and !*/Discussion and !*/*.*"]]

diff --git a/blog/entry/naught_but_a_decade.mdwn b/blog/entry/naught_but_a_decade.mdwn
new file mode 100644
index 0000000..0365d76
--- /dev/null
+++ b/blog/entry/naught_but_a_decade.mdwn
@@ -0,0 +1,93 @@
+This has been a big decade for me.
+
+Ten years ago, I was living in Sunnyvale, in the heart of
+Silicon Valley; VA had just had its [crazy
+IPO](http://news.cnet.com/8301-13505_3-10413589-16.html); my
+unvested options were worth over a million dollars on paper. I
+remember sitting in first class[1] on the way out of Atlanta
+after the holidays and wondering what one did with a million
+dollars. Avoid working too much? Have a lot of interesting
+computers? Build a distributed house[2]? Mostly I decided to
+not count my chickens, which turned out to be the right choice.
+
+Six months later, I started [[code/debian-installer]], in many
+ways my biggest project to date.
+
+In spring of '01, VA was crashing; I was sick of the Valley;
+gloom was everywhere. I took the hint and quit, cashed in my
+options for five figures, not seven, bade forewell to the many
+people I'd come to know, and moved back east.
+
+By reading my old journal, I can tell that subconciously,
+I had long before decided what to do when it was time to leave
+the Bay Area. So without really thinking too much about why
+I was able to do this, about how not just my own family, but
+others were indirectly making it possible, I moved to a 150
+acre wooded "farm", and mostly went off and did mostly my own
+thing for three years.
+
+This was such a huge life change. I lived in a building affectionatly
+called "the shack". It was renovated from a chicken coop in the 70's and
+leaked during heavy rain, but I preferred it to the main house (warmer). I
+went back to dialup for internet. I hauled groceries and most everything
+half a mile in by hand. There was an outhouse and washwater hauled from a
+creek. I cut barely enough firewood and readapted my body from California
+to cold.
+
+My main tech project during this time was [[code/mooix]].
+In some ways my largest failed project, but it was neat
+to be able to go off and do such a thing.
+
+This was a blissful, reflective, peaceful, amazing time. Parts were a
+second childhood. Somewhere in there I properly confronted my mortality.
+And learned to use a chainsaw. And over the course of three years, I
+dug myself into a rut, a hole. I wasn't going anywhere.
+
+(Except for a month in Honduras, and my first DebConf in Oslo.)
+
+In '04, I found myself talking on the phone to a cosmonaut
+in a house that had been without power for days in a hard winter.
+I realized I was ready to leave the farm if I could figure out how
+to do it, and I almost took him up on the job working on his new
+Linux distro -- but at the last minute Oslo connections suggested
+I work for SkoleLinux instead, and so I did.
+
+Soon after moving into a rented house in town, I was jaunting off to Brazil
+for a month, a great time. Followed by a productive year where I got
+heavily back into [[code/debian-installer]], started Debian's testing
+security tream, and generally worked a lot.
+
+The next summer I fooled around with an RV, and sort of fell into
+a job with ADS. But my time on the farm had changed me, I think.
+I ended up going back to the farm for a year and working part time
+from there. During this time I also started [[code/ikiwiki]] and
+other smaller projects.
+
+One day I came back from a camping trip and found the kitchen had
+been torn down in my absence. Reminded unsubtly that I was not the
+only one with a claim to the place, I got out, though I somehow
+suspect not for good.
+
+For the last four years, I've been more outwardly settled, buying a house
+in town, continuing to work at the same job, starting little projects like
+[[code/pristine-tar]], [[code/mr]], and [[code/etckeeper]]. About two years
+in I began to feel antsy sometimes (and had a minor medical scare), and set
+up the [[yurt]] as a relief valve so I can have 
+[[crazy adventures|what_am_I_doing_here?]] in the cold woods again. Still, I
+sometimes feel that a big change is building up.
+
+From here, this decade feels like it contained endless changes, important
+decisions, interesting projects, strong experiences. The 90's, containing
+only little things like college and moving to California, pale in comparison.
+Maybe the naught's will be the decade I always remember.. or maybe not.
+Anything could be around the corner.
+
+---
+
+1. Bumped up due to an airline scheduling snafu, not because
+   I was throwing money around.
+
+2. Concept of mine perhaps not worth explaining here although it was oddly
+   similar to how I ended up living at the farm. Good ol' subconcious..
+
+[[!tag lay]]

diff --git a/blog/archives/2010.mdwn b/blog/archives/2010.mdwn
new file mode 100644
index 0000000..022c447
--- /dev/null
+++ b/blog/archives/2010.mdwn
@@ -0,0 +1 @@
+[[!calendar type=year year=2010 pages="blog/entry/* and !*/Discussion"]]
diff --git a/blog/archives/2010/01.mdwn b/blog/archives/2010/01.mdwn
new file mode 100644
index 0000000..f3f57bf
--- /dev/null
+++ b/blog/archives/2010/01.mdwn
@@ -0,0 +1,3 @@
+[[!calendar type=month month=01 year=2010 pages="blog/entry/* and !*/Discussion"]]
+
+[[!inline pages="creation_month(01) and creation_year(2010) and blog/entry/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/blog/archives/2010/02.mdwn b/blog/archives/2010/02.mdwn
new file mode 100644
index 0000000..e5d5c8a
--- /dev/null
+++ b/blog/archives/2010/02.mdwn
@@ -0,0 +1,3 @@
+[[!calendar type=month month=02 year=2010 pages="blog/entry/* and !*/Discussion"]]
+
+[[!inline pages="creation_month(02) and creation_year(2010) and blog/entry/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/blog/archives/2010/03.mdwn b/blog/archives/2010/03.mdwn
new file mode 100644
index 0000000..33d4f04
--- /dev/null
+++ b/blog/archives/2010/03.mdwn
@@ -0,0 +1,3 @@
+[[!calendar type=month month=03 year=2010 pages="blog/entry/* and !*/Discussion"]]
+
+[[!inline pages="creation_month(03) and creation_year(2010) and blog/entry/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/blog/archives/2010/04.mdwn b/blog/archives/2010/04.mdwn
new file mode 100644
index 0000000..919e8f0
--- /dev/null
+++ b/blog/archives/2010/04.mdwn
@@ -0,0 +1,3 @@
+[[!calendar type=month month=04 year=2010 pages="blog/entry/* and !*/Discussion"]]
+
+[[!inline pages="creation_month(04) and creation_year(2010) and blog/entry/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/blog/archives/2010/05.mdwn b/blog/archives/2010/05.mdwn
new file mode 100644
index 0000000..84e45d0
--- /dev/null
+++ b/blog/archives/2010/05.mdwn
@@ -0,0 +1,3 @@
+[[!calendar type=month month=05 year=2010 pages="blog/entry/* and !*/Discussion"]]
+
+[[!inline pages="creation_month(05) and creation_year(2010) and blog/entry/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/blog/archives/2010/06.mdwn b/blog/archives/2010/06.mdwn
new file mode 100644
index 0000000..22b2550
--- /dev/null
+++ b/blog/archives/2010/06.mdwn
@@ -0,0 +1,3 @@
+[[!calendar type=month month=06 year=2010 pages="blog/entry/* and !*/Discussion"]]
+
+[[!inline pages="creation_month(06) and creation_year(2010) and blog/entry/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/blog/archives/2010/07.mdwn b/blog/archives/2010/07.mdwn
new file mode 100644
index 0000000..809e2e6
--- /dev/null
+++ b/blog/archives/2010/07.mdwn
@@ -0,0 +1,3 @@
+[[!calendar type=month month=07 year=2010 pages="blog/entry/* and !*/Discussion"]]
+
+[[!inline pages="creation_month(07) and creation_year(2010) and blog/entry/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/blog/archives/2010/08.mdwn b/blog/archives/2010/08.mdwn
new file mode 100644
index 0000000..395cde2
--- /dev/null
+++ b/blog/archives/2010/08.mdwn
@@ -0,0 +1,3 @@
+[[!calendar type=month month=08 year=2010 pages="blog/entry/* and !*/Discussion"]]
+
+[[!inline pages="creation_month(08) and creation_year(2010) and blog/entry/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/blog/archives/2010/09.mdwn b/blog/archives/2010/09.mdwn
new file mode 100644
index 0000000..d599f44
--- /dev/null
+++ b/blog/archives/2010/09.mdwn
@@ -0,0 +1,3 @@
+[[!calendar type=month month=09 year=2010 pages="blog/entry/* and !*/Discussion"]]
+
+[[!inline pages="creation_month(09) and creation_year(2010) and blog/entry/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/blog/archives/2010/10.mdwn b/blog/archives/2010/10.mdwn
new file mode 100644
index 0000000..b31f3b5
--- /dev/null
+++ b/blog/archives/2010/10.mdwn
@@ -0,0 +1,3 @@
+[[!calendar type=month month=10 year=2010 pages="blog/entry/* and !*/Discussion"]]
+
+[[!inline pages="creation_month(10) and creation_year(2010) and blog/entry/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/blog/archives/2010/11.mdwn b/blog/archives/2010/11.mdwn
new file mode 100644
index 0000000..e923abd
--- /dev/null
+++ b/blog/archives/2010/11.mdwn
@@ -0,0 +1,3 @@
+[[!calendar type=month month=11 year=2010 pages="blog/entry/* and !*/Discussion"]]
+
+[[!inline pages="creation_month(11) and creation_year(2010) and blog/entry/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/blog/archives/2010/12.mdwn b/blog/archives/2010/12.mdwn
new file mode 100644
index 0000000..a3a6bbf
--- /dev/null
+++ b/blog/archives/2010/12.mdwn
@@ -0,0 +1,3 @@
+[[!calendar type=month month=12 year=2010 pages="blog/entry/* and !*/Discussion"]]
+
+[[!inline pages="creation_month(12) and creation_year(2010) and blog/entry/* and !*/Discussion" show=0 feeds=no reverse=yes]]