Recent changes to this wiki. Not to be confused with my history.

Complete source to the wiki is available on gitweb or by cloning this site.

typo
diff --git a/sigs.fortune b/sigs.fortune
index e318206c..e64f87eb 100644
--- a/sigs.fortune
+++ b/sigs.fortune
@@ -526,7 +526,7 @@ Who watches the watchmen?
 Qui police la police?
 Tu. You. Toi.
 %
-Nothing in life is to be feared, it is only to be understood
+Nothing in life is to be feared, it is only to be understood.
 Now is the time to understand more, so that we may fear less.
                          - Marie Curie
 %

update on rsendmail progress: success!
diff --git a/services/mail.mdwn b/services/mail.mdwn
index 0710214a..476d576f 100644
--- a/services/mail.mdwn
+++ b/services/mail.mdwn
@@ -313,14 +313,16 @@ directly and ignore local emails.
  1. test [syncmaildir](https://github.com/gares/syncmaildir) to replace offlineimap: would allow for an
     automated configuration based on SSH keys instead of passwords
 
- 2. similarly, consider using [nullmailer](https://untroubled.org/nullmailer/). bremner has [this setup
+ 2. ✓ similarly, consider using [nullmailer](https://untroubled.org/nullmailer/). bremner has [this setup
     that using SSH](https://salsa.debian.org/bremner/nullmailer-ssh). nullmailer has the advantage over [msmtp](http://msmtp.sourceforge.net/)
-    that it can queue emails.
+    that it can queue emails. update: done, with a custom rsendmail,
+    see below.
 
- 3. alternatively, a simple `sendmail` wrapper that calls `ssh host
+ 3. ✓ alternatively, a simple `sendmail` wrapper that calls `ssh host
     sendmail` could do the job as well. it would need to be some
     restricted sendmail command, maybe like `rsendmail` above. but
-    then emails can only be sent online.
+    then emails can only be sent online. Update: this was implemented,
+    with a nullmailer remote, as [rsendmail](https://gitlab.com/anarcat/rsendmail).
 
  4. ultimately, maybe the IMAP server can send the email, through a
     "Outbox" folder that would slurp emails written there and send

another laptop reseller
diff --git a/hardware/laptop.mdwn b/hardware/laptop.mdwn
index 279e66a3..5353c642 100644
--- a/hardware/laptop.mdwn
+++ b/hardware/laptop.mdwn
@@ -414,5 +414,6 @@ Fournisseurs
   older ones: x200 t400
 * [dantech](http://www.dantech.ca/) - local friendly folks
 * [toplaptop](https://www.toplaptop.ca/) - local + cheap source of thinkpads
+* [Encan Dépôt](http://www.encandepot.com/) - same, across the street
 * [mike's computer shop](https://www.mikescomputershop.com/) - cheap canada seller
 * [canada computers](http://www.canadacomputers.com) - famous toronto computer shop?

new low for macro
diff --git a/hardware/camera.mdwn b/hardware/camera.mdwn
index 9c20fcb7..e1c2d6a6 100644
--- a/hardware/camera.mdwn
+++ b/hardware/camera.mdwn
@@ -190,7 +190,7 @@ Reference
  * [35mm f/2 R WR ø43](http://www.fujifilm.ca/products/digital_cameras/x/fujinon_lens_xf35mmf2_r_wr/), [Rockwell](http://www.kenrockwell.com/fuji/x-mount-lenses/35mm-f2.htm), [fstoppers](https://fstoppers.com/gear/fstoppers-reviews-fujifilm-35mm-f2-wr-158227), nice size,
    sealed, 350-400$ on kijiji 
  * [60mm f/2.4 R Macro ø39mm](http://www.fujifilm.ca/products/digital_cameras/x/fujinon_lens_xf60mmf24_r_macro/), [Rockwell](https://kenrockwell.com/fuji/x-mount-lenses/60mm-f24.htm), [Photograph blog](http://www.photographyblog.com/reviews/fujifilm_xf_60mm_f2_4_r_review/),
-   500-700$ on kijiji
+   425-700$ on kijiji
  * [X100f ø49](http://www.fujifilm.com/products/digital_cameras/x/fujifilm_x100f/) 1200-1600$ on kijiji
  * lens cap holder: [1](https://www.bhphotovideo.com/c/product/834774-REG/Sensei_CK_L_Cap_Keeper_for_Lens.html?sts=pi), [2](https://www.bhphotovideo.com/c/product/850525-REG/Sensei_ck_lp_Cap_Keeper_Plus_Lens.html), haven't found others
  * [cleaning pen](https://www.bhphotovideo.com/c/product/1051483-REG/lenspen_nlp1_c_nlp1c_lens_pen.html): ~10USD. haven't looked at alternative brushes.

Added a comment
diff --git a/blog/2018-04-12-terminal-emulators-1/comment_3_641fc1f051c97c1c5e2cfa467dacd74c._comment b/blog/2018-04-12-terminal-emulators-1/comment_3_641fc1f051c97c1c5e2cfa467dacd74c._comment
new file mode 100644
index 00000000..201d30e0
--- /dev/null
+++ b/blog/2018-04-12-terminal-emulators-1/comment_3_641fc1f051c97c1c5e2cfa467dacd74c._comment
@@ -0,0 +1,26 @@
+[[!comment format=mdwn
+ ip="220.233.88.110"
+ claimedauthor="Screwtape"
+ subject="comment 3"
+ date="2018-04-14T01:50:03Z"
+ content="""
+> xterm fails to display the Arabic Mem character in its default configuration
+
+Before Unicode, font rendering was simple: a font could only contain 256 characters at most, so pretty much every font had every character you cared about, so you could just load it up and start drawing it to the screen.
+
+With the advent of Unicode, nobody has the patience to draw a complete Unicode font, never mind multiple sizes. Instead, modern font-rendering systems (like browsers and GUI toolkits) will scan all the installed fonts at startup to figure out what Unicode characters they support, and then when they need to draw a particular character, they will search through all the fonts looking for the most appropriate version.
+
+Unfortunately, xterm was designed before Unicode, so by default it just uses characters from a single font. It's not that xterm lacks Unicode support, it's just that it expects you to choose a font that covers all the characters you use on a regular basis.
+
+> ...only by bumping the font size to \"Huge\" (20 points) is the character finally displayed correctly, and then other characters fail to display correctly
+
+xterm defaults to non-scalable (\"bitmap\") fonts, which means that changing the size doesn't just make the letters bigger or smaller, it switches to an entirely separate font that can have different characters available. You can configure xterm to use a scalable font, of course.
+
+> Many terminals fail this test: Alacritty, VTE-derivatives (GNOME Terminal, Terminator, and XFCE Terminal), urxvt, st, and xterm all show Sarah's name backwards—as if we would display it as \"Haras\" in English.
+
+As far as I know, there's no convention about how terminal emulators should handle RTL text; I don't believe any of the original DEC terminals (the ones that terminal emulators are emulating) handled it at all.
+
+For example, If I send a terminal the control sequence to go to location (3, 7) and print \"abc\", then go back to the same location and print \"d\", I can be sure I'll see \"dbc\". If I tell the terminal to go to location (3, 7) and print \"שרה\" then go back to the same location, and print \"ר\", will I see \"שרר\" (overwriting the character visibly at that location) or \"ררה\" (overwriting the character printed at that location)?
+
+The sanest advice I've heard is that terminals should always display characters left-to-right as they're received, and applications should reverse RTL strings before sending them to the terminal, because the application is the only one that knows what the strings mean and where they should go.
+"""]]

Added a comment: bugs
diff --git a/blog/2018-04-12-terminal-emulators-1/comment_2_04914a14f90648bb7db7682ba764ee3c._comment b/blog/2018-04-12-terminal-emulators-1/comment_2_04914a14f90648bb7db7682ba764ee3c._comment
new file mode 100644
index 00000000..8a368528
--- /dev/null
+++ b/blog/2018-04-12-terminal-emulators-1/comment_2_04914a14f90648bb7db7682ba764ee3c._comment
@@ -0,0 +1,18 @@
+[[!comment format=mdwn
+ username="anarcat"
+ avatar="https://seccdn.libravatar.org/avatar/741655483dd8a0b4df28fb3dedfa7e4c"
+ subject="bugs"
+ date="2018-04-14T01:41:54Z"
+ content="""
+>  Have you considered submitting these bugs to upstream? Especially the ones that are maintained regularly like Konsole, Xterm, etc? 
+
+If you have followed other articles I wrote, you know I usually do this, pretty extensively. :) For example, I filed almost a dozen bug upstream while writing [[2018-03-19-sigal]] ([list here](https://lwn.net/Articles/748662/)).
+
+But this series was different: I was not reviewing a single program, but multiple. And there are a bunch that I reviewed that are *not* mentioned here. Filing bugs and following up on everything would have been too prohibitive. I have spent already way too much time writing those articles and couldn't afford following up on all those issues.
+
+Besides, many of those are controversial, as you can see in the comments on the LWN site. RTL, for example, is especially tricky to agree on. Others question the very idea that paste problems are even a security in the first place. I do not really want to get into that with all those upstreams...
+
+But of course, the door is wide open for others to file those issues now, and I would very much welcome help in that regard. :)
+
+Cheers!
+"""]]

Added a comment: Bugs
diff --git a/blog/2018-04-12-terminal-emulators-1/comment_1_8cb4b7e4f095fee3b673b77598c6d74a._comment b/blog/2018-04-12-terminal-emulators-1/comment_1_8cb4b7e4f095fee3b673b77598c6d74a._comment
new file mode 100644
index 00000000..b5e6ff01
--- /dev/null
+++ b/blog/2018-04-12-terminal-emulators-1/comment_1_8cb4b7e4f095fee3b673b77598c6d74a._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ ip="172.91.111.166"
+ claimedauthor="Ben"
+ subject="Bugs"
+ date="2018-04-14T01:08:50Z"
+ content="""
+Have you considered submitting these bugs to upstream? Especially the ones that are maintained regularly like Konsole, Xterm, etc?
+"""]]

status update on firefox plugins: removed cookie autodelete, temp containers and sea containers
diff --git a/software/desktop/firefox.mdwn b/software/desktop/firefox.mdwn
index 24778072..339a4b0b 100644
--- a/software/desktop/firefox.mdwn
+++ b/software/desktop/firefox.mdwn
@@ -34,27 +34,36 @@ I have those extensions installed:
 
 I am testing those:
 
- * [Cookie autodelete](https://addons.mozilla.org/en-US/firefox/addon/cookie-autodelete/) - even though uMatrix stops most cookies
-   from being sent, it actually stores them locally. it would be great
-   if this could sync with umatrix block lists... maybe with [issue
-   #43](https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/issues/43)?
  * [Multi-account containers](https://github.com/mozilla/multi-account-containers/) - kind of useful, but also a bit
    strange: impossible to assign an existing tab to a container, UI is
    very clikety (can't open a container-specific tab from the
    keyboard), etc. need to click-hold on the "+" tab button to choose
    container.
- * [Sea containers](https://addons.mozilla.org/en-US/firefox/addon/sea-containers/) - another GUI for containers
- * [Smart HTTPS](https://addons.mozilla.org/en-US/firefox/addon/smart-https-revived/)
- * [Snooze tabs](https://addons.mozilla.org/en-US/firefox/addon/snoozetabs/)
+ * [Smart HTTPS](https://addons.mozilla.org/en-US/firefox/addon/smart-https-revived/) - some use [HTTPS everywhere](https://www.eff.org/https-everywhere) but i find that
+   one works too and doesn't require sites to be added to a
+   list. nowadays, https URLs match http URLs quite well: long gone
+   are the days where wikipedia had a special "secure" URL...
+ * [Snooze tabs](https://addons.mozilla.org/en-US/firefox/addon/snoozetabs/) - another way to deal with tab explosion
  * [Switch container](https://addons.mozilla.org/en-US/firefox/addon/switch-container/) - fixes *one* of those issues (can switch
    containers now)
- * [Temporary containers](https://addons.mozilla.org/en-US/firefox/addon/temporary-containers/) - not sure that works so well...
  * [Wayback machine](https://addons.mozilla.org/en-US/firefox/addon/wayback-machine_new/) - i also have bookmarklets, but this could
    work better! Unfortunately, it doesn't work with other archival
    sites like archive.is or Google's cache.
 
 I removed those:
 
+ * [Cookie autodelete](https://addons.mozilla.org/en-US/firefox/addon/cookie-autodelete/) - even though uMatrix stops most cookies
+   from being sent, it actually stores them locally. it would be great
+   if this could sync with umatrix block lists... maybe with [issue
+   #43](https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/issues/43)? turns out this is too inconvenient: need to specify the
+   cookies to keep per container, then per site, it's a huge mess and
+   there's no way to run a "simulation" mode... either the cookies get
+   deleted and you get kicked out everywhere (at once!) or it does
+   nothing.
+ * [Sea containers](https://addons.mozilla.org/en-US/firefox/addon/sea-containers/) - another GUI for containers. installed it and
+   then never used it so i uninstalled it.
+ * [Temporary containers](https://addons.mozilla.org/en-US/firefox/addon/temporary-containers/) - not sure that works so
+   well... installed it and then never used it so i uninstalled it.
  * [adblock plus](https://addons.mozilla.org/fr/firefox/addon/1865) - now selling ads! replaced with ublock
  * [Addons compatibility reporter](https://addons.mozilla.org/en-US/firefox/addon/add-on-compatibility-reporter/) - useless since Firefox 57 /
    Quantum, as incompatible extensions are just *disabled*

creating tag page tag/terminals
diff --git a/tag/terminals.mdwn b/tag/terminals.mdwn
new file mode 100644
index 00000000..f7474a7c
--- /dev/null
+++ b/tag/terminals.mdwn
@@ -0,0 +1,4 @@
+[[!meta title="pages tagged terminals"]]
+
+[[!inline pages="tagged(terminals)" actions="no" archive="yes"
+feedshow=10]]

add more tags
diff --git a/blog/2018-04-12-terminal-emulators-1.mdwn b/blog/2018-04-12-terminal-emulators-1.mdwn
index d25d1d41..5a746949 100644
--- a/blog/2018-04-12-terminal-emulators-1.mdwn
+++ b/blog/2018-04-12-terminal-emulators-1.mdwn
@@ -284,4 +284,4 @@ reserve judgment until our look at performance in the next article.
 [first appeared]: https://lwn.net/Articles/749992/
 [Linux Weekly News]: http://lwn.net/
 
-[[!tag debian-planet lwn]]
+[[!tag debian-planet lwn terminals geek review]]

rename page with current date
diff --git a/blog/terms.mdwn b/blog/2018-04-12-terminal-emulators-1.mdwn
similarity index 100%
rename from blog/terms.mdwn
rename to blog/2018-04-12-terminal-emulators-1.mdwn
diff --git a/blog/terms/terminator-infinite-splits.png b/blog/2018-04-12-terminal-emulators-1/terminator-infinite-splits.png
similarity index 100%
rename from blog/terms/terminator-infinite-splits.png
rename to blog/2018-04-12-terminal-emulators-1/terminator-infinite-splits.png
diff --git a/blog/terms/true-colors.png b/blog/2018-04-12-terminal-emulators-1/true-colors.png
similarity index 100%
rename from blog/terms/true-colors.png
rename to blog/2018-04-12-terminal-emulators-1/true-colors.png
diff --git a/blog/terms/unicode-gnome.png b/blog/2018-04-12-terminal-emulators-1/unicode-gnome.png
similarity index 100%
rename from blog/terms/unicode-gnome.png
rename to blog/2018-04-12-terminal-emulators-1/unicode-gnome.png
diff --git a/blog/terms/unicode-mlterm.png b/blog/2018-04-12-terminal-emulators-1/unicode-mlterm.png
similarity index 100%
rename from blog/terms/unicode-mlterm.png
rename to blog/2018-04-12-terminal-emulators-1/unicode-mlterm.png
diff --git a/blog/terms/unicode-xterm-fail-huge.png b/blog/2018-04-12-terminal-emulators-1/unicode-xterm-fail-huge.png
similarity index 100%
rename from blog/terms/unicode-xterm-fail-huge.png
rename to blog/2018-04-12-terminal-emulators-1/unicode-xterm-fail-huge.png
diff --git a/blog/terms/unicode-xterm-fail.png b/blog/2018-04-12-terminal-emulators-1/unicode-xterm-fail.png
similarity index 100%
rename from blog/terms/unicode-xterm-fail.png
rename to blog/2018-04-12-terminal-emulators-1/unicode-xterm-fail.png

note this is part of a series
diff --git a/blog/terms.mdwn b/blog/terms.mdwn
index 81d278bc..d25d1d41 100644
--- a/blog/terms.mdwn
+++ b/blog/terms.mdwn
@@ -2,6 +2,9 @@
 [[!meta date="2018-03-30T00:00:00+0000"]]
 [[!meta updated="2018-04-12T11:06:51-0400"]]
 
+> This article is the first in a two-part series about terminal
+> emulators.
+
 [[!toc levels=2]]
 
 Terminals have a special place in computing history, surviving along

use local images
diff --git a/blog/terms.mdwn b/blog/terms.mdwn
index 459240c2..81d278bc 100644
--- a/blog/terms.mdwn
+++ b/blog/terms.mdwn
@@ -61,8 +61,7 @@ display scripts from all over the world reliably. xterm fails to display
 the Arabic [Mem](https://en.wikipedia.org/wiki/Mem) character in its
 default configuration:
 
-> ![\[xterm
-> failure\]](https://static.lwn.net/images/2018/terms-unicode-xterm.png "xterm failure")
+![xterm failure](unicode-xterm-fail.png)
 
 By default, xterm uses the classic "fixed" font which, [according to
 Wikipedia](https://en.wikipedia.org/wiki/Open-source_Unicode_typefaces)
@@ -71,8 +70,7 @@ here that makes the character display as a box: only by bumping the font
 size to "Huge" (20 points) is the character finally displayed correctly,
 and then *other* characters fail to display correctly:
 
-> ![\[xterm failure, huge
-> fonts\]](https://static.lwn.net/images/2018/terms-unicode-xterm2.png "xterm failure, huge fonts")
+![xterm failure, huge fonts](unicode-xterm-fail-huge.png)
 
 Those screenshots were generated on Fedora 27 as it gave better results
 than Debian 9, where some older versions of the terminals (mlterm,
@@ -100,8 +98,7 @@ Many terminals fail this test: Alacritty, VTE-derivatives (GNOME
 Terminal, Terminator, and XFCE Terminal), urxvt, st, and xterm all show
 Sarah's name backwards—as if we would display it as "Haras" in English.
 
-> ![\[GNOME Terminal
-> Hebrew\]](https://static.lwn.net/images/2018/terms-unicode-gnome.png "GNOME Terminal Hebrew")
+![GNOME Terminal Hebrew](unicode-gnome.png)
 
 The other challenge with bi-directional text is how to align it,
 especially mixed RTL and left-to-right (LTR) text. RTL scripts should
@@ -112,8 +109,7 @@ including Konsole, which otherwise displays Sarah's name in the right
 order. Here, pterm and mlterm seem to be sticking to the standard a
 little more closely and align the test string on the right.
 
-> ![\[mlterm
-> Hebrew\]](https://static.lwn.net/images/2018/terms-unicode-mlterm.png "mlterm Hebrew")
+![mlterm Hebrew](unicode-mlterm.png)
 
 Paste protection
 ----------------
@@ -187,8 +183,7 @@ features tab support through a plugin. But in terms of tab support,
 Terminator takes the prize: not only does it support tabs, but it can
 also *tile* terminals in arbitrary patterns (as seen at the right).
 
-> [![\[Terminator
-> tiling\]](https://static.lwn.net/images/2018/terms-terminator-sm.png "Terminator tiling")](https://lwn.net/Articles/750052/)
+![Terminator tiling](terminator-infinite-splits.png)
 
 Another feature of Terminator is the capability to "group" those tabs
 together and to send the same keystrokes to a set of terminals all at
@@ -238,8 +233,7 @@ which still does a decent job at approximating the colors using its
 256-color palette. Urxvt not only fails the test but even shows blinking
 characters instead of colors.
 
-> ![\[True
-> color\]](https://static.lwn.net/images/2018/terms-true-colors.png "True color")
+![True color](true-colors.png)
 
 Some terminals also parse the text for URL patterns to make them
 clickable. This is the case for all VTE-derived terminals, while urxvt

terms pt1 article online
diff --git a/blog/terms.mdwn b/blog/terms.mdwn
index 7a547da7..459240c2 100644
--- a/blog/terms.mdwn
+++ b/blog/terms.mdwn
@@ -1,9 +1,6 @@
 [[!meta title="A look at terminal emulators, part 1"]]
-\[LWN subscriber-only content\]
--------------------------------
-
 [[!meta date="2018-03-30T00:00:00+0000"]]
-[[!meta updated="2018-03-30T14:21:21-0400"]]
+[[!meta updated="2018-04-12T11:06:51-0400"]]
 
 [[!toc levels=2]]
 
@@ -281,6 +278,8 @@ detection, and so on. So at first glance, the default terminal provided
 by your favorite desktop environment might just fit the bill, but we'll
 reserve judgment until our look at performance in the next article.
 
+------------------------------------------------------------------------
+
 
 
 > *This article [first appeared][] in the [Linux Weekly News][].*

yet another syntax error
diff --git a/communication/publications.bib b/communication/publications.bib
index c2aefe08..a0cdb0cd 100644
--- a/communication/publications.bib
+++ b/communication/publications.bib
@@ -24,9 +24,9 @@
   note = "Last of four-part NetConf/NetDev 2.1 coverage",
   url = {https://anarc.at/blog/2017-04-29-netdev-rise-linux-networking-hw/},
 }
-@article{website:2017-10-26-comparison-cryptographic-keycards
+@article{website:2017-10-26-comparison-cryptographic-keycards,
   title = "A comparison of cryptographic keycards",
-  year = 2017
+  year = 2017,
   month = "October",
   journal = "LWN.net",
   author = "Antoine Beaupré",

fix syntax error
diff --git a/communication/publications.bib b/communication/publications.bib
index 4b4dfdae..c2aefe08 100644
--- a/communication/publications.bib
+++ b/communication/publications.bib
@@ -28,7 +28,7 @@
   title = "A comparison of cryptographic keycards",
   year = 2017
   month = "October",
-  journal "LWN.net",
+  journal = "LWN.net",
   author = "Antoine Beaupré",
   note = "Second in a four-part series on cryptographic keycards and secrets storage",
   url = {https://anarc.at/blog/2017-10-26-comparison-cryptographic-keycards/},

add crypto series
diff --git a/communication/publications.bib b/communication/publications.bib
index 1cbb968b..4b4dfdae 100644
--- a/communication/publications.bib
+++ b/communication/publications.bib
@@ -24,6 +24,15 @@
   note = "Last of four-part NetConf/NetDev 2.1 coverage",
   url = {https://anarc.at/blog/2017-04-29-netdev-rise-linux-networking-hw/},
 }
+@article{website:2017-10-26-comparison-cryptographic-keycards
+  title = "A comparison of cryptographic keycards",
+  year = 2017
+  month = "October",
+  journal "LWN.net",
+  author = "Antoine Beaupré",
+  note = "Second in a four-part series on cryptographic keycards and secrets storage",
+  url = {https://anarc.at/blog/2017-10-26-comparison-cryptographic-keycards/},
+}
 @article{website:2017-02-18-passwords-entropy,
   title = "Reliably generating good passwords",
   year = 2017,

include all netdev/netconf articles in a series
diff --git a/blog/2017-04-11-netconf1.mdwn b/blog/2017-04-11-netconf1.mdwn
index 9de4f4fb..7ec7d803 100644
--- a/blog/2017-04-11-netconf1.mdwn
+++ b/blog/2017-04-11-netconf1.mdwn
@@ -2,6 +2,13 @@
 [[!meta date="2017-04-11T12:00:00-0500"]]
 [[!meta updated="2017-04-21T16:42:20-0400"]]
 
+> This article is part of a larger series about NetConf/NetDev 2.1.
+>
+> * [[A report from Netconf: Day 1|2017-04-11-netconf1]]
+> * [[A report from Netconf: Day 2|2017-04-12-netconf2]]
+> * [[New approaches to network fast paths|2017-04-29-netdev-fast-path]]
+> * [[The rise of Linux-based networking hardware|2017-04-29-netdev-rise-linux-networking-hw]]
+
 As is becoming traditional, two times a year the kernel networking
 community meets in a two-stage conference: an invite-only, informal,
 two-day plenary session called
diff --git a/blog/2017-04-12-netconf2.mdwn b/blog/2017-04-12-netconf2.mdwn
index b0886aa9..5befb722 100644
--- a/blog/2017-04-12-netconf2.mdwn
+++ b/blog/2017-04-12-netconf2.mdwn
@@ -2,6 +2,13 @@
 [[!meta date="2017-04-11T12:00:00-0500"]]
 [[!meta updated="2017-04-21T16:55:38-0400"]]
 
+> This article is part of a larger series about NetConf/NetDev 2.1.
+>
+> * [[A report from Netconf: Day 1|2017-04-11-netconf1]]
+> * [[A report from Netconf: Day 2|2017-04-12-netconf2]]
+> * [[New approaches to network fast paths|2017-04-29-netdev-fast-path]]
+> * [[The rise of Linux-based networking hardware|2017-04-29-netdev-rise-linux-networking-hw]]
+
 This article covers the second day of the informal Netconf discussions,
 held on on April 4, 2017. Topics discussed this day included the binding
 of sockets in VRF, identification of eBPF programs, inconsistencies
diff --git a/blog/2017-04-29-netdev-fast-path.mdwn b/blog/2017-04-29-netdev-fast-path.mdwn
index be2f57a2..4e6c87d1 100644
--- a/blog/2017-04-29-netdev-fast-path.mdwn
+++ b/blog/2017-04-29-netdev-fast-path.mdwn
@@ -2,7 +2,12 @@
 [[!meta date="2017-04-13T12:00:00-0500"]]
 [[!meta updated="2017-04-39T13:35:53-0500"]]
 
-> [[New approaches to network fast paths|2017-04-29-netdev-fast-path]]
+> This article is part of a larger series about NetConf/NetDev 2.1.
+>
+> * [[A report from Netconf: Day 1|2017-04-11-netconf1]]
+> * [[A report from Netconf: Day 2|2017-04-12-netconf2]]
+> * [[New approaches to network fast paths|2017-04-29-netdev-fast-path]]
+> * [[The rise of Linux-based networking hardware|2017-04-29-netdev-rise-linux-networking-hw]]
 
 With the speed of network hardware now reaching 100 Gbps and distributed
 denial-of-service (DDoS) attacks going in the [Tbps
diff --git a/blog/2017-04-29-netdev-rise-linux-networking-hw.mdwn b/blog/2017-04-29-netdev-rise-linux-networking-hw.mdwn
index 86f58b90..3b8d9502 100644
--- a/blog/2017-04-29-netdev-rise-linux-networking-hw.mdwn
+++ b/blog/2017-04-29-netdev-rise-linux-networking-hw.mdwn
@@ -2,6 +2,13 @@
 [[!meta date="2017-04-19T12:00:00-0500"]]
 [[!meta updated="2017-04-39T13:36:25-0500"]]
 
+> This article is part of a larger series about NetConf/NetDev 2.1.
+>
+> * [[A report from Netconf: Day 1|2017-04-11-netconf1]]
+> * [[A report from Netconf: Day 2|2017-04-12-netconf2]]
+> * [[New approaches to network fast paths|2017-04-29-netdev-fast-path]]
+> * [[The rise of Linux-based networking hardware|2017-04-29-netdev-rise-linux-networking-hw]]
+
 Linux usage in networking hardware has been on the rise for some time.
 During the latest [Netdev conference](http://netdevconf.org/2.1/) held
 in Montreal this April, people talked seriously about Linux running on

remove the "this article" blurb everywhere, it is redundant
diff --git a/blog/2015-12-14-yubikey-howto.mdwn b/blog/2015-12-14-yubikey-howto.mdwn
index dcdfe49a..d19c6deb 100644
--- a/blog/2015-12-14-yubikey-howto.mdwn
+++ b/blog/2015-12-14-yubikey-howto.mdwn
@@ -6,7 +6,7 @@
 >  * [[ROCA: Return Of the Coppersmith Attack|2017-11-14-ROCA-return-of-the-coppersmith-attack]]
 >  * [[A comparison of cryptographic keycards|2017-10-26-comparison-cryptographic-keycards]]
 >  * [[Strategies for offline PGP key storage|2017-10-16-strategies-offline-pgp-key-storage]]
->  * [[Using a Yubikey NEO for SSH and OpenPGP on Debian jessie|2015-12-14-yubikey-howto]] - this article
+>  * [[Using a Yubikey NEO for SSH and OpenPGP on Debian jessie|2015-12-14-yubikey-howto]]
 
 I recently ordered two [Yubikey][] devices from [Yubico][], partly
 because of a [special offer from Github][]. I ordered both a
diff --git a/blog/2017-04-29-netdev-fast-path.mdwn b/blog/2017-04-29-netdev-fast-path.mdwn
index aceb4075..be2f57a2 100644
--- a/blog/2017-04-29-netdev-fast-path.mdwn
+++ b/blog/2017-04-29-netdev-fast-path.mdwn
@@ -2,6 +2,8 @@
 [[!meta date="2017-04-13T12:00:00-0500"]]
 [[!meta updated="2017-04-39T13:35:53-0500"]]
 
+> [[New approaches to network fast paths|2017-04-29-netdev-fast-path]]
+
 With the speed of network hardware now reaching 100 Gbps and distributed
 denial-of-service (DDoS) attacks going in the [Tbps
 range](https://en.wikipedia.org/wiki/2016_Dyn_cyberattack), Linux kernel
diff --git a/blog/2017-10-16-strategies-offline-pgp-key-storage.mdwn b/blog/2017-10-16-strategies-offline-pgp-key-storage.mdwn
index 725fc66b..2edba403 100644
--- a/blog/2017-10-16-strategies-offline-pgp-key-storage.mdwn
+++ b/blog/2017-10-16-strategies-offline-pgp-key-storage.mdwn
@@ -7,7 +7,7 @@
 >
 >  * [[ROCA: Return Of the Coppersmith Attack|2017-11-14-ROCA-return-of-the-coppersmith-attack]]
 >  * [[A comparison of cryptographic keycards|2017-10-26-comparison-cryptographic-keycards]]
->  * [[Strategies for offline PGP key storage|2017-10-16-strategies-offline-pgp-key-storage]] - this article
+>  * [[Strategies for offline PGP key storage|2017-10-16-strategies-offline-pgp-key-storage]]
 >  * [[Using a Yubikey NEO for SSH and OpenPGP on Debian jessie|2015-12-14-yubikey-howto]]
 
 While the adoption of [OpenPGP](http://openpgp.org/) by the general
diff --git a/blog/2017-10-26-comparison-cryptographic-keycards.mdwn b/blog/2017-10-26-comparison-cryptographic-keycards.mdwn
index 50365757..dfa19170 100644
--- a/blog/2017-10-26-comparison-cryptographic-keycards.mdwn
+++ b/blog/2017-10-26-comparison-cryptographic-keycards.mdwn
@@ -7,7 +7,7 @@
 > and secrets storage.
 >
 >  * [[ROCA: Return Of the Coppersmith Attack|2017-11-14-ROCA-return-of-the-coppersmith-attack]]
->  * [[A comparison of cryptographic keycards|2017-10-26-comparison-cryptographic-keycards]] - this article
+>  * [[A comparison of cryptographic keycards|2017-10-26-comparison-cryptographic-keycards]]
 >  * [[Strategies for offline PGP key storage|2017-10-16-strategies-offline-pgp-key-storage]]
 >  * [[Using a Yubikey NEO for SSH and OpenPGP on Debian jessie|2015-12-14-yubikey-howto]]
 
diff --git a/blog/2017-11-14-ROCA-return-of-the-coppersmith-attack.mdwn b/blog/2017-11-14-ROCA-return-of-the-coppersmith-attack.mdwn
index fc24137a..8818ba6d 100644
--- a/blog/2017-11-14-ROCA-return-of-the-coppersmith-attack.mdwn
+++ b/blog/2017-11-14-ROCA-return-of-the-coppersmith-attack.mdwn
@@ -5,7 +5,7 @@
 > This article is part of a larger series on cryptographic keycards
 > and secrets storage.
 >
->  * [[ROCA: Return Of the Coppersmith Attack|2017-11-14-ROCA-return-of-the-coppersmith-attack]] - this article
+>  * [[ROCA: Return Of the Coppersmith Attack|2017-11-14-ROCA-return-of-the-coppersmith-attack]]
 >  * [[A comparison of cryptographic keycards|2017-10-26-comparison-cryptographic-keycards]]
 >  * [[Strategies for offline PGP key storage|2017-10-16-strategies-offline-pgp-key-storage]]
 >  * [[Using a Yubikey NEO for SSH and OpenPGP on Debian jessie|2015-12-14-yubikey-howto]]

include crypto articles in a series correctly
diff --git a/blog/2015-12-14-yubikey-howto.mdwn b/blog/2015-12-14-yubikey-howto.mdwn
index fffdcee6..dcdfe49a 100644
--- a/blog/2015-12-14-yubikey-howto.mdwn
+++ b/blog/2015-12-14-yubikey-howto.mdwn
@@ -1,4 +1,13 @@
 [[!meta title="Using a Yubikey NEO for SSH and OpenPGP on Debian jessie"]]
+
+> This article is part of a larger series on cryptographic keycards
+> and secrets storage.
+>
+>  * [[ROCA: Return Of the Coppersmith Attack|2017-11-14-ROCA-return-of-the-coppersmith-attack]]
+>  * [[A comparison of cryptographic keycards|2017-10-26-comparison-cryptographic-keycards]]
+>  * [[Strategies for offline PGP key storage|2017-10-16-strategies-offline-pgp-key-storage]]
+>  * [[Using a Yubikey NEO for SSH and OpenPGP on Debian jessie|2015-12-14-yubikey-howto]] - this article
+
 I recently ordered two [Yubikey][] devices from [Yubico][], partly
 because of a [special offer from Github][]. I ordered both a
 [Yubikey NEO][] and a [Yubikey 4][], although I am not sure I remember
diff --git a/blog/2017-10-16-strategies-offline-pgp-key-storage.mdwn b/blog/2017-10-16-strategies-offline-pgp-key-storage.mdwn
index b36dabc9..725fc66b 100644
--- a/blog/2017-10-16-strategies-offline-pgp-key-storage.mdwn
+++ b/blog/2017-10-16-strategies-offline-pgp-key-storage.mdwn
@@ -2,6 +2,14 @@
 [[!meta date="2017-10-02T12:00:00-0500"]]
 [[!meta updated="2017-10-16T20:05:30-0500"]]
 
+> This article is part of a larger series on cryptographic keycards
+> and secrets storage.
+>
+>  * [[ROCA: Return Of the Coppersmith Attack|2017-11-14-ROCA-return-of-the-coppersmith-attack]]
+>  * [[A comparison of cryptographic keycards|2017-10-26-comparison-cryptographic-keycards]]
+>  * [[Strategies for offline PGP key storage|2017-10-16-strategies-offline-pgp-key-storage]] - this article
+>  * [[Using a Yubikey NEO for SSH and OpenPGP on Debian jessie|2015-12-14-yubikey-howto]]
+
 While the adoption of [OpenPGP](http://openpgp.org/) by the general
 population is marginal at best, it is a critical component for the
 security community and particularly for Linux distributions. For
diff --git a/blog/2017-10-26-comparison-cryptographic-keycards.mdwn b/blog/2017-10-26-comparison-cryptographic-keycards.mdwn
index e9db42dd..50365757 100644
--- a/blog/2017-10-26-comparison-cryptographic-keycards.mdwn
+++ b/blog/2017-10-26-comparison-cryptographic-keycards.mdwn
@@ -3,6 +3,14 @@
 [[!meta date="2017-10-17T00:00:00+0000"]]
 [[!meta updated="2017-10-26T19:42:06-0400"]]
 
+> This article is part of a larger series on cryptographic keycards
+> and secrets storage.
+>
+>  * [[ROCA: Return Of the Coppersmith Attack|2017-11-14-ROCA-return-of-the-coppersmith-attack]]
+>  * [[A comparison of cryptographic keycards|2017-10-26-comparison-cryptographic-keycards]] - this article
+>  * [[Strategies for offline PGP key storage|2017-10-16-strategies-offline-pgp-key-storage]]
+>  * [[Using a Yubikey NEO for SSH and OpenPGP on Debian jessie|2015-12-14-yubikey-howto]]
+
 An [[earlier article|2017-10-16-strategies-offline-pgp-key-storage]] showed that
 private key storage is an important problem to solve in any
 cryptographic system and established keycards as a good way to store
diff --git a/blog/2017-11-14-ROCA-return-of-the-coppersmith-attack.mdwn b/blog/2017-11-14-ROCA-return-of-the-coppersmith-attack.mdwn
index fdef87f0..fc24137a 100644
--- a/blog/2017-11-14-ROCA-return-of-the-coppersmith-attack.mdwn
+++ b/blog/2017-11-14-ROCA-return-of-the-coppersmith-attack.mdwn
@@ -2,6 +2,14 @@
 [[!meta date="2017-11-14T00:00:00+0000"]]
 [[!meta updated="2017-11-29T22:27:33-0500"]]
 
+> This article is part of a larger series on cryptographic keycards
+> and secrets storage.
+>
+>  * [[ROCA: Return Of the Coppersmith Attack|2017-11-14-ROCA-return-of-the-coppersmith-attack]] - this article
+>  * [[A comparison of cryptographic keycards|2017-10-26-comparison-cryptographic-keycards]]
+>  * [[Strategies for offline PGP key storage|2017-10-16-strategies-offline-pgp-key-storage]]
+>  * [[Using a Yubikey NEO for SSH and OpenPGP on Debian jessie|2015-12-14-yubikey-howto]]
+
 On October 30, 2017, a group of Czech researchers from Masaryk
 University presented the [ROCA
 paper](https://crocs.fi.muni.cz/public/papers/rsa_ccs17) at the ACM CCS

renew PGP key.
process followed:
1. gpg --edit-key + expire 14m (so it falls in summer instead of busier spring) + save
2. gpg --keyserver pool.sks-keyservers.net --send-keys XXXXX
3. gpg --keyserver keyring.debian.org --send-keys XXXXXX
4. fight with encrypted mailing lists to get the keys to update (x-add-key fails)
5. wait for the Debian keyring changes to trickle down into the
infrastructure, which happens roughly monthly and can be checked on
https://salsa.debian.org/debian-keyring/keyring/
This probably forgets some stuff.
diff --git a/pubkey.asc b/pubkey.asc
index 0d766443..5e5aeae2 100644
--- a/pubkey.asc
+++ b/pubkey.asc
@@ -11,60 +11,60 @@ V628Tn9+8oDg6c+dO3RCCmw+nUUPjeGU0k19S6fNIbNPRlElS31QGL4H0IazZqnE
 q1wWFFQDskG+ybN2Qy7SZMQtjjOqM+CmdeAnQGVwxowSDPbHfFpYeCEb+Wzya337
 Jy9yJwkfa+V7e7Lkv9/OysEsV4hJrOh8YXu9a4qBWZvZHnIO7zRbz7cqVBKmdrL2
 iGqpEUv/x5onjNQwpjSVX5S+ZRBZTzah0w186IpXVxsU8dSk0yeQskblrwARAQAB
-tCNBbnRvaW5lIEJlYXVwcsOpIDxhbmFyY2F0QGFuYXJjLmF0PokCVAQTAQgAPhYh
-BI3JAc5kFGwEitUPu3khUlJ7dZIeBQJY96veAhsDBQkQuLYXBQsJCAcDBRUKCQgL
-BRYCAwEAAh4BAheAAAoJEHkhUlJ7dZIeBzIQAIeNS6JilNJFGh1RjBRFpI8JKxmc
-1Cc7Bw8iCwgNB9UjOdD3C2OEiMrm5l3NuuOdBWZ4bv0A3phqiwgaGeeJmrDCDvmp
-dixLBrG5yGwhE8x4cQweY62zN8NbmvOG25CydMph8vmyLpSPn3Y5FpQNFpdStqly
-APRJORgMJQAMYM1G//QksQMjmDIue8kK2wIjCjKkJ8/GYdbGytUBOkfEBuwXYdxN
-WD148zJk1FA3+BatcsUDySQjkpp3hqKLtT+NwI/SZ/4YhZ9kP4F6avBWG4eCCdO4
-hG0kNyNcOjyYvmaczO3I8Yz6Ba7vdd3+ixXRrg0F0oJ3Zzcp4BnDM+0t9uZCzWMV
-wr3DLwWtqZ9UtJUq7uydLLAnpONBdFxCgZKjW1OSMDKybkvOb+i8gSoIWC4VyRn1
-QQlglmuk/znX8W0e0nZDvZW5Jz74P5o8x/Aigb6jbn0JR6lYtxH+jVm31uRbyIsV
-QljVWYaT6Bw2vxH8jjf/GlR5fAX0RwW9IZ+GKOvSIkqoi6kPHidubm7n/3PssT3a
-KzD4rfugt1NFv2j2Nj0wRMLwMyCuhNSr56ddaQVvc5m/4HVceAysm7Jd8ifw1bxY
-tHaqFxwayG04W/PV+M97yOWCbG3kWxwNB0U01bkbjRTg6XTZu6zbGA0KEyu18Jpm
-AGRgsfOT0mYm42BVtCZBbnRvaW5lIEJlYXVwcsOpIDxhbmFyY2F0QGtvdW1iaXQu
+tCNBbnRvaW5lIEJlYXVwcsOpIDxhbmFyY2F0QGFuYXJjLmF0PokCVAQTAQgAPgIb
+AwULCQgHAwUVCgkICwUWAgMBAAIeAQIXgBYhBI3JAc5kFGwEitUPu3khUlJ7dZIe
+BQJazWjGBQkS1vYoAAoJEHkhUlJ7dZIepK8P+gJCwRKwKoXAzVtwyHR8H6YbM2gw
+RU/OrDMOqYF53NMPgsPkYvR8kUXL0PZtHdJdNQdTc8J2tQdxkZrlUwgpILvktEkT
+R9dwlip8jJ0ucIg9X10ICyACM4XuW+kNuUCPs3PrSVicrSX7iAyopSZoueQF4VaA
+s+HwSUjYA1n4oGnBmnblWi59CepCM1yAJPLIQjvs/qq2Iuz2cOpsajEAyCsklNgj
+/irO8a8PxcKN5u7TiWmC7IKB850USi9cIi7wg4XjdRE5nPSkjToKwS5ejMfpm/LZ
+0tQ4BepBp8+cq/T33lps1m0Kc2rkwCp4BVnWq/e6ve/wevl58L94A9jQF/I4nMqL
++7al+hXDu5Ejwb7sEbo509cIj9i+Qpze/nQ++am3tDxCs2kmeX1wwdvq3QKDtTHy
+mYSn/ByVz33UuThfV23B4xghz7L2K4OqmO2B2o5WqdDIFx88kDFLJrAsT+DNzo1d
+JFKI46etVJbg8fV7B6PX4Y9iAqy1s/2IBLJ9VtT75v7fhrDdwhCRbl6OaahxvnZc
+vtWIv//QF/xoJ+l6iFF/631bUijqWK0inAoVXSjrQs8CILV5byhfPHlJOjSm37k0
+kvHkhpKNNM7d/IB9HOYCGB98esGcOWJp+OE+vkK0Wn2nVQiFC0S1ncSXPyibngOx
+mqXdw31bW38TtM5FtCZBbnRvaW5lIEJlYXVwcsOpIDxhbmFyY2F0QGtvdW1iaXQu
 b3JnPokCVAQTAQgAPgIbAwULCQgHAwUVCgkICwUWAgMBAAIeAQIXgBYhBI3JAc5k
-FGwEitUPu3khUlJ7dZIeBQJY96s4BQkQuLYXAAoJEHkhUlJ7dZIeO7AQAJMhIpwD
-iAKor/asxujphJHzB6Phja1S/G24N49bxhvXIScNAAfDaiwyWUF6Pxp6D77Y4NAa
-3+3cZNacBx1VRhWDbgJD22uNF5r++q4iLCApR0LGw8eEZyvm+5tLfcqrhtQgYRB9
-HQkbb87mvMBiNjrfz2jAkhuBRxDYb8i0JsL5UyvD32C0+JRK+CabSyIYpeR2ZdBM
-h9oxR3Hm1ofqlPcO+fNxSNjn8UJvB1RLlS0UqoD9Dbq/l8Ok3ssfWsFbSYdov4ka
-dRCfwI38fFgXuM8dcvit1XtGXtsZzE21HHzwYQIvW6T1lylY7PiUWjnknab88fCw
-+HhuAJj+HeJfcpZW8C51Zqf4q4igLtp/BIWkn5ehLKNZhFNc+1m32/fMK8LP1Hvt
-AIiZxTOmjPpTavyO4dTF53kilQjb1+/UEkTwKLK/yCjL/8mfbg4Wkr1dfaGjyolC
-iV4vrOuD3uV5YFhOJW2THV/hKp+M5sNonSmpkkTZ9b7SoFUfg8ZHqsXeqZFgSW2o
-+vXtlQvtxwM4gYdRNxcDWi6Xn8/RQ1cAOrh195GEdS9JkHknZPrh9jhr3u9mAX4e
-PCmdi94wO8WADWuaszuuFqqTN3ArxcsXa8VVmAy505h5/eoDrgfKJxoYSUQ8+5p4
-Xr7kzfzSpYPUP9XZuZ6XHxVKej3nrkElDN1ttCpBbnRvaW5lIEJlYXVwcsOpIDxh
+FGwEitUPu3khUlJ7dZIeBQJazWjIBQkS1vYoAAoJEHkhUlJ7dZIeNsMP/jOq7Dz0
+QouK+XfIGQd5y8c8DPipx45KTGPDt9YW7q55MC7+7YBZ/pgk0B5NWErtzxQP00O2
+chk2EZ48iF5QW4pO9J4ZYIBgf+u4KQ2GnikjrtpotdVtwkAKnzFmH29Y1kzqnGjf
+/qStLmvip2xcMWgTPNHZWjNZD7vEmIsswgHnQis55NldlfB/qqvAF+4LAAtJY6hj
+GsJuxJ/0KtkKKGat9+NNNWmPtGhVlAB1xWQSULSJdUghFZRuebVSW9d6jK3dcYMo
+7XN8cdziDQ6E9pnkr1qOJ0dP20pf80P+DlizzD7ywWxqeSZz+bzHA4xCqW0CACeh
+WftXtmLSXRITh/EL4BK17U1wfT1361siuH3Gr93RJKGloa4HJsQQ8q1un2EHsTUL
+aoioG05xXu/ykCr/dPZTcoj5dQoLN1SG0CKxzALBpkodsE1uHy1EFPYRGWmolZcq
+ozzElKwIzqemRyRzbUNCPLPQotZfPtjs0hYIIwfQtGUwIEttZrXf2zF/A9yJankf
+bpvpR+WjdZDVdmAsZNsfbeq5sc8EOKCmPe6/4IpNL44cI1yS8CTlUa0MKcdf417r
+HEISPAn0PcFUi5LVsngekRbWenkK3jWMQ1iM0uvmI24yLmzNbbOoc9U4mGBoIk1x
+saXqfJUKBIeMNtP1EpLXiGUxLJ9A4UxssUCctCpBbnRvaW5lIEJlYXVwcsOpIDxh
 bmFyY2F0QG9yYW5nZXNlZWRzLm9yZz6JAlQEEwEIAD4CGwMFCwkIBwMFFQoJCAsF
-FgIDAQACHgECF4AWIQSNyQHOZBRsBIrVD7t5IVJSe3WSHgUCWPerNQUJELi2FwAK
-CRB5IVJSe3WSHqNeEACr1XFC4JWCNAuUmbKf72keTHAqo7Wr3jNZYUO/GDYOICAT
-ZMmEfPMn9ALWxkSuwCca9SL3KMtxjJ7QREjUnyVH7CeZUaJpUJhRvroOr9cKaDvl
-Yd7VP5QcibVBtXaVqMq8QZCxGMuyWMN+vzNCPFidXQBvOUtYyTeDX0pHQWKbJtv5
-VBlcTNekm40qKCirnEHl8i69wa2wZ4aAUg3VEJ2nF0gQcsEyD6cc0Q86HM652h9j
-uVBNyDVIZAzI1FYAHn7cDeBEB9HwaG29ZrV3R3gcgkJ2B8vXZdcuUfDelZfcZs/J
-B+ZN/veyO2aIIUdgEv9bYJO9H+o/H6Hy3xNFcKuZ8dmicMlKOO2/p6vgBrNbLi2A
-nlrFE+0xRcTpNc6NfvX1E2slHTYgRqLF0NzXfRokmKPsonLauXKdKvyXuUlM9I61
-T8NYTZyoRruOFhLTv15pKcd3GYMZSiJiUfVsBHy7YX+IbXPvFU/6Qi2BV7kwGhlc
-eLEaS+mL7CoBVQPkAeYKYOfqfrIjWHQq8/3T959QnOXHPO6JeiDIQmW37p0GXMiA
-dswRtJQlh7wY3afMa2mUGoc2fjvr4C3EAKmFo1rCo1WpuxJzfe4d5cWzdtcEp7Tp
-jLVyMsFjKrusvoKFAxxl1ZXQX/NgQ5qOug/GQ/TAdguvX3p6uukCAsT4CxkABbQl
+FgIDAQACHgECF4AWIQSNyQHOZBRsBIrVD7t5IVJSe3WSHgUCWs1oyAUJEtb2KAAK
+CRB5IVJSe3WSHh+DEACzlorp/RzyaI2QPOgxxqUBIiLK6V2KEEjDpTWe7VUWZpe7
+i50otpbxFTfHqz0dh7LFsgUyj2VybpOk759oxKpZ/wRJx6+G47NLW1PEV3NfBJDh
+xQvt5DCcUjRYcgSkqCgfQzK9ZOqqsZKXX5vgI6p+4G17y64jvxFTW+wnHjyDOw1n
+zOwlLRGtHXOScVzKrZycZ/GUH6z6IjywxK5SYZI0hUw5JO2HL4tjE6TA4dZsrq4U
+RVmJnrw8Y1rg/dqeMU4iPOaD/UNtQ5bcMSKWPnVkD+F8K6OoiUVCsGYLGFfVweEJ
+5KtCNJhGRj1D17uhC3QX7oxhTE6Czf1DYNPNzbQpsgLipo43QU806muhUbaYnpqF
+l5D/IWZDiG2Jmx6SH+4A1B2JiIc2j0K8+jwfQOmzLSlOIdpGfDgEReTno2FXSal3
++r1HHAnMHPxTzfJFGYcJazZ07buosbHhpcd0Exx3yi1cbJE8Y/dREezNH5jwovM+
+6vGbZWHEJ8wN+ZeB9zhLybwa6CnyXLU8dnFG3ZQ9SW0mgo0f4a1MabLJk0ljLyBo
+m+DdzAt+yRQfnbTnraM9XZS6zDVY5Uq6YuK6EtCQvx6q8obypGYApJRSs04/gM8Q
+LTLyuv7b18f+OltYPzJcclZ1u/gOm3RJm8WnfYdUMMTnoifq4efwQUNopKnRq7Ql
 QW50b2luZSBCZWF1cHLDqSA8YW5hcmNhdEBkZWJpYW4ub3JnPokCVAQTAQgAPgIb
 AwULCQgHAwUVCgkICwUWAgMBAAIeAQIXgBYhBI3JAc5kFGwEitUPu3khUlJ7dZIe
-BQJY96s4BQkQuLYXAAoJEHkhUlJ7dZIeYZ8P/04rBf24prUki+ccidisKx/EFKMs
-yUWxErp0XIfgpc59BEoNvQXXCvp0o7BC/JAxK4spxFjfi6q7k/PmPq/qhQUaBop2
-GYEMdy9IbMgPlqciRCeSHpWt5WT+E4uXaVR7ponPcgWToTChVniipTGHAqpuetLo
-I3nnBOxOk7OoSf48m6l4DlV9Ju0YIpO1W0cRbDbgSbmgk1Ila3Rt297rZ5lJSPWQ
-ImvTn2qkrZn1fvIEV95Faoc0lcOPmmDbJoPsMtTH5XsIvB0fN69+VsAzYnbmSFRF
-hCSKhwnOZrWJ/1GKCxDonFaWyQxYovhFRKSk3qdWMSDmi/Oj/5u4YRxocxwaMeiW
-ECuYM3Ul9hlySHh+kekeW736pSJfxbM2FwjE+LTA6apBjv6vBUZIeJJI97shOa2N
-j7zAHnijah60270yIPUt3gXhWuCO+iakPno50/pgcjVh8kRqUEob8iVuAvYz8CT8
-kzLDaTQyiq9w4vjGL6MDtXUUdLHLqpiraNIGtrsVyXgOimW8YMUdSJh8NnXgofyd
-xhO3EYnPytgMpAcHPJ2u0i6B76ixKDwo/KNYQJrbcujt4HJ1Xig8qT+ueMhbzKMM
-QpGGl3m0v86sTQIlV27uIVaqO07Bm8EKkBm7TmwzAp2JyZQFh6kZ6IPlRZPLXbUa
-ERTA/ONgRCuA6ySOtC1BbnRvaW5lIEJlYXVwcsOpICh3b3JrKSA8YW5hcmNhdEBr
+BQJazWjIBQkS1vYoAAoJEHkhUlJ7dZIe3IUP/3G/keDpoV5OwBct1K3TLNMAZSIC
+cy4Nh+NT6/XQZlsT2FtSZn3zESsw9IaHE/4nUJOW2C6WcJo85h/obDsnsEGl9KfC
+t84jXMeJZQg3o3O26dRLDNZQVSO8iliNzHX6/V8NYtWulZ/x9Hqthhg8HcM9Tor7
+uKuQbNSE5M8SzsNH4cb9aSeKeIqMoOY2OS41eTS4uHyaogCBRpnnj+AAhuv7eUeU
+wzrfkQkzPtq/2y0O6L7Ce8K9u0BPL4ywBFe6zqBafeevTo1kCCLf+95Af42nl/bW
+lbAyCnFPegEkPWqj74wSqFQMHrkYx+er2FykPoI0WYaunq1LZlolk/v95+U5WsNr
+f7uwz7UmyDKADM69x7DTFUEZ1PoExPM1Zo+w5RTXFqfWR5uroKJhw5UkGhYrqg1T
+RSeqbB14DLWnQFZYztdVgTDqDM5g0PJpaA1+COMH5PpyhdRg1UfWET32LZDpbnqx
+6ntiq/AfHQeHp+Ibugu/PO/qD8T+kAs3GVXDzJd+rS8quxLekkKiiQp1S5ZIzCsI
+Tp2fVOqIgTszjlVy/ypGUkLnbDQE/tu22faaksdd6jpzgbupbZUOPSPaywUUVOEA
+jb+EwZPFQWIAzbbTflGY8L10leez1X0HYfcC95hRSEobdBlK9iWtS/7grN/o85RT
+iuuQgoul178m+VnotC1BbnRvaW5lIEJlYXVwcsOpICh3b3JrKSA8YW5hcmNhdEBr
 b3VtYml0Lm9yZz6JAjYEMAEIACAFAlPOcNsZHSByZW1vdmluZyBjb21tZW50IGZp
 ZWxkcwAKCRB5IVJSe3WSHvC/D/sH8ak9X0dom7HTDWyDb9fO4g95jP4MOOGuTL2I
 P7SPn3OoXZtAVaHihgvp+6H7Z0C4S+JiNL8XagcZmv7xZ6cbXyfCWAU6JEd6rTDo
@@ -214,5 +214,5 @@ wrT6mtK9Kgzxs/12ZUQYi6vOxMaOFM4FxvTODIKZhUPdLjy9mVOAezMB6zXPBoLK
 3f+07CvNTkmxElWez4H9NRhpH+7eggMwPKC8Tk5tbFdoVWcILn2v7OXQVrNnSi7K
 TYBghHMd/6fWf3wcKeBE7gVF6XbLMYNg7ass+RdGb40cJG9QD+LjMaQmzYBXSGwo
 r3/Hy4yQGMcB0CF5eFj4KyLMbOwqON/C+Cp/zgvADNIN1motUTbIZA==
-=xx3m
+=GqfQ
 -----END PGP PUBLIC KEY BLOCK-----

Added a comment: Ethernet ports on current ultrabooks
diff --git a/hardware/laptop/thinkpad-x120e/comment_4_f0c55986a089a2629c8ad033ce62c916._comment b/hardware/laptop/thinkpad-x120e/comment_4_f0c55986a089a2629c8ad033ce62c916._comment
new file mode 100644
index 00000000..afa98366
--- /dev/null
+++ b/hardware/laptop/thinkpad-x120e/comment_4_f0c55986a089a2629c8ad033ce62c916._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ ip="128.100.3.51"
+ claimedauthor="Chris Siebenmann"
+ url="https://utcc.utoronto.ca/~cks/space/blog/"
+ subject="Ethernet ports on current ultrabooks"
+ date="2018-04-09T16:47:08Z"
+ content="""
+As a sysadmin, I do sort of miss a built in Ethernet port on my XPS 13 (although I don't need it very often for my work when I'm not at my desk). Unfortunately, my impression is that basically all modern 'ultrabooks' (ie, nice thin 13\" laptops) now omit Ethernet ports; all you get is USB, increasingly USB-C only. For example, my co-worker has a modern Lenovo ultrabook and it too lacks Ethernet. The dongle we use to get wired Ethernet is from Pluggable; it's okay and not too big, but it definitely would be another annoying thing to carry around and to plug into the laptop.
+"""]]

Added a comment: x220
diff --git a/hardware/laptop/thinkpad-x120e/comment_3_b604ca3d30d97a3ce1d7059796e20918._comment b/hardware/laptop/thinkpad-x120e/comment_3_b604ca3d30d97a3ce1d7059796e20918._comment
new file mode 100644
index 00000000..f46deda5
--- /dev/null
+++ b/hardware/laptop/thinkpad-x120e/comment_3_b604ca3d30d97a3ce1d7059796e20918._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="anarcat"
+ avatar="https://seccdn.libravatar.org/avatar/741655483dd8a0b4df28fb3dedfa7e4c"
+ subject="x220"
+ date="2018-04-09T13:24:45Z"
+ content="""
+I would love to find one of those, but it seems the second-hand market doesn't carry the x220 at all anymore. It seems like the perfect compromise... but I may have to settle for a x230 unfortunately. This is basically why I started looking for [[other alternatives|hardware/laptop]].
+
+About the XPS13: people keep on bringing me back to that thing. It seems like a very popular laptop! The power, resolution, size and weight certainly seem attractive, but it's a bit on the expensive side for me right now. I guess I could look at the used market for that as well, but all the used Dell stuff I find are old Latitude models. Also, the lack of Ethernet port is a big problem for me: I regularly work with routers that I need to talk with through RJ-45 cables directly and the prospect of carrying yet another dongle is not great.
+"""]]

Added a comment
diff --git a/hardware/laptop/thinkpad-x120e/comment_2_ee9a73c7fa197e2856b35dd1540e1d76._comment b/hardware/laptop/thinkpad-x120e/comment_2_ee9a73c7fa197e2856b35dd1540e1d76._comment
new file mode 100644
index 00000000..1c983a95
--- /dev/null
+++ b/hardware/laptop/thinkpad-x120e/comment_2_ee9a73c7fa197e2856b35dd1540e1d76._comment
@@ -0,0 +1,11 @@
+[[!comment format=mdwn
+ ip="66.96.18.208"
+ claimedauthor="Chris Siebenmann"
+ url="https://utcc.utoronto.ca/~cks/blog/"
+ subject="comment 2"
+ date="2018-04-09T12:51:01Z"
+ content="""
+I'm quite happy running Fedora on a Dell XPS 13 (2017 model, which has 2x USB-A and one USB-C; the 2018 model is all USB-C). Everything works, I love the small size and portability, and I've had great battery life, especially after I tuned things with powertop, although I tend to mostly use the laptop for terminal windows and browsers, with only a few compiles. Dell appears to have pretty good support for Linux in general; for example, I've had the machine offer and apply BIOS upgrades through Linux (with a GUI in Cinnamon, presumably based on fwupdmgr). On the downsides, everything is completely non-upgradeable and the 16 GB models are definitely pricey. I have a somewhat longer review of it on my blog [here](https://utcc.utoronto.ca/~cks/space/blog/linux/DellXPS13FedoraReview) and I'd be happy to answer questions about it.
+
+(Sadly I rather expect that there are binary blobs involved in the wireless card and so on, although I haven't looked. It's possible to disable Secure Boot, although the laptop comes configured to do it by default and I have Fedora installed with it enabled.)
+"""]]

Added a comment
diff --git a/hardware/laptop/thinkpad-x120e/comment_1_13b3f8a90e6629ec5c99e17a0aaac4fe._comment b/hardware/laptop/thinkpad-x120e/comment_1_13b3f8a90e6629ec5c99e17a0aaac4fe._comment
new file mode 100644
index 00000000..c6ee59f2
--- /dev/null
+++ b/hardware/laptop/thinkpad-x120e/comment_1_13b3f8a90e6629ec5c99e17a0aaac4fe._comment
@@ -0,0 +1,11 @@
+[[!comment format=mdwn
+ ip="78.56.236.68"
+ claimedauthor="Marius Gedminas"
+ url="https://gedmin.as"
+ subject="comment 1"
+ date="2018-04-09T07:08:58Z"
+ content="""
+I'm still very happy with my x220.  I think it's the last generation with a non-chicklet keyboard and three physical trackpoint buttons.
+
+Officially it supports up to 8 GB of RAM, but I put in 16 GB and it works fine.
+"""]]

mycroft trick
diff --git a/software/desktop/firefox.mdwn b/software/desktop/firefox.mdwn
index 201a2552..24778072 100644
--- a/software/desktop/firefox.mdwn
+++ b/software/desktop/firefox.mdwn
@@ -124,6 +124,9 @@ this restricts the width of pages in the Debian wiki:
 The syntax of this file is basically undocumented. Its location and
 basic usage is documented [in MozillaZine](http://kb.mozillazine.org/UserContent.css) but not much further.
 
+I add some search engines that are misconfigured from
+[Mycroft](http://mycroftproject.com/search-engines.html?name=linguee). 
+
 History
 -------
 

remove the argon theory for now
diff --git a/hardware/laptop/thinkpad-x120e.mdwn b/hardware/laptop/thinkpad-x120e.mdwn
index 9110ce68..98be5359 100644
--- a/hardware/laptop/thinkpad-x120e.mdwn
+++ b/hardware/laptop/thinkpad-x120e.mdwn
@@ -38,26 +38,32 @@ How the x120e died
 
 In the end, this laptop died a horrible death: it crashed, face first,
 on a linoleum floor. This seems to have cracked something in the
-screen which, apparently, releases some argon gaz (!). The text was
-*readable*, but barely, and colors were totally off. Here is a Github
-webpage that is supposed to be white, but shows up as cyan:
+screen which makes the text *readable*, but barely, and colors, totally
+off. Here is a Github webpage that is supposed to be white, but shows
+up as cyan:
 
 [<img src="https://photos.anarc.at/documentation/angela-death/DSCF2164.jpg" alt="the blue screen (of death?)" />](https://photos.anarc.at/documentation/angela-death/#/2)
 
-This progressively damages the display until it displays nothing but a
-[blank white screen](https://photos.anarc.at/documentation/angela-death/#/1). It would probably be possible to replace that
-screen (40-60$USD for parts), however there are *more* issues still.
+This phenomenon progressively damages the display until it displays
+nothing but a [blank white screen](https://photos.anarc.at/documentation/angela-death/#/1). I have heard it might be some
+gaz that leaks from the display into the LCD, but that screen is
+supposed to be lit by a LED array (as opposed to [CFFL](https://en.wikipedia.org/wiki/Cold_cathode), see the
+[backlight](https://en.wikipedia.org/wiki/Backlight) article for more explanations) so that's probably not
+the problem. So I don't quite know what's going on with that screen,
+but it's obviously dead, which is somewhat inconvenient for a laptop,
+to say the least.
 
-The CPU/fan assembly also has a serious cooling problem. When the
-machine boots, the fan kicks in full speed immediately. Just idle, the
-CPU hits 62°C. Doing a `git annex fsck` on a bunch of files (which
-involves many SHA256 checksums) made the CPU heat up to 99°C. Playing
-videos on Netflix completely crashes the machine with temperature
-warnings, as it struggles to decode videos in the browser. This might
-be fixable as well, but it means lot of work to do on a machine I
-didn't like very much in the first place. In the meantime, it means
-the CPU can basically boil an egg which can't be good for the
-hardware.
+It would probably be possible to replace that screen (40-60$USD for
+parts), however there is another issue: the CPU/fan assembly also has
+a serious cooling problem. When the machine boots, the fan kicks in
+full speed immediately. Just idle, the CPU hits 62°C. Doing a `git
+annex fsck` on a bunch of files (which involves many SHA256 checksums)
+made the CPU heat up to 99°C. Playing videos on Netflix completely
+crashes the machine with temperature warnings, as it struggles to
+decode videos in the browser. This might be fixable as well, but it
+means lot of work to do on a machine I didn't like very much in the
+first place. In the meantime, it means the CPU can basically boil an
+egg which can't be good for the hardware.
 
 So basically, to get this machine up to speed, I would need to:
 

fix link
diff --git a/hardware/laptop/thinkpad-x120e.mdwn b/hardware/laptop/thinkpad-x120e.mdwn
index 068e7eb9..9110ce68 100644
--- a/hardware/laptop/thinkpad-x120e.mdwn
+++ b/hardware/laptop/thinkpad-x120e.mdwn
@@ -6,7 +6,7 @@ a [Ultraportable](https://en.wikipedia.org/wiki/Subnotebook)), which meant back
 wide, slim laptop with less power, but cheaper. It did its job: I
 carried it through meetings and conferences all over the world for 7
 years now. I also used it as a workstation for a short time in
-2016-2017 when [[marcos]] stopped being a workstation and turned
+2016-2017 when [[hardware/server/marcos]] stopped being a workstation and turned
 solely into a home cinema.
 
 I always disliked the keyboard. I got used to the "chiclet" key style,

finalize article and publish on blog
diff --git a/hardware/laptop/thinkpad-x120e.mdwn b/hardware/laptop/thinkpad-x120e.mdwn
index 6f1d1eb9..068e7eb9 100644
--- a/hardware/laptop/thinkpad-x120e.mdwn
+++ b/hardware/laptop/thinkpad-x120e.mdwn
@@ -44,9 +44,9 @@ webpage that is supposed to be white, but shows up as cyan:
 
 [<img src="https://photos.anarc.at/documentation/angela-death/DSCF2164.jpg" alt="the blue screen (of death?)" />](https://photos.anarc.at/documentation/angela-death/#/2)
 
-This progressively damages the display until nothing shows up but a
-blank white screen. It would probably be possible to replace that
-screen (40-60$USD for parts), but there are other problems...
+This progressively damages the display until it displays nothing but a
+[blank white screen](https://photos.anarc.at/documentation/angela-death/#/1). It would probably be possible to replace that
+screen (40-60$USD for parts), however there are *more* issues still.
 
 The CPU/fan assembly also has a serious cooling problem. When the
 machine boots, the fan kicks in full speed immediately. Just idle, the
@@ -57,11 +57,27 @@ warnings, as it struggles to decode videos in the browser. This might
 be fixable as well, but it means lot of work to do on a machine I
 didn't like very much in the first place. In the meantime, it means
 the CPU can basically boil an egg which can't be good for the
-hardware...
+hardware.
 
-So, angela served me well, for 7 years. May it rest in peace or be
-sold for parts. Of course, the [soul of the laptop](https://en.wikipedia.org/wiki/Angela_Davis) is still alive
-and moves on to its new home: it was dead simple to take the hard
+So basically, to get this machine up to speed, I would need to:
+
+ 1. replace the screen (60-80$ USD + time)
+ 2. replace the CPU/fan assembly (20$ USD + time + may not work at all)
+ 3. buy new RAM sticks (80$ USD + may not work at all)
+
+... and I would still be stuck with that old CPU. Comparing this with a
+brand new Chromebook at around 300$ USD, or a used Thinkpad x230 for
+300-400CAD which takes up to 16GB of RAM makes it difficult to justify
+the time and expense, although there's always the question of
+electronic waste reduction.
+
+For now, angela served me well in the last seven years. May it rest in
+peace or be sold for parts. Of course, the [soul of the laptop](https://en.wikipedia.org/wiki/Angela_Davis) is
+still alive and moves on to its new home: it was easy to take the hard
 drive and connect it in the x201. Hopefully this will keep me
 traveling for a little while longer while I look for a replacement
-[[hardware/laptop]] in the future.
+[[hardware/laptop]] in the future. I obviously welcome suggestions for
+a replacement machine in the future, although keep in mind I did my
+research in the aforementioned page.
+
+[[!tag debian-planet debian blog hardware history documentation hacking]]

clutter
diff --git a/hardware/laptop/thinkpad-x120e.mdwn b/hardware/laptop/thinkpad-x120e.mdwn
index a308831e..6f1d1eb9 100644
--- a/hardware/laptop/thinkpad-x120e.mdwn
+++ b/hardware/laptop/thinkpad-x120e.mdwn
@@ -1,4 +1,4 @@
-[[!meta title="Thinkpad x120e laptop death"]]
+[[!meta title="Death of a Thinkpad x120e laptop"]]
 
 My laptop named "angela" is (was?) a [Thinkpad x120e](https://www3.lenovo.com/us/en/laptops/thinkpad/x-series/x120e/)
 ([ThinkWiki](https://www.thinkwiki.org/wiki/Category:X120e)). It's a [netbook](https://en.wikipedia.org/wiki/Netbook) model (although they branded it
@@ -64,4 +64,4 @@ sold for parts. Of course, the [soul of the laptop](https://en.wikipedia.org/wik
 and moves on to its new home: it was dead simple to take the hard
 drive and connect it in the x201. Hopefully this will keep me
 traveling for a little while longer while I look for a replacement
-[[../laptop]] in the future.
+[[hardware/laptop]] in the future.

more formatting and wording
diff --git a/hardware/laptop/thinkpad-x120e.mdwn b/hardware/laptop/thinkpad-x120e.mdwn
index 1d2eed7a..a308831e 100644
--- a/hardware/laptop/thinkpad-x120e.mdwn
+++ b/hardware/laptop/thinkpad-x120e.mdwn
@@ -1,4 +1,4 @@
-[[!meta title="Thinkpad x120e: laptop death"]]
+[[!meta title="Thinkpad x120e laptop death"]]
 
 My laptop named "angela" is (was?) a [Thinkpad x120e](https://www3.lenovo.com/us/en/laptops/thinkpad/x-series/x120e/)
 ([ThinkWiki](https://www.thinkwiki.org/wiki/Category:X120e)). It's a [netbook](https://en.wikipedia.org/wiki/Netbook) model (although they branded it
@@ -22,21 +22,31 @@ and it's not possible to replace it because the BIOS [blocks
 "unauthorized" cards from being installed](https://www.thinkwiki.org/wiki/Problem_with_unauthorized_MiniPCI_network_card), an absolutely ludicrous
 idea.
 
-In comparison, the x201, released a year earlier, fully supports 8GB
-of RAM and has a more powerful i5 processor. It can also run Coreboot,
-although that is less supported than other Thinkpad models.
+As a comparison, the Thinkpad x201, released a year earlier, fully
+supports 8GB of RAM and has a more powerful i5 processor. It can also
+run Coreboot, although that is less supported than other Thinkpad
+models. A generous friend was nice enough to give me his spare x201
+which, even if it's incredibly worn out, already feels more solid,
+reliable and fast than my shiny x120e. And the x201 has broken keys,
+torn bezel and the hard drive cover is held together with duct tape. I
+love it.
+
+How the x120e died
+------------------
 
 [<img src="https://photos.anarc.at/documentation/angela-death/DSCF2166.jpg" alt="the early signs of death of the screen" />](https://photos.anarc.at/documentation/angela-death/#/0)
 
 In the end, this laptop died a horrible death: it crashed, face first,
 on a linoleum floor. This seems to have cracked something in the
-screen which, apparently, releases some argon gaz (!). The text was *readable*, but barely, and colors were totally off. Here is a Github webpage that is supposed to be white, but shows up as cyan:
+screen which, apparently, releases some argon gaz (!). The text was
+*readable*, but barely, and colors were totally off. Here is a Github
+webpage that is supposed to be white, but shows up as cyan:
 
 [<img src="https://photos.anarc.at/documentation/angela-death/DSCF2164.jpg" alt="the blue screen (of death?)" />](https://photos.anarc.at/documentation/angela-death/#/2)
 
-This progressively damages the display until nothing shows up but a blank
-white screen. It would probably be possible to replace that screen
-(40-60$USD for parts), but there are other problems...
+This progressively damages the display until nothing shows up but a
+blank white screen. It would probably be possible to replace that
+screen (40-60$USD for parts), but there are other problems...
 
 The CPU/fan assembly also has a serious cooling problem. When the
 machine boots, the fan kicks in full speed immediately. Just idle, the
@@ -45,7 +55,13 @@ involves many SHA256 checksums) made the CPU heat up to 99°C. Playing
 videos on Netflix completely crashes the machine with temperature
 warnings, as it struggles to decode videos in the browser. This might
 be fixable as well, but it means lot of work to do on a machine I
-didn't like very much in the first place.
+didn't like very much in the first place. In the meantime, it means
+the CPU can basically boil an egg which can't be good for the
+hardware...
 
-It served me well, for 7 years. May it rest in peace or be sold for
-parts.
+So, angela served me well, for 7 years. May it rest in peace or be
+sold for parts. Of course, the [soul of the laptop](https://en.wikipedia.org/wiki/Angela_Davis) is still alive
+and moves on to its new home: it was dead simple to take the hard
+drive and connect it in the x201. Hopefully this will keep me
+traveling for a little while longer while I look for a replacement
+[[../laptop]] in the future.

review
diff --git a/hardware/laptop/thinkpad-x120e.mdwn b/hardware/laptop/thinkpad-x120e.mdwn
index d803648f..1d2eed7a 100644
--- a/hardware/laptop/thinkpad-x120e.mdwn
+++ b/hardware/laptop/thinkpad-x120e.mdwn
@@ -1,22 +1,26 @@
-The laptop named "angela" is (was?) a [Thinkpad x120e](https://www3.lenovo.com/us/en/laptops/thinkpad/x-series/x120e/)
-([ThinkWiki](https://www.thinkwiki.org/wiki/Category:X120e)). It's a "netbook" model, which meant back then that
-it was a small, wide, slim laptop with less power, but cheaper. It did
-its job: I carried it through meetings and conferences all over the
-world. I also used it as a workstation for a short time in 2016-2017
-when [[marcos]] stopped being a workstation and turned solely into a
-home cinema.
-
-I always dislike the keyboard: I could get used to the "chiclet" key
-style, but never to the missing block of keys. I just use "scroll
-lock", "print screen" and "pause" too much. I also found the CPU to be
-much slower than marcos, which meant it was a pain to go back to
-it. Memory was also a limitation: I could apparently bump the memory
-to 8GB, but the cost was prohibitive and the configuration was not
-officially supported. 
-
-I also struggled with the wifi card: it only works through binary
-blobs and it's not possible to change it because of a block in the
-BIOS.
+[[!meta title="Thinkpad x120e: laptop death"]]
+
+My laptop named "angela" is (was?) a [Thinkpad x120e](https://www3.lenovo.com/us/en/laptops/thinkpad/x-series/x120e/)
+([ThinkWiki](https://www.thinkwiki.org/wiki/Category:X120e)). It's a [netbook](https://en.wikipedia.org/wiki/Netbook) model (although they branded it
+a [Ultraportable](https://en.wikipedia.org/wiki/Subnotebook)), which meant back then that it was a small,
+wide, slim laptop with less power, but cheaper. It did its job: I
+carried it through meetings and conferences all over the world for 7
+years now. I also used it as a workstation for a short time in
+2016-2017 when [[marcos]] stopped being a workstation and turned
+solely into a home cinema.
+
+I always disliked the keyboard. I got used to the "chiclet" key style,
+but never to the missing top block of keys: I just use "scroll lock",
+"print screen" and "pause" too much. I also found the CPU to be much
+slower than my previous workstation (marcos), which meant it was a
+pain to go back to it. Memory was also a limitation: I could
+apparently bump the memory to 8GB, but the cost is high (80$) and the
+configuration is not officially supported.
+
+I also struggled with the wifi card that works through binary blobs
+and it's not possible to replace it because the BIOS [blocks
+"unauthorized" cards from being installed](https://www.thinkwiki.org/wiki/Problem_with_unauthorized_MiniPCI_network_card), an absolutely ludicrous
+idea.
 
 In comparison, the x201, released a year earlier, fully supports 8GB
 of RAM and has a more powerful i5 processor. It can also run Coreboot,
@@ -40,7 +44,8 @@ CPU hits 62°C. Doing a `git annex fsck` on a bunch of files (which
 involves many SHA256 checksums) made the CPU heat up to 99°C. Playing
 videos on Netflix completely crashes the machine with temperature
 warnings, as it struggles to decode videos in the browser. This might
-be fixable as well, but it is a lot of work to do on a machine I
+be fixable as well, but it means lot of work to do on a machine I
 didn't like very much in the first place.
 
-It served me well, for 7 years. May it rest in peace.
+It served me well, for 7 years. May it rest in peace or be sold for
+parts.

link to pics
diff --git a/hardware/laptop/thinkpad-x120e.mdwn b/hardware/laptop/thinkpad-x120e.mdwn
index 32574368..d803648f 100644
--- a/hardware/laptop/thinkpad-x120e.mdwn
+++ b/hardware/laptop/thinkpad-x120e.mdwn
@@ -22,12 +22,17 @@ In comparison, the x201, released a year earlier, fully supports 8GB
 of RAM and has a more powerful i5 processor. It can also run Coreboot,
 although that is less supported than other Thinkpad models.
 
+[<img src="https://photos.anarc.at/documentation/angela-death/DSCF2166.jpg" alt="the early signs of death of the screen" />](https://photos.anarc.at/documentation/angela-death/#/0)
+
 In the end, this laptop died a horrible death: it crashed, face first,
 on a linoleum floor. This seems to have cracked something in the
-screen which, apparently, releases some argon gaz (!). This
-progressively damages the display until nothing shows up but a blank
+screen which, apparently, releases some argon gaz (!). The text was *readable*, but barely, and colors were totally off. Here is a Github webpage that is supposed to be white, but shows up as cyan:
+
+[<img src="https://photos.anarc.at/documentation/angela-death/DSCF2164.jpg" alt="the blue screen (of death?)" />](https://photos.anarc.at/documentation/angela-death/#/2)
+
+This progressively damages the display until nothing shows up but a blank
 white screen. It would probably be possible to replace that screen
-(40-60$USD for parts)
+(40-60$USD for parts), but there are other problems...
 
 The CPU/fan assembly also has a serious cooling problem. When the
 machine boots, the fan kicks in full speed immediately. Just idle, the

angela dead and reborn
diff --git a/hardware/history.mdwn b/hardware/history.mdwn
index 79d77c8a..981b5bc3 100644
--- a/hardware/history.mdwn
+++ b/hardware/history.mdwn
@@ -37,10 +37,13 @@ See also my software [[software/history]].
 * 2010: HP Mini 10 [[blog/2010-03-18-hp-mini-10-netbook-doom]]
 * 2011-...: custom server ([[server/marcos]]), merge of marvin and
   lenny, backups of marvin archived in two disks (~120GB)
-* 2011-...: Thinkpad X120e (angela, 600$, 4GB RAM, AMD E-350, battery
+* 2011-2018: [[laptop/thinkpad-x120e]] (angela, 600$, 4GB RAM (2x2GB), AMD E-350, battery
   changed in 2015, see [[blog/2015-09-28-fun-with-batteries]], debian
-  wheezy, then jessie, then stretch...)
+  wheezy, jessie, then stretch. dead screen)
 * 2017-...: Intel NUC desktop (curie, 750$, 16GB, Intel i3-6100U
   2.3Ghz 4 threads, M.2 500GB disk,
   [installation report](https://wiki.debian.org/InstallingDebianOn/Intel/NUC6i3SYH#preview),
   debian stretch)
+* 2018-...: Thinkpad x201 (new angela, 0$ from micah, i5 m520, 8GB
+  RAM (2x4GB), physically worn out: keys falling off, disk slot broken, drive
+  taken from old angela the x120e, running stretch, 128GB Crucial M4 SSD)
diff --git a/hardware/laptop/thinkpad-x120e.mdwn b/hardware/laptop/thinkpad-x120e.mdwn
new file mode 100644
index 00000000..32574368
--- /dev/null
+++ b/hardware/laptop/thinkpad-x120e.mdwn
@@ -0,0 +1,41 @@
+The laptop named "angela" is (was?) a [Thinkpad x120e](https://www3.lenovo.com/us/en/laptops/thinkpad/x-series/x120e/)
+([ThinkWiki](https://www.thinkwiki.org/wiki/Category:X120e)). It's a "netbook" model, which meant back then that
+it was a small, wide, slim laptop with less power, but cheaper. It did
+its job: I carried it through meetings and conferences all over the
+world. I also used it as a workstation for a short time in 2016-2017
+when [[marcos]] stopped being a workstation and turned solely into a
+home cinema.
+
+I always dislike the keyboard: I could get used to the "chiclet" key
+style, but never to the missing block of keys. I just use "scroll
+lock", "print screen" and "pause" too much. I also found the CPU to be
+much slower than marcos, which meant it was a pain to go back to
+it. Memory was also a limitation: I could apparently bump the memory
+to 8GB, but the cost was prohibitive and the configuration was not
+officially supported. 
+
+I also struggled with the wifi card: it only works through binary
+blobs and it's not possible to change it because of a block in the
+BIOS.
+
+In comparison, the x201, released a year earlier, fully supports 8GB
+of RAM and has a more powerful i5 processor. It can also run Coreboot,
+although that is less supported than other Thinkpad models.
+
+In the end, this laptop died a horrible death: it crashed, face first,
+on a linoleum floor. This seems to have cracked something in the
+screen which, apparently, releases some argon gaz (!). This
+progressively damages the display until nothing shows up but a blank
+white screen. It would probably be possible to replace that screen
+(40-60$USD for parts)
+
+The CPU/fan assembly also has a serious cooling problem. When the
+machine boots, the fan kicks in full speed immediately. Just idle, the
+CPU hits 62°C. Doing a `git annex fsck` on a bunch of files (which
+involves many SHA256 checksums) made the CPU heat up to 99°C. Playing
+videos on Netflix completely crashes the machine with temperature
+warnings, as it struggles to decode videos in the browser. This might
+be fixable as well, but it is a lot of work to do on a machine I
+didn't like very much in the first place.
+
+It served me well, for 7 years. May it rest in peace.

explain how i run quantum
diff --git a/software/desktop/firefox.mdwn b/software/desktop/firefox.mdwn
index fefa2816..201a2552 100644
--- a/software/desktop/firefox.mdwn
+++ b/software/desktop/firefox.mdwn
@@ -5,6 +5,13 @@
 TL;DR: I use [Firefox](https://getfirefox.com/), for technical and
 political reasons. This page documents my config and why.
 
+I run the "Quantum" version (57+) as it's a huge performance
+improvement, even on older machines. Some plugins fell by the wayside
+but I was able to find replacement for most of what I need. I
+installed it from the upstream tarballs on some machine, but I also
+tried using [Snap](https://snapcraft.io) which also works generally well. I documented
+that procedure in [the Debian wiki](https://wiki.debian.org/Firefox#Using_snap).
+
 Extensions
 ----------
 

sort and tweak
diff --git a/software/desktop/firefox.mdwn b/software/desktop/firefox.mdwn
index 9f16a4b6..fefa2816 100644
--- a/software/desktop/firefox.mdwn
+++ b/software/desktop/firefox.mdwn
@@ -16,7 +16,7 @@ I have those extensions installed:
    package"]], [source](https://github.com/gorhill/uBlock)) - making the web sane again
  * [uMatrix](https://addons.mozilla.org/firefox/addon/umatrix/) (no debian package, [source](https://github.com/gorhill/uMatrix)) - making the web
    somewhat safe again
- * [wallabager](https://addons.mozilla.org/en-US/firefox/addon/wallabagger/) (no debian package, [source](https://github.com/wallabag/wallabagger)) - to YOLO a bunch
+ * [Wallabager](https://addons.mozilla.org/en-US/firefox/addon/wallabagger/) (no debian package, [source](https://github.com/wallabag/wallabagger)) - to YOLO a bunch
    of links in a pile outside my web browser that I can read offline
    thanks to [Wallabako](https://gitlab.com/anarcat/wallabako/)
 
@@ -25,9 +25,8 @@ I have those extensions installed:
 [site engagement]: https://www.chromium.org/developers/design-documents/site-engagement
 [infamous privacy intrusions]: https://lwn.net/Articles/648392/
 
-I am testing this:
+I am testing those:
 
- * [Smart HTTPS](https://addons.mozilla.org/en-US/firefox/addon/smart-https-revived/)
  * [Cookie autodelete](https://addons.mozilla.org/en-US/firefox/addon/cookie-autodelete/) - even though uMatrix stops most cookies
    from being sent, it actually stores them locally. it would be great
    if this could sync with umatrix block lists... maybe with [issue
@@ -38,6 +37,7 @@ I am testing this:
    keyboard), etc. need to click-hold on the "+" tab button to choose
    container.
  * [Sea containers](https://addons.mozilla.org/en-US/firefox/addon/sea-containers/) - another GUI for containers
+ * [Smart HTTPS](https://addons.mozilla.org/en-US/firefox/addon/smart-https-revived/)
  * [Snooze tabs](https://addons.mozilla.org/en-US/firefox/addon/snoozetabs/)
  * [Switch container](https://addons.mozilla.org/en-US/firefox/addon/switch-container/) - fixes *one* of those issues (can switch
    containers now)

more firefox plugins in test
diff --git a/software/desktop/firefox.mdwn b/software/desktop/firefox.mdwn
index 943f28cc..9f16a4b6 100644
--- a/software/desktop/firefox.mdwn
+++ b/software/desktop/firefox.mdwn
@@ -28,10 +28,23 @@ I have those extensions installed:
 I am testing this:
 
  * [Smart HTTPS](https://addons.mozilla.org/en-US/firefox/addon/smart-https-revived/)
+ * [Cookie autodelete](https://addons.mozilla.org/en-US/firefox/addon/cookie-autodelete/) - even though uMatrix stops most cookies
+   from being sent, it actually stores them locally. it would be great
+   if this could sync with umatrix block lists... maybe with [issue
+   #43](https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/issues/43)?
  * [Multi-account containers](https://github.com/mozilla/multi-account-containers/) - kind of useful, but also a bit
    strange: impossible to assign an existing tab to a container, UI is
    very clikety (can't open a container-specific tab from the
-   keyboard), etc.
+   keyboard), etc. need to click-hold on the "+" tab button to choose
+   container.
+ * [Sea containers](https://addons.mozilla.org/en-US/firefox/addon/sea-containers/) - another GUI for containers
+ * [Snooze tabs](https://addons.mozilla.org/en-US/firefox/addon/snoozetabs/)
+ * [Switch container](https://addons.mozilla.org/en-US/firefox/addon/switch-container/) - fixes *one* of those issues (can switch
+   containers now)
+ * [Temporary containers](https://addons.mozilla.org/en-US/firefox/addon/temporary-containers/) - not sure that works so well...
+ * [Wayback machine](https://addons.mozilla.org/en-US/firefox/addon/wayback-machine_new/) - i also have bookmarklets, but this could
+   work better! Unfortunately, it doesn't work with other archival
+   sites like archive.is or Google's cache.
 
 I removed those:
 

poe quote
diff --git a/sigs.fortune b/sigs.fortune
index da84edbf..e318206c 100644
--- a/sigs.fortune
+++ b/sigs.fortune
@@ -1088,3 +1088,7 @@ power to control the government and legalize their robbery.
 The good news about computers is that they do what you tell them to
 do. The bad news is that they do what you tell them to do.
                         - Ted Nelson
+%
+It may be roundly asserted that human ingenuity cannot concoct a
+cipher which human ingenuity cannot resolve.
+                        - Edgar Allan Poe

etendre la liste d'electro apres le voyage
diff --git a/pleinair/liste.mdwn b/pleinair/liste.mdwn
index 3818a069..62904845 100644
--- a/pleinair/liste.mdwn
+++ b/pleinair/liste.mdwn
@@ -74,7 +74,7 @@ toujours retourner sur l'ordinateur.
 
 ## Divertissement
 
- * Livre
+ * Livre / liseuse
  * Caméra et chargeur
  * Trépied
  * Musique pour l'auto (MP3 player)
@@ -85,16 +85,25 @@ toujours retourner sur l'ordinateur.
 ## Électronique
 
  * Téléphone cellulaire + chargeur(s)
- * Onduleur
- * Radio CB/FM/etc
- * Adaptateur universel de courant
- * Chargeur 12V-USB (allume-cigare)
+ * Radio CB/FM/HF/etc + Antenne + power
+ * Adaptateurs électriques:
+   * AC/AC universel (amerique/europe/etc)
+   * DC/DC 12V-USB (allume-cigare)
+   * AC/DC 120V-USB (wall wart)
+   * DC/AC (onduleur)
+ * Chargeur / batterie USB
  * Laptop
-   * Câble ethernet
-   * Adaptateur crossover
-   * Lecteur carte SD
-   * Adaptateurs USB
+ * Acessoires laptop:
+   * Câble ethernet RJ45
    * Mini powerbar
+   * Video cable (HDMI)
+   * Speaker
+ * Kit laptop (devrait être déjà dans un sac):
+   * Audio cable (mini 1/8)
+   * Adaptateurs USB/micro/mini/etc
+   * Écouteurs + Micro
+   * SDR
+
 
 ## Équipement technique
 

moved to github repo
diff --git a/blog/terms-boring.mdwn b/blog/terms-boring.mdwn
deleted file mode 100644
index 597ea0cb..00000000
--- a/blog/terms-boring.mdwn
+++ /dev/null
@@ -1,293 +0,0 @@
-Comparison matrix
------------------
-
-A set of features to be evaluated was selected based on common
-features available (or not) in various terminals. Here's a simple
-breakdown of each feature set, which is detailed in the individual
-evaluation of each terminal below.
-
-### Base features
-
- Terminal | tab | URL | paste | text-wrap | scrollback | unicode | version
- -------- | --- | --- | ----- | --------- | ---------- | ------- | -------
- alacritty |    |     |       |           |            |    ✓    | 3df394d 
- eterm    |     |     |       |           |      ✓     |         | 0.9.6-5 
- gnome    |  ✓  |  ✓  |       |    ✓      |      ✓     |    ✓    | 3.22.2-1 
- konsole  |  ✓  |  ✓  |       |           |      ✓     |    ✓    | 4:16.12.0-4 
- kterm    |     |     |       |           |      ✓     |         | 6.2.0-46.2 
- mlterm   |     |     |       |           |      ✓     |         | 3.5.0-1+b2 
- mrxvt    |  ✓  |     |       |           |      ✓     |         | 0.5.4-2 
- pterm    |     |     |       |           |      ✓     |    ✓    | 0.67-3 
- st       |     |     |       |           |            |    ✓    | 0.6-1
- terminator | ✓ | ✓   |       |    ✓      |      ✓     |    ✓    | 1.90+bzr-1705-1 
- urxvt    |     |  ✓  |   ✓   |    ✓      |      ✓     |    ✓    | 9.22-1+b1 
- xfce     |  ✓  |  ✓  |       |    ✓      |      ✓     |    ✓    | 0.8.3-1 
- xterm    |     |     |       |           |      ✓     |         | 327-2
- xvt      |     |     |       |           |      ✓     |         | 2.1-20.3 
-
- * tab: display and manage multiple tabs
- * URL: detect URLs and make them clickable or activate with a
-   keybinding
- * paste: protection against hidden material in copy-pasted text - our
-   standard here is the second test on [Jann Horn test site](http://thejh.net/misc/website-terminal-copy-paste)
- * text-wrap: properly reflow long lines instead of trimming or
-   stripping them
- * scrollback buffer: if screen history is preserved
- * unicode support was tested by pasting the string "é, Δ, Й, ק ,م, ๗, あ,叶, 葉, and 말" in the terminal with the middle mouse
-   button. The checkmark appears only if all characters show up.
-
-### Cosmetic features
-
- Terminal | backgrounds | transparency | freetype | true-color 
- -------- | ----------- | ------------ | -------- | ----------
- alacritty |            |              |    ✓     |     ✓ 
- eterm    |     ✓       |      ✓       |    ?     | 
- gnome    |     ✓       |      ✓       |    ✓     |     ✓ 
- konsole  |             |              |    ✓     |     ✓ 
- kterm    |             |              |          | 
- mlterm   |     ✓       |      ✓       |    ✓     | 
- mrxvt    |     ✓       |      ✓       |          | 
- pterm    |             |              |    ✓     | 
- st       |             |              |    ✓     |     ✓ 
- terminator |           |      ✓       |    ✓     |     ✓ 
- urxvt    |     ✓       |      ✓       |    ✓     | 
- xfce     |     ✓       |      ✓       |    ✓     |     ✓ 
- xterm    |             |              |    ✓     | 
- xvt      |             |              |          | 
-
- * background image support: if the background image can be changed
- * transparency: if the background can be made transparent
- * true-color support: does the terminal display more than 256 colors?
-   tested with the awk script provided in the [following gist](https://gist.github.com/XVilka/8346728)
- * freetype: if high quality fonts are supported
-
-### Advanced features
-
- Terminal | profiles | scripting | daemon 
- -------  | -------- | --------- | ------
- alacritty |         |           | 
- eterm    |          |           | 
- gnome    |    ✓     |           | 
- konsole  |    ✓     |           |
- kterm    |          |           | 
- mlterm   |    ?     |     ?     |    ✓ 
- mrxvt    |    ✓     |           | 
- pterm    |    ✓     |           | 
- st       |          |           | 
- terminator |  ✓     |           |    ✓ 
- urxvt    |          |     ✓     |    ✓ 
- xfce     |          |           | 
- xterm    |          |           | 
- xvt      |          |           | 
-
- * profiles: if custom settings or command can be retained in
-   different profiles
- * scripting: terminal behavior can be scripted with some programming
-   language without recompiling
- * daemon: if the terminal can be put in "daemon mode", which is
-   (presumably) useful if a lot of terminals are started, as it
-   reduces the memory usage and startup time
-
-alacritty
----------
-
-Alphabetical order forces me to start with an apology: I have
-added [alacritty](https://github.com/jwilm/alacritty) to this list even though it is not
-actually [packaged in Debian](https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=851639). It seemed to me it had a novel
-approach of using GPU acceleration that merited further
-inspection. Like other projects, its focus is not on features (it
-doesn't even have a scrollback buffer!) but on performance. It does
-feature excellent unicode and color support, but unfortunately fails
-the line-wrapping and bracketed paste tests.
-
-Compiling alacritty was a little bit of a challenge. I wanted to avoid
-using [rustup.sh](https://rustup.rs/) because I do not endorse sites telling users to
-blindly run `curl | sh` commandlines. Instead, I installed alacritty
-using the following sequence:
-
-    sudo apt install -t unstable rustc # need 1.15 or later
-    sudo apt install cargo cmake libfreetype6-dev libfontconfig1-dev xclip
-    git clone https://github.com/jwilm/alacritty && cd alacritty
-    cargo build --release
-
-Since there are no public releases of alacritty, this ended up testing
-the 08b5ae52c1c7dc3587ad31eee3036b58c3df394d git version.
-
-Eterm
------
-
-[Eterm](http://www.eterm.org/) is the default emulator for the [Englightenment][] desktop
-environment. It is derived from rxvt and is designed as a "feature
-rich replacement for xterm", which also shows a bit of its age. Its
-unicode support is poor: only the latin1 character is displayed
-properly, and it has trouble displaying a simple sudo prompt in the
-test locale. It is unclear if freetype fonts are supported as the font
-choices are limited to "font 1, 2, 3 and 4"...
-
- [Enlightenment]: https://en.wikipedia.org/wiki/Enlightenment_(software)
-
-gnome-terminal
---------------
-
-[GNOME terminal](https://en.wikipedia.org/wiki/GNOME_Terminal) is the default terminal emulator shipped with
-the [GNOME desktop environment](https://en.wikipedia.org/wiki/GNOME). gnome-terminal supports tabs, URL
-detection, text-wrapping, customizable backgrounds, freetype fonts and
-multiple profiles. gnome-terminal claims to have several
-"compatibility features" but, in my experience, it sometimes struggles
-to display exotic escape sequences. I had, in particular, trouble
-operating menus on the serial console of a HP ProCurve switch, for
-which I had to revert to xterm.
-
-gnome-terminal is, like many other terminals evaluated here, based on
-the [libvte](https://wiki.gnome.org/Apps/Terminal/VTE) library which handles the basic terminal emulation
-features, and so will act as a poster child for the other emulators
-derived from that library.
-
-konsole
--------
-
-[konsole](https://konsole.kde.org/) is the default terminal emulator of the KDE desktop
-environment. Using libvte brings it good unicode support but it
-doesn't have as good line-wrap support as gnome-terminal: expanding a
-window doesn't flow the lines back again. Like gnome-terminal, it also
-features profile support but also includes interesting features like
-bookmarks and activity / silence notifications.
-
-kterm
------
-
-[kterm](https://ja.wikipedia.org/wiki/Kterm), also known as "Kagotani term" (not to be confused with
-the [kindle terminale emulator](https://github.com/bfabiszewski/kterm)) is another old terminal emulator
-derived from xterm to enable multiple language support, especially
-japanese. It fails the unicode test, but that may be because of
-limitations in the default "fixed" font chosen by the terminal.
-
-The custom font was used for the latency test.
-
-mlterm
-------
-
-[mlterm](http://mlterm.sourceforge.net/) is one of the only terminals supporting right-to-left
-languages. It supports a graphical preferences dialog where features
-like input methods, background image or transparency can be set. The
-dialog also features a crude [scp](https://en.wikipedia.org/wiki/Secure_copy) client. It failed to unicode
-test because the asian characters were displayed as boxes, probably an
-issue with the default font chosen.
-
-mrxvt
------
-
-[mrxvt](https://en.wikipedia.org/wiki/Mrxvt) is a fork of rxvt from 2004 that aims to provide multiple
-tabs support. It claims multi-language support, but unicode support is
-actually not implemented and it had trouble displaying a simple sudo
-prompt in the test locale. Profiles are implemented, in a way, by
-having custom commands per tab.
-
-The custom font was used for the latency test.
-
-pterm
------
-
-pterm is the terminal emulator of the famous [putty](https://www.chiark.greenend.org.uk/~sgtatham/putty/) ssh client,
-mostly designed for the Windows operating system, but also ported to
-UNIX. It has excellent unicode support and has a graphical preferences
-dialog, but fails the true-color test and is otherwise generally

(Diff truncated)
remove table moved to github
diff --git a/blog/terms-table.mdwn b/blog/terms-table.mdwn
deleted file mode 100644
index 2492b993..00000000
--- a/blog/terms-table.mdwn
+++ /dev/null
@@ -1,32 +0,0 @@
-| Terminal   | backgrounds | transparency | freetype | true-color | profiles | scripting | daemon | tab | URL | paste | text-wrap | scrollback | unicode | version         |
-| ---------- | ----------- | ------------ | -------- | ---------- | -------- | --------- | ------ | --- | --- | ----- | --------- | ---------- | ------- | --------------- |
-| alacritty  |             |              |    ✓     |     ✓      |          |           |        |     |     |       |           |            |    ✓    | 3df394d         |
-| gnome      |     ✓       |      ✓       |    ✓     |     ✓      |    ✓     |           |        |  ✓  |  ✓  |       |    ✓      |      ✓     |    ✓    | 3.22.2-1        |
-| konsole    |             |              |    ✓     |     ✓      |    ✓     |           |        |  ✓  |  ✓  |       |           |      ✓     |    ✓    | 4:16.12.0-4     |
-| kterm      |             |              |          |            |          |           |        |     |     |       |           |      ✓     |         | 6.2.0-46.2      |
-| mlterm     |     ✓       |      ✓       |    ✓     |            |    ?     |     ?     |    ✓   |     |     |       |           |      ✓     |         | 3.5.0-1+b2      |
-| mrxvt      |     ✓       |      ✓       |          |            |    ✓     |           |        |  ✓  |     |       |           |      ✓     |         | 0.5.4-2         |
-| pterm      |             |              |    ✓     |            |    ✓     |           |        |     |     |       |           |      ✓     |    ✓    | 0.67-3          |
-| st         |             |              |    ✓     |     ✓      |          |           |        |     |     |       |           |            |    ✓    | 0.6-1           |
-| terminator |             |      ✓       |    ✓     |     ✓      |    ✓     |           |    ✓   | ✓   | ✓   |       |    ✓      |      ✓     |    ✓    | 1.90+bzr-1705-1 |
-| urxvt      |     ✓       |      ✓       |    ✓     |            |          |     ✓     |    ✓   |     |  ✓  |   ✓   |    ✓      |      ✓     |    ✓    | 9.22-1+b1       |
-| xfce       |     ✓       |      ✓       |    ✓     |     ✓      |          |           |        |  ✓  |  ✓  |       |    ✓      |      ✓     |    ✓    | 0.8.3-1         |
-| xterm      |             |              |    ✓     |            |          |           |        |     |     |       |           |      ✓     |         | 327-2           |
-
-
-| Terminal     | alacritty  | gnome    | konsole     | kterm      | mlterm     | mrxvt   | pterm  | st    | terminator      | urxvt     | xfce    | xterm |
-| ------------ | ---------- | -------- | ----------- | ---------- | ---------- | ------- | ------ | ----- | --------------- | --------- | ------- | ----- |
-| backgrounds  |            | ✓        |             |            | ✓          | ✓       |        |       |                 | ✓         | ✓       |       |
-| transparency |            | ✓        |             |            | ✓          | ✓       |        |       | ✓               | ✓         | ✓       |       |
-| freetype     | ✓          | ✓        | ✓           |            | ✓          |         | ✓      | ✓     | ✓               | ✓         | ✓       | ✓     |
-| true-color   | ✓          | ✓        | ✓           |            |            |         |        | ✓     | ✓               |           | ✓       |       |
-| profiles     |            | ✓        | ✓           |            | ?          | ✓       | ✓      |       | ✓               |           |         |       |
-| scripting    |            |          |             |            | ?          |         |        |       |                 | ✓         |         |       |
-| daemon       |            |          |             |            | ✓          |         |        |       | ✓               | ✓         |         |       |
-| tab          |            | ✓        | ✓           |            |            | ✓       |        |       | ✓               |           | ✓       |       |
-| URL          |            | ✓        | ✓           |            |            |         |        |       | ✓               | ✓         | ✓       |       |
-| paste        |            |          |             |            |            |         |        |       |                 | ✓         |         |       |
-| text-wrap    |            | ✓        |             |            |            |         |        |       | ✓               | ✓         | ✓       |       |
-| scrollback   |            | ✓        | ✓           | ✓          | ✓          | ✓       | ✓      |       | ✓               | ✓         | ✓       | ✓     |
-| unicode      | ✓          | ✓        | ✓           |            |            |         | ✓      | ✓     | ✓               | ✓         | ✓       |       |
-| version      | 3df394d    | 3.22.2-1 | 4:16.12.0-4 | 6.2.0-46.2 | 3.5.0-1+b2 | 0.5.4-2 | 0.67-3 | 0.6-1 | 1.90+bzr-1705-1 | 9.22-1+b1 | 0.8.3-1 | 327-2 |

remove CV from public site
diff --git a/communication.mdwn b/communication.mdwn
index 5901d6e6..74ff6e20 100644
--- a/communication.mdwn
+++ b/communication.mdwn
@@ -7,12 +7,12 @@ J'essaie d'écrire. Pour l'instant, il s'agit surtout de mon [[blog]] mais j'ess
 
 Voici certain des articles les plus importants que j'ai publié:
 
-[[!bibtex2html cv/publications.bib]]
+[[!bibtex2html publications.bib]]
 
 J'ai également participé aux [ateliers littéraires](https://wikifarm.koumbit.net/orangeseeds/AteliersLitteraires) (février-mai 2004) et aux [Carnets co-libristes](http://parolecitoyenne.org/blogs/carnets-co-libristes/author/antoine/) de [Parole Citoyenne](http://parolecitoyenne.org/) (juillet-août 2006, [archive](https://web.archive.org/web/20140119214354/http://parolecitoyenne.org/blogs/carnets-co-libristes/author/antoine/)).
 
 Pour citer un de ces articles, vous pouvez utiliser les références
-bibliographiques disponible dans le fichier [[cv/publications.bib]].
+bibliographiques disponible dans le fichier [[publications.bib]].
 
 Interviews
 ==========
diff --git a/cv/publications.bib b/communication/publications.bib
similarity index 96%
rename from cv/publications.bib
rename to communication/publications.bib
index 57632db5..1cbb968b 100644
--- a/cv/publications.bib
+++ b/communication/publications.bib
@@ -1,3 +1,4 @@
+% WARNING: this file is duplicated in the repositories "écrits/" (cv/ folder) and the "anarc.at" wiki (communication/ folder). this should be fixed, but for now, the file need to be copied around by hand.
 @article{website:lwn-all,
    title="All publications",
    url={https://anarc.at/tag/lwn/},
diff --git a/cv.mdwn b/cv.mdwn
deleted file mode 100644
index c6e44339..00000000
--- a/cv.mdwn
+++ /dev/null
@@ -1,34 +0,0 @@
-Je profite, comme programmeur, de plusieurs années d'expérience avec
-une grande variété de systèmes et de langages de programmation, et
-avec une bonne facilité d'apprentissage de nouveaux langages, grâce à
-ma formation universitaire à l'[Université de Montréal][]. J'ai aussi
-acquis au fil du temps une solide expérience d'administrateur de
-serveurs UNIX à toute sauce. Ma spécialisation à ce niveau est
-orientée [Debian GNU/Linux][] (je suis d'ailleurs un
-[Membre du projet][], mais j'ai aussi une bonne connaissance des
-systèmes [*BSD][], particulièrement [FreeBSD][]. Je travaille sur un
-multitude de projets, surtout des [[logiciel libre|software]], mais je
-fais aussi des projets politiques, le plus important étant évidemment
-mon travail ([Koumbit][]), que j'ai aidé à fonder en 2004 et qui
-persiste toujours.
-
- [Université de Montréal]: http://umontreal.ca/
- [Debian GNU/Linux]: http://debian.org/
- [Membre du projet]: http://qa.debian.org/developer.php?login=anarcat
- [*BSD]: http://bsd.org/
- [FreeBSD]: http://freebsd.org
- [Koumbit]: http://koumbit.org/
-
-Voici mon CV.
-
-Français
-========
-
- * [[cv.fr.pdf]]
- * [[cv.fr.tex]]
-
-English
-=======
-
- * [[cv.en.pdf]]
- * [[cv.en.tex]]
diff --git a/cv/Makefile b/cv/Makefile
deleted file mode 100644
index f5993adf..00000000
--- a/cv/Makefile
+++ /dev/null
@@ -1,278 +0,0 @@
-################################################
-# file: Makefile
-# Makefile for latex
-#
-# @Author: SUN, Tong
-# Copyright (c)2001, Tong SUN, all right reserved
-# @Version: $Date: 2003/11/15 22:39:35 $ $Revision: 1.4 $
-# @Home URL: http://xpt.sourceforge.net/
-#
-# CREDIT:
-# Skeleton from: chris beggy chrisb@kippona.com
-# Skeleton Id: skel-make-latex.el,v 1.3 2001/01/17 23:52:17 chrisb Exp 
-#
-# Readme begins:
-# 
-# This is a generic makefile to create output from a Latex file.
-# 
-# It will run the designated LaTeX FILE through TeX in turn until all
-# cross-references are resolved, building all indices.  The directory
-# containing each FILE is searched for included files.
-# 
-# It can also generate .html, .txt or .rtf files.
-# 
-# To get help, type 'make help'
-# 
-# Distribute freely, but please include the author's info & copyright,
-# the file's version & url with the distribution.
-# 
-# Support free software movement! Please send you comments, suggestions, bug
-# reports, patches to the author from the xpt project home URL. They are
-# warmly welcome. Thank you for using the tools from the xpt project.
-# 
-# Readme ends.
-#  cat Makefile | sed -n '/# [R]eadme /,/# [R]eadme / p' | cut -c3- > latexmake/README
-# 
-# {{{ Commentary:
-
-#
-#  To make the latex file latex_file.tex, issue:
-#
-#   make TEX_SOURCE_BASE=latex_file
-#  or rather:
-#   export TEX_SOURCE_BASE=latex_file
-#   make
-#  
-# Basically you need to set the TEX_SOURCE_BASE variable before invoking make
-# but using 'make check' can have 'make' makes suggestion for you: 
-# If there is only one .tex file in current dirctory, make will suggest it.
-# else suggest the directory name. For example, if the directory is named
-# "thesis", make will assume that your will work on the file "thesis.tex".
-# The benefit of setting this variable is that you can clean all the generated
-# files easily using 'make clean'.
-
-# If the TEX_DEST_DIR variable is set, all generated files (.ps, .pdf...) will
-# end up in that particular directory. This is mandatory if you want to build
-# an HTML (or .txt) version from the .tex file. The default is current dir.
-#  
-# It default makes only .dvi file, and no output unless errors occur
-# You can also issue 'make view' to view the result right after the make
-#
-# To generate other formats, issue
-#  
-#   make ps
-# and/or,
-#   make pdf
-#   make html
-#   make txt
-#   make rtf
-#  
-#  or simply:
-#   make all rtf
-#
-# The general procedure would be
-#   'make view' repeatly until you are fully satisfied
-#   'make all', or 'make ps pdf html' for the final blast
-#
-#  Targets           Explanation
-#  -------------------------------------------
-#  dvi           dvi format
-#  ps            postscript
-#  pdf           pdf Adobe
-#  html          for web browser
-#  txt           normal plain text file
-#  rtf           for M$ Word/WordPad
-#
-#  .tex          Latex source file 
-#  .chk         check latex syntax with chktex
-#
-# The values of the BIBTEX, LATEX (or PDFLATEX), MAKEINDEX, MAKEINFO, TEX (or
-# PDFTEX), and TEXINDEX environment variables are used to run those commands,
-# if they are set.
-#
-# All tools used in this Makefile are well-known tools. They can all be easily
-# located on the web using any search engines. Most of them may have already
-# been included in your *nix distribution.
-#
-
-# }}} end commentary.
-#
-################################################
-
-# {{{ Code:
-
-# .............................................................. &ss ...
-# here's the system dependent stuff
-#
-
-ifndef SYNTAXCHK
-SYNTAXCHK = chktex
-endif
-
-ifndef LATEX
-LATEX = texi2dvi -q
-endif
-
-ifndef DVIPS
-DVIPS=dvips
-endif
-
-ifndef DVIVIEWER
-DVIVIEWER=xdvi
-endif
-

(Diff truncated)
remove old test file
diff --git a/testhome.mdwn b/testhome.mdwn
deleted file mode 100644
index 8b8369b9..00000000
--- a/testhome.mdwn
+++ /dev/null
@@ -1,79 +0,0 @@
--wtf|
-[Image:folipon.jpg]
-|| ------ |
--
-[[!toc ]]
-
-
-## Présentation
-
-Je suis un programmeur analyste profitant de plusieurs années d'expérience avec une grande variété de languages de programmation, et avec une bonne facilité d'apprentissage de nouveaux languages, grâce à ma formation universitaire à l'[Université de Montréal](http://umontreal.ca/). J'ai aussi acquis au fil du temps une solide expérience d'administrateur de serveurs UNIX à toute sauce. Ma spécialisation à ce niveau est présentement orientée [Debian GNU/Linux](http://debian.org/), mais j'ai aussi une bonne connaissance des systèmes [*BSD](http://bsd.org/) et je suis un des développeurs principaux du panneau de contrôle d'hébergement [AlternC](http://alternc.org/). J'administre également les serveurs variés du [réseau Koumbit](http://koumbit.org/). Je siège aussi sur le [ConseildAdministration](ConseildAdministration) de l'organisme, dont je suis membre fondateur et que nous essayons de concevoir comme un nouveau modèle d'entreprise sociale en suivant des [PrincipesFondateurs](PrincipesFondateurs) originaux, en particulier au niveau de l'organisation du travail, grâce aux principes de l'[ÉconomieParticipative](ÉconomieParticipative).
-
-
-## Projets
-
-Je suis un grand promoteur du [logiciel libre](http://fsf.org/) et du [projet GNU](http://gnu.org/), et j'ai l'intention de participer à la [révision](http://gplv3.fsf.org/comments/) de la [GPLv3](http://gplv3.fsf.org/). Je participe activement au projet [Gnuvernment](http://gnuvernment.org/), en particulier au développement du module [Decisions](http://decisions.gnuvernment.org) pour [Drupal](http://drupal.org/). Je suis également en train de développer une expertise en téléphonie IP grâce au logiciel [Asterisk](http://asterisk.org/). Je participe au développement du [WikiWikiWeb](WikiWikiWeb) [MoinMoin](MoinMoin), principalement en prenant le rôle du WikiGnome de service.
-
-Plus précisément, mes projets concrets tournent pour l'instant beaucoup autour de Koumbit:
-
- * [CommunityColocationProject](CommunityColocationProject)
- * [AdministrationSystème](AdministrationSystème), incluant:
-  * [AlterncService](AlterncService)
-  * [Puppet](Puppet)
-  * [PlanArchitectural](PlanArchitectural)
-  * [DrupalFarmService](DrupalFarmService)
- * [LedgerSmb](LedgerSmb), [Comptabilité](Comptabilité), [Coordination](Coordination) et [Secrétariat](Secrétariat) de Koumbit...
- * [RoCoCo](http://rocococamp.info/)
- * Mon [blog](http://anarcat.koumbit.org/)
-
-## Other free software projects
-
-Voir [http://anarcat.ath.cx/software](http://anarcat.ath.cx/software)
-
-
-## Autres intérêts
-
-Voir aussi mon [CV](http://anarcat.ath.cx/cv). Du côté plus ludique, j'ai tendance à être un peu mélomane sur les bords, j'ai même eu un  [band](http://orangeseeds.org/) à un moment donné. J'aime bien la photo et le [PleinAir](PleinAir).
-
-
-## Autres ressources
-
-D'autres ressources que j'édite sur d'auters wiki ou blogues:
-
- * [mon homepage](http://anarcat.ath.cx/)
- * [mon blogue](http://anarcat.koumbit.org/)
- * [mon wiki-blog](TheAnarcatBlog) fut un échec
- * [mon ancien ancien blog](http://insomniaque.org/blog/5) sur le défunt [Insomniaque](http://insomniaque.org/)
- * FreeExperiments: des reviews de programmes libres
- * mon homepage sur d'autres wiki:
-  * TheAnarcat
-  * TheAnarcat
- * OrangeSoftware: plein de hacks et programmes oranges
- * J'ai participé aux AteliersLitteraires
-
-## Forum
-
-Write up your stuff here.. écrivez-moi ici...
-
-
-## Mes pages personnelles dans ce wiki
-
-[[!inline pages="TheAnarcat/*" feeds=no]]
-
-J'ai aussi le [WirelessBridge](WirelessBridge) qui me manque.
-
-
-## Détails permenance
-Embauche
-:    24 janvier 2005 / 6 mars 2007
-
-Début salariat
-:    25 mars 2007
-
-Fin de probation
-:    ?
-
-
-
-
- [CategoryHomepage](CategoryHomepage) * [CatégoriePermanent](CatégoriePermanent) * [CatégorieEmployé](CatégorieEmployé) [CategoryMentor](CategoryMentor) (sysadmin, koumbit, comptabilité, secrétariat)

add undertime, debian ref, reorder langs and fix syntax
diff --git a/cv/cv.en.pdf b/cv/cv.en.pdf
index df270ca9..de3d1d5b 100644
Binary files a/cv/cv.en.pdf and b/cv/cv.en.pdf differ
diff --git a/cv/cv.en.tex b/cv/cv.en.tex
index 8335cb7a..d1a7448d 100644
--- a/cv/cv.en.tex
+++ b/cv/cv.en.tex
@@ -85,6 +85,9 @@
 \cventry{2017--present}{feed2exec}{}{}{Programmable RSS feed
   reader.}{Author, Python. \url{https://gitlab.com/anarcat/feed2exec}}
 
+\cventry{2017--present}{undertime}{}{}{Meeting coordination
+  tool.}{Author, Python. \url{https://gitlab.com/anarcat/undertime}}
+
 \cventry{2014--2016}{Borgbackup}{}{}{Deduplicating, high performance
   backup software, fork of Attic.}{Attic converter author,
   documentation, misc. programming in Python. \url{https://www.borgbackup.org/}}
@@ -110,7 +113,7 @@
   \url{https://www.drupal.org/user/1274}}
 
 \subsection{Computing skills}
-\cvitem{Programming}{Golang, Python, Perl, PHP, shell, Haskell, C,
+\cvitem{Programming}{Python, Perl, PHP, shell, Golang, Haskell, C,
   C++, Java, Lisp, HTML/CSS, etc}
 \cvitem{Protocols}{HTTPS, SMTP, IMAP, LDAP, SIP, SSH, XMPP, BGP, Babel,
   IPv6, IPsec, Tor, etc}
@@ -134,23 +137,24 @@ A detailed list of software contributions is available at
   world. \url{https://www.openstreetmap.org/user/anarcat}}
 
 \cventry{2006--present}{Wikipedia}{}{International}{Collaborative online
-  encyclopedia}{Editor and WikiGnome
+  encyclopedia}{Editor and WikiGnome.
   \url{https://en.wikipedia.org/wiki/User:TheAnarcat}}
 
-\cventry{2003--present}{Debian}{}{International}{Operating
-  system}{Debian Developer since 2011, bug reports,
-  documentation, packaging since 2003. \url{http://debian.org/}}
+\cventry{2003--present}{Debian}{}{International}{Operating system}{Bug
+  reports, documentation, packaging, etc. Debian Developer since
+  2011. \url{https://debian.org/}
+  \url{https://contributors.debian.org/contributor/anarcat\%40debian.org/}}
 
 \cventry{2003--2010}{CMAQ}{}{Montréal}{Centre des Médias Alternatifs
   du Québec - Indymedia Québec}{Board of Trustees member, technical
-  work \url{http://cmaq.net/}}
+  work. \url{http://cmaq.net/}}
 
 \cventry{2000--2005}{L'Insomniaque}{}{Montréal}{reflexion ezine}{Author,
-  coordinator and founding member \url{http://insomniaque.org/}}
+  coordinator and founding member. \url{http://insomniaque.org/}}
 
 \cventry{1998--2001}{Food Not Bombs}{}{Montréal}{Community kitchen,
   distribution of free vegeterian meals}{Volunteer, cook and
-  collective member}
+  collective member.}
 
 \section{Education}
 

move education down towards the end, it is a long time ago now
diff --git a/cv/cv.en.pdf b/cv/cv.en.pdf
index ff327238..df270ca9 100644
Binary files a/cv/cv.en.pdf and b/cv/cv.en.pdf differ
diff --git a/cv/cv.en.tex b/cv/cv.en.tex
index 928266f4..8335cb7a 100644
--- a/cv/cv.en.tex
+++ b/cv/cv.en.tex
@@ -77,18 +77,6 @@
   consulting on free software technologies\newline{}
   \url{http://www.espressocommunication.com/}}
 
-\section{Education}
-
-\cventry{2015}{First aid}{Sirius}{Sainte-Thérèse}{}{First aid in
-  remote areas certificate, RCR/DEA (A+)\newline{} \url{http://www.siriusmed.com/}}
-
-\cventry{1998--2000}{B. Sc. in Computer Sciences}{Université de
-  Montréal}{Montréal}{}{2 years
-  completed}
-
-\cventry{1995--1997}{Diplôme d'Études Collégiales}{Collège
-  Ahuntsic}{Montréal}{}{equivalent of a one-year associate degree}
-
 \section{Computing projects}
 
 \cventry{2017--present}{Wallabako}{}{}{Embedded ``read-it-later'' client
@@ -164,6 +152,18 @@ A detailed list of software contributions is available at
   distribution of free vegeterian meals}{Volunteer, cook and
   collective member}
 
+\section{Education}
+
+\cventry{2015}{First aid}{Sirius}{Sainte-Thérèse}{}{First aid in
+  remote areas certificate, RCR/DEA (A+)\newline{} \url{http://www.siriusmed.com/}}
+
+\cventry{1998--2000}{B. Sc. in Computer Sciences}{Université de
+  Montréal}{Montréal}{}{2 years
+  completed}
+
+\cventry{1995--1997}{Diplôme d'Études Collégiales}{Collège
+  Ahuntsic}{Montréal}{}{equivalent of a one-year associate degree}
+
 \section{Languages}
 \cvitemwithcomment{French}{ILR level 5, CEFR C2, Native proficiency}{Native language}
 \cvitemwithcomment{English}{ILR level 5, CEFR C2, Bilingual proficiency}{Slight Québécois accent}

add another entry to biblio, fix first
diff --git a/cv/cv.en.pdf b/cv/cv.en.pdf
index 4bd9af0c..ff327238 100644
Binary files a/cv/cv.en.pdf and b/cv/cv.en.pdf differ
diff --git a/cv/cv.en.tex b/cv/cv.en.tex
index f417f1fc..928266f4 100644
--- a/cv/cv.en.tex
+++ b/cv/cv.en.tex
@@ -178,6 +178,7 @@ A detailed list of software contributions is available at
 % https://en.wikibooks.org/wiki/LaTeX/Bibliography_Management#Not_standard_templates
 % https://www.tug.org/twg/mactex/tutorials/ltxprimer-1.0.pdf
 \nocite{website:2017-12-20-demystifying-container-runtimes}
+\nocite{website:2017-04-29-netdev-rise-linux-networking-hw}
 \nocite{website:2017-02-18-passwords-entropy}
 \nocite{website:2016-01-24-internet-in-cuba}
 \nocite{website:2016-01-12-the-downloadable-internet}
diff --git a/cv/publications.bib b/cv/publications.bib
index 3d93ab1b..57632db5 100644
--- a/cv/publications.bib
+++ b/cv/publications.bib
@@ -8,12 +8,21 @@
 @article{website:2017-12-20-demystifying-container-runtimes,
   title =        "Demystifying container runtimes",
   year =         2017,
-  publisher = "LWN.net",
+  journal = "LWN.net",
   month = "December",
   author = "Antoine Beaupré",
-  note = "Third of six-part KubeCon 2017 reporting",
+  note = "Third of six-part KubeCon 2017 coverage",
   url = {https://anarc.at/blog/2017-12-20-demystifying-container-runtimes/},
 }
+@article{website:2017-04-29-netdev-rise-linux-networking-hw,
+  title = "The rise of Linux-based networking hardware",
+  year = 2017,
+  month = "April",
+  journal = "LWN.net",
+  author = "Antoine Beaupré",
+  note = "Last of four-part NetConf/NetDev 2.1 coverage",
+  url = {https://anarc.at/blog/2017-04-29-netdev-rise-linux-networking-hw/},
+}
 @article{website:2017-02-18-passwords-entropy,
   title = "Reliably generating good passwords",
   year = 2017,

remove cell phone number
diff --git a/cv/cv.en.pdf b/cv/cv.en.pdf
index 703064b9..4bd9af0c 100644
Binary files a/cv/cv.en.pdf and b/cv/cv.en.pdf differ
diff --git a/cv/cv.en.tex b/cv/cv.en.tex
index 1e5ab152..f417f1fc 100644
--- a/cv/cv.en.tex
+++ b/cv/cv.en.tex
@@ -26,7 +26,6 @@
 \name{Antoine}{Beaupré}
 %\title{Resumé title}                               % optional, remove / comment the line if not wanted
 \address{Montréal}{Canada}{}% optional, remove / comment the line if not wanted; the "postcode city" and "country" arguments can be omitted or provided empty
-\phone[mobile]{+1~(514)~583~5686}                   % optional, remove / comment the line if not wanted; the optional "type" of the phone can be "mobile" (default), "fixed" or "fax"
 \phone[fixed]{+1~(514)~357~2682}
 \email{anarcat+cv@orangeseeds.org}                               % optional, remove / comment the line if not wanted
 \extrainfo{\url{https://anarc.at}}
diff --git a/cv/cv.fr.pdf b/cv/cv.fr.pdf
index 2a0bd829..a6920f67 100644
Binary files a/cv/cv.fr.pdf and b/cv/cv.fr.pdf differ
diff --git a/cv/cv.fr.tex b/cv/cv.fr.tex
index 454b0fbf..cccabae9 100644
--- a/cv/cv.fr.tex
+++ b/cv/cv.fr.tex
@@ -26,7 +26,6 @@
 \name{Antoine}{Beaupré}
 %\title{Resumé title}                               % optional, remove / comment the line if not wanted
 \address{Montréal}{Canada}{}% optional, remove / comment the line if not wanted; the "postcode city" and "country" arguments can be omitted or provided empty
-\phone[mobile]{+1~(514)~583~5686}                   % optional, remove / comment the line if not wanted; the optional "type" of the phone can be "mobile" (default), "fixed" or "fax"
 \phone[fixed]{+1~(514)~357~2682}
 \email{anarcat+cv@orangeseeds.org}                               % optional, remove / comment the line if not wanted
 \extrainfo{\url{https://anarc.at}}

add lwn.net and more software projects
diff --git a/cv/cv.en.pdf b/cv/cv.en.pdf
index 1941fcd8..703064b9 100644
Binary files a/cv/cv.en.pdf and b/cv/cv.en.pdf differ
diff --git a/cv/cv.en.tex b/cv/cv.en.tex
index 4e097799..1e5ab152 100644
--- a/cv/cv.en.tex
+++ b/cv/cv.en.tex
@@ -58,6 +58,9 @@
 
 \section{Experience}
 
+\cventry{2016--present}{Journalist}{LWN.net}{remote work}{}{Freelance
+  journalist for the technical magazine. \url{https://lwn.net}}
+
 \cventry{2015--present}{Package maintainer}{Freexian}{remote
   work}{}{Debian Long Term Support program\newline{}
   Security maintenance on Debian packages\newline{}
@@ -87,48 +90,73 @@
 \cventry{1995--1997}{Diplôme d'Études Collégiales}{Collège
   Ahuntsic}{Montréal}{}{equivalent of a one-year associate degree}
 
-\section{Computer skills}
-\cvitem{Programming}{Python, Perl, PHP, shell, C, C++, Java, HTML/CSS,
-  etc}
-\cvitem{Protocols}{HTTP, SMTP, IMAP, LDAP, SIP, SSH, XMPP, BGP, Babel,
+\section{Computing projects}
+
+\cventry{2017--present}{Wallabako}{}{}{Embedded ``read-it-later'' client
+  for Kobo e-readers.}{Author, Golang.\url{https://gitlab.com/anarcat/wallabako}}
+
+\cventry{2017--present}{feed2exec}{}{}{Programmable RSS feed
+  reader.}{Author, Python. \url{https://gitlab.com/anarcat/feed2exec}}
+
+\cventry{2014--2016}{Borgbackup}{}{}{Deduplicating, high performance
+  backup software, fork of Attic.}{Attic converter author,
+  documentation, misc. programming in Python. \url{https://www.borgbackup.org/}}
+
+\cventry{2013--present}{Stressant}{}{}{Stress-testing, ``burn-in''
+  software.}{Author, Python. \url{https://gitlab.com/anarcat/stressant}}
+
+\cventry{2010--present}{Monkeysign}{}{}{GnuPG cryptographic key
+  signing usability improvement prototype.}{Author, Python. Pioneered
+  the use of QR codes for easy fingerprint transmission.
+  \url{http://monkeysphere.info/monkeysign}}
+
+\cventry{2009-2015}{Isuma.tv}{}{Québec}{Distributed low-bandwidth
+  media players.}{Design of offline video sharing in remote
+  communities with restricted network access. Python, Haskell, Shell,
+  Debian packaging. \url{http://isuma-media-players.readthedocs.io/}}
+
+\cventry{2007-2015}{Aegir}{}{}{Drupal mass hosting control panel}{Core
+  maintainer and major contributor \url{https://aegirproject.org/}}
+
+\cventry{2001--2015}{Drupal}{}{International}{Content management
+  system}{Early adopter, contrib module author, PHP.
+  \url{https://www.drupal.org/user/1274}}
+
+\subsection{Computing skills}
+\cvitem{Programming}{Golang, Python, Perl, PHP, shell, Haskell, C,
+  C++, Java, Lisp, HTML/CSS, etc}
+\cvitem{Protocols}{HTTPS, SMTP, IMAP, LDAP, SIP, SSH, XMPP, BGP, Babel,
   IPv6, IPsec, Tor, etc}
 \cvitem{Tools}{OpenPGP, Git, Git-annex, Puppet, Jenkins, etc}
 
 I am familiar with a large set of programming languages, protocols and
 tools. The above list includes those where my expertise in recognized,
-and for which I have written and provided formal training.
+for which I have provided formal training, or written software in.
 
 A detailed list of software contributions is available at
 \url{https://anarc.at/software/}.
 
-\section{Computing projects}
+\section{Community projects}
+
+\cventry{2012--2017}{Réseau Libre}{}{Montréal}{Mesh
+  network}{Network protocol review, documentation, hardware
+  installations and founding member. \url{http://reseaulibre.ca/}}
 
 \cventry{2009--present}{OpenStreetMap}{}{International}{Collaborative online
   map}{Various contributions and mapping, all over the
   world. \url{https://www.openstreetmap.org/user/anarcat}}
 
-\cventry{2009-2015}{Isuma.tv}{}{Québec}{Distributed low-bandwidth
-  media players}{Design of offline video sharing in remote communities
-  with restricted network
-  access. \url{http://isuma-media-players.readthedocs.io/}}
-
-\cventry{2001--2015}{Drupal}{}{International}{Content management system}{Early
-  adopter and long time contributor to this well-known CMS.
-  \url{https://www.drupal.org/user/1274}}
-
-\section{Community projects}
-
-\cventry{2012--present}{Réseau Libre}{}{Montréal}{Mesh
-  network}{Network protocol review, documentation, hardware
-  installations and founding member. \url{http://reseaulibre.ca/}}
+\cventry{2006--present}{Wikipedia}{}{International}{Collaborative online
+  encyclopedia}{Editor and WikiGnome
+  \url{https://en.wikipedia.org/wiki/User:TheAnarcat}}
 
 \cventry{2003--present}{Debian}{}{International}{Operating
-  system}{Debian Developer since 2011, contributor, bug reporter,
-  documentation, packager since 2003 \url{http://debian.org/}}
+  system}{Debian Developer since 2011, bug reports,
+  documentation, packaging since 2003. \url{http://debian.org/}}
 
 \cventry{2003--2010}{CMAQ}{}{Montréal}{Centre des Médias Alternatifs
   du Québec - Indymedia Québec}{Board of Trustees member, technical
-  worker \url{http://cmaq.net/}}
+  work \url{http://cmaq.net/}}
 
 \cventry{2000--2005}{L'Insomniaque}{}{Montréal}{reflexion ezine}{Author,
   coordinator and founding member \url{http://insomniaque.org/}}
@@ -150,6 +178,8 @@ A detailed list of software contributions is available at
 % see this for more help:
 % https://en.wikibooks.org/wiki/LaTeX/Bibliography_Management#Not_standard_templates
 % https://www.tug.org/twg/mactex/tutorials/ltxprimer-1.0.pdf
+\nocite{website:2017-12-20-demystifying-container-runtimes}
+\nocite{website:2017-02-18-passwords-entropy}
 \nocite{website:2016-01-24-internet-in-cuba}
 \nocite{website:2016-01-12-the-downloadable-internet}
 \nocite{website:2005-11-23-comment-la-tunisie-censure-linternet}
diff --git a/cv/publications.bib b/cv/publications.bib
index ebbea5de..3d93ab1b 100644
--- a/cv/publications.bib
+++ b/cv/publications.bib
@@ -1,3 +1,28 @@
+@article{website:lwn-all,
+   title="All publications",
+   url={https://anarc.at/tag/lwn/},
+   year="2016--present",
+   journal = "LWN.net",
+   author = {Antoine Beaupré},
+}
+@article{website:2017-12-20-demystifying-container-runtimes,
+  title =        "Demystifying container runtimes",
+  year =         2017,
+  publisher = "LWN.net",
+  month = "December",
+  author = "Antoine Beaupré",
+  note = "Third of six-part KubeCon 2017 reporting",
+  url = {https://anarc.at/blog/2017-12-20-demystifying-container-runtimes/},
+}
+@article{website:2017-02-18-passwords-entropy,
+  title = "Reliably generating good passwords",
+  year = 2017,
+  month = "February",
+  journal = "LWN.net",
+  author = {Antoine Beaupré},
+  note = "First of four-part series on password managers",
+  url = {https://anarc.at/blog/2017-02-18-passwords-entropy/},
+}
 @misc{website:2016-01-24-internet-in-cuba,
    title="Internet in Cuba",
    url={https://anarc.at/blog/2016-01-24-internet-in-cuba},

add one more sys76 laptop with caveat
diff --git a/hardware/laptop.mdwn b/hardware/laptop.mdwn
index 1c3f1368..279e66a3 100644
--- a/hardware/laptop.mdwn
+++ b/hardware/laptop.mdwn
@@ -224,7 +224,33 @@ might be too pricey.
 System76
 --------
 
-https://system76.com/laptops/lemur
+### Galaga pro
+
+<https://system76.com/laptops/galago>
+
+ * 13" HiDPI (3200x1800)
+ * i5-8250u, i7-8550u +219$
+ * 1x8GB, 16GB (+139$), 32GB (+359$)
+ * 150GB M.2 SSD
+   * 250GB +59$
+   * 500GB +169$
+   * room for another 2.5" drive
+ * 2xUSB3, 1xUSB-C
+ * SD reader
+ * Chiclet backlit
+ * Gbit, Wifi (+AC 20$), BT
+ * HDMI, MiniDP over USB-C?
+ * split headphones/mike jack
+ * 720p webcam
+ * 959$USD base price (+AC = 979$ / +16GB = ~1100$)
+
+The Galaga is, according to HN, [just a rebrand](https://news.ycombinator.com/item?id=13778991) of the [Clevo](https://news.ycombinator.com/item?id=13778991),
+which have [questionable hardware quality](https://news.ycombinator.com/item?id=13941255). Clevo also [for sale at
+Sager](https://www.sagernotebook.com/Notebook-NP3132.html).
+
+### Lemur
+
+<https://system76.com/laptops/lemur>
 
 * 14"
 * i3 2.4GHz, i7 3.5GHz +160$
@@ -240,7 +266,9 @@ https://system76.com/laptops/lemur
 * Wifi AC +20$
 * 699$ (+AC = 770$ / +M.2 +16GB = 877$)
 
-https://system76.com/desktops/meerkat
+### Meerkat
+
+<https://system76.com/desktops/meerkat>
 
 * tiny box, no screen
 * i3 6100U 2.3GHz 3MB cache (i5 +125$)

details about dell xps laptop
diff --git a/hardware/laptop.mdwn b/hardware/laptop.mdwn
index aa9b5033..1c3f1368 100644
--- a/hardware/laptop.mdwn
+++ b/hardware/laptop.mdwn
@@ -213,6 +213,14 @@ https://puri.sm/products/
 1500 - 1700$USD... trop cher. mais vraiment intéressant parce qu'ils
 semblent vraiment libérer le matériel.
 
+Dell
+----
+
+Heard lots of good things about the XPS13. First, it's small-ish
+(13"), then it has apparently [great battery life](https://news.ycombinator.com/item?id=16057783) and good Linux
+support. It's also well supported in linux for firmware updates. But
+might be too pricey.
+
 System76
 --------
 

mention chromebooks
diff --git a/hardware/laptop.mdwn b/hardware/laptop.mdwn
index 5f10b303..aa9b5033 100644
--- a/hardware/laptop.mdwn
+++ b/hardware/laptop.mdwn
@@ -198,8 +198,12 @@ model (~20-75$ in parts)
    * https://www.coreboot.org/Board:lenovo/x230
    * IME, EC, VGA, CPU microcode proprietary
 
-Chromebooks?
-------------
+Chromebooks
+-----------
+
+RK3399-derived chromebooks run Coreboot out of the box and may have no
+binary blobs. Many are limited to 4GB however and run Google-droid by
+default.
 
 Purism
 ------

another hotlink to the blog
diff --git a/services/mail.mdwn b/services/mail.mdwn
index 7b876fd7..0710214a 100644
--- a/services/mail.mdwn
+++ b/services/mail.mdwn
@@ -268,6 +268,9 @@ the [auth package][]. For example, you can store the password on disk
 [auth package]: https://www.gnu.org/software/emacs/manual/html_node/auth/Help-for-users.html#Help-for-users
 [gpg documentation]: https://www.gnu.org/software/emacs/manual/html_node/auth/GnuPG-and-EasyPG-Assistant-Configuration.html#GnuPG-and-EasyPG-Assistant-Configuration
 
+A more detailed documentation of my client setup is in
+[[blog/2016-05-12-email-setup]].
+
 ### Postfix
 
 To configure Postfix as a *client* for the above, the following

ideas for better offline support
diff --git a/services/mail.mdwn b/services/mail.mdwn
index d9b2236d..7b876fd7 100644
--- a/services/mail.mdwn
+++ b/services/mail.mdwn
@@ -305,6 +305,25 @@ Note that this method stores your plaintext password on disk, which is
 not really desirable. It is best to configure your MUA to send email
 directly and ignore local emails.
 
+### Ideas
+
+ 1. test [syncmaildir](https://github.com/gares/syncmaildir) to replace offlineimap: would allow for an
+    automated configuration based on SSH keys instead of passwords
+
+ 2. similarly, consider using [nullmailer](https://untroubled.org/nullmailer/). bremner has [this setup
+    that using SSH](https://salsa.debian.org/bremner/nullmailer-ssh). nullmailer has the advantage over [msmtp](http://msmtp.sourceforge.net/)
+    that it can queue emails.
+
+ 3. alternatively, a simple `sendmail` wrapper that calls `ssh host
+    sendmail` could do the job as well. it would need to be some
+    restricted sendmail command, maybe like `rsendmail` above. but
+    then emails can only be sent online.
+
+ 4. ultimately, maybe the IMAP server can send the email, through a
+    "Outbox" folder that would slurp emails written there and send
+    them through the SMTP server. this seems to be only [supported by
+    Courier IMAP](https://www.courier-mta.org/imap/INSTALL.html#imapsend) unfortunately.
+
 References
 ----------
 

article online
diff --git a/blog/terms.mdwn b/blog/terms.mdwn
index e5843997..7a547da7 100644
--- a/blog/terms.mdwn
+++ b/blog/terms.mdwn
@@ -2,8 +2,8 @@
 \[LWN subscriber-only content\]
 -------------------------------
 
-[[!meta date="2018-03-22T00:00:00+0000"]]
-[[!meta updated="2018-03-30T13:44:38-0400"]]
+[[!meta date="2018-03-30T00:00:00+0000"]]
+[[!meta updated="2018-03-30T14:21:21-0400"]]
 
 [[!toc levels=2]]
 
@@ -269,8 +269,8 @@ see that some terminals have serious drawbacks. For example, users
 dealing with RTL scripts on a regular basis may be interested in mlterm
 and pterm, as they seem to have better support for those scripts.
 Konsole gets away with a good score here as well. Users who do not
-normally work with RTL scripts will be happy with the other terminal
-choices.
+normally work with RTL scripts will also be happy with the other
+terminal choices.
 
 In terms of paste protection, urxvt stands alone above the rest with its
 special feature, which I find particularly convenient. Those looking for

last changes from LWN
diff --git a/blog/terms.mdwn b/blog/terms.mdwn
index a1ce869d..e5843997 100644
--- a/blog/terms.mdwn
+++ b/blog/terms.mdwn
@@ -3,7 +3,7 @@
 -------------------------------
 
 [[!meta date="2018-03-22T00:00:00+0000"]]
-[[!meta updated="2018-03-30T08:53:31-0400"]]
+[[!meta updated="2018-03-30T13:44:38-0400"]]
 
 [[!toc levels=2]]
 
@@ -134,7 +134,7 @@ shows how the apparently innocuous command:
         git clone git://git.kernel.org/pub/scm/utils/kup/kup.git
 
 gets turned into this nasty mess (reformatted a bit for easier reading)
-when pasted in a terminal:
+when pasted from Horn's site into a terminal:
 
         git clone /dev/null;
         clear;
@@ -150,26 +150,28 @@ of the viewport using CSS.
 
 [Bracketed paste mode](https://cirw.in/blog/bracketed-paste) is
 explicitly designed to neutralize this attack. In this mode, terminals
-wrap pasted text in escape sequences so that shells can do the right
-thing. Terminals going all the way back to the venerable xterm have
-supported this feature, but bracketed paste also needs support from the
-shell or application running on the terminal. For example, software
-using [GNU
+wrap pasted text in a pair of special escape sequences to inform the
+shell of that text's origin. The shell can then ignore special editing
+characters found in the pasted text. Terminals going all the way back to
+the venerable xterm have supported this feature, but bracketed paste
+also needs support from the shell or application running on the
+terminal. For example, software using [GNU
 Readline](https://tiswww.case.edu/php/chet/readline/rltop.html) (e.g.
 Bash) needs the following in the `~/.inputrc` file:
 
         set enable-bracketed-paste on
 
 Unfortunately, Horn's test page also shows how to bypass this
-protection, by including the escape sequence (`^[[201~`) in the
-copy-pasted code itself. This works because some terminals do not
-properly filter escape sequences before adding their own. For example,
-in my tests, Konsole fails to properly escape the second test, even with
-`.inputrc` properly configured. That means it is easy to end up with a
-broken configuration, either due to an unsupported application or
-misconfigured shell. This is particularly likely when logged on to
-remote servers where carefully crafted configuration files may be less
-common, especially if you operate many different machines.
+protection, by including the end-of-pasted-text sequence in the pasted
+text itself, thus ending the bracketed mode prematurely. This works
+because some terminals do not properly filter escape sequences before
+adding their own. For example, in my tests, Konsole fails to properly
+escape the second test, even with `.inputrc` properly configured. That
+means it is easy to end up with a broken configuration, either due to an
+unsupported application or misconfigured shell. This is particularly
+likely when logged on to remote servers where carefully crafted
+configuration files may be less common, especially if you operate many
+different machines.
 
 A good solution to this problem is the `confirm-paste` plugin of the
 urxvt terminal, which simply prompts before allowing any paste with a
@@ -266,10 +268,9 @@ memory usage, speed, and latency of the terminals. But we can already
 see that some terminals have serious drawbacks. For example, users
 dealing with RTL scripts on a regular basis may be interested in mlterm
 and pterm, as they seem to have better support for those scripts.
-Konsole gets away with a good score here as well. Some might argue, on
-the contrary, that a terminal should not mess with the order of bytes
-shown on the screen, in which case the behavior of most other terminals
-will be acceptable.
+Konsole gets away with a good score here as well. Users who do not
+normally work with RTL scripts will be happy with the other terminal
+choices.
 
 In terms of paste protection, urxvt stands alone above the rest with its
 special feature, which I find particularly convenient. Those looking for

add macro lens
diff --git a/hardware/camera.mdwn b/hardware/camera.mdwn
index e0a7098a..9c20fcb7 100644
--- a/hardware/camera.mdwn
+++ b/hardware/camera.mdwn
@@ -189,6 +189,8 @@ Reference
    on kijiji
  * [35mm f/2 R WR ø43](http://www.fujifilm.ca/products/digital_cameras/x/fujinon_lens_xf35mmf2_r_wr/), [Rockwell](http://www.kenrockwell.com/fuji/x-mount-lenses/35mm-f2.htm), [fstoppers](https://fstoppers.com/gear/fstoppers-reviews-fujifilm-35mm-f2-wr-158227), nice size,
    sealed, 350-400$ on kijiji 
+ * [60mm f/2.4 R Macro ø39mm](http://www.fujifilm.ca/products/digital_cameras/x/fujinon_lens_xf60mmf24_r_macro/), [Rockwell](https://kenrockwell.com/fuji/x-mount-lenses/60mm-f24.htm), [Photograph blog](http://www.photographyblog.com/reviews/fujifilm_xf_60mm_f2_4_r_review/),
+   500-700$ on kijiji
  * [X100f ø49](http://www.fujifilm.com/products/digital_cameras/x/fujifilm_x100f/) 1200-1600$ on kijiji
  * lens cap holder: [1](https://www.bhphotovideo.com/c/product/834774-REG/Sensei_CK_L_Cap_Keeper_for_Lens.html?sts=pi), [2](https://www.bhphotovideo.com/c/product/850525-REG/Sensei_ck_lp_Cap_Keeper_Plus_Lens.html), haven't found others
  * [cleaning pen](https://www.bhphotovideo.com/c/product/1051483-REG/lenspen_nlp1_c_nlp1c_lens_pen.html): ~10USD. haven't looked at alternative brushes.

reorder
diff --git a/hardware/camera.mdwn b/hardware/camera.mdwn
index 345c3252..e0a7098a 100644
--- a/hardware/camera.mdwn
+++ b/hardware/camera.mdwn
@@ -185,10 +185,10 @@ Reference
    but real nice, 900-1400$
  * [23mm f/1.4 R ø62](http://www.fujifilm.ca/products/digital_cameras/x/fujinon_lens_xf23mmf14_r/): [Rockwell](http://www.kenrockwell.com/fuji/x-mount-lenses/23mm-f14.htm), [fstoppers](https://fstoppers.com/gear/worlds-quickest-lens-review-fuji-xf-23mm-14r-8342) (glowing review),
    700-900$ on kijiji
- * [35mm f/2 R WR ø43](http://www.fujifilm.ca/products/digital_cameras/x/fujinon_lens_xf35mmf2_r_wr/), [Rockwell](http://www.kenrockwell.com/fuji/x-mount-lenses/35mm-f2.htm), [fstoppers](https://fstoppers.com/gear/fstoppers-reviews-fujifilm-35mm-f2-wr-158227), nice size,
-   sealed, 350-400$ on kijiji 
  * [27mm f/2.8 ø39](http://www.fujifilm.com/products/digital_cameras/x/fujinon_lens_xf27mmf28/), [Rockwell](http://www.kenrockwell.com/fuji/x-mount-lenses/27mm-f28.htm), nice little pancake lens, 300-350$
    on kijiji
+ * [35mm f/2 R WR ø43](http://www.fujifilm.ca/products/digital_cameras/x/fujinon_lens_xf35mmf2_r_wr/), [Rockwell](http://www.kenrockwell.com/fuji/x-mount-lenses/35mm-f2.htm), [fstoppers](https://fstoppers.com/gear/fstoppers-reviews-fujifilm-35mm-f2-wr-158227), nice size,
+   sealed, 350-400$ on kijiji 
  * [X100f ø49](http://www.fujifilm.com/products/digital_cameras/x/fujifilm_x100f/) 1200-1600$ on kijiji
  * lens cap holder: [1](https://www.bhphotovideo.com/c/product/834774-REG/Sensei_CK_L_Cap_Keeper_for_Lens.html?sts=pi), [2](https://www.bhphotovideo.com/c/product/850525-REG/Sensei_ck_lp_Cap_Keeper_Plus_Lens.html), haven't found others
  * [cleaning pen](https://www.bhphotovideo.com/c/product/1051483-REG/lenspen_nlp1_c_nlp1c_lens_pen.html): ~10USD. haven't looked at alternative brushes.

small changes from LWN
diff --git a/blog/terms.mdwn b/blog/terms.mdwn
index 34dc03a8..a1ce869d 100644
--- a/blog/terms.mdwn
+++ b/blog/terms.mdwn
@@ -3,7 +3,7 @@
 -------------------------------
 
 [[!meta date="2018-03-22T00:00:00+0000"]]
-[[!meta updated="2018-03-29T18:57:02-0400"]]
+[[!meta updated="2018-03-30T08:53:31-0400"]]
 
 [[!toc levels=2]]
 
@@ -16,7 +16,7 @@ terminals](https://en.wikipedia.org/wiki/Computer_terminal), which
 themselves were upgrades from punched cards and toggle-switch inputs.
 Modern distributions now ship with a surprising variety of terminal
 emulators. While some people may be happy with the default terminal
-provided by desktop environments, others take great pride at using
+provided by their desktop environment, others take great pride at using
 exotic software for running their favorite shell or text editor. But as
 we'll see in this two-part series, not all terminals are created equal:
 they vary wildly in terms of functionality, size, and performance.
@@ -29,33 +29,20 @@ to help readers determine which terminal they should be running in 2018.
 This first article compares features, while the second part evaluates
 performance.
 
-Here are the terminals reviewed in the series:
-
-| Terminal          | Notes                                      |
-|-------------------|--------------------------------------------|
-| [Alacritty][]     | built from source                          |
-| [GNOME Terminal][]| uses GTK3, [VTE][]                         |
-| [Konsole][]       | uses KDE libraries                         |
-| [mlterm][]        | uses VTE, "Multi-lingual terminal"         |
-| [pterm][]         | [PuTTY][] without ssh, uses GTK2           |
-| [st][]            | "simple terminal"                          |
-| [Terminator][]    | uses GTK3, VTE                             |
-| [urxvt][]         | main rxvt fork, also known as rxvt-unicode |
-| [Xfce Terminal][] | uses GTK3, VTE                             |
-| [XTerm][]         | the original X terminal                    |
-
-[Alacritty]: https://github.com/jwilm/alacritty
-[GNOME Terminal]: https://wiki.gnome.org/Apps/Terminal
-[Konsole]: https://konsole.kde.org/
-[PuTTY]: https://www.chiark.greenend.org.uk/~sgtatham/putty/
-[Terminator]: https://gnometerminator.blogspot.ca/
-[VTE]: https://github.com/GNOME/vte
-[XTerm]: http://invisible-island.net/xterm/
-[Xfce Terminal]: https://docs.xfce.org/apps/terminal/start
-[mlterm]: http://mlterm.sourceforge.net/
-[pterm]: https://manpages.debian.org/pterm
-[st]: https://st.suckless.org/
-[urxvt]: http://software.schmorp.de/pkg/rxvt-unicode.html
+Here are the terminals examined in the series:
+
+| Terminal                                                   | Debian        | Fedora  | Upstream | Notes                                                                                 |
+|------------------------------------------------------------|---------------|---------|----------|---------------------------------------------------------------------------------------|
+| [Alacritty](https://github.com/jwilm/alacritty)            | N/A           | N/A     | 6debc4f  | no releases, Git head                                                                 |
+| [GNOME Terminal](https://wiki.gnome.org/Apps/Terminal)     | 3.22.2        | 3.26.2  | 3.28.0   | uses GTK3, [VTE](https://github.com/GNOME/vte)                                        |
+| [Konsole](https://konsole.kde.org/)                        | 16.12.0       | 17.12.2 | 17.12.3  | uses KDE libraries                                                                    |
+| [mlterm](http://mlterm.sourceforge.net/)                   | 3.5.0         | 3.7.0   | 3.8.5    | uses VTE, "Multi-lingual terminal"                                                    |
+| [pterm](https://manpages.debian.org/pterm)                 | 0.67          | 0.70    | 0.70     | [PuTTY](https://www.chiark.greenend.org.uk/%7Esgtatham/putty/) without ssh, uses GTK2 |
+| [st](https://st.suckless.org/)                             | 0.6           | 0.7     | 0.8.1    | "simple terminal"                                                                     |
+| [Terminator](https://gnometerminator.blogspot.ca/)         | 1.90+bzr-1705 | 1.91    | 1.91     | uses GTK3, VTE                                                                        |
+| [urxvt](http://software.schmorp.de/pkg/rxvt-unicode.html)  | 9.22          | 9.22    | 9.22     | main rxvt fork, also known as rxvt-unicode                                            |
+| [Xfce Terminal](https://docs.xfce.org/apps/terminal/start) | 0.8.3         | 0.8.7   | 0.8.7.2  | uses GTK3, VTE                                                                        |
+| [xterm](http://invisible-island.net/xterm/)                | 327           | 330     | 331      | the original X terminal                                                               |
 
 Those versions may be behind the latest upstream releases, as I
 restricted myself to stable software that managed to make it into
@@ -73,36 +60,37 @@ The first feature I considered is Unicode support. The first test was to
 display a string that was based on a string [from the Wikipedia Unicode
 page](https://en.wikipedia.org/wiki/Unicode#Web): "é, Δ, Й, ק ,م,
 ๗,あ,叶, 葉, and 말". This tests whether a terminal can correctly
-display scripts from all over the world reliably. XTerm fails to display
+display scripts from all over the world reliably. xterm fails to display
 the Arabic [Mem](https://en.wikipedia.org/wiki/Mem) character in its
 default configuration:
 
-> ![\[XTerm
-> failure\]](https://static.lwn.net/images/2018/terms-unicode-xterm.png "XTerm failure")
+> ![\[xterm
+> failure\]](https://static.lwn.net/images/2018/terms-unicode-xterm.png "xterm failure")
 
-By default, XTerm uses the classic "fixed" font which, [according to
+By default, xterm uses the classic "fixed" font which, [according to
 Wikipedia](https://en.wikipedia.org/wiki/Open-source_Unicode_typefaces)
 has "substantial Unicode coverage since 1997". Something is happening
 here that makes the character display as a box: only by bumping the font
 size to "Huge" (20 points) is the character finally displayed correctly,
 and then *other* characters fail to display correctly:
 
-> ![\[XTerm failure, huge
-> fonts\]](https://static.lwn.net/images/2018/terms-unicode-xterm2.png "XTerm failure, huge fonts")
+> ![\[xterm failure, huge
+> fonts\]](https://static.lwn.net/images/2018/terms-unicode-xterm2.png "xterm failure, huge fonts")
 
 Those screenshots were generated on Fedora 27 as it gave better results
 than Debian 9, where some older versions of the terminals (mlterm,
 namely) would fail to properly fallback across fonts. Thankfully, this
 seems to have been fixed in later versions.
 
-Now notice the order of the string displayed by XTerm: it turns out that
+Now notice the order of the string displayed by xterm: it turns out that
 Mem and the following character, the Semitic
 [Qoph](https://en.wikipedia.org/wiki/Qoph), are both part of
 [right-to-left](https://en.wikipedia.org/wiki/Right-to-left) (RTL)
-scripts, so technically, they should be reversed when displayed. Web
-browsers like Firefox 57 handle this correctly in the above string. A
-simpler test is the word "[Sarah](https://en.wikipedia.org/wiki/Sarah)"
-in Hebrew ([שרה](https://he.wikipedia.org/wiki/%D7%A9%D7%A8%D7%94)). The
+scripts, so technically, they should be rendered right to left when
+displayed. Web browsers like Firefox 57 handle this correctly in the
+above string. A simpler test is the word
+"[Sarah](https://en.wikipedia.org/wiki/Sarah)" in Hebrew
+([שרה](https://he.wikipedia.org/wiki/%D7%A9%D7%A8%D7%94)). The
 [Wikipedia page about bi-directional
 text](https://en.wikipedia.org/wiki/Bi-directional_text) explains that:
 
@@ -163,7 +151,7 @@ of the viewport using CSS.
 [Bracketed paste mode](https://cirw.in/blog/bracketed-paste) is
 explicitly designed to neutralize this attack. In this mode, terminals
 wrap pasted text in escape sequences so that shells can do the right
-thing. Terminals going all the way back to the venerable XTerm have
+thing. Terminals going all the way back to the venerable xterm have
 supported this feature, but bracketed paste also needs support from the
 shell or application running on the terminal. For example, software
 using [GNU
@@ -193,7 +181,7 @@ Tabs and profiles
 
 A popular feature is support for a tabbed interface, which we'll define
 broadly as a single terminal window holding multiple terminals. This
-feature varies across terminals: while traditional terminals like XTerm
+feature varies across terminals: while traditional terminals like xterm
 do not support tabs at all, more modern implementations like Xfce
 Terminal, GNOME Terminal, and Konsole all have tab support. Urxvt also
 features tab support through a plugin. But in terms of tab support,
@@ -246,7 +234,7 @@ keeps track of which terminals have "true color" support. My tests also
 confirm that st, Alacritty, and the VTE-derived terminals I tested have
 excellent true color support. Other terminals, however, do not fare so
 well and actually fail to display even 256 colors. You can see below the
-difference between true color support in GNOME Terminal, st, and XTerm,
+difference between true color support in GNOME Terminal, st, and xterm,
 which still does a decent job at approximating the colors using its
 256-color palette. Urxvt not only fails the test but even shows blinking
 characters instead of colors.

restore narrow layout
diff --git a/blog/terms.mdwn b/blog/terms.mdwn
index 46af8b76..34dc03a8 100644
--- a/blog/terms.mdwn
+++ b/blog/terms.mdwn
@@ -31,18 +31,31 @@ performance.
 
 Here are the terminals reviewed in the series:
 
-| Terminal                                                   | Notes                                                                               |
-|------------------------------------------------------------|-------------------------------------------------------------------------------------|
-| [Alacritty](https://github.com/jwilm/alacritty)            | built from source                                                                   |
-| [GNOME Terminal](https://wiki.gnome.org/Apps/Terminal)     | uses GTK3, [VTE](https://github.com/GNOME/vte)                                      |
-| [Konsole](https://konsole.kde.org/)                        | uses KDE libraries                                                                  |
-| [mlterm](http://mlterm.sourceforge.net/)                   | uses VTE, "Multi-lingual terminal"                                                  |
-| [pterm](https://manpages.debian.org/pterm)                 | [PuTTY](https://www.chiark.greenend.org.uk/~sgtatham/putty/) without ssh, uses GTK2 |
-| [st](https://st.suckless.org/)                             | "simple terminal"                                                                   |
-| [Terminator](https://gnometerminator.blogspot.ca/)         | uses GTK3, VTE                                                                      |
-| [urxvt](http://software.schmorp.de/pkg/rxvt-unicode.html)  | main rxvt fork, also known as rxvt-unicode                                          |
-| [Xfce Terminal](https://docs.xfce.org/apps/terminal/start) | uses GTK3, VTE                                                                      |
-| [XTerm](http://invisible-island.net/xterm/)                | the original X terminal                                                             |
+| Terminal          | Notes                                      |
+|-------------------|--------------------------------------------|
+| [Alacritty][]     | built from source                          |
+| [GNOME Terminal][]| uses GTK3, [VTE][]                         |
+| [Konsole][]       | uses KDE libraries                         |
+| [mlterm][]        | uses VTE, "Multi-lingual terminal"         |
+| [pterm][]         | [PuTTY][] without ssh, uses GTK2           |
+| [st][]            | "simple terminal"                          |
+| [Terminator][]    | uses GTK3, VTE                             |
+| [urxvt][]         | main rxvt fork, also known as rxvt-unicode |
+| [Xfce Terminal][] | uses GTK3, VTE                             |
+| [XTerm][]         | the original X terminal                    |
+
+[Alacritty]: https://github.com/jwilm/alacritty
+[GNOME Terminal]: https://wiki.gnome.org/Apps/Terminal
+[Konsole]: https://konsole.kde.org/
+[PuTTY]: https://www.chiark.greenend.org.uk/~sgtatham/putty/
+[Terminator]: https://gnometerminator.blogspot.ca/
+[VTE]: https://github.com/GNOME/vte
+[XTerm]: http://invisible-island.net/xterm/
+[Xfce Terminal]: https://docs.xfce.org/apps/terminal/start
+[mlterm]: http://mlterm.sourceforge.net/
+[pterm]: https://manpages.debian.org/pterm
+[st]: https://st.suckless.org/
+[urxvt]: http://software.schmorp.de/pkg/rxvt-unicode.html
 
 Those versions may be behind the latest upstream releases, as I
 restricted myself to stable software that managed to make it into

more tweaks now that versions are gone
diff --git a/blog/terms.mdwn b/blog/terms.mdwn
index 69bec498..46af8b76 100644
--- a/blog/terms.mdwn
+++ b/blog/terms.mdwn
@@ -3,7 +3,7 @@
 -------------------------------
 
 [[!meta date="2018-03-22T00:00:00+0000"]]
-[[!meta updated="2018-03-29T18:24:02-0400"]]
+[[!meta updated="2018-03-29T18:57:02-0400"]]
 
 [[!toc levels=2]]
 
@@ -33,16 +33,16 @@ Here are the terminals reviewed in the series:
 
 | Terminal                                                   | Notes                                                                               |
 |------------------------------------------------------------|-------------------------------------------------------------------------------------|
-| [Alacritty](https://github.com/jwilm/alacritty)            | No releases, git head                                                               |
+| [Alacritty](https://github.com/jwilm/alacritty)            | built from source                                                                   |
 | [GNOME Terminal](https://wiki.gnome.org/Apps/Terminal)     | uses GTK3, [VTE](https://github.com/GNOME/vte)                                      |
 | [Konsole](https://konsole.kde.org/)                        | uses KDE libraries                                                                  |
 | [mlterm](http://mlterm.sourceforge.net/)                   | uses VTE, "Multi-lingual terminal"                                                  |
 | [pterm](https://manpages.debian.org/pterm)                 | [PuTTY](https://www.chiark.greenend.org.uk/~sgtatham/putty/) without ssh, uses GTK2 |
 | [st](https://st.suckless.org/)                             | "simple terminal"                                                                   |
 | [Terminator](https://gnometerminator.blogspot.ca/)         | uses GTK3, VTE                                                                      |
-| [urxvt](http://software.schmorp.de/pkg/rxvt-unicode.html)  | Main rxvt fork, also known as rxvt-unicode                                          |
+| [urxvt](http://software.schmorp.de/pkg/rxvt-unicode.html)  | main rxvt fork, also known as rxvt-unicode                                          |
 | [Xfce Terminal](https://docs.xfce.org/apps/terminal/start) | uses GTK3, VTE                                                                      |
-| [XTerm](http://invisible-island.net/xterm/)                | the original                                                                        |
+| [XTerm](http://invisible-island.net/xterm/)                | the original X terminal                                                             |
 
 Those versions may be behind the latest upstream releases, as I
 restricted myself to stable software that managed to make it into
@@ -130,7 +130,6 @@ that hidden commands can sneak into copy-pasted text from a web browser,
 even after careful review. [Jann Horn's test
 site](http://thejh.net/misc/website-terminal-copy-paste) brilliantly
 shows how the apparently innocuous command:
-
         git clone git://git.kernel.org/pub/scm/utils/kup/kup.git
 
 gets turned into this nasty mess (reformatted a bit for easier reading)

fixes to the unicode section from jake
diff --git a/blog/terms.mdwn b/blog/terms.mdwn
index 3d074908..69bec498 100644
--- a/blog/terms.mdwn
+++ b/blog/terms.mdwn
@@ -3,7 +3,7 @@
 -------------------------------
 
 [[!meta date="2018-03-22T00:00:00+0000"]]
-[[!meta updated="2018-03-29T16:22:12-0400"]]
+[[!meta updated="2018-03-29T18:24:02-0400"]]
 
 [[!toc levels=2]]
 
@@ -31,33 +31,18 @@ performance.
 
 Here are the terminals reviewed in the series:
 
-| Terminal            | Notes                              |
-| ------------------- | ---------------------------------- |
-| [Alacritty][]       | No releases, git head              |
-| [GNOME Terminal][]  | uses GTK3, [VTE][]                 |
-| [Konsole][]         | uses KDE libraries                 |
-| [mlterm][]          | uses VTE, "Multi-lingual terminal" |
-| [pterm][]           | [PuTTY][] without ssh, uses GTK2   |
-| [st][]              | "simple terminal"                  |
-| [Terminator][]      | uses GTK3, VTE                     |
-| [urxvt][]   | Main rxvt fork, also known as rxvt-unicode |
-| [Xfce Terminal][]   | uses GTK3, VTE                     |
-| [xterm][]           | the original                       |
-
- [Alacritty]: https://github.com/jwilm/alacritty
- [GNOME Terminal]: https://wiki.gnome.org/Apps/Terminal
- [Konsole]: https://konsole.kde.org/
- [kterm]: https://ja.wikipedia.org/wiki/Kterm
- [mlterm]: http://mlterm.sourceforge.net/
- [mrxvt]: https://en.wikipedia.org/wiki/Mrxvt
- [pterm]: https://manpages.debian.org/pterm
- [PuTTY]: https://www.chiark.greenend.org.uk/~sgtatham/putty/
- [st]: https://st.suckless.org/
- [Terminator]: https://gnometerminator.blogspot.ca/
- [VTE]: https://github.com/GNOME/vte
- [urxvt]: http://software.schmorp.de/pkg/rxvt-unicode.html
- [Xfce Terminal]: https://docs.xfce.org/apps/terminal/start
- [XTerm]: http://invisible-island.net/xterm/
+| Terminal                                                   | Notes                                                                               |
+|------------------------------------------------------------|-------------------------------------------------------------------------------------|
+| [Alacritty](https://github.com/jwilm/alacritty)            | No releases, git head                                                               |
+| [GNOME Terminal](https://wiki.gnome.org/Apps/Terminal)     | uses GTK3, [VTE](https://github.com/GNOME/vte)                                      |
+| [Konsole](https://konsole.kde.org/)                        | uses KDE libraries                                                                  |
+| [mlterm](http://mlterm.sourceforge.net/)                   | uses VTE, "Multi-lingual terminal"                                                  |
+| [pterm](https://manpages.debian.org/pterm)                 | [PuTTY](https://www.chiark.greenend.org.uk/~sgtatham/putty/) without ssh, uses GTK2 |
+| [st](https://st.suckless.org/)                             | "simple terminal"                                                                   |
+| [Terminator](https://gnometerminator.blogspot.ca/)         | uses GTK3, VTE                                                                      |
+| [urxvt](http://software.schmorp.de/pkg/rxvt-unicode.html)  | Main rxvt fork, also known as rxvt-unicode                                          |
+| [Xfce Terminal](https://docs.xfce.org/apps/terminal/start) | uses GTK3, VTE                                                                      |
+| [XTerm](http://invisible-island.net/xterm/)                | the original                                                                        |
 
 Those versions may be behind the latest upstream releases, as I
 restricted myself to stable software that managed to make it into
@@ -71,66 +56,66 @@ rather poor performance.
 Unicode support
 ---------------
 
-The first feature I considered is Unicode support. The first test was
-to display a string that was taken [from the Wikipedia Unicode
+The first feature I considered is Unicode support. The first test was to
+display a string that was based on a string [from the Wikipedia Unicode
 page](https://en.wikipedia.org/wiki/Unicode#Web): "é, Δ, Й, ק ,م,
 ๗,あ,叶, 葉, and 말". This tests whether a terminal can correctly
-display scripts from all over the world
-reliably. [XTerm](http://invisible-island.net/xterm/) fails to display
+display scripts from all over the world reliably. XTerm fails to display
 the Arabic [Mem](https://en.wikipedia.org/wiki/Mem) character in its
 default configuration:
 
 > ![\[XTerm
-> failure\]](terms/unicode-xterm-fail.png)
+> failure\]](https://static.lwn.net/images/2018/terms-unicode-xterm.png "XTerm failure")
 
 By default, XTerm uses the classic "fixed" font which, [according to
 Wikipedia](https://en.wikipedia.org/wiki/Open-source_Unicode_typefaces)
-has "extensive unicode coverage since 1997". Something is happening
-here that makes the character display as a box: only by bumping the
-font size to "Huge" (20 points) is the character finally displayed
-correctly, and then *other* characters fail to display correctly:
+has "substantial Unicode coverage since 1997". Something is happening
+here that makes the character display as a box: only by bumping the font
+size to "Huge" (20 points) is the character finally displayed correctly,
+and then *other* characters fail to display correctly:
 
-![XTerm failure, huge fonts](terms/unicode-xterm-fail-huge.png)
+> ![\[XTerm failure, huge
+> fonts\]](https://static.lwn.net/images/2018/terms-unicode-xterm2.png "XTerm failure, huge fonts")
 
-Those screenshots were generated on Fedora 27 as it gave better
-results than Debian 9, where some older versions of the terminals
-(mlterm, namely) would fail to properly fallback across
-fonts. Thankfully, this seems to have been fixed in later versions.
+Those screenshots were generated on Fedora 27 as it gave better results
+than Debian 9, where some older versions of the terminals (mlterm,
+namely) would fail to properly fallback across fonts. Thankfully, this
+seems to have been fixed in later versions.
 
-Now notice the order of the string displayed by XTerm: it turns out
-that mem and the following character, the semitic
+Now notice the order of the string displayed by XTerm: it turns out that
+Mem and the following character, the Semitic
 [Qoph](https://en.wikipedia.org/wiki/Qoph), are both part of
 [right-to-left](https://en.wikipedia.org/wiki/Right-to-left) (RTL)
 scripts, so technically, they should be reversed when displayed. Web
 browsers like Firefox 57 handle this correctly in the above string. A
-simpler test is the word
-"[Sarah](https://en.wikipedia.org/wiki/Sarah)" in Hebrew
-([שרה](https://he.wikipedia.org/wiki/%D7%A9%D7%A8%D7%94)). The
+simpler test is the word "[Sarah](https://en.wikipedia.org/wiki/Sarah)"
+in Hebrew ([שרה](https://he.wikipedia.org/wiki/%D7%A9%D7%A8%D7%94)). The
 [Wikipedia page about bi-directional
-text](https://en.wikipedia.org/wiki/Bi-directional_text) explains
-that:
+text](https://en.wikipedia.org/wiki/Bi-directional_text) explains that:
 
-> Many computer programs fail to display bi-directional text
-> correctly. For example, the Hebrew name Sarah (שרה) is spelled: sin
-> (ש) (which appears rightmost), then resh (ר), and finally heh (ה)
-> (which should appear leftmost).
+> Many computer programs fail to display bi-directional text correctly.
+> For example, the Hebrew name Sarah (שרה) is spelled: sin (ש) (which
+> appears rightmost), then resh (ר), and finally heh (ה) (which should
+> appear leftmost).
 
 Many terminals fail this test: Alacritty, VTE-derivatives (GNOME
-Terminal, Terminator and XFCE Terminal), urxvt, st and xterm all show
-Sarah's name backwards, as if we would spell it "Haras" in english.
+Terminal, Terminator, and XFCE Terminal), urxvt, st, and xterm all show
+Sarah's name backwards—as if we would display it as "Haras" in English.
 
-![GNOME Terminal showing Sarah backwards](terms/unicode-gnome.png)
+> ![\[GNOME Terminal
+> Hebrew\]](https://static.lwn.net/images/2018/terms-unicode-gnome.png "GNOME Terminal Hebrew")
 
-The other challenge with bi-directional text is how to align text, and
+The other challenge with bi-directional text is how to align it,
 especially mixed RTL and left-to-right (LTR) text. RTL scripts should
 start from the right side of the terminal, but what should happen in a
-terminal where the prompt is in english, on the left? Most terminals
-do not make special provisions and align all the text on the left,
+terminal where the prompt is in English, on the left? Most terminals do
+not make special provisions and align all of the text on the left,
 including Konsole, which otherwise displays Sarah's name in the right
 order. Here, pterm and mlterm seem to be sticking to the standard a
 little more closely and align the test string on the right.
 
-![mlterm displaying Sarah and the test string correctly](terms/unicode-mlterm.png)
+> ![\[mlterm
+> Hebrew\]](https://static.lwn.net/images/2018/terms-unicode-mlterm.png "mlterm Hebrew")
 
 Paste protection
 ----------------
@@ -279,12 +264,12 @@ Preliminary conclusions
 In the next article, we'll compare performance characteristics like
 memory usage, speed, and latency of the terminals. But we can already
 see that some terminals have serious drawbacks. For example, users
-dealing with RTL scripts on a regular basis may be interested in
-mlterm and pterm, as they seem to have better support for those
-scripts. Konsole gets away with a good score here as well. Some might
-argue, on the contrary, that a terminal should not mess with the order
-of bytes shown on the screen, in which case the behavior of most other
-terminals will be acceptable.
+dealing with RTL scripts on a regular basis may be interested in mlterm
+and pterm, as they seem to have better support for those scripts.
+Konsole gets away with a good score here as well. Some might argue, on
+the contrary, that a terminal should not mess with the order of bytes
+shown on the screen, in which case the behavior of most other terminals
+will be acceptable.
 
 In terms of paste protection, urxvt stands alone above the rest with its
 special feature, which I find particularly convenient. Those looking for

whitespace change from lwn
diff --git a/blog/terms.mdwn b/blog/terms.mdwn
index 3f40690d..3d074908 100644
--- a/blog/terms.mdwn
+++ b/blog/terms.mdwn
@@ -187,10 +187,9 @@ remote servers where carefully crafted configuration files may be less
 common, especially if you operate many different machines.
 
 A good solution to this problem is the `confirm-paste` plugin of the
-urxvt terminal, which simply prompts before
-allowing any paste with a newline character. I haven't found another
-terminal with such definitive protection against the attack described by
-Horn.
+urxvt terminal, which simply prompts before allowing any paste with a
+newline character. I haven't found another terminal with such definitive
+protection against the attack described by Horn.
 
 Tabs and profiles
 -----------------

simple urxvt switch from jake
diff --git a/blog/terms.mdwn b/blog/terms.mdwn
index 58faf3dd..3f40690d 100644
--- a/blog/terms.mdwn
+++ b/blog/terms.mdwn
@@ -3,7 +3,7 @@
 -------------------------------
 
 [[!meta date="2018-03-22T00:00:00+0000"]]
-[[!meta updated="2018-03-29T15:51:01-0400"]]
+[[!meta updated="2018-03-29T16:22:12-0400"]]
 
 [[!toc levels=2]]
 
@@ -40,7 +40,7 @@ Here are the terminals reviewed in the series:
 | [pterm][]           | [PuTTY][] without ssh, uses GTK2   |
 | [st][]              | "simple terminal"                  |
 | [Terminator][]      | uses GTK3, VTE                     |
-| [rxvt-unicode][]    | Main rxvt fork, also known as urxvt |
+| [urxvt][]   | Main rxvt fork, also known as rxvt-unicode |
 | [Xfce Terminal][]   | uses GTK3, VTE                     |
 | [xterm][]           | the original                       |
 
@@ -55,7 +55,7 @@ Here are the terminals reviewed in the series:
  [st]: https://st.suckless.org/
  [Terminator]: https://gnometerminator.blogspot.ca/
  [VTE]: https://github.com/GNOME/vte
- [rxvt-unicode]: http://software.schmorp.de/pkg/rxvt-unicode.html
+ [urxvt]: http://software.schmorp.de/pkg/rxvt-unicode.html
  [Xfce Terminal]: https://docs.xfce.org/apps/terminal/start
  [XTerm]: http://invisible-island.net/xterm/
 

whitespace diff from LWN
diff --git a/blog/terms.mdwn b/blog/terms.mdwn
index 9f7aadb2..58faf3dd 100644
--- a/blog/terms.mdwn
+++ b/blog/terms.mdwn
@@ -179,13 +179,12 @@ Unfortunately, Horn's test page also shows how to bypass this
 protection, by including the escape sequence (`^[[201~`) in the
 copy-pasted code itself. This works because some terminals do not
 properly filter escape sequences before adding their own. For example,
-in my tests,  Konsole fails to properly escape
-the second test, even with `.inputrc` properly configured. That means it
-is easy to end up with a broken configuration, either due to an
-unsupported application or misconfigured shell. This is particularly
-likely when logged on to remote servers where carefully crafted
-configuration files may be less common, especially if you operate many
-different machines.
+in my tests, Konsole fails to properly escape the second test, even with
+`.inputrc` properly configured. That means it is easy to end up with a
+broken configuration, either due to an unsupported application or
+misconfigured shell. This is particularly likely when logged on to
+remote servers where carefully crafted configuration files may be less
+common, especially if you operate many different machines.
 
 A good solution to this problem is the `confirm-paste` plugin of the
 urxvt terminal, which simply prompts before

small fixes from LWN, lead approved, partly
diff --git a/blog/terms.mdwn b/blog/terms.mdwn
index 1e48c186..9f7aadb2 100644
--- a/blog/terms.mdwn
+++ b/blog/terms.mdwn
@@ -3,7 +3,7 @@
 -------------------------------
 
 [[!meta date="2018-03-22T00:00:00+0000"]]
-[[!meta updated="2018-03-29T14:27:42-0400"]]
+[[!meta updated="2018-03-29T15:51:01-0400"]]
 
 [[!toc levels=2]]
 
@@ -59,13 +59,12 @@ Here are the terminals reviewed in the series:
  [Xfce Terminal]: https://docs.xfce.org/apps/terminal/start
  [XTerm]: http://invisible-island.net/xterm/
 
-Those version may be behind the latest upstream releases, as I
-restricted myself to stable software that managed to make it Debian or
-Fedora. One exception to
-this rule is the Alacritty project, which is a poster child for
-GPU-accelerated terminals written in a fancy new language (Rust, in this
-case). I restricted the list to terminals with an active upstream and
-excluded web-based terminals (including those using
+Those versions may be behind the latest upstream releases, as I
+restricted myself to stable software that managed to make it into
+Debian 9 (stretch) or Fedora 27. One exception to this rule is the
+Alacritty project, which is a poster child for GPU-accelerated terminals
+written in a fancy new language (Rust, in this case). I excluded
+web-based terminals (including those using
 [Electron](https://electronjs.org/)) because preliminary tests showed
 rather poor performance.
 

fix from LWN, others still pending
diff --git a/blog/terms.mdwn b/blog/terms.mdwn
index 99cc4278..1e48c186 100644
--- a/blog/terms.mdwn
+++ b/blog/terms.mdwn
@@ -3,7 +3,7 @@
 -------------------------------
 
 [[!meta date="2018-03-22T00:00:00+0000"]]
-[[!meta updated="2018-03-27T17:04:56-0400"]]
+[[!meta updated="2018-03-29T14:27:42-0400"]]
 
 [[!toc levels=2]]
 
@@ -221,11 +221,11 @@ in other terminals.
 
 Tabs work especially well with the notion of "profiles": for example,
 you may have one tab for your email, another for chat, and so on. This
-is well supported by Konsole and GNOME Terminal, which allows each tab
-to automatically start a profile. Terminator, on the other hand,
-supports profiles, but I could not find a way to have specific tabs
-automatically start a given program. Other terminals do not have the
-concept of "profiles" at all.
+is well supported by Konsole and GNOME Terminal; both allow each tab to
+automatically start a profile. Terminator, on the other hand, supports
+profiles, but I could not find a way to have specific tabs automatically
+start a given program. Other terminals do not have the concept of
+"profiles" at all.
 
 Eye candy
 ---------
@@ -298,6 +298,8 @@ detection, and so on. So at first glance, the default terminal provided
 by your favorite desktop environment might just fit the bill, but we'll
 reserve judgment until our look at performance in the next article.
 
+
+
 > *This article [first appeared][] in the [Linux Weekly News][].*
 
 [first appeared]: https://lwn.net/Articles/749992/

rewrite conclusion
diff --git a/blog/terms.mdwn b/blog/terms.mdwn
index 59f1ec4a..99cc4278 100644
--- a/blog/terms.mdwn
+++ b/blog/terms.mdwn
@@ -279,15 +279,15 @@ every terminal I could find supports scrollback buffers.
 Preliminary conclusions
 -----------------------
 
-{check}
-
 In the next article, we'll compare performance characteristics like
 memory usage, speed, and latency of the terminals. But we can already
-see that some terminals have serious drawbacks. {For example, users
-dealing with many different scripts on a regular basis should think
-twice before using XTerm and mlterm, as they do not properly fallback
-when a font is missing certain scripts, unless of course they can find a
-font that covers all the scripts they currently use.}
+see that some terminals have serious drawbacks. For example, users
+dealing with RTL scripts on a regular basis may be interested in
+mlterm and pterm, as they seem to have better support for those
+scripts. Konsole gets away with a good score here as well. Some might
+argue, on the contrary, that a terminal should not mess with the order
+of bytes shown on the screen, in which case the behavior of most other
+terminals will be acceptable.
 
 In terms of paste protection, urxvt stands alone above the rest with its
 special feature, which I find particularly convenient. Those looking for

urxvt fix
diff --git a/blog/terms.mdwn b/blog/terms.mdwn
index 1d33e99f..59f1ec4a 100644
--- a/blog/terms.mdwn
+++ b/blog/terms.mdwn
@@ -40,7 +40,7 @@ Here are the terminals reviewed in the series:
 | [pterm][]           | [PuTTY][] without ssh, uses GTK2   |
 | [st][]              | "simple terminal"                  |
 | [Terminator][]      | uses GTK3, VTE                     |
-| [rxvt-unicode][]    | Main rxvt fork                     |
+| [rxvt-unicode][]    | Main rxvt fork, also known as urxvt |
 | [Xfce Terminal][]   | uses GTK3, VTE                     |
 | [xterm][]           | the original                       |
 
@@ -189,7 +189,7 @@ configuration files may be less common, especially if you operate many
 different machines.
 
 A good solution to this problem is the `confirm-paste` plugin of the
-rxvt-unicode (also known as urxvt) terminal, which simply prompts before
+urxvt terminal, which simply prompts before
 allowing any paste with a newline character. I haven't found another
 terminal with such definitive protection against the attack described by
 Horn.
@@ -298,8 +298,6 @@ detection, and so on. So at first glance, the default terminal provided
 by your favorite desktop environment might just fit the bill, but we'll
 reserve judgment until our look at performance in the next article.
 
-
-
 > *This article [first appeared][] in the [Linux Weekly News][].*
 
 [first appeared]: https://lwn.net/Articles/749992/

finish review of unicode section
diff --git a/blog/terms.mdwn b/blog/terms.mdwn
index d1044474..1d33e99f 100644
--- a/blog/terms.mdwn
+++ b/blog/terms.mdwn
@@ -72,60 +72,64 @@ rather poor performance.
 Unicode support
 ---------------
 
-{review}
-
-The first feature I considered is Unicode support. Unicode is a
-complex topic with many pitfalls and corner cases, but I have tried to
-design a simple test to cover basic functionality. The first test was
-to display a string including scripts from all over the world that was
-taken [from the Wikipedia Unicode
+The first feature I considered is Unicode support. The first test was
+to display a string that was taken [from the Wikipedia Unicode
 page](https://en.wikipedia.org/wiki/Unicode#Web): "é, Δ, Й, ק ,م,
-๗,あ,叶, 葉, and 말". {This tests whether a terminal can correctly
-fallback to another font when a character is missing in the configured
-font.} [XTerm](http://invisible-island.net/xterm/), for example fails
-to display the Arabic [Mem](https://en.wikipedia.org/wiki/Mem)
-character in its default configuration:
+๗,あ,叶, 葉, and 말". This tests whether a terminal can correctly
+display scripts from all over the world
+reliably. [XTerm](http://invisible-island.net/xterm/) fails to display
+the Arabic [Mem](https://en.wikipedia.org/wiki/Mem) character in its
+default configuration:
 
 > ![\[XTerm
 > failure\]](terms/unicode-xterm-fail.png)
 
 By default, XTerm uses the classic "fixed" font which, [according to
 Wikipedia](https://en.wikipedia.org/wiki/Open-source_Unicode_typefaces)
-has "extensive unicode coverage since 1997". However, by default,
-XTerm's font is too small to display this character properly: only by
-bumping the font size to "Huge" (20 points) is the character finally
-displayed correctly, and then *other* characters fail to display.
+has "extensive unicode coverage since 1997". Something is happening
+here that makes the character display as a box: only by bumping the
+font size to "Huge" (20 points) is the character finally displayed
+correctly, and then *other* characters fail to display correctly:
 
 ![XTerm failure, huge fonts](terms/unicode-xterm-fail-huge.png)
 
-Also notice the order: it turns out that mem and the following
-character, the semitic [Qoph](https://en.wikipedia.org/wiki/Qoph), are
-both part of
-[right-to-left](https://en.wikipedia.org/wiki/Right-to-left) scripts,
-so technically, they should be reversed when displayed. This is what
-your web browser should have done in the string above as well. A
-simpler test for this is to use the word "Sarah" in Hebrew (שרה). The
+Those screenshots were generated on Fedora 27 as it gave better
+results than Debian 9, where some older versions of the terminals
+(mlterm, namely) would fail to properly fallback across
+fonts. Thankfully, this seems to have been fixed in later versions.
+
+Now notice the order of the string displayed by XTerm: it turns out
+that mem and the following character, the semitic
+[Qoph](https://en.wikipedia.org/wiki/Qoph), are both part of
+[right-to-left](https://en.wikipedia.org/wiki/Right-to-left) (RTL)
+scripts, so technically, they should be reversed when displayed. Web
+browsers like Firefox 57 handle this correctly in the above string. A
+simpler test is the word
+"[Sarah](https://en.wikipedia.org/wiki/Sarah)" in Hebrew
+([שרה](https://he.wikipedia.org/wiki/%D7%A9%D7%A8%D7%94)). The
 [Wikipedia page about bi-directional
-text](https://en.wikipedia.org/wiki/Bi-directional_text) explains that:
+text](https://en.wikipedia.org/wiki/Bi-directional_text) explains
+that:
 
 > Many computer programs fail to display bi-directional text
-> correctly. For example, the Hebrew name [Sarah](https://en.wikipedia.org/wiki/Sarah) ([שרה](https://he.wikipedia.org/wiki/%D7%A9%D7%A8%D7%94) is spelled: sin
+> correctly. For example, the Hebrew name Sarah (שרה) is spelled: sin
 > (ש) (which appears rightmost), then resh (ר), and finally heh (ה)
 > (which should appear leftmost).
 
-It turns out that many terminals actually fail at this test:
-Alacritty, VTE-derivatives (GNOME Terminal, Terminator and XFCE
-Terminal), rxvt, st and xterm all fail to display Sarah's name
-correctly. It's shown backwards, as if we would spell it "Haras" in
-english.
+Many terminals fail this test: Alacritty, VTE-derivatives (GNOME
+Terminal, Terminator and XFCE Terminal), urxvt, st and xterm all show
+Sarah's name backwards, as if we would spell it "Haras" in english.
 
 ![GNOME Terminal showing Sarah backwards](terms/unicode-gnome.png)
 
-The other challenge is to align the word correctly: right-to-left
-scripts should start from the right side of the terminal. Of the three
-that order the characters correctly (Konsole, mlterm and pterm),
-Konsole aligns the string from the left, a minor annoyance, probably,
-but still a deviance from the standard.
+The other challenge with bi-directional text is how to align text, and
+especially mixed RTL and left-to-right (LTR) text. RTL scripts should
+start from the right side of the terminal, but what should happen in a
+terminal where the prompt is in english, on the left? Most terminals
+do not make special provisions and align all the text on the left,
+including Konsole, which otherwise displays Sarah's name in the right
+order. Here, pterm and mlterm seem to be sticking to the standard a
+little more closely and align the test string on the right.
 
 ![mlterm displaying Sarah and the test string correctly](terms/unicode-mlterm.png)
 

commit last nights review
diff --git a/blog/terms.mdwn b/blog/terms.mdwn
index b3b4d39d..d1044474 100644
--- a/blog/terms.mdwn
+++ b/blog/terms.mdwn
@@ -72,15 +72,17 @@ rather poor performance.
 Unicode support
 ---------------
 
-The first feature I considered is Unicode support. This is a rather
-tricky topic: Unicode is a complex subject with many pitfalls and
-corner cases, but I have tried to design a simple test to cover basic
-functionality. The first test was to display a string including
-scripts from all over the world that was taken [from the Wikipedia
-Unicode page](https://en.wikipedia.org/wiki/Unicode#Web): 
-"é, Δ, Й, ק ,م, ๗,あ,叶, 葉, and 말". This tests whether a terminal
-can correctly fallback to another font when a character is missing in the configured
-font.  [XTerm](http://invisible-island.net/xterm/), for example fails
+{review}
+
+The first feature I considered is Unicode support. Unicode is a
+complex topic with many pitfalls and corner cases, but I have tried to
+design a simple test to cover basic functionality. The first test was
+to display a string including scripts from all over the world that was
+taken [from the Wikipedia Unicode
+page](https://en.wikipedia.org/wiki/Unicode#Web): "é, Δ, Й, ק ,م,
+๗,あ,叶, 葉, and 말". {This tests whether a terminal can correctly
+fallback to another font when a character is missing in the configured
+font.} [XTerm](http://invisible-island.net/xterm/), for example fails
 to display the Arabic [Mem](https://en.wikipedia.org/wiki/Mem)
 character in its default configuration:
 
@@ -107,25 +109,23 @@ simpler test for this is to use the word "Sarah" in Hebrew (שרה). The
 text](https://en.wikipedia.org/wiki/Bi-directional_text) explains that:
 
 > Many computer programs fail to display bi-directional text
-> correctly. For example, the Hebrew name Sarah (שרה) is spelled: sin
+> correctly. For example, the Hebrew name [Sarah](https://en.wikipedia.org/wiki/Sarah) ([שרה](https://he.wikipedia.org/wiki/%D7%A9%D7%A8%D7%94) is spelled: sin
 > (ש) (which appears rightmost), then resh (ר), and finally heh (ה)
 > (which should appear leftmost).
 
-Web browsers usually render this correctly, but it turns out that most
-terminals actually fail at this test: Alacritty, VTE-derivatives
-(GNOME Terminal, Terminator and XFCE Terminal), rxvt, st and xterm all
-fail to display Sarah's name correctly. It's shown backwards, a bit
-like we would spell the name as "Haras" in english. 
+It turns out that many terminals actually fail at this test:
+Alacritty, VTE-derivatives (GNOME Terminal, Terminator and XFCE
+Terminal), rxvt, st and xterm all fail to display Sarah's name
+correctly. It's shown backwards, as if we would spell it "Haras" in
+english.
 
 ![GNOME Terminal showing Sarah backwards](terms/unicode-gnome.png)
 
 The other challenge is to align the word correctly: right-to-left
 scripts should start from the right side of the terminal. Of the three
 that order the characters correctly (Konsole, mlterm and pterm),
-Konsole actually fails that test and aligns the string from the left,
-a minor annoyance, probably, but still a deviance from the standard.
-Those are arguably corner cases, but they may be nevertheless
-important to users frequently working with those scripts.
+Konsole aligns the string from the left, a minor annoyance, probably,
+but still a deviance from the standard.
 
 ![mlterm displaying Sarah and the test string correctly](terms/unicode-mlterm.png)
 
@@ -275,13 +275,15 @@ every terminal I could find supports scrollback buffers.
 Preliminary conclusions
 -----------------------
 
+{check}
+
 In the next article, we'll compare performance characteristics like
 memory usage, speed, and latency of the terminals. But we can already
-see that some terminals have serious drawbacks. For example, users
+see that some terminals have serious drawbacks. {For example, users
 dealing with many different scripts on a regular basis should think
 twice before using XTerm and mlterm, as they do not properly fallback
 when a font is missing certain scripts, unless of course they can find a
-font that covers all the scripts they currently use.
+font that covers all the scripts they currently use.}
 
 In terms of paste protection, urxvt stands alone above the rest with its
 special feature, which I find particularly convenient. Those looking for

Revert "removed the wrong file"
This reverts commit 8eabbda38d52a4826098b432e72f696385d7fc72.
diff --git a/blog/terms.mdwn b/blog/terms.mdwn
index 5fc6d51a..b3b4d39d 100644
--- a/blog/terms.mdwn
+++ b/blog/terms.mdwn
@@ -117,7 +117,7 @@ terminals actually fail at this test: Alacritty, VTE-derivatives
 fail to display Sarah's name correctly. It's shown backwards, a bit
 like we would spell the name as "Haras" in english. 
 
-![GNOME Terminal showing Sarah backwards](terms/unicode-gnome-fail.png)
+![GNOME Terminal showing Sarah backwards](terms/unicode-gnome.png)
 
 The other challenge is to align the word correctly: right-to-left
 scripts should start from the right side of the terminal. Of the three
diff --git a/blog/terms/unicode-gnome-fail.png b/blog/terms/unicode-gnome-fail.png
deleted file mode 100644
index e38f67d1..00000000
Binary files a/blog/terms/unicode-gnome-fail.png and /dev/null differ
diff --git a/blog/terms/unicode-gnome.png b/blog/terms/unicode-gnome.png
new file mode 100644
index 00000000..a3ab261b
Binary files /dev/null and b/blog/terms/unicode-gnome.png differ

removed the wrong file
diff --git a/blog/terms/unicode-gnome-fail.png b/blog/terms/unicode-gnome-fail.png
new file mode 100644
index 00000000..e38f67d1
Binary files /dev/null and b/blog/terms/unicode-gnome-fail.png differ
diff --git a/blog/terms/unicode-gnome.png b/blog/terms/unicode-gnome.png
deleted file mode 100644
index a3ab261b..00000000
Binary files a/blog/terms/unicode-gnome.png and /dev/null differ

remove old screenshots again
diff --git a/blog/terms/unicode-gnome-fail.png b/blog/terms/unicode-gnome-fail.png
deleted file mode 100644
index e38f67d1..00000000
Binary files a/blog/terms/unicode-gnome-fail.png and /dev/null differ
diff --git a/blog/terms/urxvt-screenfetch.png b/blog/terms/urxvt-screenfetch.png
deleted file mode 100644
index 0ad9275b..00000000
Binary files a/blog/terms/urxvt-screenfetch.png and /dev/null differ

point to local screenshot
diff --git a/blog/terms.mdwn b/blog/terms.mdwn
index 83e65b5c..5fc6d51a 100644
--- a/blog/terms.mdwn
+++ b/blog/terms.mdwn
@@ -85,7 +85,7 @@ to display the Arabic [Mem](https://en.wikipedia.org/wiki/Mem)
 character in its default configuration:
 
 > ![\[XTerm
-> failure\]](https://static.lwn.net/images/2018/terms-unicode-xterm.png "XTerm failure")
+> failure\]](terms/unicode-xterm-fail.png)
 
 By default, XTerm uses the classic "fixed" font which, [according to
 Wikipedia](https://en.wikipedia.org/wiki/Open-source_Unicode_typefaces)

remove old pic
diff --git a/blog/terms/unicode-xterm.png b/blog/terms/unicode-xterm.png
deleted file mode 100644
index 29013f1a..00000000
Binary files a/blog/terms/unicode-xterm.png and /dev/null differ

regenerate all screenshots from F27 with shutter
diff --git a/blog/terms/unicode-gnome.png b/blog/terms/unicode-gnome.png
index 4cb3e5a1..a3ab261b 100644
Binary files a/blog/terms/unicode-gnome.png and b/blog/terms/unicode-gnome.png differ
diff --git a/blog/terms/unicode-mlterm.png b/blog/terms/unicode-mlterm.png
index 5148e9c8..43b4befb 100644
Binary files a/blog/terms/unicode-mlterm.png and b/blog/terms/unicode-mlterm.png differ
diff --git a/blog/terms/unicode-xterm-fail-huge.png b/blog/terms/unicode-xterm-fail-huge.png
index 366ba178..ca94b616 100644
Binary files a/blog/terms/unicode-xterm-fail-huge.png and b/blog/terms/unicode-xterm-fail-huge.png differ
diff --git a/blog/terms/unicode-xterm-fail.png b/blog/terms/unicode-xterm-fail.png
index ea88c2d9..282429cb 100644
Binary files a/blog/terms/unicode-xterm-fail.png and b/blog/terms/unicode-xterm-fail.png differ

remove artifact in mlterm
diff --git a/blog/terms/unicode-mlterm.png b/blog/terms/unicode-mlterm.png
index 3b80c417..5148e9c8 100644
Binary files a/blog/terms/unicode-mlterm.png and b/blog/terms/unicode-mlterm.png differ

regenerate uxterm screenshot to match test procedure
diff --git a/blog/terms.mdwn b/blog/terms.mdwn
index f1d15ec6..83e65b5c 100644
--- a/blog/terms.mdwn
+++ b/blog/terms.mdwn
@@ -94,7 +94,7 @@ XTerm's font is too small to display this character properly: only by
 bumping the font size to "Huge" (20 points) is the character finally
 displayed correctly, and then *other* characters fail to display.
 
-![XTerm failure, huge fonts](terms/terms-unicode-xterm-huge.png)
+![XTerm failure, huge fonts](terms/unicode-xterm-fail-huge.png)
 
 Also notice the order: it turns out that mem and the following
 character, the semitic [Qoph](https://en.wikipedia.org/wiki/Qoph), are
diff --git a/blog/terms/terms-unicode-xterm-huge.png b/blog/terms/terms-unicode-xterm-huge.png
deleted file mode 100644
index b618b330..00000000
Binary files a/blog/terms/terms-unicode-xterm-huge.png and /dev/null differ
diff --git a/blog/terms/unicode-xterm-fail-huge.png b/blog/terms/unicode-xterm-fail-huge.png
new file mode 100644
index 00000000..366ba178
Binary files /dev/null and b/blog/terms/unicode-xterm-fail-huge.png differ

add more screenshots
diff --git a/blog/terms.mdwn b/blog/terms.mdwn
index f2ca0739..f1d15ec6 100644
--- a/blog/terms.mdwn
+++ b/blog/terms.mdwn
@@ -117,16 +117,17 @@ terminals actually fail at this test: Alacritty, VTE-derivatives
 fail to display Sarah's name correctly. It's shown backwards, a bit
 like we would spell the name as "Haras" in english. 
 
+![GNOME Terminal showing Sarah backwards](terms/unicode-gnome-fail.png)
+
 The other challenge is to align the word correctly: right-to-left
 scripts should start from the right side of the terminal. Of the three
 that order the characters correctly (Konsole, mlterm and pterm),
 Konsole actually fails that test and aligns the string from the left,
 a minor annoyance, probably, but still a deviance from the standard.
-
 Those are arguably corner cases, but they may be nevertheless
 important to users frequently working with those scripts.
 
-{add screenshots}
+![mlterm displaying Sarah and the test string correctly](terms/unicode-mlterm.png)
 
 Paste protection
 ----------------
diff --git a/blog/terms/unicode-gnome-fail.png b/blog/terms/unicode-gnome-fail.png
new file mode 100644
index 00000000..e38f67d1
Binary files /dev/null and b/blog/terms/unicode-gnome-fail.png differ
diff --git a/blog/terms/unicode-mlterm.png b/blog/terms/unicode-mlterm.png
new file mode 100644
index 00000000..3b80c417
Binary files /dev/null and b/blog/terms/unicode-mlterm.png differ

confirmed in fedora
diff --git a/blog/terms.mdwn b/blog/terms.mdwn
index 0502ce4a..f2ca0739 100644
--- a/blog/terms.mdwn
+++ b/blog/terms.mdwn
@@ -94,7 +94,7 @@ XTerm's font is too small to display this character properly: only by
 bumping the font size to "Huge" (20 points) is the character finally
 displayed correctly, and then *other* characters fail to display.
 
-{confirm in fedora}
+![XTerm failure, huge fonts](terms/terms-unicode-xterm-huge.png)
 
 Also notice the order: it turns out that mem and the following
 character, the semitic [Qoph](https://en.wikipedia.org/wiki/Qoph), are
diff --git a/blog/terms/terms-unicode-xterm-huge.png b/blog/terms/terms-unicode-xterm-huge.png
new file mode 100644
index 00000000..b618b330
Binary files /dev/null and b/blog/terms/terms-unicode-xterm-huge.png differ

first rewrite of unicode article
diff --git a/blog/terms.mdwn b/blog/terms.mdwn
index 3a2c2d10..0502ce4a 100644
--- a/blog/terms.mdwn
+++ b/blog/terms.mdwn
@@ -72,83 +72,61 @@ rather poor performance.
 Unicode support
 ---------------
 
-The first feature I considered is Unicode support, which was tested by
-simply displaying an arbitrary string including scripts from all over
-the world that was taken [from the Wikipedia Unicode
-page](https://en.wikipedia.org/wiki/Unicode#Web): "é, Δ, Й, ק ,م, ๗,
-あ,叶, 葉, and 말". Not all terminals can display (let alone *input*)
-this correctly. [XTerm](http://invisible-island.net/xterm/), for
-example, even when compiled with Unicode support (e.g. the `uxterm`
-binary in Debian), fails to display some of the characters by default:
+The first feature I considered is Unicode support. This is a rather
+tricky topic: Unicode is a complex subject with many pitfalls and
+corner cases, but I have tried to design a simple test to cover basic
+functionality. The first test was to display a string including
+scripts from all over the world that was taken [from the Wikipedia
+Unicode page](https://en.wikipedia.org/wiki/Unicode#Web): 
+"é, Δ, Й, ק ,م, ๗,あ,叶, 葉, and 말". This tests whether a terminal
+can correctly fallback to another font when a character is missing in the configured
+font.  [XTerm](http://invisible-island.net/xterm/), for example fails
+to display the Arabic [Mem](https://en.wikipedia.org/wiki/Mem)
+character in its default configuration:
 
 > ![\[XTerm
 > failure\]](https://static.lwn.net/images/2018/terms-unicode-xterm.png "XTerm failure")
 
-The results will vary between different environments: the above is from
-a basic Debian 9 (stretch) virtual machine. This means XTerm is using
-the classic "fixed" font, which should have "substantial Unicode
-coverage since 1997", [according to
-Wikipedia](https://en.wikipedia.org/wiki/Open-source_Unicode_typefaces), but
-the font seems to be missing the Arabic
-[Mem](https://en.wikipedia.org/wiki/Mem) character, which shows up as a
-[blank
-box](https://invisible-island.net/xterm/xterm.faq.html#utf8_fonts).
-Using the [DejaVu
-font](https://en.wikipedia.org/wiki/DejaVu_fonts) (specified as
-`faceName: Monospace Regular`), XTerm fails in a slightly different way:
-
-> ![\[Another XTerm
-> failure\]](https://static.lwn.net/images/2018/terms-unicode-xterm2.png "Another XTerm failure")
-
-Notice how, in both
-cases, characters within the
-[ISO-8859](https://en.wikipedia.org/wiki/ISO/IEC_8859) range display
-correctly, as they are available in both fonts. The problem, in this
-case, is that XTerm does not fallback on other fonts when the
-configured font lacks some characters.
-
-Terminals designed for multi-lingual use also give interesting
-results. A similar issue occurs in
-[mlterm](http://mlterm.sourceforge.net/) even though it is specifically
-designed as a "multilingual terminal emulator":
-
-> ![\[mlterm
-> failure\]](https://static.lwn.net/images/2018/terms-unicode-mlterm.png "mlterm failure")
-
-Here most other characters show up as boxes. Also notice how the "Mem"
-character is not in the same order as in the other terminals: it shows
-up in fourth instead of fifth place. But Firefox actually agrees with
-mlterm here: acute readers will have noticed that, in the original
-string, Mem is *not* in fifth position but in fourth. It is unclear
-exactly how that *should* be rendered because the string chosen by
-Wikipedia cleverly mixes right to left and left to right scripts. The
-character following Mem is the semitic
-[Qoph](https://en.wikipedia.org/wiki/Qoph), which is also right to
-left: it therefore seems logical to display them backwards, like
-Firefox does. So as it turns out, mlterm might actually the only one
-displaying this in a more logical, if confusing, order.
-
-Fortunately, many terminals
-([Alacritty](https://github.com/jwilm/alacritty),
-[Konsole](https://konsole.kde.org/),
-[pterm](https://manpages.debian.org/pterm),
-[rxvt-unicode](http://software.schmorp.de/pkg/rxvt-unicode.html), and
-[st](https://st.suckless.org/)) along with terminals built on top of the
-[VTE](https://github.com/GNOME/vte) library ([GNOME
-Terminal](https://wiki.gnome.org/Apps/Terminal),
-[Terminator](https://gnometerminator.blogspot.ca/), and [Xfce
-Terminal](https://docs.xfce.org/apps/terminal/start)) mostly succeed
-at falling back to other fonts (e.g. the [Noto
-fonts](https://en.wikipedia.org/wiki/Noto_fonts)) when characters are
-missing in the default font. Here, we can see how GNOME Terminal shows
-all of the characters almost perfectly:
-
-> ![\[GNOME
-> Terminal\]](https://static.lwn.net/images/2018/terms-unicode-gnome.png "GNOME Terminal")
-
-The only glitch here is that the mem character shows up in fifth
-instead of fourth, which is the case for all terminals but pterm,
-Konsole and mlterm.
+By default, XTerm uses the classic "fixed" font which, [according to
+Wikipedia](https://en.wikipedia.org/wiki/Open-source_Unicode_typefaces)
+has "extensive unicode coverage since 1997". However, by default,
+XTerm's font is too small to display this character properly: only by
+bumping the font size to "Huge" (20 points) is the character finally
+displayed correctly, and then *other* characters fail to display.
+
+{confirm in fedora}
+
+Also notice the order: it turns out that mem and the following
+character, the semitic [Qoph](https://en.wikipedia.org/wiki/Qoph), are
+both part of
+[right-to-left](https://en.wikipedia.org/wiki/Right-to-left) scripts,
+so technically, they should be reversed when displayed. This is what
+your web browser should have done in the string above as well. A
+simpler test for this is to use the word "Sarah" in Hebrew (שרה). The
+[Wikipedia page about bi-directional
+text](https://en.wikipedia.org/wiki/Bi-directional_text) explains that:
+
+> Many computer programs fail to display bi-directional text
+> correctly. For example, the Hebrew name Sarah (שרה) is spelled: sin
+> (ש) (which appears rightmost), then resh (ר), and finally heh (ה)
+> (which should appear leftmost).
+
+Web browsers usually render this correctly, but it turns out that most
+terminals actually fail at this test: Alacritty, VTE-derivatives
+(GNOME Terminal, Terminator and XFCE Terminal), rxvt, st and xterm all
+fail to display Sarah's name correctly. It's shown backwards, a bit
+like we would spell the name as "Haras" in english. 
+
+The other challenge is to align the word correctly: right-to-left
+scripts should start from the right side of the terminal. Of the three
+that order the characters correctly (Konsole, mlterm and pterm),
+Konsole actually fails that test and aligns the string from the left,
+a minor annoyance, probably, but still a deviance from the standard.
+
+Those are arguably corner cases, but they may be nevertheless
+important to users frequently working with those scripts.
+
+{add screenshots}
 
 Paste protection
 ----------------

remove notes
diff --git a/blog/terms.mdwn b/blog/terms.mdwn
index d7beb88f..3a2c2d10 100644
--- a/blog/terms.mdwn
+++ b/blog/terms.mdwn
@@ -321,90 +321,3 @@ reserve judgment until our look at performance in the next article.
 [Linux Weekly News]: http://lwn.net/
 
 [[!tag debian-planet lwn]]
-
-Notes
------
-
-  1. I need to figure out if I try yet another rewrite of the Unicode
-     section (probably not)
-
-  2. I need to review that version list to see if there are any glaring
-     holes that need to be covered
-
-  3. in case of glaring holes, I will review the versions in Fedora to
-     see if the feature results change
-
-  4. someone (?) needs to decide whether we include a blurb about debian
-     being old and our versions being (sometimes) out of date or not.
-
-The only thing we need to figure out, it seems is:
-
- * if I include a blurb about 'why debian'
- * if we list the actual version numbers in a table or we introduce them
-   in some narrative
-
-I hear we are in agreement that we don't list to explicitly list the
-upstream version numbers, however, so that seems settled.
-
-I like the idea of using a table because it's clear and simple, and a
-narrative would be hard to construct so that it's readable.
-
-I personnally don't care if we explain 'why debian' or not.
-
-So far, I've worked up this diff, maybe we can start from there?
- 
-diff --git a/blog/terms.mdwn b/blog/terms.mdwn
-index 490464f..7e55cf9 100644
---- a/blog/terms.mdwn
-+++ b/blog/terms.mdwn
-@@ -27,11 +27,30 @@ scripting. While we have [covered](https://lwn.net/Articles/88161/)
- terminal emulators in the distant past, this article provides a refresh
- to help readers determine which terminal they should be running in 2018.
- This first article compares features, while the second part evaluates
--performance. For sanity reasons, I cover only terminals that are
--packaged in Debian stable and have an active upstream. One exception to
-+performance.
-+
-+Here are the terminals reviewed in this article:
-+
-+| Terminal            | Version tested  |
-+| ------------------- | --------------- |
-+| [Alacritty][]       | 3df394d         |
-+| [GNOME Terminal][]  | 3.22.2          |
-+| [Konsole][]         | 16.12.0         |
-+| [mlterm][]          | 3.5.0           |
-+| [pterm][]           | 0.67            |
-+| [st][]              | 0.6             |
-+| [Terminator][]      | 1.90+bzr-1705   |
-+| [rxvt][]            | 9.22            |
-+| [Xfce Terminal][]   | 0.8.3           |
-+| [xterm][]           | 327             |
-+
-+Those version may be behind the latest upstream releases, as I
-+restricted myself to stable software that managed to make it in
-+Debian. One exception to
- this rule is the Alacritty project, which is a poster child for
- GPU-accelerated terminals written in a fancy new language (Rust, in this
--case). I excluded web-based terminals (including those using
-+case). I restricted the list to terminals with an active upstream and
-+excluded web-based terminals (including those using
- [Electron](https://electronjs.org/)) because preliminary tests showed
- rather poor performance.
-
-I can push harder on the "Debian is a real use case" argument or tone it
-down.
-
-Maybe we can wrap it up with just that diff and skipping the Unicode
-section altogether? I feel bad trying to make you go through another
-revision of a 600 words section at this point, so maybe I won't go
-through with a rewrite. I still feel there's something to be said there,
-but considering the differences are rather minor (can automatically pick
-fallback font or not, proper RTL ordering), I'm not sure we should worry
-about this too much, although it *does* mean we're disregarding users
-speaking Arabic, Persian and Hebrew, which must have trouble with
-basically *all* modern terminal emulators. But even then: before making
-such a claim, I'd need to talk to locals, really, and that's something I
-can't afford. So let's scrap it - it can go in the comments as an open
-question.
-
-So: sorry for the back and forth again. ;)

allow for some fedora packages
diff --git a/blog/terms.mdwn b/blog/terms.mdwn
index 3b81ff5f..d7beb88f 100644
--- a/blog/terms.mdwn
+++ b/blog/terms.mdwn
@@ -60,8 +60,8 @@ Here are the terminals reviewed in the series:
  [XTerm]: http://invisible-island.net/xterm/
 
 Those version may be behind the latest upstream releases, as I
-restricted myself to stable software that managed to make it in
-Debian. One exception to
+restricted myself to stable software that managed to make it Debian or
+Fedora. One exception to
 this rule is the Alacritty project, which is a poster child for
 GPU-accelerated terminals written in a fancy new language (Rust, in this
 case). I restricted the list to terminals with an active upstream and

remove version numbers from table, did not have concensus with LWN
diff --git a/blog/terms.mdwn b/blog/terms.mdwn
index 615be28a..3b81ff5f 100644
--- a/blog/terms.mdwn
+++ b/blog/terms.mdwn
@@ -29,20 +29,20 @@ to help readers determine which terminal they should be running in 2018.
 This first article compares features, while the second part evaluates
 performance.
 
-Here are the terminals reviewed in this article:
-
-| Terminal            | Debian        | Fedora  | Upstream | Notes                    |
-| ------------------- | ------------- | ------- | -------- | ------------------------ |
-| [Alacritty][]       | 3df394d       | N/A     | N/A      | No releases, git head    |
-| [GNOME Terminal][]  | 3.22.2        | 3.26.1  | 3.28.0   | uses GTK3, [VTE][]       |
-| [Konsole][]         | 16.12.0       | 17.12.2 | 17.12.3  | uses KDE libraries       |
-| [mlterm][]          | 3.5.0         | N/A     | 3.8.5    | uses VTE, "Multi-lingual terminal" |
-| [pterm][]           | 0.67          | 0.70    | 0.70     | [PuTTY][] without ssh, uses GTK2 |
-| [st][]              | 0.6           | 0.7     | 0.8.1    | "simple terminal"        |
-| [Terminator][]      | 1.90+bzr-1705 | 1.91    | 1.91     | uses GTK3, VTE           |
-| [rxvt-unicode][]    | 9.22          | 9.22    | 9.22     | Main rxvt fork           |
-| [Xfce Terminal][]   | 0.8.3         | 0.8.7   | 0.8.7.2  | uses GTK3, VTE           |
-| [xterm][]           | 327           | 330     | 331      | the original             |
+Here are the terminals reviewed in the series:
+
+| Terminal            | Notes                              |
+| ------------------- | ---------------------------------- |
+| [Alacritty][]       | No releases, git head              |
+| [GNOME Terminal][]  | uses GTK3, [VTE][]                 |
+| [Konsole][]         | uses KDE libraries                 |
+| [mlterm][]          | uses VTE, "Multi-lingual terminal" |
+| [pterm][]           | [PuTTY][] without ssh, uses GTK2   |
+| [st][]              | "simple terminal"                  |
+| [Terminator][]      | uses GTK3, VTE                     |
+| [rxvt-unicode][]    | Main rxvt fork                     |
+| [Xfce Terminal][]   | uses GTK3, VTE                     |
+| [xterm][]           | the original                       |
 
  [Alacritty]: https://github.com/jwilm/alacritty
  [GNOME Terminal]: https://wiki.gnome.org/Apps/Terminal

gnome *can* start given tabs in a given profile, terminator was the culprit
diff --git a/blog/terms.mdwn b/blog/terms.mdwn
index 383b0f48..615be28a 100644
--- a/blog/terms.mdwn
+++ b/blog/terms.mdwn
@@ -238,11 +238,11 @@ in other terminals.
 
 Tabs work especially well with the notion of "profiles": for example,
 you may have one tab for your email, another for chat, and so on. This
-is well supported by Konsole, which allows each tab to automatically
-start a profile. GNOME Terminal, however, doesn't seem to allow running
-different profiles in different tabs: in my tests, I was only able to
-have different *windows* running different profiles. Other terminals do
-not have the concept of "profiles" at all.
+is well supported by Konsole and GNOME Terminal, which allows each tab
+to automatically start a profile. Terminator, on the other hand,
+supports profiles, but I could not find a way to have specific tabs
+automatically start a given program. Other terminals do not have the
+concept of "profiles" at all.
 
 Eye candy
 ---------

simpler paste protection failure example: konsole fails in F27
diff --git a/blog/terms.mdwn b/blog/terms.mdwn
index 4fa8ec81..383b0f48 100644
--- a/blog/terms.mdwn
+++ b/blog/terms.mdwn
@@ -197,7 +197,7 @@ Unfortunately, Horn's test page also shows how to bypass this
 protection, by including the escape sequence (`^[[201~`) in the
 copy-pasted code itself. This works because some terminals do not
 properly filter escape sequences before adding their own. For example,
-in my tests, running zsh under Alacritty would fail to properly escape
+in my tests,  Konsole fails to properly escape
 the second test, even with `.inputrc` properly configured. That means it
 is easy to end up with a broken configuration, either due to an
 unsupported application or misconfigured shell. This is particularly

expand introduction table to include upstream and fedora versions
diff --git a/blog/terms.mdwn b/blog/terms.mdwn
index f4cb84f4..4fa8ec81 100644
--- a/blog/terms.mdwn
+++ b/blog/terms.mdwn
@@ -31,18 +31,18 @@ performance.
 
 Here are the terminals reviewed in this article:
 
-| Terminal            | Version       | Notes                    |
-| ------------------- | ------------- | ------------------------ |
-| [Alacritty][]       | 3df394d       | No releases, git head    |
-| [GNOME Terminal][]  | 3.22.2        | uses GTK3, [VTE][]       |
-| [Konsole][]         | 16.12.0       | uses KDE libraries       |
-| [mlterm][]          | 3.5.0         | "Multi-lingual terminal" |
-| [pterm][]           | 0.67          | [PuTTY][] without ssh, uses GTK2 |
-| [st][]              | 0.6           | "simple terminal"        |
-| [Terminator][]      | 1.90+bzr-1705 | uses GTK3, VTE           |
-| [rxvt-unicode][]    | 9.22          | Main rxvt fork           |
-| [Xfce Terminal][]   | 0.8.3         | uses GTK3, VTE           |
-| [xterm][]           | 327           | the original             |
+| Terminal            | Debian        | Fedora  | Upstream | Notes                    |
+| ------------------- | ------------- | ------- | -------- | ------------------------ |
+| [Alacritty][]       | 3df394d       | N/A     | N/A      | No releases, git head    |
+| [GNOME Terminal][]  | 3.22.2        | 3.26.1  | 3.28.0   | uses GTK3, [VTE][]       |
+| [Konsole][]         | 16.12.0       | 17.12.2 | 17.12.3  | uses KDE libraries       |
+| [mlterm][]          | 3.5.0         | N/A     | 3.8.5    | uses VTE, "Multi-lingual terminal" |
+| [pterm][]           | 0.67          | 0.70    | 0.70     | [PuTTY][] without ssh, uses GTK2 |
+| [st][]              | 0.6           | 0.7     | 0.8.1    | "simple terminal"        |
+| [Terminator][]      | 1.90+bzr-1705 | 1.91    | 1.91     | uses GTK3, VTE           |
+| [rxvt-unicode][]    | 9.22          | 9.22    | 9.22     | Main rxvt fork           |
+| [Xfce Terminal][]   | 0.8.3         | 0.8.7   | 0.8.7.2  | uses GTK3, VTE           |
+| [xterm][]           | 327           | 330     | 331      | the original             |
 
  [Alacritty]: https://github.com/jwilm/alacritty
  [GNOME Terminal]: https://wiki.gnome.org/Apps/Terminal
@@ -55,7 +55,7 @@ Here are the terminals reviewed in this article:
  [st]: https://st.suckless.org/
  [Terminator]: https://gnometerminator.blogspot.ca/
  [VTE]: https://github.com/GNOME/vte
- [rxvt]: http://software.schmorp.de/pkg/rxvt-unicode.html
+ [rxvt-unicode]: http://software.schmorp.de/pkg/rxvt-unicode.html
  [Xfce Terminal]: https://docs.xfce.org/apps/terminal/start
  [XTerm]: http://invisible-island.net/xterm/
 

add notes in the table
diff --git a/blog/terms.mdwn b/blog/terms.mdwn
index 723114c0..f4cb84f4 100644
--- a/blog/terms.mdwn
+++ b/blog/terms.mdwn
@@ -31,18 +31,33 @@ performance.
 
 Here are the terminals reviewed in this article:
 
-| Terminal            | Version tested  |
-| ------------------- | --------------- |
-| [Alacritty][]       | 3df394d         |
-| [GNOME Terminal][]  | 3.22.2          |
-| [Konsole][]         | 16.12.0         |
-| [mlterm][]          | 3.5.0           |
-| [pterm][]           | 0.67            |
-| [st][]              | 0.6             |
-| [Terminator][]      | 1.90+bzr-1705   |
-| [rxvt][]            | 9.22            |
-| [Xfce Terminal][]   | 0.8.3           |
-| [xterm][]           | 327             |
+| Terminal            | Version       | Notes                    |
+| ------------------- | ------------- | ------------------------ |
+| [Alacritty][]       | 3df394d       | No releases, git head    |
+| [GNOME Terminal][]  | 3.22.2        | uses GTK3, [VTE][]       |
+| [Konsole][]         | 16.12.0       | uses KDE libraries       |
+| [mlterm][]          | 3.5.0         | "Multi-lingual terminal" |
+| [pterm][]           | 0.67          | [PuTTY][] without ssh, uses GTK2 |
+| [st][]              | 0.6           | "simple terminal"        |
+| [Terminator][]      | 1.90+bzr-1705 | uses GTK3, VTE           |
+| [rxvt-unicode][]    | 9.22          | Main rxvt fork           |
+| [Xfce Terminal][]   | 0.8.3         | uses GTK3, VTE           |
+| [xterm][]           | 327           | the original             |
+
+ [Alacritty]: https://github.com/jwilm/alacritty
+ [GNOME Terminal]: https://wiki.gnome.org/Apps/Terminal
+ [Konsole]: https://konsole.kde.org/
+ [kterm]: https://ja.wikipedia.org/wiki/Kterm
+ [mlterm]: http://mlterm.sourceforge.net/
+ [mrxvt]: https://en.wikipedia.org/wiki/Mrxvt
+ [pterm]: https://manpages.debian.org/pterm
+ [PuTTY]: https://www.chiark.greenend.org.uk/~sgtatham/putty/
+ [st]: https://st.suckless.org/
+ [Terminator]: https://gnometerminator.blogspot.ca/
+ [VTE]: https://github.com/GNOME/vte
+ [rxvt]: http://software.schmorp.de/pkg/rxvt-unicode.html
+ [Xfce Terminal]: https://docs.xfce.org/apps/terminal/start
+ [XTerm]: http://invisible-island.net/xterm/
 
 Those version may be behind the latest upstream releases, as I
 restricted myself to stable software that managed to make it in

add solver hack for backports
diff --git a/software/debian-development.mdwn b/software/debian-development.mdwn
index a99d3c8c..00d11751 100644
--- a/software/debian-development.mdwn
+++ b/software/debian-development.mdwn
@@ -515,6 +515,10 @@ A few handy sbuild-related commands:
    though another suite is specified (e.g. `UNRElEASED`,
    `wheezy-backports` or `wheezy-security`)
 
+ * `sbuild --build-dep-resolver=aptitude` - use another solver for
+   dependencies, required for backports, for example. see the manpage
+   for details of those solvers.
+
  * `schroot -c wheezy-amd64-sbuild` - enter the `wheezy` chroot to make
    tests, changes will be discarded
 

add a bunch of notes from email convos
diff --git a/blog/terms.mdwn b/blog/terms.mdwn
index 5419cda4..723114c0 100644
--- a/blog/terms.mdwn
+++ b/blog/terms.mdwn
@@ -306,3 +306,90 @@ reserve judgment until our look at performance in the next article.
 [Linux Weekly News]: http://lwn.net/
 
 [[!tag debian-planet lwn]]
+
+Notes
+-----
+
+  1. I need to figure out if I try yet another rewrite of the Unicode
+     section (probably not)
+
+  2. I need to review that version list to see if there are any glaring
+     holes that need to be covered
+
+  3. in case of glaring holes, I will review the versions in Fedora to
+     see if the feature results change
+
+  4. someone (?) needs to decide whether we include a blurb about debian
+     being old and our versions being (sometimes) out of date or not.
+
+The only thing we need to figure out, it seems is:
+
+ * if I include a blurb about 'why debian'
+ * if we list the actual version numbers in a table or we introduce them
+   in some narrative
+
+I hear we are in agreement that we don't list to explicitly list the
+upstream version numbers, however, so that seems settled.
+
+I like the idea of using a table because it's clear and simple, and a
+narrative would be hard to construct so that it's readable.
+
+I personnally don't care if we explain 'why debian' or not.
+
+So far, I've worked up this diff, maybe we can start from there?
+ 
+diff --git a/blog/terms.mdwn b/blog/terms.mdwn
+index 490464f..7e55cf9 100644
+--- a/blog/terms.mdwn
++++ b/blog/terms.mdwn
+@@ -27,11 +27,30 @@ scripting. While we have [covered](https://lwn.net/Articles/88161/)
+ terminal emulators in the distant past, this article provides a refresh
+ to help readers determine which terminal they should be running in 2018.
+ This first article compares features, while the second part evaluates
+-performance. For sanity reasons, I cover only terminals that are
+-packaged in Debian stable and have an active upstream. One exception to
++performance.
++
++Here are the terminals reviewed in this article:
++
++| Terminal            | Version tested  |
++| ------------------- | --------------- |
++| [Alacritty][]       | 3df394d         |
++| [GNOME Terminal][]  | 3.22.2          |
++| [Konsole][]         | 16.12.0         |
++| [mlterm][]          | 3.5.0           |
++| [pterm][]           | 0.67            |
++| [st][]              | 0.6             |
++| [Terminator][]      | 1.90+bzr-1705   |
++| [rxvt][]            | 9.22            |
++| [Xfce Terminal][]   | 0.8.3           |
++| [xterm][]           | 327             |
++
++Those version may be behind the latest upstream releases, as I
++restricted myself to stable software that managed to make it in
++Debian. One exception to
+ this rule is the Alacritty project, which is a poster child for
+ GPU-accelerated terminals written in a fancy new language (Rust, in this
+-case). I excluded web-based terminals (including those using
++case). I restricted the list to terminals with an active upstream and
++excluded web-based terminals (including those using
+ [Electron](https://electronjs.org/)) because preliminary tests showed
+ rather poor performance.
+
+I can push harder on the "Debian is a real use case" argument or tone it
+down.
+
+Maybe we can wrap it up with just that diff and skipping the Unicode
+section altogether? I feel bad trying to make you go through another
+revision of a 600 words section at this point, so maybe I won't go
+through with a rewrite. I still feel there's something to be said there,
+but considering the differences are rather minor (can automatically pick
+fallback font or not, proper RTL ordering), I'm not sure we should worry
+about this too much, although it *does* mean we're disregarding users
+speaking Arabic, Persian and Hebrew, which must have trouble with
+basically *all* modern terminal emulators. But even then: before making
+such a claim, I'd need to talk to locals, really, and that's something I
+can't afford. So let's scrap it - it can go in the comments as an open
+question.
+
+So: sorry for the back and forth again. ;)

feeble attempt at reworking the unicode section
diff --git a/blog/terms.mdwn b/blog/terms.mdwn
index 7e55cf9a..5419cda4 100644
--- a/blog/terms.mdwn
+++ b/blog/terms.mdwn
@@ -64,7 +64,7 @@ page](https://en.wikipedia.org/wiki/Unicode#Web): "é, Δ, Й, ק ,م, ๗,
 あ,叶, 葉, and 말". Not all terminals can display (let alone *input*)
 this correctly. [XTerm](http://invisible-island.net/xterm/), for
 example, even when compiled with Unicode support (e.g. the `uxterm`
-binary in Debian), fails to display some of the characters:
+binary in Debian), fails to display some of the characters by default:
 
 > ![\[XTerm
 > failure\]](https://static.lwn.net/images/2018/terms-unicode-xterm.png "XTerm failure")
@@ -73,26 +73,26 @@ The results will vary between different environments: the above is from
 a basic Debian 9 (stretch) virtual machine. This means XTerm is using
 the classic "fixed" font, which should have "substantial Unicode
 coverage since 1997", [according to
-Wikipedia](https://en.wikipedia.org/wiki/Open-source_Unicode_typefaces).
-The font seems to be missing the Arabic
+Wikipedia](https://en.wikipedia.org/wiki/Open-source_Unicode_typefaces), but
+the font seems to be missing the Arabic
 [Mem](https://en.wikipedia.org/wiki/Mem) character, which shows up as a
 [blank
 box](https://invisible-island.net/xterm/xterm.faq.html#utf8_fonts).
-However, on my workstation, XTerm renders the character correctly, but
-others show up as blanks:
+Using the [DejaVu
+font](https://en.wikipedia.org/wiki/DejaVu_fonts) (specified as
+`faceName: Monospace Regular`), XTerm fails in a slightly different way:
 
 > ![\[Another XTerm
 > failure\]](https://static.lwn.net/images/2018/terms-unicode-xterm2.png "Another XTerm failure")
 
-In this second example, XTerm uses the [DejaVu
-font](https://en.wikipedia.org/wiki/DejaVu_fonts) (specified as
-`faceName: Monospace Regular`), which doesn't have good coverage for
-Asian scripts but does have the Arabic character. Notice how, in both
+Notice how, in both
 cases, characters within the
 [ISO-8859](https://en.wikipedia.org/wiki/ISO/IEC_8859) range display
-correctly, as they are available in both fonts.
+correctly, as they are available in both fonts. The problem, in this
+case, is that XTerm does not fallback on other fonts when the
+configured font lacks some characters.
 
-Other terminals designed for multi-lingual use also give interesting
+Terminals designed for multi-lingual use also give interesting
 results. A similar issue occurs in
 [mlterm](http://mlterm.sourceforge.net/) even though it is specifically
 designed as a "multilingual terminal emulator":
@@ -110,7 +110,7 @@ Wikipedia cleverly mixes right to left and left to right scripts. The
 character following Mem is the semitic
 [Qoph](https://en.wikipedia.org/wiki/Qoph), which is also right to
 left: it therefore seems logical to display them backwards, like
-Firefox does. So as it turns out, mlterm is actually the only one
+Firefox does. So as it turns out, mlterm might actually the only one
 displaying this in a more logical, if confusing, order.
 
 Fortunately, many terminals

Revert "remove unicode section"
This reverts commit c80220fd09620dfa19e84d3f2d9c7f47267cf982.
diff --git a/blog/terms.mdwn b/blog/terms.mdwn
index 19e61250..7e55cf9a 100644
--- a/blog/terms.mdwn
+++ b/blog/terms.mdwn
@@ -54,10 +54,91 @@ excluded web-based terminals (including those using
 [Electron](https://electronjs.org/)) because preliminary tests showed
 rather poor performance.
 
+Unicode support
+---------------
+
+The first feature I considered is Unicode support, which was tested by
+simply displaying an arbitrary string including scripts from all over
+the world that was taken [from the Wikipedia Unicode
+page](https://en.wikipedia.org/wiki/Unicode#Web): "é, Δ, Й, ק ,م, ๗,
+あ,叶, 葉, and 말". Not all terminals can display (let alone *input*)
+this correctly. [XTerm](http://invisible-island.net/xterm/), for
+example, even when compiled with Unicode support (e.g. the `uxterm`
+binary in Debian), fails to display some of the characters:
+
+> ![\[XTerm
+> failure\]](https://static.lwn.net/images/2018/terms-unicode-xterm.png "XTerm failure")
+
+The results will vary between different environments: the above is from
+a basic Debian 9 (stretch) virtual machine. This means XTerm is using
+the classic "fixed" font, which should have "substantial Unicode
+coverage since 1997", [according to
+Wikipedia](https://en.wikipedia.org/wiki/Open-source_Unicode_typefaces).
+The font seems to be missing the Arabic
+[Mem](https://en.wikipedia.org/wiki/Mem) character, which shows up as a
+[blank
+box](https://invisible-island.net/xterm/xterm.faq.html#utf8_fonts).
+However, on my workstation, XTerm renders the character correctly, but
+others show up as blanks:
+
+> ![\[Another XTerm
+> failure\]](https://static.lwn.net/images/2018/terms-unicode-xterm2.png "Another XTerm failure")
+
+In this second example, XTerm uses the [DejaVu
+font](https://en.wikipedia.org/wiki/DejaVu_fonts) (specified as
+`faceName: Monospace Regular`), which doesn't have good coverage for
+Asian scripts but does have the Arabic character. Notice how, in both
+cases, characters within the
+[ISO-8859](https://en.wikipedia.org/wiki/ISO/IEC_8859) range display
+correctly, as they are available in both fonts.
+
+Other terminals designed for multi-lingual use also give interesting
+results. A similar issue occurs in
+[mlterm](http://mlterm.sourceforge.net/) even though it is specifically
+designed as a "multilingual terminal emulator":
+
+> ![\[mlterm
+> failure\]](https://static.lwn.net/images/2018/terms-unicode-mlterm.png "mlterm failure")
+
+Here most other characters show up as boxes. Also notice how the "Mem"
+character is not in the same order as in the other terminals: it shows
+up in fourth instead of fifth place. But Firefox actually agrees with
+mlterm here: acute readers will have noticed that, in the original
+string, Mem is *not* in fifth position but in fourth. It is unclear
+exactly how that *should* be rendered because the string chosen by
+Wikipedia cleverly mixes right to left and left to right scripts. The
+character following Mem is the semitic
+[Qoph](https://en.wikipedia.org/wiki/Qoph), which is also right to
+left: it therefore seems logical to display them backwards, like
+Firefox does. So as it turns out, mlterm is actually the only one
+displaying this in a more logical, if confusing, order.
+
+Fortunately, many terminals
+([Alacritty](https://github.com/jwilm/alacritty),
+[Konsole](https://konsole.kde.org/),
+[pterm](https://manpages.debian.org/pterm),
+[rxvt-unicode](http://software.schmorp.de/pkg/rxvt-unicode.html), and
+[st](https://st.suckless.org/)) along with terminals built on top of the
+[VTE](https://github.com/GNOME/vte) library ([GNOME
+Terminal](https://wiki.gnome.org/Apps/Terminal),
+[Terminator](https://gnometerminator.blogspot.ca/), and [Xfce
+Terminal](https://docs.xfce.org/apps/terminal/start)) mostly succeed
+at falling back to other fonts (e.g. the [Noto
+fonts](https://en.wikipedia.org/wiki/Noto_fonts)) when characters are
+missing in the default font. Here, we can see how GNOME Terminal shows
+all of the characters almost perfectly:
+
+> ![\[GNOME
+> Terminal\]](https://static.lwn.net/images/2018/terms-unicode-gnome.png "GNOME Terminal")
+
+The only glitch here is that the mem character shows up in fifth
+instead of fourth, which is the case for all terminals but pterm,
+Konsole and mlterm.
+
 Paste protection
 ----------------
 
-The first critical feature I have identified is paste protection. While
+The next critical feature I have identified is paste protection. While
 it is widely known that incantations like:
 
         $ curl http://example.com/ | sh

remove unicode section
diff --git a/blog/terms.mdwn b/blog/terms.mdwn
index 7e55cf9a..19e61250 100644
--- a/blog/terms.mdwn
+++ b/blog/terms.mdwn
@@ -54,91 +54,10 @@ excluded web-based terminals (including those using
 [Electron](https://electronjs.org/)) because preliminary tests showed
 rather poor performance.
 
-Unicode support
----------------
-
-The first feature I considered is Unicode support, which was tested by
-simply displaying an arbitrary string including scripts from all over
-the world that was taken [from the Wikipedia Unicode
-page](https://en.wikipedia.org/wiki/Unicode#Web): "é, Δ, Й, ק ,م, ๗,
-あ,叶, 葉, and 말". Not all terminals can display (let alone *input*)
-this correctly. [XTerm](http://invisible-island.net/xterm/), for
-example, even when compiled with Unicode support (e.g. the `uxterm`
-binary in Debian), fails to display some of the characters:
-
-> ![\[XTerm
-> failure\]](https://static.lwn.net/images/2018/terms-unicode-xterm.png "XTerm failure")
-
-The results will vary between different environments: the above is from
-a basic Debian 9 (stretch) virtual machine. This means XTerm is using
-the classic "fixed" font, which should have "substantial Unicode
-coverage since 1997", [according to
-Wikipedia](https://en.wikipedia.org/wiki/Open-source_Unicode_typefaces).
-The font seems to be missing the Arabic
-[Mem](https://en.wikipedia.org/wiki/Mem) character, which shows up as a
-[blank
-box](https://invisible-island.net/xterm/xterm.faq.html#utf8_fonts).
-However, on my workstation, XTerm renders the character correctly, but
-others show up as blanks:
-
-> ![\[Another XTerm
-> failure\]](https://static.lwn.net/images/2018/terms-unicode-xterm2.png "Another XTerm failure")
-
-In this second example, XTerm uses the [DejaVu
-font](https://en.wikipedia.org/wiki/DejaVu_fonts) (specified as
-`faceName: Monospace Regular`), which doesn't have good coverage for
-Asian scripts but does have the Arabic character. Notice how, in both
-cases, characters within the
-[ISO-8859](https://en.wikipedia.org/wiki/ISO/IEC_8859) range display
-correctly, as they are available in both fonts.
-
-Other terminals designed for multi-lingual use also give interesting
-results. A similar issue occurs in
-[mlterm](http://mlterm.sourceforge.net/) even though it is specifically
-designed as a "multilingual terminal emulator":
-
-> ![\[mlterm
-> failure\]](https://static.lwn.net/images/2018/terms-unicode-mlterm.png "mlterm failure")
-
-Here most other characters show up as boxes. Also notice how the "Mem"
-character is not in the same order as in the other terminals: it shows
-up in fourth instead of fifth place. But Firefox actually agrees with
-mlterm here: acute readers will have noticed that, in the original
-string, Mem is *not* in fifth position but in fourth. It is unclear
-exactly how that *should* be rendered because the string chosen by
-Wikipedia cleverly mixes right to left and left to right scripts. The
-character following Mem is the semitic
-[Qoph](https://en.wikipedia.org/wiki/Qoph), which is also right to
-left: it therefore seems logical to display them backwards, like
-Firefox does. So as it turns out, mlterm is actually the only one
-displaying this in a more logical, if confusing, order.
-
-Fortunately, many terminals
-([Alacritty](https://github.com/jwilm/alacritty),
-[Konsole](https://konsole.kde.org/),
-[pterm](https://manpages.debian.org/pterm),
-[rxvt-unicode](http://software.schmorp.de/pkg/rxvt-unicode.html), and
-[st](https://st.suckless.org/)) along with terminals built on top of the
-[VTE](https://github.com/GNOME/vte) library ([GNOME
-Terminal](https://wiki.gnome.org/Apps/Terminal),
-[Terminator](https://gnometerminator.blogspot.ca/), and [Xfce
-Terminal](https://docs.xfce.org/apps/terminal/start)) mostly succeed
-at falling back to other fonts (e.g. the [Noto
-fonts](https://en.wikipedia.org/wiki/Noto_fonts)) when characters are
-missing in the default font. Here, we can see how GNOME Terminal shows
-all of the characters almost perfectly:
-
-> ![\[GNOME
-> Terminal\]](https://static.lwn.net/images/2018/terms-unicode-gnome.png "GNOME Terminal")
-
-The only glitch here is that the mem character shows up in fifth
-instead of fourth, which is the case for all terminals but pterm,
-Konsole and mlterm.
-
 Paste protection
 ----------------
 
-The next critical feature I have identified is paste protection. While
+The first critical feature I have identified is paste protection. While
 it is widely known that incantations like:
 
         $ curl http://example.com/ | sh

introduce all terminals in a neat little table
diff --git a/blog/terms.mdwn b/blog/terms.mdwn
index 490464fc..7e55cf9a 100644
--- a/blog/terms.mdwn
+++ b/blog/terms.mdwn
@@ -27,11 +27,30 @@ scripting. While we have [covered](https://lwn.net/Articles/88161/)
 terminal emulators in the distant past, this article provides a refresh
 to help readers determine which terminal they should be running in 2018.
 This first article compares features, while the second part evaluates
-performance. For sanity reasons, I cover only terminals that are
-packaged in Debian stable and have an active upstream. One exception to
+performance.
+
+Here are the terminals reviewed in this article:
+
+| Terminal            | Version tested  |
+| ------------------- | --------------- |
+| [Alacritty][]       | 3df394d         |
+| [GNOME Terminal][]  | 3.22.2          |
+| [Konsole][]         | 16.12.0         |
+| [mlterm][]          | 3.5.0           |
+| [pterm][]           | 0.67            |
+| [st][]              | 0.6             |
+| [Terminator][]      | 1.90+bzr-1705   |
+| [rxvt][]            | 9.22            |
+| [Xfce Terminal][]   | 0.8.3           |
+| [xterm][]           | 327             |
+
+Those version may be behind the latest upstream releases, as I
+restricted myself to stable software that managed to make it in
+Debian. One exception to
 this rule is the Alacritty project, which is a poster child for
 GPU-accelerated terminals written in a fancy new language (Rust, in this
-case). I excluded web-based terminals (including those using
+case). I restricted the list to terminals with an active upstream and
+excluded web-based terminals (including those using
 [Electron](https://electronjs.org/)) because preliminary tests showed
 rather poor performance.
 

more changes from lwn
diff --git a/blog/terms.mdwn b/blog/terms.mdwn
index b0401f9f..490464fc 100644
--- a/blog/terms.mdwn
+++ b/blog/terms.mdwn
@@ -3,7 +3,7 @@
 -------------------------------
 
 [[!meta date="2018-03-22T00:00:00+0000"]]
-[[!meta updated="2018-03-23T17:33:16-0400"]]
+[[!meta updated="2018-03-27T17:04:56-0400"]]
 
 [[!toc levels=2]]
 
@@ -24,9 +24,9 @@ they vary wildly in terms of functionality, size, and performance.
 Some terminals have surprising security vulnerabilities and most have
 wildly different feature sets, from support for a tabbed interface to
 scripting. While we have [covered](https://lwn.net/Articles/88161/)
-terminal emulators in the past, this article provides a refresh to help
-readers determine which terminal they should be running in 2018. This
-first article compares features, while the second part evaluates
+terminal emulators in the distant past, this article provides a refresh
+to help readers determine which terminal they should be running in 2018.
+This first article compares features, while the second part evaluates
 performance. For sanity reasons, I cover only terminals that are
 packaged in Debian stable and have an active upstream. One exception to
 this rule is the Alacritty project, which is a poster child for
@@ -135,13 +135,19 @@ shows how the apparently innocuous command:
 gets turned into this nasty mess (reformatted a bit for easier reading)
 when pasted in a terminal:
 
-        git clone /dev/null;clear; echo -n "Hello ";whoami|tr -d '\n';
+        git clone /dev/null;
+        clear;
+        echo -n "Hello ";
+        whoami|tr -d '\n';
         echo -e '!\nThat was a bad idea. Don'"'"'t copy code from websites you don'"'"'t trust! \
-        Here'"'"'s the first line of your /etc/passwd: ';head -n1 /etc/passwd
+        Here'"'"'s the first line of your /etc/passwd: ';
+        head -n1 /etc/passwd
         git clone git://git.kernel.org/pub/scm/utils/kup/kup.git
 
-This works by hiding the evil code in a `<span>` block that's moved
-out of the viewport with CSS. [Bracketed paste mode](https://cirw.in/blog/bracketed-paste) is
+This works by hiding the evil code in a `<span>` block that's moved out
+of the viewport using CSS.
+
+[Bracketed paste mode](https://cirw.in/blog/bracketed-paste) is
 explicitly designed to neutralize this attack. In this mode, terminals
 wrap pasted text in escape sequences so that shells can do the right
 thing. Terminals going all the way back to the venerable XTerm have
@@ -154,15 +160,16 @@ Bash) needs the following in the `~/.inputrc` file:
         set enable-bracketed-paste on
 
 Unfortunately, Horn's test page also shows how to bypass this
-protection, by including the escape sequence (`^[[201~`) in the copy-pasted code
-itself. This works because some terminals do not properly filter escape
-sequences before adding their own. For example, in my tests, running zsh
-under Alacritty would fail to properly escape the second test, even with
-`.inputrc` properly configured. That means it is easy to end up
-with a broken configuration, either due to an unsupported application or
-misconfigured shell. This is especially likely when logged on to remote
-servers where carefully crafted configuration files are less common,
-especially if you operate many different machines.
+protection, by including the escape sequence (`^[[201~`) in the
+copy-pasted code itself. This works because some terminals do not
+properly filter escape sequences before adding their own. For example,
+in my tests, running zsh under Alacritty would fail to properly escape
+the second test, even with `.inputrc` properly configured. That means it
+is easy to end up with a broken configuration, either due to an
+unsupported application or misconfigured shell. This is particularly
+likely when logged on to remote servers where carefully crafted
+configuration files may be less common, especially if you operate many
+different machines.
 
 A good solution to this problem is the `confirm-paste` plugin of the
 rxvt-unicode (also known as urxvt) terminal, which simply prompts before
@@ -216,7 +223,7 @@ only a `Xresources` file setting a basic color set
 ([Solarized](http://ethanschoonover.com/solarized)) for urxvt. Such
 non-standard color themes can create problems however. Solarized, for
 example, [breaks](https://github.com/altercation/solarized/issues/220)
-with applications using colors such as [htop](http://hisham.hm/htop/) and
+with color-using applications such as [htop](http://hisham.hm/htop/) and
 [IPTraf](http://iptraf.seul.org/).
 
 While the original [VT100 terminal](https://en.wikipedia.org/wiki/VT100)
@@ -242,12 +249,12 @@ requires the `matcher` plugin to visit URLs through a mouse click or
 keyboard shortcut. Other terminals reviewed do not display URLs in any
 special way.
 
-Finally, a new trend treats scroll-back buffers as a cosmetic features.
-For example, `st` has no scroll-back buffer at all, pointing people
+Finally, a new trend treats scrollback buffers as an optional feature.
+For example, `st` has no scrollback buffer at all, pointing people
 toward terminal multiplexers like tmux and [GNU
 Screen](https://www.gnu.org/software/screen/) in its
 [FAQ](http://git.suckless.org/st/plain/FAQ). Alacritty also lacks
-scroll-back buffers but will [add support
+scrollback buffers but will [add support
 soon](https://github.com/jwilm/alacritty/issues/124) because there was
 "so much pushback on the scrollback support". Apart from those outliers,
 every terminal I could find supports scrollback buffers.

remove node dependencies, broken in debian
diff --git a/software/packages.yml b/software/packages.yml
index ecc3a706..11fd18f0 100644
--- a/software/packages.yml
+++ b/software/packages.yml
@@ -258,9 +258,6 @@
       - multitime
       - myrepos
       - ncdu
-      - nodejs
-      - nodejs-legacy
-      - npm
       - org-mode
       - org-mode-doc
       - pastebinit

fix broken package names
diff --git a/software/packages.yml b/software/packages.yml
index 176c5f85..ecc3a706 100644
--- a/software/packages.yml
+++ b/software/packages.yml
@@ -175,7 +175,7 @@
       - xmonad
       - xplanet
       - xscreensaver
-      - xscreensaver-bsod
+      - xscreensaver-screensaver-bsod
       - xterm
       - xul-ext-zotero
       - yubikey-personalization
@@ -232,7 +232,7 @@
       - gitlint
       - glade
       - gocode
-      - godep
+      - go-dep
       - golang
       - golang-mode
       - golint

sort package list in ansible
diff --git a/software/packages.yml b/software/packages.yml
index 70cec897..176c5f85 100644
--- a/software/packages.yml
+++ b/software/packages.yml
@@ -30,21 +30,156 @@
   hosts: all
 
   tasks:
-  - name: install graphics packages
-    # My graphic design tools. Not much, since I don't do much of that.
+  - name: install authorship tools (incl. TeX)
+    # This is mostly TeX-related packages
+    tags: author
     apt: name={{item}} state=installed
-    tags: graphics
     with_items:
-      - colorhug-client
-      - darktable
-      - dia
-      - dispcalgui
+      - auctex
+      - dict
+      - dict-bouvier
+      - dict-devil
+      - dict-elements
+      - dict-foldoc
+      - dict-freedict-eng-fra
+      - dict-freedict-eng-spa
+      - dict-freedict-fra-eng
+      - dict-freedict-spa-eng
+      - dict-gazetteer2k
+      - dict-gcide
+      - dict-jargon
+      - dict-moby-thesaurus
+      - dict-vera
+      - dict-wn
+      - dictd
+      - epubcheck
+      - elpa-writegood-mode
+      - gv
+      - libtext-multimarkdown-perl
+      - multitime
+      - pandoc
+      - sigil
+      - texlive-latex-base
+      - texlive-latex-recommended
+      - texlive-latex-extra
+
+  - name: install communication tools
+    tags: comms
+    #  Mostly consists of mail and IRC stuff (irssi, mutt, thunderbird, offlineimap).
+    apt: name={{item}} state=installed
+    with_items:
+      - bsd-mailx
+      - irssi-plugin-otr
+      - irssi-plugin-xmpp
+      - irssi-scripts
+      - mutt
+      - offlineimap
+ 
+  - name: install desktop packages
+    # Shitload of stuff that doesn't fit anywhere else.
+    tags: desktop
+    apt: name={{item}} state=installed
+    with_items:
+      - apksigner
+      - arandr
+      - aspell-fr
+      - calibre
+      - chromium
+      - diceware
+      - dict
+      - electrum
+      - emacs
+      - exiftool
+      - feed2exec
       - feh
-      - gimp
-      - inkscape
-      - rapid-photo-downloader
-      - sane
-      - xsane
+      - fim
+      - finger
+      - firefox-esr
+      - fonts-roboto
+      - fortunes
+      - gajim
+      - gameclock
+      - git-annex
+      - git-lfs
+      - git-mediawiki
+      - gobby
+      - gnutls-bin
+      - hledger
+      - i3
+      - jmtpfs
+      - ledger
+      - ledger-el
+      - less
+      - libnotify-bin
+      - libu2f-host0
+      - localepurge
+      - locales
+      - mlocate
+      - maim
+      - monkeysign
+      - monkeysphere
+      - mpd
+      - msmtp-mta
+      - mumble
+      - mutt
+      - ncdu
+      - needrestart
+      - needrestart-session
+      - network-manager-iodine-gnome
+      - network-manager-openvpn-gnome
+      - notmuch
+      - notmuch-emacs
+      - oathtool
+      - offlineimap
+      - onionshare
+      - openjdk-8-jdk-headless
+      - openntpd
+      - parcimonie
+      - pavucontrol
+      - pass
+      - pcscd
+      - picard
+      - pidgin
+      - pinpoint
+      - pmount
+      - pinentry-qt
+      - python-certifi
+      - qalculate
+      - qalculate-gtk
+      - redshift-gtk
+      - rofi
+      - rxvt-unicode
+      - scdaemon
+      - slop
+      - sxiv
+      - taffybar
+      - thunar
+      - torbrowser-launcher
+      - transmission-qt
+      - trayer
+      - tty-clock
+      - unattended-upgrades
+      - unicode
+      - verbiste
+      - verbiste-gnome
+      - workrave
+      - wotsap
+      - xkbset
+      - xprintidle
+      - xkcdpass
+      - xmobar
+      - libghc-xmonad-dev
+      - libghc-xmonad-contrib-dev
+      - libghc-xmonad-extras-dev
+      - libghc-taffybar-dev
+      - xmonad
+      - xplanet
+      - xscreensaver
+      - xscreensaver-bsod
+      - xterm
+      - xul-ext-zotero
+      - yubikey-personalization
+      - zotero-standalone
 
   - name: install developer tools
     tags: developer
@@ -178,145 +313,71 @@
       - virtualbox
       - wget
 
-  - name: install desktop packages
-    # Shitload of stuff that doesn't fit anywhere else.
-    tags: desktop
+  - name: install GPS tools
+    tags: gis
     apt: name={{item}} state=installed
     with_items:
-      - apksigner
-      - arandr
-      - aspell-fr
-      - calibre
-      - chromium
-      - diceware
-      - dict
-      - electrum
-      - emacs
-      - exiftool
-      - feed2exec
-      - feh
-      - fim
-      - finger
-      - firefox-esr
-      - fonts-roboto

(Diff truncated)
add a bunch of installs in march
diff --git a/software/packages.yml b/software/packages.yml
index 839deb1f..70cec897 100644
--- a/software/packages.yml
+++ b/software/packages.yml
@@ -39,6 +39,7 @@
       - darktable
       - dia
       - dispcalgui
+      - feh
       - gimp
       - inkscape
       - rapid-photo-downloader
@@ -69,6 +70,7 @@
       - devscripts
       - dia
       - dpkg-dev-el
+      - dstat
       - elpa-anzu
       - elpa-company
       - elpa-company-go
@@ -92,13 +94,16 @@
       - git-extras
       - git-mediawiki
       - git-svn
+      - gitlint
       - glade
       - gocode
+      - godep
       - golang
       - golang-mode
       - golint
       - graphviz
       - haskell-mode
+      - help2man
       - stylish-haskell
       - icdiff
       - ikiwiki
@@ -115,6 +120,7 @@
       - linkchecker
       - make-doc
       - mercurial
+      - multitime
       - myrepos
       - ncdu
       - nodejs
@@ -188,7 +194,9 @@
       - emacs
       - exiftool
       - feed2exec
+      - feh
       - fim
+      - finger
       - firefox-esr
       - fonts-roboto
       - fortunes
@@ -200,6 +208,7 @@
       - gobby
       - gnutls-bin
       - hledger
+      - i3
       - jmtpfs
       - ledger
       - ledger-el
@@ -299,7 +308,9 @@
       - dictd
       - epubcheck
       - elpa-writegood-mode
+      - gv
       - libtext-multimarkdown-perl
+      - multitime
       - pandoc
       - sigil
       - texlive-latex-base
@@ -318,12 +329,14 @@
       - borgbackup
       - borgbackup-doc
       - bup
+      - canid
       - ccze
       - cu
       - curl
       - debian-goodies
       - debsums
       - dnsutils
+      - dstat
       - etckeeper
       - f3
       - git
@@ -337,6 +350,7 @@
       - ioping
       - ipcalc
       - iperf3
+      - libnss3-tools
       - libu2f-host0
       - memtest86+
       - moreutils

Archival link:

The above link creates a machine-readable RSS feed that can be used to easily archive new changes to the site. It is used by internal scripts to do sanity checks on new entries in the wiki.

Created . Edited .