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.

Added a comment
diff --git a/blog/2020-05-28-isp-upgrade/comment_2_0268518e78b93314146e535ba4c0baa1._comment b/blog/2020-05-28-isp-upgrade/comment_2_0268518e78b93314146e535ba4c0baa1._comment
new file mode 100644
index 00000000..285f7720
--- /dev/null
+++ b/blog/2020-05-28-isp-upgrade/comment_2_0268518e78b93314146e535ba4c0baa1._comment
@@ -0,0 +1,14 @@
+[[!comment format=mdwn
+ username="anarcat"
+ avatar="https://seccdn.libravatar.org/avatar/741655483dd8a0b4df28fb3dedfa7e4c"
+ subject="comment 2"
+ date="2020-06-02T20:23:38Z"
+ content="""
+> Other than the speed being lower than what you want and the IPv6 being iffy, does TSI satisfy your other requirements?
+
+It does, mostly. I'm looking for something cheaper / faster.
+
+One problem I have with TSI is they are not local. I come out from somewhere in Ontario, both in geolocation but also (more critically) in terms of latency. So that's inconvenient for local voice conferencing, where you want latency to an absolute minimum. 
+
+DSL also adds quite a lot more latency than cable, so the latter is kind of becoming a must. And unfortunately, there, TSI has the same problems as Ebox, last I checked (that is, services are blocked).
+"""]]

approve comment
diff --git a/blog/2020-05-28-isp-upgrade/comment_1_f2a8b591f8b87403f04aeefbe5600c9e._comment b/blog/2020-05-28-isp-upgrade/comment_1_f2a8b591f8b87403f04aeefbe5600c9e._comment
new file mode 100644
index 00000000..77f95bba
--- /dev/null
+++ b/blog/2020-05-28-isp-upgrade/comment_1_f2a8b591f8b87403f04aeefbe5600c9e._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ ip="96.23.12.217"
+ claimedauthor="mgregoire"
+ subject="comment 1"
+ date="2020-05-28T18:55:17Z"
+ content="""
+Other than the speed being lower than what you want and the IPv6 being iffy, does TSI satisfy your other requirements?
+
+I live on the South Shore, and haven't been very happy with either Vidéotron or Bell.  Teksavvy might be an improvement.
+"""]]

add delays
diff --git a/blog/2020-05-28-isp-upgrade.mdwn b/blog/2020-05-28-isp-upgrade.mdwn
index 5b1610f7..3f627977 100644
--- a/blog/2020-05-28-isp-upgrade.mdwn
+++ b/blog/2020-05-28-isp-upgrade.mdwn
@@ -94,6 +94,8 @@ residential services", even though they [seem to have that package on
 their website](https://www.teksavvy.com/services/internet/hardware/?itemID=4843&prov=QC). They confirmed that they "don't have a option more
 than 10 mbps upload."
 
+TSI were the first to respond, within 24h.
+
 Oricom
 ------
 
@@ -105,6 +107,10 @@ their IP address space.
 
 I can confirm that the IP is fairly static from the office.
 
+Oricom were the second to respond, within 24h, but required a phone
+call instead of an email exchange. Responded within 6 hours after
+leaving a voicemail.
+
 Ebox
 ----
 
@@ -122,6 +128,8 @@ service:
 No static IP addressing, shared dynamic space so no garantee on
 reputation. IPv6 only on DSL, so no high speed IPv6.
 
+Ebox took the longest to respond, about 48 hours.
+
 Beanfield / Openface
 ---------------------
 

ebox response
diff --git a/blog/2020-05-28-isp-upgrade.mdwn b/blog/2020-05-28-isp-upgrade.mdwn
index b51bf793..5b1610f7 100644
--- a/blog/2020-05-28-isp-upgrade.mdwn
+++ b/blog/2020-05-28-isp-upgrade.mdwn
@@ -108,7 +108,19 @@ I can confirm that the IP is fairly static from the office.
 Ebox
 ----
 
-No response yet.
+Ebox claims my neighborhood supports 400mbps down, but offered me a
+100/30 package with 350Go bandwidth per month for 54.95$/mth or
+unlimited for 65$/mth.
+
+Many ports are blocked, which makes it impossible for me to use their
+service:
+
+ * port 25 blocked incoming
+ * port 25 filtered outgoing (only allowed to their servers)
+ * port 53 blocked incoming (!)
+
+No static IP addressing, shared dynamic space so no garantee on
+reputation. IPv6 only on DSL, so no high speed IPv6.
 
 Beanfield / Openface
 ---------------------

clarifier les sections
diff --git a/services/dns.mdwn b/services/dns.mdwn
index 3853315f..27cab389 100644
--- a/services/dns.mdwn
+++ b/services/dns.mdwn
@@ -4,6 +4,8 @@ Le service de DNS n'est pas censuré d'aucune façon, mais donne des réponses d
 
 Il supporte [[IPv6]].
 
+[[!toc levels=2]]
+
 Problèmes connus
 ================
 
@@ -51,7 +53,13 @@ femmes. Exemples utilisés:
  * [[hardware/server/mafalda]] ([yes, the character](https://en.wikipedia.org/wiki/Mafalda))
  * [[hardware/server/plastik]] (a "piece of plastic")
 
-Utilisés par le passé:
+Anciens
+-------
+
+Ces noms ont été utilisés par le passé et ont été retiré de la
+circulation, généralement parce que les machines auxquelles ils ont
+été attitrés ont été retirés, mais aussi parce que les noms ne sont
+plus compatibles avec la nouvelle convention.
 
  * [[hardware/server/lenny]] - origin forgotten
  * marvin - origin forgotten
@@ -61,7 +69,10 @@ Utilisés par le passé:
  * roadkill
  * [[hardware/server/roadkiller]]
 
-Autres idées:
+Potentiels
+----------
+
+Les noms suivants pourraient être utilisés pour de futures machines:
 
  * [Hannah Arendt](https://en.wikipedia.org/wiki/Hannah_Arendt) - "one of the most important political
    philosophers of the twentieth century"

explain the picks
diff --git a/services/dns.mdwn b/services/dns.mdwn
index 2b1f5cb1..3853315f 100644
--- a/services/dns.mdwn
+++ b/services/dns.mdwn
@@ -63,14 +63,19 @@ Utilisés par le passé:
 
 Autres idées:
 
- * [Hannah Arendt](https://en.wikipedia.org/wiki/Hannah_Arendt) - although, how do you spell it?
- * [Viola Desmond](https://en.wikipedia.org/wiki/Viola_Desmond)
- * [Margaret Hamilton][]
- * [Ada Lovelace](https://en.wikipedia.org/wiki/Ada_Lovelace)
- * [Grace Hopper](https://en.wikipedia.org/wiki/Grace_Hopper)
- * [Fumiko Kaneko](https://en.wikipedia.org/wiki/Fumiko_Kaneko)
- * [Louise Michel](https://fr.wikipedia.org/wiki/Louise_Michel)
- * [Séverine](https://fr.wikipedia.org/wiki/S%C3%A9verine)
+ * [Hannah Arendt](https://en.wikipedia.org/wiki/Hannah_Arendt) - "one of the most important political
+   philosophers of the twentieth century"
+ * [Viola Desmond](https://en.wikipedia.org/wiki/Viola_Desmond) - challenged racial segregation in Canada
+ * [Margaret Hamilton][] - developed the on-board flight software for NASA's Apollo program
+ * [Ada Lovelace](https://en.wikipedia.org/wiki/Ada_Lovelace) - first programmer
+ * [Grace Hopper](https://en.wikipedia.org/wiki/Grace_Hopper) - inventor of the compiler and linker
+ * [Fumiko Kaneko](https://en.wikipedia.org/wiki/Fumiko_Kaneko) - Japanese feminist, anti-colonialist, anarchist
+   and nihilist, (possibly self-)convicted of plotting to assassinate
+   the Japanese emperor
+ * [Louise Michel](https://fr.wikipedia.org/wiki/Louise_Michel) - anarchiste de la commune de Paris, première à
+   arborer le drapeau noir
+ * [Séverine](https://fr.wikipedia.org/wiki/S%C3%A9verine) - journaliste, féministe, première femme à diriger un
+   grand quotidien en France
 
 [Margaret Hamilton]: https://en.wikipedia.org/wiki/Margaret_Hamilton_(software_engineer)
 

move names ideas
diff --git a/services/dns.mdwn b/services/dns.mdwn
index 6734e3c6..2b1f5cb1 100644
--- a/services/dns.mdwn
+++ b/services/dns.mdwn
@@ -66,7 +66,11 @@ Autres idées:
  * [Hannah Arendt](https://en.wikipedia.org/wiki/Hannah_Arendt) - although, how do you spell it?
  * [Viola Desmond](https://en.wikipedia.org/wiki/Viola_Desmond)
  * [Margaret Hamilton][]
+ * [Ada Lovelace](https://en.wikipedia.org/wiki/Ada_Lovelace)
+ * [Grace Hopper](https://en.wikipedia.org/wiki/Grace_Hopper)
  * [Fumiko Kaneko](https://en.wikipedia.org/wiki/Fumiko_Kaneko)
+ * [Louise Michel](https://fr.wikipedia.org/wiki/Louise_Michel)
+ * [Séverine](https://fr.wikipedia.org/wiki/S%C3%A9verine)
 
 [Margaret Hamilton]: https://en.wikipedia.org/wiki/Margaret_Hamilton_(software_engineer)
 

openface/beanfield update
diff --git a/blog/2020-05-28-isp-upgrade.mdwn b/blog/2020-05-28-isp-upgrade.mdwn
index e5db6171..b51bf793 100644
--- a/blog/2020-05-28-isp-upgrade.mdwn
+++ b/blog/2020-05-28-isp-upgrade.mdwn
@@ -115,6 +115,8 @@ Beanfield / Openface
 
 Even though they have a really interesting service (50$/mth for
 unlimited 1gbps), they are not in my building. I did try to contact
-them over chat, they told me to call, and I left a message
+them over chat, they told me to call, and I left a message. They
+responded saying they mostly offer business services for now, no
+residential in Montreal.
 
 [[!tag debian-planet internet neutrality québec sysadmin diy montreal]]

add more ideas
diff --git a/blog/2020-05-28-isp-upgrade.mdwn b/blog/2020-05-28-isp-upgrade.mdwn
index d1f7a477..e5db6171 100644
--- a/blog/2020-05-28-isp-upgrade.mdwn
+++ b/blog/2020-05-28-isp-upgrade.mdwn
@@ -59,12 +59,13 @@ So I'm shopping for a replacement. The requirements are:
 Contestants
 ===========
 
-I wrote a similar message asking three major ISPs in my city for those
+I wrote a similar message asking major ISPs in my city for those
 services, including business service if necessary:
 
  * [Oricom](https://oricom.ca) - `ventes@oricom.ca`
  * [TSI](https://teksavvy.com) - `sales@teksavvy.com`
  * [Ebox](https://ebox.ca) - `sales@ebox.ca`
+ * [Beanfield/Openface](https://www.beanfield.com/residential/)
 
 I have *not* contacted those providers:
 
@@ -96,11 +97,24 @@ than 10 mbps upload."
 Oricom
 ------
 
-No response yet.
+They offer a 100/30 link for 65$ plus 25$ for a static IP.
+
+No IPv6 yet, unlikely to come soon. No services blocked, they have
+their own PoP within Videotron's datacenters so clients come out from
+their IP address space.
+
+I can confirm that the IP is fairly static from the office.
 
 Ebox
 ----
 
 No response yet.
 
+Beanfield / Openface
+---------------------
+
+Even though they have a really interesting service (50$/mth for
+unlimited 1gbps), they are not in my building. I did try to contact
+them over chat, they told me to call, and I left a message
+
 [[!tag debian-planet internet neutrality québec sysadmin diy montreal]]
diff --git a/services/dns.mdwn b/services/dns.mdwn
index cd1d0818..6734e3c6 100644
--- a/services/dns.mdwn
+++ b/services/dns.mdwn
@@ -65,6 +65,10 @@ Autres idées:
 
  * [Hannah Arendt](https://en.wikipedia.org/wiki/Hannah_Arendt) - although, how do you spell it?
  * [Viola Desmond](https://en.wikipedia.org/wiki/Viola_Desmond)
+ * [Margaret Hamilton][]
+ * [Fumiko Kaneko](https://en.wikipedia.org/wiki/Fumiko_Kaneko)
+
+[Margaret Hamilton]: https://en.wikipedia.org/wiki/Margaret_Hamilton_(software_engineer)
 
 Relié
 =====

confirmed response from TSI
diff --git a/blog/2020-05-28-isp-upgrade.mdwn b/blog/2020-05-28-isp-upgrade.mdwn
index f503ef66..d1f7a477 100644
--- a/blog/2020-05-28-isp-upgrade.mdwn
+++ b/blog/2020-05-28-isp-upgrade.mdwn
@@ -90,7 +90,8 @@ TSI
 
 First answer from TSI was "we do not provide 30mbps upload on
 residential services", even though they [seem to have that package on
-their website](https://www.teksavvy.com/services/internet/hardware/?itemID=4843&prov=QC).
+their website](https://www.teksavvy.com/services/internet/hardware/?itemID=4843&prov=QC). They confirmed that they "don't have a option more
+than 10 mbps upload."
 
 Oricom
 ------

a little more rationale
diff --git a/blog/2020-05-28-isp-upgrade.mdwn b/blog/2020-05-28-isp-upgrade.mdwn
index 42066dd3..f503ef66 100644
--- a/blog/2020-05-28-isp-upgrade.mdwn
+++ b/blog/2020-05-28-isp-upgrade.mdwn
@@ -22,6 +22,11 @@ often feel I should pack a little more punch at home (although I have
 no illusions about my capacity of resisting any sort of DoS attack at
 home of course).
 
+Also, the idea of having gigabit links at home brings back the idea of
+the original internet, that *everyone* on the internet is a
+"peer". "Client" and "servers" are just a technical distinction and
+everyone should be able to run a server.
+
 Requirements
 ============
 

fix toc
diff --git a/blog/2020-05-28-isp-upgrade.mdwn b/blog/2020-05-28-isp-upgrade.mdwn
index 16256e65..42066dd3 100644
--- a/blog/2020-05-28-isp-upgrade.mdwn
+++ b/blog/2020-05-28-isp-upgrade.mdwn
@@ -1,5 +1,7 @@
 [[!meta title="Upgrading my home server uplink"]]
 
+[[!toc levels=3]]
+
 For more than a few decades now (!), I've been running my own
 server. First it was just my old Pentium 1 squatting on university
 networks, but eventually grew into a real server somewhere at the dawn
@@ -8,6 +10,9 @@ hosted over ADSL links, first a handful of megabits, up to the current
 25 Mbps down, 6 Mbps up that the Bell Canada network seems to allow
 to its resellers (currently Teksavvy Internet, or TSI).
 
+Why change?
+===========
+
 Obviously, this speed is showing its age, and especially in this age
 of Pandemia where everyone is on videoconferencing all the time. But
 it's also inconvenient when I need to *upload* large files on the
@@ -17,6 +22,9 @@ often feel I should pack a little more punch at home (although I have
 no illusions about my capacity of resisting any sort of DoS attack at
 home of course).
 
+Requirements
+============
+
 So I'm shopping for a replacement. The requirements are:
 
  1. higher speed than 25/6, preferably 100mbps down, 30mbps up, or
@@ -43,6 +51,9 @@ So I'm shopping for a replacement. The requirements are:
 
 (All amounts in $CAD.)
 
+Contestants
+===========
+
 I wrote a similar message asking three major ISPs in my city for those
 services, including business service if necessary:
 
@@ -70,19 +81,19 @@ from a major telco exchange site, so it's not like I'm in a rural
 community. This should just work.
 
 TSI
-===
+---
 
 First answer from TSI was "we do not provide 30mbps upload on
 residential services", even though they [seem to have that package on
 their website](https://www.teksavvy.com/services/internet/hardware/?itemID=4843&prov=QC).
 
 Oricom
-======
+------
 
 No response yet.
 
 Ebox
-====
+----
 
 No response yet.
 

explain where i am a little
diff --git a/blog/2020-05-28-isp-upgrade.mdwn b/blog/2020-05-28-isp-upgrade.mdwn
index 37d3d65b..16256e65 100644
--- a/blog/2020-05-28-isp-upgrade.mdwn
+++ b/blog/2020-05-28-isp-upgrade.mdwn
@@ -65,6 +65,10 @@ I might have forgotten some, let me know if you're in the area and
 have a good recommendation. I'll update this post with findings as
 they come in.
 
+Keep in mind that I am in a major Canadian city, less than a kilometer
+from a major telco exchange site, so it's not like I'm in a rural
+community. This should just work.
+
 TSI
 ===
 

tsi does have a package, wtf?
diff --git a/blog/2020-05-28-isp-upgrade.mdwn b/blog/2020-05-28-isp-upgrade.mdwn
index c4c1e49f..37d3d65b 100644
--- a/blog/2020-05-28-isp-upgrade.mdwn
+++ b/blog/2020-05-28-isp-upgrade.mdwn
@@ -69,7 +69,8 @@ TSI
 ===
 
 First answer from TSI was "we do not provide 30mbps upload on
-residential services".
+residential services", even though they [seem to have that package on
+their website](https://www.teksavvy.com/services/internet/hardware/?itemID=4843&prov=QC).
 
 Oricom
 ======

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

new isp research
diff --git a/blog/2020-05-28-isp-upgrade.mdwn b/blog/2020-05-28-isp-upgrade.mdwn
new file mode 100644
index 00000000..c4c1e49f
--- /dev/null
+++ b/blog/2020-05-28-isp-upgrade.mdwn
@@ -0,0 +1,84 @@
+[[!meta title="Upgrading my home server uplink"]]
+
+For more than a few decades now (!), I've been running my own
+server. First it was just my old Pentium 1 squatting on university
+networks, but eventually grew into a real server somewhere at the dawn
+of the millenia. Apart from the university days, the server was mostly
+hosted over ADSL links, first a handful of megabits, up to the current
+25 Mbps down, 6 Mbps up that the Bell Canada network seems to allow
+to its resellers (currently Teksavvy Internet, or TSI).
+
+Obviously, this speed is showing its age, and especially in this age
+of Pandemia where everyone is on videoconferencing all the time. But
+it's also inconvenient when I need to *upload* large files on the
+network. I also host a variety of [[services]] on this network, and I
+always worry that any idiot can (rather trivially) DoS my server, so I
+often feel I should pack a little more punch at home (although I have
+no illusions about my capacity of resisting any sort of DoS attack at
+home of course).
+
+So I'm shopping for a replacement. The requirements are:
+
+ 1. higher speed than 25/6, preferably 100mbps down, 30mbps up, or
+    more. ideally 1gbps symmetric.
+
+ 2. static or near-static IP address: I run a DNS server with its IP
+    in the glue records (although the latter could possibly be
+    relaxed). ideally a /29 or more.
+
+ 3. all ports open: I run an SMTP server (incoming and outgoing) along
+    with a webserver and other experiments. ideally, no firewall or
+    policy should be blocking me from hosting stuff, unless there's an
+    attack or security issue, obviously.
+    
+ 4. clean IP address: the SMTP server needs to have a good reputation,
+    so the IP address should not be in a "residential space" pool.
+
+ 5. IPv6 support: TSI offers IPv6 support, but it is buggy (I
+    frequently have to restart the IPv6 interface on the router
+    because the delegated block stops routing, and they haven't been
+    able to figure out the problem). ideally, a /56.
+
+ 6. less than 100$/mth, ideally close to the current 60$/mth I pay.
+
+(All amounts in $CAD.)
+
+I wrote a similar message asking three major ISPs in my city for those
+services, including business service if necessary:
+
+ * [Oricom](https://oricom.ca) - `ventes@oricom.ca`
+ * [TSI](https://teksavvy.com) - `sales@teksavvy.com`
+ * [Ebox](https://ebox.ca) - `sales@ebox.ca`
+
+I have *not* contacted those providers:
+
+ * Bell Canada: i have sworn, two decades ago, never to do business
+   with that company ever again. They have a near-monopoly on almost
+   all telcos in Canada and I want to give them as little money as
+   possible.
+
+ * Videotron: I know for a fact they do not allow servers on their
+   network, and their [IPv6 has been in beta](https://support.videotron.com/residential/internet/monitor-usage/ipv6) [for so long](http://web.archive.org/web/20110713003117/http://soutien.videotron.com/residentiel/internet/ipv6) it
+   has become somewhat of a joke now
+
+I might have forgotten some, let me know if you're in the area and
+have a good recommendation. I'll update this post with findings as
+they come in.
+
+TSI
+===
+
+First answer from TSI was "we do not provide 30mbps upload on
+residential services".
+
+Oricom
+======
+
+No response yet.
+
+Ebox
+====
+
+No response yet.
+
+[[!tag debian-planet internet neutrality québec sysadmin diy montreal]]

fix listing in parent page
diff --git a/hardware/emma.mdwn b/hardware/emma.mdwn
index dff49e4f..f955d845 100644
--- a/hardware/emma.mdwn
+++ b/hardware/emma.mdwn
@@ -19,3 +19,5 @@ music recording.
 
 Emma's name was also briefly attributed to [[rosa]] by mistake, before
 I remembered of its existence.
+
+[[!tag node]]
diff --git a/hardware/rosa.mdwn b/hardware/rosa.mdwn
index 3a583784..5fc02f37 100644
--- a/hardware/rosa.mdwn
+++ b/hardware/rosa.mdwn
@@ -213,3 +213,5 @@ it was supposed to deliver 300mbps:
 So performance is also *definitely* disappointing here, although that
 could also be due to the hardware in angela, which wouldn't surprise
 me at this point.
+
+[[!tag node]]

another link
diff --git a/services/dns.mdwn b/services/dns.mdwn
index b6d60ba9..cd1d0818 100644
--- a/services/dns.mdwn
+++ b/services/dns.mdwn
@@ -46,7 +46,7 @@ femmes. Exemples utilisés:
  * [[hardware/emma]] ([Goldman](https://en.wikipedia.org/wiki/Emma_Goldman))
  * ([Subcommandante](https://en.wikipedia.org/wiki/Subcomandante_Marcos)) [[hardware/server/marcos]]
  * [[hardware/octavia]] ([E. Butler](https://en.wikipedia.org/wiki/Octavia_E._Butler))
- * [[hardware/rosa]] ([Luxembourg](https://en.wikipedia.org/wiki/Rosa_Luxemburg))
+ * [[hardware/rosa]] ([Luxembourg](https://en.wikipedia.org/wiki/Rosa_Luxemburg) or [Parks](https://en.wikipedia.org/wiki/Rosa_Parks))
  * [[hardware/ursula]] ([K. Le Guin](https://en.wikipedia.org/wiki/Ursula_K._Le_Guin))
  * [[hardware/server/mafalda]] ([yes, the character](https://en.wikipedia.org/wiki/Mafalda))
  * [[hardware/server/plastik]] (a "piece of plastic")

the other rosa
diff --git a/hardware/rosa.mdwn b/hardware/rosa.mdwn
index 79ee122f..3a583784 100644
--- a/hardware/rosa.mdwn
+++ b/hardware/rosa.mdwn
@@ -7,6 +7,18 @@ anti-war activist and revolutionary socialist.
 > proletariat, but our solution offers the only means of saving human
 > society from destruction. -- Rosa Luxembourg
 
+[Rosa Parks](https://en.wikipedia.org/wiki/Rosa_Parks) was also an American activist in the civil rights
+movement best known for her pivotal role in the Montgomery bus
+boycott. The United States Congress has called her "the first lady of
+civil rights" and "the mother of the freedom movement".
+
+> People always said that I didn't give up my seat because I was
+> tired, but that isn't true. I was not tired physically, or no more
+> tired than I usually was at the end of a working day. I was not old,
+> although some people have an image of me as being old then. I was
+> forty-two. No, the only tired I was, was tired of giving in.  --
+> Rosa Parks
+
 It is also a TP-Link AC1750 v5 router that I use as a bridge. It was
 configured similarly to [[hardware/server/plastik]], with a fresh
 OpenWRT (19.07.3) setup (see the [OpenWRT hardware page](https://openwrt.org/toh/hwdata/tp-link/tp-link_archer_c7_v5)), using

sort names alpha
diff --git a/services/dns.mdwn b/services/dns.mdwn
index 5dafbde9..b6d60ba9 100644
--- a/services/dns.mdwn
+++ b/services/dns.mdwn
@@ -38,12 +38,13 @@ Les noms des machines sur le réseau sont des personalités ou autrices
 inspirantes (politiquement ou autre), préférablement des
 femmes. Exemples utilisés:
 
- * ([Subcommandante](https://en.wikipedia.org/wiki/Subcomandante_Marcos)) [[hardware/server/marcos]]
  * [[hardware/angela]] ([Davis](https://en.wikipedia.org/wiki/Angela_Davis))
+ * bell ([Hooks](https://en.wikipedia.org/wiki/Bell_hooks))
  * ([Margaret](https://en.wikipedia.org/wiki/Margaret_Atwood)) Atwood
  * ([Marie](https://en.wikipedia.org/wiki/Marie_Curie)) [[hardware/curie]]
  * ([Richard](https://en.wikipedia.org/wiki/Richard_Dawkins)) dawkins
  * [[hardware/emma]] ([Goldman](https://en.wikipedia.org/wiki/Emma_Goldman))
+ * ([Subcommandante](https://en.wikipedia.org/wiki/Subcomandante_Marcos)) [[hardware/server/marcos]]
  * [[hardware/octavia]] ([E. Butler](https://en.wikipedia.org/wiki/Octavia_E._Butler))
  * [[hardware/rosa]] ([Luxembourg](https://en.wikipedia.org/wiki/Rosa_Luxemburg))
  * [[hardware/ursula]] ([K. Le Guin](https://en.wikipedia.org/wiki/Ursula_K._Le_Guin))
@@ -55,11 +56,14 @@ Utilisés par le passé:
  * [[hardware/server/lenny]] - origin forgotten
  * marvin - origin forgotten
  * mumia ([Abu Jamal](https://en.wikipedia.org/wiki/Mumia_Abu-Jamal))
+ * orange
+ * tangerine
  * roadkill
  * [[hardware/server/roadkiller]]
 
 Autres idées:
 
+ * [Hannah Arendt](https://en.wikipedia.org/wiki/Hannah_Arendt) - although, how do you spell it?
  * [Viola Desmond](https://en.wikipedia.org/wiki/Viola_Desmond)
 
 Relié

emma already in use (laptop in the koumbit office) switch to rosa
diff --git a/hardware/emma.mdwn b/hardware/emma.mdwn
index a5fd3ab4..dff49e4f 100644
--- a/hardware/emma.mdwn
+++ b/hardware/emma.mdwn
@@ -11,202 +11,11 @@ Europe in the first half of the 20th century".
 > wealth; an order that will guarantee to every human being free
 > access to the earth and full enjoyment of the necessities of life,
 > according to individual desires, tastes, and inclinations.
-> 
+>
 > -- Emma Goldman, 1910
 
-It is a TP-Link AC1750 v5 router that I use as a bridge. It was
-configured similarly to [[hardware/server/plastik]], with a fresh
-OpenWRT (19.07.3) setup (see the [OpenWRT hardware
-page](https://openwrt.org/toh/hwdata/tp-link/tp-link_archer_c7_v5)),
-using the `factory.bin` image from the TP-Link stock firmware web
-interface.
+Emma is also an old battered X220 laptop running Debian I use for
+music recording.
 
-Benchmarks
-==========
-
-I performed some benchmarks at the request of people from
-`#debian-quebec`, provided below.
-
-I unfortunately forgot to run the same benchmarks with the stock
-firmware, but that could have been difficult unless it ships with
-`iperf3`...
-
-Wired network
--------------
-
-From [[angela]] (with a Startech USB-3 gigabit adapter) to emma over a
-RJ-45 wire:
-
-    root@angela:/home/anarcat# iperf3 -c 192.168.0.10
-    Connecting to host 192.168.0.10, port 5201
-    [  5] local 192.168.0.116 port 44332 connected to 192.168.0.10 port 5201
-    [ ID] Interval           Transfer     Bitrate         Retr  Cwnd
-    [  5]   0.00-1.00   sec  20.8 MBytes   174 Mbits/sec    0    440 KBytes       
-    [  5]   1.00-2.00   sec  29.5 MBytes   248 Mbits/sec   14    344 KBytes       
-    [  5]   2.00-3.00   sec  29.3 MBytes   246 Mbits/sec    0    370 KBytes       
-    [  5]   3.00-4.00   sec  30.4 MBytes   255 Mbits/sec    0    399 KBytes       
-    [  5]   4.00-5.00   sec  28.3 MBytes   237 Mbits/sec    0    403 KBytes       
-    [  5]   5.00-6.00   sec  19.9 MBytes   167 Mbits/sec    2    417 KBytes       
-    [  5]   6.00-7.00   sec  28.6 MBytes   240 Mbits/sec    0    441 KBytes       
-    [  5]   7.00-8.00   sec  30.5 MBytes   255 Mbits/sec    0    454 KBytes       
-    [  5]   8.00-9.00   sec  29.2 MBytes   245 Mbits/sec    0    462 KBytes       
-    [  5]   9.00-10.00  sec  29.5 MBytes   247 Mbits/sec    0    469 KBytes       
-    - - - - - - - - - - - - - - - - - - - - - - - - -
-    [ ID] Interval           Transfer     Bitrate         Retr
-    [  5]   0.00-10.00  sec   276 MBytes   231 Mbits/sec   16             sender
-    [  5]   0.00-10.02  sec   273 MBytes   229 Mbits/sec                  receiver
-
-    iperf Done.
-
-In comparison, from angela to [[octavia]], the Turris Omnia router:
-
-    root@angela:/home/anarcat# iperf3 -c 192.168.0.1
-    Connecting to host 192.168.0.1, port 5201
-    [  5] local 192.168.0.116 port 56192 connected to 192.168.0.1 port 5201
-    [ ID] Interval           Transfer     Bitrate         Retr  Cwnd
-    [  5]   0.00-1.00   sec  42.6 MBytes   357 Mbits/sec    0    208 KBytes       
-    [  5]   1.00-2.00   sec  41.8 MBytes   350 Mbits/sec    0    208 KBytes       
-    [  5]   2.00-3.00   sec  42.0 MBytes   353 Mbits/sec    0    219 KBytes       
-    [  5]   3.00-4.00   sec  41.8 MBytes   351 Mbits/sec    0    229 KBytes       
-    [  5]   4.00-5.00   sec  42.1 MBytes   353 Mbits/sec    0    229 KBytes       
-    [  5]   5.00-6.00   sec  42.3 MBytes   354 Mbits/sec    0    229 KBytes       
-    [  5]   6.00-7.00   sec  42.0 MBytes   352 Mbits/sec    0    229 KBytes       
-    [  5]   7.00-8.00   sec  41.8 MBytes   350 Mbits/sec    0    229 KBytes       
-    [  5]   8.00-9.00   sec  42.4 MBytes   355 Mbits/sec    0    229 KBytes       
-    [  5]   9.00-10.00  sec  41.9 MBytes   351 Mbits/sec    0    229 KBytes       
-    - - - - - - - - - - - - - - - - - - - - - - - - -
-    [ ID] Interval           Transfer     Bitrate         Retr
-    [  5]   0.00-10.00  sec   421 MBytes   353 Mbits/sec    0             sender
-    [  5]   0.00-10.00  sec   420 MBytes   352 Mbits/sec                  receiver
-
-    iperf Done.
-
-Between octavia and emma directly:
-
-    root@octavia:~# iperf3 -c 192.168.0.10
-    Connecting to host 192.168.0.10, port 5201
-    [  5] local 192.168.0.1 port 44068 connected to 192.168.0.10 port 5201
-    [ ID] Interval           Transfer     Bitrate         Retr  Cwnd
-    [  5]   0.00-1.00   sec  36.2 MBytes   303 Mbits/sec    0    344 KBytes       
-    [  5]   1.00-2.00   sec  36.2 MBytes   303 Mbits/sec    0    393 KBytes       
-    [  5]   2.00-3.00   sec  32.3 MBytes   271 Mbits/sec    0    393 KBytes       
-    [  5]   3.00-4.00   sec  27.5 MBytes   230 Mbits/sec    0    393 KBytes       
-    [  5]   4.00-5.00   sec  35.9 MBytes   301 Mbits/sec    0    424 KBytes       
-    [  5]   5.00-6.00   sec  36.0 MBytes   302 Mbits/sec   27    341 KBytes       
-    [  5]   6.00-7.00   sec  35.9 MBytes   301 Mbits/sec    0    382 KBytes       
-    [  5]   7.00-8.00   sec  32.1 MBytes   269 Mbits/sec    0    382 KBytes       
-    [  5]   8.00-9.00   sec  27.0 MBytes   227 Mbits/sec    0    382 KBytes       
-    [  5]   9.00-10.00  sec  36.0 MBytes   302 Mbits/sec   48    315 KBytes       
-    - - - - - - - - - - - - - - - - - - - - - - - - -
-    [ ID] Interval           Transfer     Bitrate         Retr
-    [  5]   0.00-10.00  sec   335 MBytes   281 Mbits/sec   75             sender
-    [  5]   0.00-10.03  sec   333 MBytes   279 Mbits/sec                  receiver
-
-    iperf Done.
-
-Between octavia and [[server/marcos]]:
-
-    anarcat@marcos:~(master)$ iperf3 -c 192.168.0.1
-    Connecting to host 192.168.0.1, port 5201
-    [  5] local 192.168.0.3 port 50918 connected to 192.168.0.1 port 5201
-    [ ID] Interval           Transfer     Bitrate         Retr  Cwnd
-    [  5]   0.00-1.00   sec   114 MBytes   956 Mbits/sec    0    448 KBytes       
-    [  5]   1.00-2.00   sec   113 MBytes   948 Mbits/sec    0    469 KBytes       
-    [  5]   2.00-3.00   sec   112 MBytes   941 Mbits/sec    0    513 KBytes       
-    [  5]   3.00-4.00   sec   112 MBytes   942 Mbits/sec    0    513 KBytes       
-    [  5]   4.00-5.00   sec   112 MBytes   939 Mbits/sec    0    540 KBytes       
-    [  5]   5.00-6.00   sec   112 MBytes   941 Mbits/sec    0    540 KBytes       
-    [  5]   6.00-7.00   sec   112 MBytes   943 Mbits/sec    0    540 KBytes       
-    [  5]   7.00-8.00   sec   112 MBytes   936 Mbits/sec    0    540 KBytes       
-    [  5]   8.00-9.00   sec   112 MBytes   942 Mbits/sec    0    540 KBytes       
-    [  5]   9.00-10.00  sec   113 MBytes   947 Mbits/sec    0    567 KBytes       
-    - - - - - - - - - - - - - - - - - - - - - - - - -
-    [ ID] Interval           Transfer     Bitrate         Retr
-    [  5]   0.00-10.00  sec  1.10 GBytes   944 Mbits/sec    0             sender
-    [  5]   0.00-10.02  sec  1.10 GBytes   940 Mbits/sec                  receiver
-
-    iperf Done.
-
-... which proves octavia is not the bottleneck: the tp-link is (and,
-unrelatedly, angela's gigabit adapter as well, but we could still
-reproduce without it).
-
-Wireless network
-----------------
-
-Over 2.4GHz:
-
-    root@angela:/home/anarcat# iperf3 -c 192.168.0.10
-    Connecting to host 192.168.0.10, port 5201
-    [  5] local 192.168.0.152 port 59030 connected to 192.168.0.10 port 5201
-    [ ID] Interval           Transfer     Bitrate         Retr  Cwnd
-    [  5]   0.00-1.00   sec  5.71 MBytes  47.9 Mbits/sec    0    325 KBytes       
-    [  5]   1.00-2.00   sec  5.72 MBytes  48.0 Mbits/sec    0    359 KBytes       
-    [  5]   2.00-3.00   sec  4.23 MBytes  35.4 Mbits/sec    0    423 KBytes       
-    [  5]   3.00-4.00   sec  6.59 MBytes  55.3 Mbits/sec    0    444 KBytes       
-    [  5]   4.00-5.00   sec  5.84 MBytes  49.0 Mbits/sec    0    465 KBytes       
-    [  5]   5.00-6.00   sec  4.16 MBytes  34.9 Mbits/sec    0    489 KBytes       
-    [  5]   6.00-7.00   sec  4.47 MBytes  37.5 Mbits/sec    0    489 KBytes       
-    [  5]   7.00-8.00   sec  4.41 MBytes  37.0 Mbits/sec    0    489 KBytes       
-    [  5]   8.00-9.00   sec  5.03 MBytes  42.2 Mbits/sec    0    489 KBytes       
-    [  5]   9.00-10.00  sec  4.29 MBytes  36.0 Mbits/sec    0    489 KBytes       
-    - - - - - - - - - - - - - - - - - - - - - - - - -
-    [ ID] Interval           Transfer     Bitrate         Retr
-    [  5]   0.00-10.00  sec  50.5 MBytes  42.3 Mbits/sec    0             sender
-    [  5]   0.00-10.01  sec  48.3 MBytes  40.5 Mbits/sec                  receiver
-
-    iperf Done.
-
-`iwconfig` was showing:
-
-    wlp2s0    IEEE 802.11  ESSID:"CrapN6-emma"  
-              Mode:Managed  Frequency:2.412 GHz  Access Point: B0:95:75:41:E7:C1   
-              Bit Rate=144.4 Mb/s   Tx-Power=15 dBm   
-              Retry short limit:7   RTS thr:off   Fragment thr:off
-              Power Management:off
-              Link Quality=70/70  Signal level=-22 dBm  
-              Rx invalid nwid:0  Rx invalid crypt:0  Rx invalid frag:0
-              Tx excessive retries:1  Invalid misc:104   Missed beacon:0
-
-So the 40Mbps is actually disappointing here. It's possible
-neighboring access points caused interference.
-
-Over 5GHz:
-
-    root@angela:/home/anarcat# iperf3 -c 192.168.0.10
-    Connecting to host 192.168.0.10, port 5201
-    [  5] local 192.168.0.152 port 59148 connected to 192.168.0.10 port 5201
-    [ ID] Interval           Transfer     Bitrate         Retr  Cwnd
-    [  5]   0.00-1.00   sec  8.45 MBytes  70.9 Mbits/sec    1    348 KBytes       
-    [  5]   1.00-2.00   sec  12.6 MBytes   106 Mbits/sec    0    488 KBytes       
-    [  5]   2.00-3.00   sec  6.46 MBytes  54.2 Mbits/sec    0    488 KBytes       
-    [  5]   3.00-4.00   sec  5.29 MBytes  44.4 Mbits/sec    0    488 KBytes       
-    [  5]   4.00-5.00   sec  6.14 MBytes  51.5 Mbits/sec    1    488 KBytes       
-    [  5]   5.00-6.00   sec  5.10 MBytes  42.7 Mbits/sec    0    488 KBytes       
-    [  5]   6.00-7.00   sec  6.96 MBytes  58.4 Mbits/sec    1    488 KBytes       
-    [  5]   7.00-8.00   sec  7.71 MBytes  64.6 Mbits/sec    0    488 KBytes       
-    [  5]   8.00-9.00   sec  7.27 MBytes  61.0 Mbits/sec    0    488 KBytes       
-    [  5]   9.00-10.00  sec  7.33 MBytes  61.5 Mbits/sec    0    488 KBytes       
-    - - - - - - - - - - - - - - - - - - - - - - - - -
-    [ ID] Interval           Transfer     Bitrate         Retr
-    [  5]   0.00-10.00  sec  73.3 MBytes  61.5 Mbits/sec    3             sender
-    [  5]   0.00-10.11  sec  70.6 MBytes  58.6 Mbits/sec                  receiver
-
-    iperf Done.
-
-I had trouble connecting to the router over 5GHz and web browsing
-performance was bad (Wikipedia would not load properly). Still it said
-it was supposed to deliver 300mbps:
-
-    wlp2s0    IEEE 802.11  ESSID:"CrapN6-5GHz-emma"  
-              Mode:Managed  Frequency:5.745 GHz  Access Point: B0:95:75:41:E7:C0   

(Diff truncated)
update: fp3 teardown is, of course, a perfect 10 again, congrats!
diff --git a/hardware/phone.mdwn b/hardware/phone.mdwn
index 849caac6..7326c167 100644
--- a/hardware/phone.mdwn
+++ b/hardware/phone.mdwn
@@ -204,6 +204,7 @@ The full specs:
    * Thickness 9.89 mm
    * Weight: 189g
    * IP54 certification
+ * Again, [10/10 iFixit score](https://www.ifixit.com/Teardown/Fairphone+3+Teardown/125573)
 
 There are some problems, however, that I have found with the specs:
 
@@ -250,7 +251,8 @@ On the upside:
  * transluscent cover is back
  * [positive first impressions from iFixit](https://www.ifixit.com/News/the-fairphone-3-is-here-and-its-not-the-only-sustainable-phone-on-the-way) although they do
    mention problems with US networks and that there are now other
-   porjects like the Fairphone (namely [Shift](https://www.shiftphones.com/en/) and [Teracube](https://myteracube.com/))
+   porjects like the Fairphone (namely [Shift](https://www.shiftphones.com/en/) and
+   [Teracube](https://myteracube.com/)). update: they did a 10/10 score in the [teardown](https://www.ifixit.com/Teardown/Fairphone+3+Teardown/125573)
 
 Places that might ship in Canada:
 

more emma details
diff --git a/hardware/emma.mdwn b/hardware/emma.mdwn
index 053eb511..a5fd3ab4 100644
--- a/hardware/emma.mdwn
+++ b/hardware/emma.mdwn
@@ -15,11 +15,22 @@ Europe in the first half of the 20th century".
 > -- Emma Goldman, 1910
 
 It is a TP-Link AC1750 v5 router that I use as a bridge. It was
-configured similarly to [[hardware/server/plastik]].
+configured similarly to [[hardware/server/plastik]], with a fresh
+OpenWRT (19.07.3) setup (see the [OpenWRT hardware
+page](https://openwrt.org/toh/hwdata/tp-link/tp-link_archer_c7_v5)),
+using the `factory.bin` image from the TP-Link stock firmware web
+interface.
 
 Benchmarks
 ==========
 
+I performed some benchmarks at the request of people from
+`#debian-quebec`, provided below.
+
+I unfortunately forgot to run the same benchmarks with the stock
+firmware, but that could have been difficult unless it ships with
+`iperf3`...
+
 Wired network
 -------------
 

mention emma
diff --git a/hardware/history.mdwn b/hardware/history.mdwn
index 796affd3..37c6e0b6 100644
--- a/hardware/history.mdwn
+++ b/hardware/history.mdwn
@@ -71,3 +71,5 @@ Here's the detailed history:
   8GB ram, running stretch, 512GB SSD)
 * 2019-...: Vero 4k+ ([[ursula]], home cinema service replacing a part of
   marcos, which is moved to the basement)
+* 2020-...: TP-Link AC1750 router ([[emma]]), may become
+  "standard" for cheap, not-quite-gigabit, wireless bridges

small documentation for a new server
diff --git a/hardware/emma.mdwn b/hardware/emma.mdwn
new file mode 100644
index 00000000..053eb511
--- /dev/null
+++ b/hardware/emma.mdwn
@@ -0,0 +1,201 @@
+[Emma Goldman](https://en.wikipedia.org/wiki/Emma_Goldman) was "an
+anarchist political activist and writer. She played a pivotal role in
+the development of anarchist political philosophy in North America and
+Europe in the first half of the 20th century".
+
+> Anarchism, then, really stands for the liberation of the human mind
+> from the dominion of religion; the liberation of the human body from
+> the dominion of property; liberation from the shackles and restraint
+> of government. Anarchism stands for a social order based on the free
+> grouping of individuals for the purpose of producing real social
+> wealth; an order that will guarantee to every human being free
+> access to the earth and full enjoyment of the necessities of life,
+> according to individual desires, tastes, and inclinations.
+> 
+> -- Emma Goldman, 1910
+
+It is a TP-Link AC1750 v5 router that I use as a bridge. It was
+configured similarly to [[hardware/server/plastik]].
+
+Benchmarks
+==========
+
+Wired network
+-------------
+
+From [[angela]] (with a Startech USB-3 gigabit adapter) to emma over a
+RJ-45 wire:
+
+    root@angela:/home/anarcat# iperf3 -c 192.168.0.10
+    Connecting to host 192.168.0.10, port 5201
+    [  5] local 192.168.0.116 port 44332 connected to 192.168.0.10 port 5201
+    [ ID] Interval           Transfer     Bitrate         Retr  Cwnd
+    [  5]   0.00-1.00   sec  20.8 MBytes   174 Mbits/sec    0    440 KBytes       
+    [  5]   1.00-2.00   sec  29.5 MBytes   248 Mbits/sec   14    344 KBytes       
+    [  5]   2.00-3.00   sec  29.3 MBytes   246 Mbits/sec    0    370 KBytes       
+    [  5]   3.00-4.00   sec  30.4 MBytes   255 Mbits/sec    0    399 KBytes       
+    [  5]   4.00-5.00   sec  28.3 MBytes   237 Mbits/sec    0    403 KBytes       
+    [  5]   5.00-6.00   sec  19.9 MBytes   167 Mbits/sec    2    417 KBytes       
+    [  5]   6.00-7.00   sec  28.6 MBytes   240 Mbits/sec    0    441 KBytes       
+    [  5]   7.00-8.00   sec  30.5 MBytes   255 Mbits/sec    0    454 KBytes       
+    [  5]   8.00-9.00   sec  29.2 MBytes   245 Mbits/sec    0    462 KBytes       
+    [  5]   9.00-10.00  sec  29.5 MBytes   247 Mbits/sec    0    469 KBytes       
+    - - - - - - - - - - - - - - - - - - - - - - - - -
+    [ ID] Interval           Transfer     Bitrate         Retr
+    [  5]   0.00-10.00  sec   276 MBytes   231 Mbits/sec   16             sender
+    [  5]   0.00-10.02  sec   273 MBytes   229 Mbits/sec                  receiver
+
+    iperf Done.
+
+In comparison, from angela to [[octavia]], the Turris Omnia router:
+
+    root@angela:/home/anarcat# iperf3 -c 192.168.0.1
+    Connecting to host 192.168.0.1, port 5201
+    [  5] local 192.168.0.116 port 56192 connected to 192.168.0.1 port 5201
+    [ ID] Interval           Transfer     Bitrate         Retr  Cwnd
+    [  5]   0.00-1.00   sec  42.6 MBytes   357 Mbits/sec    0    208 KBytes       
+    [  5]   1.00-2.00   sec  41.8 MBytes   350 Mbits/sec    0    208 KBytes       
+    [  5]   2.00-3.00   sec  42.0 MBytes   353 Mbits/sec    0    219 KBytes       
+    [  5]   3.00-4.00   sec  41.8 MBytes   351 Mbits/sec    0    229 KBytes       
+    [  5]   4.00-5.00   sec  42.1 MBytes   353 Mbits/sec    0    229 KBytes       
+    [  5]   5.00-6.00   sec  42.3 MBytes   354 Mbits/sec    0    229 KBytes       
+    [  5]   6.00-7.00   sec  42.0 MBytes   352 Mbits/sec    0    229 KBytes       
+    [  5]   7.00-8.00   sec  41.8 MBytes   350 Mbits/sec    0    229 KBytes       
+    [  5]   8.00-9.00   sec  42.4 MBytes   355 Mbits/sec    0    229 KBytes       
+    [  5]   9.00-10.00  sec  41.9 MBytes   351 Mbits/sec    0    229 KBytes       
+    - - - - - - - - - - - - - - - - - - - - - - - - -
+    [ ID] Interval           Transfer     Bitrate         Retr
+    [  5]   0.00-10.00  sec   421 MBytes   353 Mbits/sec    0             sender
+    [  5]   0.00-10.00  sec   420 MBytes   352 Mbits/sec                  receiver
+
+    iperf Done.
+
+Between octavia and emma directly:
+
+    root@octavia:~# iperf3 -c 192.168.0.10
+    Connecting to host 192.168.0.10, port 5201
+    [  5] local 192.168.0.1 port 44068 connected to 192.168.0.10 port 5201
+    [ ID] Interval           Transfer     Bitrate         Retr  Cwnd
+    [  5]   0.00-1.00   sec  36.2 MBytes   303 Mbits/sec    0    344 KBytes       
+    [  5]   1.00-2.00   sec  36.2 MBytes   303 Mbits/sec    0    393 KBytes       
+    [  5]   2.00-3.00   sec  32.3 MBytes   271 Mbits/sec    0    393 KBytes       
+    [  5]   3.00-4.00   sec  27.5 MBytes   230 Mbits/sec    0    393 KBytes       
+    [  5]   4.00-5.00   sec  35.9 MBytes   301 Mbits/sec    0    424 KBytes       
+    [  5]   5.00-6.00   sec  36.0 MBytes   302 Mbits/sec   27    341 KBytes       
+    [  5]   6.00-7.00   sec  35.9 MBytes   301 Mbits/sec    0    382 KBytes       
+    [  5]   7.00-8.00   sec  32.1 MBytes   269 Mbits/sec    0    382 KBytes       
+    [  5]   8.00-9.00   sec  27.0 MBytes   227 Mbits/sec    0    382 KBytes       
+    [  5]   9.00-10.00  sec  36.0 MBytes   302 Mbits/sec   48    315 KBytes       
+    - - - - - - - - - - - - - - - - - - - - - - - - -
+    [ ID] Interval           Transfer     Bitrate         Retr
+    [  5]   0.00-10.00  sec   335 MBytes   281 Mbits/sec   75             sender
+    [  5]   0.00-10.03  sec   333 MBytes   279 Mbits/sec                  receiver
+
+    iperf Done.
+
+Between octavia and [[server/marcos]]:
+
+    anarcat@marcos:~(master)$ iperf3 -c 192.168.0.1
+    Connecting to host 192.168.0.1, port 5201
+    [  5] local 192.168.0.3 port 50918 connected to 192.168.0.1 port 5201
+    [ ID] Interval           Transfer     Bitrate         Retr  Cwnd
+    [  5]   0.00-1.00   sec   114 MBytes   956 Mbits/sec    0    448 KBytes       
+    [  5]   1.00-2.00   sec   113 MBytes   948 Mbits/sec    0    469 KBytes       
+    [  5]   2.00-3.00   sec   112 MBytes   941 Mbits/sec    0    513 KBytes       
+    [  5]   3.00-4.00   sec   112 MBytes   942 Mbits/sec    0    513 KBytes       
+    [  5]   4.00-5.00   sec   112 MBytes   939 Mbits/sec    0    540 KBytes       
+    [  5]   5.00-6.00   sec   112 MBytes   941 Mbits/sec    0    540 KBytes       
+    [  5]   6.00-7.00   sec   112 MBytes   943 Mbits/sec    0    540 KBytes       
+    [  5]   7.00-8.00   sec   112 MBytes   936 Mbits/sec    0    540 KBytes       
+    [  5]   8.00-9.00   sec   112 MBytes   942 Mbits/sec    0    540 KBytes       
+    [  5]   9.00-10.00  sec   113 MBytes   947 Mbits/sec    0    567 KBytes       
+    - - - - - - - - - - - - - - - - - - - - - - - - -
+    [ ID] Interval           Transfer     Bitrate         Retr
+    [  5]   0.00-10.00  sec  1.10 GBytes   944 Mbits/sec    0             sender
+    [  5]   0.00-10.02  sec  1.10 GBytes   940 Mbits/sec                  receiver
+
+    iperf Done.
+
+... which proves octavia is not the bottleneck: the tp-link is (and,
+unrelatedly, angela's gigabit adapter as well, but we could still
+reproduce without it).
+
+Wireless network
+----------------
+
+Over 2.4GHz:
+
+    root@angela:/home/anarcat# iperf3 -c 192.168.0.10
+    Connecting to host 192.168.0.10, port 5201
+    [  5] local 192.168.0.152 port 59030 connected to 192.168.0.10 port 5201
+    [ ID] Interval           Transfer     Bitrate         Retr  Cwnd
+    [  5]   0.00-1.00   sec  5.71 MBytes  47.9 Mbits/sec    0    325 KBytes       
+    [  5]   1.00-2.00   sec  5.72 MBytes  48.0 Mbits/sec    0    359 KBytes       
+    [  5]   2.00-3.00   sec  4.23 MBytes  35.4 Mbits/sec    0    423 KBytes       
+    [  5]   3.00-4.00   sec  6.59 MBytes  55.3 Mbits/sec    0    444 KBytes       
+    [  5]   4.00-5.00   sec  5.84 MBytes  49.0 Mbits/sec    0    465 KBytes       
+    [  5]   5.00-6.00   sec  4.16 MBytes  34.9 Mbits/sec    0    489 KBytes       
+    [  5]   6.00-7.00   sec  4.47 MBytes  37.5 Mbits/sec    0    489 KBytes       
+    [  5]   7.00-8.00   sec  4.41 MBytes  37.0 Mbits/sec    0    489 KBytes       
+    [  5]   8.00-9.00   sec  5.03 MBytes  42.2 Mbits/sec    0    489 KBytes       
+    [  5]   9.00-10.00  sec  4.29 MBytes  36.0 Mbits/sec    0    489 KBytes       
+    - - - - - - - - - - - - - - - - - - - - - - - - -
+    [ ID] Interval           Transfer     Bitrate         Retr
+    [  5]   0.00-10.00  sec  50.5 MBytes  42.3 Mbits/sec    0             sender
+    [  5]   0.00-10.01  sec  48.3 MBytes  40.5 Mbits/sec                  receiver
+
+    iperf Done.
+
+`iwconfig` was showing:
+
+    wlp2s0    IEEE 802.11  ESSID:"CrapN6-emma"  
+              Mode:Managed  Frequency:2.412 GHz  Access Point: B0:95:75:41:E7:C1   
+              Bit Rate=144.4 Mb/s   Tx-Power=15 dBm   
+              Retry short limit:7   RTS thr:off   Fragment thr:off
+              Power Management:off
+              Link Quality=70/70  Signal level=-22 dBm  
+              Rx invalid nwid:0  Rx invalid crypt:0  Rx invalid frag:0
+              Tx excessive retries:1  Invalid misc:104   Missed beacon:0
+
+So the 40Mbps is actually disappointing here. It's possible
+neighboring access points caused interference.
+
+Over 5GHz:
+
+    root@angela:/home/anarcat# iperf3 -c 192.168.0.10
+    Connecting to host 192.168.0.10, port 5201
+    [  5] local 192.168.0.152 port 59148 connected to 192.168.0.10 port 5201
+    [ ID] Interval           Transfer     Bitrate         Retr  Cwnd
+    [  5]   0.00-1.00   sec  8.45 MBytes  70.9 Mbits/sec    1    348 KBytes       
+    [  5]   1.00-2.00   sec  12.6 MBytes   106 Mbits/sec    0    488 KBytes       
+    [  5]   2.00-3.00   sec  6.46 MBytes  54.2 Mbits/sec    0    488 KBytes       
+    [  5]   3.00-4.00   sec  5.29 MBytes  44.4 Mbits/sec    0    488 KBytes       
+    [  5]   4.00-5.00   sec  6.14 MBytes  51.5 Mbits/sec    1    488 KBytes       
+    [  5]   5.00-6.00   sec  5.10 MBytes  42.7 Mbits/sec    0    488 KBytes       
+    [  5]   6.00-7.00   sec  6.96 MBytes  58.4 Mbits/sec    1    488 KBytes       
+    [  5]   7.00-8.00   sec  7.71 MBytes  64.6 Mbits/sec    0    488 KBytes       
+    [  5]   8.00-9.00   sec  7.27 MBytes  61.0 Mbits/sec    0    488 KBytes       
+    [  5]   9.00-10.00  sec  7.33 MBytes  61.5 Mbits/sec    0    488 KBytes       
+    - - - - - - - - - - - - - - - - - - - - - - - - -
+    [ ID] Interval           Transfer     Bitrate         Retr
+    [  5]   0.00-10.00  sec  73.3 MBytes  61.5 Mbits/sec    3             sender
+    [  5]   0.00-10.11  sec  70.6 MBytes  58.6 Mbits/sec                  receiver
+
+    iperf Done.
+
+I had trouble connecting to the router over 5GHz and web browsing
+performance was bad (Wikipedia would not load properly). Still it said
+it was supposed to deliver 300mbps:
+
+    wlp2s0    IEEE 802.11  ESSID:"CrapN6-5GHz-emma"  
+              Mode:Managed  Frequency:5.745 GHz  Access Point: B0:95:75:41:E7:C0   
+              Bit Rate=300 Mb/s   Tx-Power=17 dBm   
+              Retry short limit:7   RTS thr:off   Fragment thr:off
+              Power Management:off

(Diff truncated)
fix url
diff --git a/services/dns.mdwn b/services/dns.mdwn
index c61041c7..6a804b38 100644
--- a/services/dns.mdwn
+++ b/services/dns.mdwn
@@ -47,7 +47,7 @@ femmes. Exemples utilisés:
  * [[hardware/octavia]] ([E. Butler](https://en.wikipedia.org/wiki/Octavia_E._Butler))
  * [[hardware/ursula]] ([K. Le Guin](https://en.wikipedia.org/wiki/Ursula_K._Le_Guin))
  * [[hardware/server/mafalda]] ([yes, the character](https://en.wikipedia.org/wiki/Mafalda))
- * [[hardware/plastik]] (a "piece of plastic")
+ * [[hardware/server/plastik]] (a "piece of plastic")
 
 Utilisés par le passé:
 

add references and emma
diff --git a/services/dns.mdwn b/services/dns.mdwn
index 4bab2373..c61041c7 100644
--- a/services/dns.mdwn
+++ b/services/dns.mdwn
@@ -38,21 +38,22 @@ Les noms des machines sur le réseau sont des personalités ou autrices
 inspirantes (politiquement ou autre), préférablement des
 femmes. Exemples utilisés:
 
- * (el commandante) [[hardware/server/marcos]]
- * [[hardware/angela]] (Davis)
- * (Margaret) Atwood
- * (Marie) [[hardware/curie]]
- * (Richard) dawkins
- * [[hardware/octavia]] (Butler)
- * [[hardware/ursula]] (K. Le Guin)
- * [[hardware/server/mafalda]]
- * [[hardware/plastik]]
+ * ([Subcommandante](https://en.wikipedia.org/wiki/Subcomandante_Marcos)) [[hardware/server/marcos]]
+ * [[hardware/angela]] ([Davis](https://en.wikipedia.org/wiki/Angela_Davis))
+ * ([Margaret](https://en.wikipedia.org/wiki/Margaret_Atwood)) Atwood
+ * ([Marie](https://en.wikipedia.org/wiki/Marie_Curie)) [[hardware/curie]]
+ * ([Richard](https://en.wikipedia.org/wiki/Richard_Dawkins)) dawkins
+ * emma ([Goldman](https://en.wikipedia.org/wiki/Emma_Goldman))
+ * [[hardware/octavia]] ([E. Butler](https://en.wikipedia.org/wiki/Octavia_E._Butler))
+ * [[hardware/ursula]] ([K. Le Guin](https://en.wikipedia.org/wiki/Ursula_K._Le_Guin))
+ * [[hardware/server/mafalda]] ([yes, the character](https://en.wikipedia.org/wiki/Mafalda))
+ * [[hardware/plastik]] (a "piece of plastic")
 
 Utilisés par le passé:
 
  * [[hardware/server/lenny]] - origin forgotten
  * marvin - origin forgotten
- * mumia (Abu Jamal)
+ * mumia ([Abu Jamal](https://en.wikipedia.org/wiki/Mumia_Abu-Jamal))
  * roadkill
  * [[hardware/server/roadkiller]]
 

document known names
diff --git a/services/dns.mdwn b/services/dns.mdwn
index 0f9e387f..4bab2373 100644
--- a/services/dns.mdwn
+++ b/services/dns.mdwn
@@ -31,6 +31,35 @@ Documentation locale
  * [[dnssec]] - la validation des noms de domaines
  * [[migration]] - comment migrer vers une nouvelle IP
 
+Convention de noms
+==================
+
+Les noms des machines sur le réseau sont des personalités ou autrices
+inspirantes (politiquement ou autre), préférablement des
+femmes. Exemples utilisés:
+
+ * (el commandante) [[hardware/server/marcos]]
+ * [[hardware/angela]] (Davis)
+ * (Margaret) Atwood
+ * (Marie) [[hardware/curie]]
+ * (Richard) dawkins
+ * [[hardware/octavia]] (Butler)
+ * [[hardware/ursula]] (K. Le Guin)
+ * [[hardware/server/mafalda]]
+ * [[hardware/plastik]]
+
+Utilisés par le passé:
+
+ * [[hardware/server/lenny]] - origin forgotten
+ * marvin - origin forgotten
+ * mumia (Abu Jamal)
+ * roadkill
+ * [[hardware/server/roadkiller]]
+
+Autres idées:
+
+ * [Viola Desmond](https://en.wikipedia.org/wiki/Viola_Desmond)
+
 Relié
 =====
 

remove test comments
diff --git a/blog/2020-04-27-drowning-camera/comment_1_07f43231a14d0ee6e78d1030aa6a7985._comment b/blog/2020-04-27-drowning-camera/comment_1_07f43231a14d0ee6e78d1030aa6a7985._comment
deleted file mode 100644
index 66d9ec47..00000000
--- a/blog/2020-04-27-drowning-camera/comment_1_07f43231a14d0ee6e78d1030aa6a7985._comment
+++ /dev/null
@@ -1,9 +0,0 @@
-[[!comment format=mdwn
- ip="192.168.0.116"
- claimedauthor="spammer name"
- url="example.com"
- subject="subject"
- date="2020-05-27T04:00:23Z"
- content="""
-spammy comment
-"""]]
diff --git a/blog/2020-04-27-drowning-camera/comment_1_502d3046f8db0210ff544738112f04f1._comment b/blog/2020-04-27-drowning-camera/comment_1_502d3046f8db0210ff544738112f04f1._comment
deleted file mode 100644
index 75e708dd..00000000
--- a/blog/2020-04-27-drowning-camera/comment_1_502d3046f8db0210ff544738112f04f1._comment
+++ /dev/null
@@ -1,9 +0,0 @@
-[[!comment format=mdwn
- ip="192.168.0.116"
- claimedauthor="spammer name"
- url="example.com"
- subject="subject"
- date="2020-05-27T03:41:17Z"
- content="""
-spammy comment
-"""]]

removed
diff --git a/blog/2020-04-27-drowning-camera/comment_1_62335f3c8f73f1225334816487995f76._comment b/blog/2020-04-27-drowning-camera/comment_1_62335f3c8f73f1225334816487995f76._comment
deleted file mode 100644
index cb07362b..00000000
--- a/blog/2020-04-27-drowning-camera/comment_1_62335f3c8f73f1225334816487995f76._comment
+++ /dev/null
@@ -1,9 +0,0 @@
-[[!comment format=mdwn
- ip="208.111.65.10"
- claimedauthor="test"
- url="test website"
- subject="test subject"
- date="2020-05-27T15:10:09Z"
- content="""
-this is the commetn's body
-"""]]

approve comment
diff --git a/blog/2020-04-27-drowning-camera/comment_1_62335f3c8f73f1225334816487995f76._comment b/blog/2020-04-27-drowning-camera/comment_1_62335f3c8f73f1225334816487995f76._comment
new file mode 100644
index 00000000..cb07362b
--- /dev/null
+++ b/blog/2020-04-27-drowning-camera/comment_1_62335f3c8f73f1225334816487995f76._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ ip="208.111.65.10"
+ claimedauthor="test"
+ url="test website"
+ subject="test subject"
+ date="2020-05-27T15:10:09Z"
+ content="""
+this is the commetn's body
+"""]]

approve comment
diff --git a/blog/2020-04-27-drowning-camera/comment_1_07f43231a14d0ee6e78d1030aa6a7985._comment b/blog/2020-04-27-drowning-camera/comment_1_07f43231a14d0ee6e78d1030aa6a7985._comment
new file mode 100644
index 00000000..66d9ec47
--- /dev/null
+++ b/blog/2020-04-27-drowning-camera/comment_1_07f43231a14d0ee6e78d1030aa6a7985._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ ip="192.168.0.116"
+ claimedauthor="spammer name"
+ url="example.com"
+ subject="subject"
+ date="2020-05-27T04:00:23Z"
+ content="""
+spammy comment
+"""]]

Comment moderation
diff --git a/blog/2020-04-27-drowning-camera/comment_1_502d3046f8db0210ff544738112f04f1._comment b/blog/2020-04-27-drowning-camera/comment_1_502d3046f8db0210ff544738112f04f1._comment
new file mode 100644
index 00000000..75e708dd
--- /dev/null
+++ b/blog/2020-04-27-drowning-camera/comment_1_502d3046f8db0210ff544738112f04f1._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ ip="192.168.0.116"
+ claimedauthor="spammer name"
+ url="example.com"
+ subject="subject"
+ date="2020-05-27T03:41:17Z"
+ content="""
+spammy comment
+"""]]

removed
diff --git a/blog/2020-04-27-drowning-camera/comment_2_712ef800ffe47d9bb492f4c935f81bf3._comment b/blog/2020-04-27-drowning-camera/comment_2_712ef800ffe47d9bb492f4c935f81bf3._comment
deleted file mode 100644
index 5161af2a..00000000
--- a/blog/2020-04-27-drowning-camera/comment_2_712ef800ffe47d9bb492f4c935f81bf3._comment
+++ /dev/null
@@ -1,8 +0,0 @@
-[[!comment format=mdwn
- ip="192.168.0.116"
- claimedauthor="spammer2"
- subject="another spam test"
- date="2020-05-27T00:12:06Z"
- content="""
-test
-"""]]

removed
diff --git a/blog/2020-04-27-drowning-camera/comment_1_f4f99921837deb77857a6cc7b682269c._comment b/blog/2020-04-27-drowning-camera/comment_1_f4f99921837deb77857a6cc7b682269c._comment
deleted file mode 100644
index 361294e8..00000000
--- a/blog/2020-04-27-drowning-camera/comment_1_f4f99921837deb77857a6cc7b682269c._comment
+++ /dev/null
@@ -1,9 +0,0 @@
-[[!comment format=mdwn
- ip="192.168.0.116"
- claimedauthor="spammer"
- url="http://spammer.example.net/"
- subject="this is a spammy comment"
- date="2020-05-27T00:09:27Z"
- content="""
-this is spam, obviosuly. a test.
-"""]]

Added a comment: another spam test
diff --git a/blog/2020-04-27-drowning-camera/comment_2_712ef800ffe47d9bb492f4c935f81bf3._comment b/blog/2020-04-27-drowning-camera/comment_2_712ef800ffe47d9bb492f4c935f81bf3._comment
new file mode 100644
index 00000000..5161af2a
--- /dev/null
+++ b/blog/2020-04-27-drowning-camera/comment_2_712ef800ffe47d9bb492f4c935f81bf3._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ ip="192.168.0.116"
+ claimedauthor="spammer2"
+ subject="another spam test"
+ date="2020-05-27T00:12:06Z"
+ content="""
+test
+"""]]

Added a comment: this is a spammy comment
diff --git a/blog/2020-04-27-drowning-camera/comment_1_f4f99921837deb77857a6cc7b682269c._comment b/blog/2020-04-27-drowning-camera/comment_1_f4f99921837deb77857a6cc7b682269c._comment
new file mode 100644
index 00000000..361294e8
--- /dev/null
+++ b/blog/2020-04-27-drowning-camera/comment_1_f4f99921837deb77857a6cc7b682269c._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ ip="192.168.0.116"
+ claimedauthor="spammer"
+ url="http://spammer.example.net/"
+ subject="this is a spammy comment"
+ date="2020-05-27T00:09:27Z"
+ content="""
+this is spam, obviosuly. a test.
+"""]]

more fucking spam
diff --git a/blog/2017-09-01-free-software-activities-august-2017/comment_1_93f28878da00874db95b5517e948773c._comment b/blog/2017-09-01-free-software-activities-august-2017/comment_1_93f28878da00874db95b5517e948773c._comment
deleted file mode 100644
index 66593b40..00000000
--- a/blog/2017-09-01-free-software-activities-august-2017/comment_1_93f28878da00874db95b5517e948773c._comment
+++ /dev/null
@@ -1,14 +0,0 @@
-[[!comment format=mdwn
- ip="103.73.164.234"
- claimedauthor="RajabandarQ"
- url="http://202.95.10.208"
- subject="RajabandarQ: Situs Bandarq, DominoQQ, Poker Online"
- date="2020-05-26T23:07:42Z"
- content="""
-Mau Dapatkan Uang Dengan Mudah...
-Yuk join bersama <a href=\"http://202.95.10.208/\" rel=\"nofollow\">Rajabandarq</a> Situs Bandarq, DominoQQ, Poker Online terbaik di asia dengan 9 game yang paling seru...
-
-Buruan Daftar Disini >>> <a href=\"http://202.95.10.208/\" rel=\"nofollow\">Rajabandarq</a>
-Klik Disini : <a href=\"http://202.95.10.208/\" rel=\"nofollow\">Situs BandarQ</a>
-Klik Disini : <a href=\"http://202.95.10.208/\" rel=\"nofollow\">Poker Online</a>
-"""]]
diff --git a/blog/2017-09-01-free-software-activities-august-2017/comment_2_7265fae6e1d149e61f9973b232cec900._comment b/blog/2017-09-01-free-software-activities-august-2017/comment_2_7265fae6e1d149e61f9973b232cec900._comment
deleted file mode 100644
index 536cc1b3..00000000
--- a/blog/2017-09-01-free-software-activities-august-2017/comment_2_7265fae6e1d149e61f9973b232cec900._comment
+++ /dev/null
@@ -1,14 +0,0 @@
-[[!comment format=mdwn
- ip="103.73.164.234"
- claimedauthor="RajabandarQ"
- url="http://202.95.10.208"
- subject="RajabandarQ: Situs Bandarq, DominoQQ, Poker Online"
- date="2020-05-26T23:08:05Z"
- content="""
-Mau Dapatkan Uang Dengan Mudah...
-Yuk join bersama <a href=\"http://202.95.10.208/\" rel=\"nofollow\">Rajabandarq</a> Situs Bandarq, DominoQQ, Poker Online terbaik di asia dengan 9 game yang paling seru...
-
-Buruan Daftar Disini >>> <a href=\"http://202.95.10.208/\" rel=\"nofollow\">Rajabandarq</a>
-Klik Disini : <a href=\"http://202.95.10.208/\" rel=\"nofollow\">Situs BandarQ</a>
-Klik Disini : <a href=\"http://202.95.10.208/\" rel=\"nofollow\">Poker Online</a>
-"""]]
diff --git a/blog/2017-09-01-free-software-activities-august-2017/comment_3_105fa59ba2598239b7399c000fbaec51._comment b/blog/2017-09-01-free-software-activities-august-2017/comment_3_105fa59ba2598239b7399c000fbaec51._comment
deleted file mode 100644
index eb506703..00000000
--- a/blog/2017-09-01-free-software-activities-august-2017/comment_3_105fa59ba2598239b7399c000fbaec51._comment
+++ /dev/null
@@ -1,14 +0,0 @@
-[[!comment format=mdwn
- ip="103.73.164.234"
- claimedauthor="RajabandarQ"
- url="http://202.95.10.208"
- subject="RajabandarQ: Situs Bandarq, DominoQQ, Poker Online"
- date="2020-05-26T23:08:28Z"
- content="""
-Mau Dapatkan Uang Dengan Mudah...
-Yuk join bersama <a href=\"http://202.95.10.208/\" rel=\"nofollow\">Rajabandarq</a> Situs Bandarq, DominoQQ, Poker Online terbaik di asia dengan 9 game yang paling seru...
-
-Buruan Daftar Disini >>> <a href=\"http://202.95.10.208/\" rel=\"nofollow\">Rajabandarq</a>
-Klik Disini : <a href=\"http://202.95.10.208/\" rel=\"nofollow\">Situs BandarQ</a>
-Klik Disini : <a href=\"http://202.95.10.208/\" rel=\"nofollow\">Poker Online</a>
-"""]]

removed
diff --git a/blog/2017-09-01-free-software-activities-august-2017/comment_4_34ed57aceb6388eb623ac25ce92b0db1._comment b/blog/2017-09-01-free-software-activities-august-2017/comment_4_34ed57aceb6388eb623ac25ce92b0db1._comment
deleted file mode 100644
index 17d56368..00000000
--- a/blog/2017-09-01-free-software-activities-august-2017/comment_4_34ed57aceb6388eb623ac25ce92b0db1._comment
+++ /dev/null
@@ -1,14 +0,0 @@
-[[!comment format=mdwn
- ip="103.73.164.234"
- claimedauthor="RajabandarQ"
- url="http://202.95.10.208"
- subject="RajabandarQ: Situs Bandarq, DominoQQ, Poker Online"
- date="2020-05-26T23:08:51Z"
- content="""
-Mau Dapatkan Uang Dengan Mudah...
-Yuk join bersama <a href=\"http://202.95.10.208/\" rel=\"nofollow\">Rajabandarq</a> Situs Bandarq, DominoQQ, Poker Online terbaik di asia dengan 9 game yang paling seru...
-
-Buruan Daftar Disini >>> <a href=\"http://202.95.10.208/\" rel=\"nofollow\">Rajabandarq</a>
-Klik Disini : <a href=\"http://202.95.10.208/\" rel=\"nofollow\">Situs BandarQ</a>
-Klik Disini : <a href=\"http://202.95.10.208/\" rel=\"nofollow\">Poker Online</a>
-"""]]

Added a comment: RajabandarQ: Situs Bandarq, DominoQQ, Poker Online
diff --git a/blog/2017-09-01-free-software-activities-august-2017/comment_4_34ed57aceb6388eb623ac25ce92b0db1._comment b/blog/2017-09-01-free-software-activities-august-2017/comment_4_34ed57aceb6388eb623ac25ce92b0db1._comment
new file mode 100644
index 00000000..17d56368
--- /dev/null
+++ b/blog/2017-09-01-free-software-activities-august-2017/comment_4_34ed57aceb6388eb623ac25ce92b0db1._comment
@@ -0,0 +1,14 @@
+[[!comment format=mdwn
+ ip="103.73.164.234"
+ claimedauthor="RajabandarQ"
+ url="http://202.95.10.208"
+ subject="RajabandarQ: Situs Bandarq, DominoQQ, Poker Online"
+ date="2020-05-26T23:08:51Z"
+ content="""
+Mau Dapatkan Uang Dengan Mudah...
+Yuk join bersama <a href=\"http://202.95.10.208/\" rel=\"nofollow\">Rajabandarq</a> Situs Bandarq, DominoQQ, Poker Online terbaik di asia dengan 9 game yang paling seru...
+
+Buruan Daftar Disini >>> <a href=\"http://202.95.10.208/\" rel=\"nofollow\">Rajabandarq</a>
+Klik Disini : <a href=\"http://202.95.10.208/\" rel=\"nofollow\">Situs BandarQ</a>
+Klik Disini : <a href=\"http://202.95.10.208/\" rel=\"nofollow\">Poker Online</a>
+"""]]

Added a comment: RajabandarQ: Situs Bandarq, DominoQQ, Poker Online
diff --git a/blog/2017-09-01-free-software-activities-august-2017/comment_3_105fa59ba2598239b7399c000fbaec51._comment b/blog/2017-09-01-free-software-activities-august-2017/comment_3_105fa59ba2598239b7399c000fbaec51._comment
new file mode 100644
index 00000000..eb506703
--- /dev/null
+++ b/blog/2017-09-01-free-software-activities-august-2017/comment_3_105fa59ba2598239b7399c000fbaec51._comment
@@ -0,0 +1,14 @@
+[[!comment format=mdwn
+ ip="103.73.164.234"
+ claimedauthor="RajabandarQ"
+ url="http://202.95.10.208"
+ subject="RajabandarQ: Situs Bandarq, DominoQQ, Poker Online"
+ date="2020-05-26T23:08:28Z"
+ content="""
+Mau Dapatkan Uang Dengan Mudah...
+Yuk join bersama <a href=\"http://202.95.10.208/\" rel=\"nofollow\">Rajabandarq</a> Situs Bandarq, DominoQQ, Poker Online terbaik di asia dengan 9 game yang paling seru...
+
+Buruan Daftar Disini >>> <a href=\"http://202.95.10.208/\" rel=\"nofollow\">Rajabandarq</a>
+Klik Disini : <a href=\"http://202.95.10.208/\" rel=\"nofollow\">Situs BandarQ</a>
+Klik Disini : <a href=\"http://202.95.10.208/\" rel=\"nofollow\">Poker Online</a>
+"""]]

Added a comment: RajabandarQ: Situs Bandarq, DominoQQ, Poker Online
diff --git a/blog/2017-09-01-free-software-activities-august-2017/comment_2_7265fae6e1d149e61f9973b232cec900._comment b/blog/2017-09-01-free-software-activities-august-2017/comment_2_7265fae6e1d149e61f9973b232cec900._comment
new file mode 100644
index 00000000..536cc1b3
--- /dev/null
+++ b/blog/2017-09-01-free-software-activities-august-2017/comment_2_7265fae6e1d149e61f9973b232cec900._comment
@@ -0,0 +1,14 @@
+[[!comment format=mdwn
+ ip="103.73.164.234"
+ claimedauthor="RajabandarQ"
+ url="http://202.95.10.208"
+ subject="RajabandarQ: Situs Bandarq, DominoQQ, Poker Online"
+ date="2020-05-26T23:08:05Z"
+ content="""
+Mau Dapatkan Uang Dengan Mudah...
+Yuk join bersama <a href=\"http://202.95.10.208/\" rel=\"nofollow\">Rajabandarq</a> Situs Bandarq, DominoQQ, Poker Online terbaik di asia dengan 9 game yang paling seru...
+
+Buruan Daftar Disini >>> <a href=\"http://202.95.10.208/\" rel=\"nofollow\">Rajabandarq</a>
+Klik Disini : <a href=\"http://202.95.10.208/\" rel=\"nofollow\">Situs BandarQ</a>
+Klik Disini : <a href=\"http://202.95.10.208/\" rel=\"nofollow\">Poker Online</a>
+"""]]

Added a comment: RajabandarQ: Situs Bandarq, DominoQQ, Poker Online
diff --git a/blog/2017-09-01-free-software-activities-august-2017/comment_1_93f28878da00874db95b5517e948773c._comment b/blog/2017-09-01-free-software-activities-august-2017/comment_1_93f28878da00874db95b5517e948773c._comment
new file mode 100644
index 00000000..66593b40
--- /dev/null
+++ b/blog/2017-09-01-free-software-activities-august-2017/comment_1_93f28878da00874db95b5517e948773c._comment
@@ -0,0 +1,14 @@
+[[!comment format=mdwn
+ ip="103.73.164.234"
+ claimedauthor="RajabandarQ"
+ url="http://202.95.10.208"
+ subject="RajabandarQ: Situs Bandarq, DominoQQ, Poker Online"
+ date="2020-05-26T23:07:42Z"
+ content="""
+Mau Dapatkan Uang Dengan Mudah...
+Yuk join bersama <a href=\"http://202.95.10.208/\" rel=\"nofollow\">Rajabandarq</a> Situs Bandarq, DominoQQ, Poker Online terbaik di asia dengan 9 game yang paling seru...
+
+Buruan Daftar Disini >>> <a href=\"http://202.95.10.208/\" rel=\"nofollow\">Rajabandarq</a>
+Klik Disini : <a href=\"http://202.95.10.208/\" rel=\"nofollow\">Situs BandarQ</a>
+Klik Disini : <a href=\"http://202.95.10.208/\" rel=\"nofollow\">Poker Online</a>
+"""]]

fix typo, thanks u.
diff --git a/services/mail/syncmaildir.mdwn b/services/mail/syncmaildir.mdwn
index 0368a370..fa5caa8f 100644
--- a/services/mail/syncmaildir.mdwn
+++ b/services/mail/syncmaildir.mdwn
@@ -5,7 +5,7 @@ page documents how that process was done and the SMD configuration.
 
 [syncmaildir]: https://github.com/gares/syncmaildir
 
-I tried to follow the official procedure to migrate from OfflienIMAP
+I tried to follow the official procedure to migrate from OfflineIMAP
 to SMD. I hit some difficulties, which I documented in upstream
 issues. What follows is the detailed test procedure I followed to test
 the synchronization and notes about the process.

removed
diff --git a/blog/2020-04-27-drowning-camera/comment_1_79876e7f57608534a1e3cebea4f2a2fd._comment b/blog/2020-04-27-drowning-camera/comment_1_79876e7f57608534a1e3cebea4f2a2fd._comment
deleted file mode 100644
index 2662d3b7..00000000
--- a/blog/2020-04-27-drowning-camera/comment_1_79876e7f57608534a1e3cebea4f2a2fd._comment
+++ /dev/null
@@ -1,9 +0,0 @@
-[[!comment format=creole
- ip="5.248.226.19"
- claimedauthor="edoejiasef"
- url="http://mewkid.net/when-is-xaxlop/"
- subject="If fovea, lonely predicament each burrow charged. "
- date="2020-05-25T16:21:47Z"
- content="""
-http://mewkid.net/when-is-xaxlop/ - Buy Amoxicillin Online <a href=\"http://mewkid.net/when-is-xaxlop/\">Amoxil Dose For 55 Pounds</a> vpr.lxkg.davidalfonso.es.aga.ww http://mewkid.net/when-is-xaxlop/
-"""]]

Added a comment: If fovea, lonely predicament each burrow charged.
diff --git a/blog/2020-04-27-drowning-camera/comment_1_79876e7f57608534a1e3cebea4f2a2fd._comment b/blog/2020-04-27-drowning-camera/comment_1_79876e7f57608534a1e3cebea4f2a2fd._comment
new file mode 100644
index 00000000..2662d3b7
--- /dev/null
+++ b/blog/2020-04-27-drowning-camera/comment_1_79876e7f57608534a1e3cebea4f2a2fd._comment
@@ -0,0 +1,9 @@
+[[!comment format=creole
+ ip="5.248.226.19"
+ claimedauthor="edoejiasef"
+ url="http://mewkid.net/when-is-xaxlop/"
+ subject="If fovea, lonely predicament each burrow charged. "
+ date="2020-05-25T16:21:47Z"
+ content="""
+http://mewkid.net/when-is-xaxlop/ - Buy Amoxicillin Online <a href=\"http://mewkid.net/when-is-xaxlop/\">Amoxil Dose For 55 Pounds</a> vpr.lxkg.davidalfonso.es.aga.ww http://mewkid.net/when-is-xaxlop/
+"""]]

removed
diff --git a/blog/2018-04-12-terminal-emulators-1/comment_5_ed20bcc4a2a4b9ca79ba3aa27f9e3d81._comment b/blog/2018-04-12-terminal-emulators-1/comment_5_ed20bcc4a2a4b9ca79ba3aa27f9e3d81._comment
deleted file mode 100644
index c8d4adb2..00000000
--- a/blog/2018-04-12-terminal-emulators-1/comment_5_ed20bcc4a2a4b9ca79ba3aa27f9e3d81._comment
+++ /dev/null
@@ -1,9 +0,0 @@
-[[!comment format=mdwn
- ip="110.82.167.108"
- claimedauthor="hotlimon"
- url="http://www.hotlimon.com/"
- subject="hotlimon"
- date="2020-05-25T03:48:07Z"
- content="""
-<a href=\"http://www.soanuncios.com/knitted-baby-boy-hats-patterns-books-hat_pl\">knitted baby boy hats patterns books</a> <a href=\"http://www.maeblooms.com/lebron-11-all-white-gold-trainers_ge\">lebron 11 all white gold</a> <a href=\"http://www.vesissb.com/all-white-air-jordan-5-shoes-uk-cheap_ie\">all white air jordan 5 shoes uk</a> <a href=\"http://www.kreshme.com/where-can-i-acquistare-adidas-nmd-runner-shoe_bo\">where can i acquistare adidas nmd runner</a> <a href=\"http://www.dominiclb.com/new-curry-shoes-grey-purple-shoes-on-sale-running_pt\">new curry shoes grey purple shoes on sale</a> <a href=\"http://www.mrchiizu.com/dirk-nowitzki-jersey-city-edition-nfl_de\">dirk nowitzki jersey city edition</a>
-"""]]

Added a comment: hotlimon
diff --git a/blog/2018-04-12-terminal-emulators-1/comment_5_ed20bcc4a2a4b9ca79ba3aa27f9e3d81._comment b/blog/2018-04-12-terminal-emulators-1/comment_5_ed20bcc4a2a4b9ca79ba3aa27f9e3d81._comment
new file mode 100644
index 00000000..c8d4adb2
--- /dev/null
+++ b/blog/2018-04-12-terminal-emulators-1/comment_5_ed20bcc4a2a4b9ca79ba3aa27f9e3d81._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ ip="110.82.167.108"
+ claimedauthor="hotlimon"
+ url="http://www.hotlimon.com/"
+ subject="hotlimon"
+ date="2020-05-25T03:48:07Z"
+ content="""
+<a href=\"http://www.soanuncios.com/knitted-baby-boy-hats-patterns-books-hat_pl\">knitted baby boy hats patterns books</a> <a href=\"http://www.maeblooms.com/lebron-11-all-white-gold-trainers_ge\">lebron 11 all white gold</a> <a href=\"http://www.vesissb.com/all-white-air-jordan-5-shoes-uk-cheap_ie\">all white air jordan 5 shoes uk</a> <a href=\"http://www.kreshme.com/where-can-i-acquistare-adidas-nmd-runner-shoe_bo\">where can i acquistare adidas nmd runner</a> <a href=\"http://www.dominiclb.com/new-curry-shoes-grey-purple-shoes-on-sale-running_pt\">new curry shoes grey purple shoes on sale</a> <a href=\"http://www.mrchiizu.com/dirk-nowitzki-jersey-city-edition-nfl_de\">dirk nowitzki jersey city edition</a>
+"""]]

removed
diff --git a/blog/2018-04-12-terminal-emulators-1/comment_5_fe2f89514a9d068be5378687d08bf384._comment b/blog/2018-04-12-terminal-emulators-1/comment_5_fe2f89514a9d068be5378687d08bf384._comment
deleted file mode 100644
index ad54959c..00000000
--- a/blog/2018-04-12-terminal-emulators-1/comment_5_fe2f89514a9d068be5378687d08bf384._comment
+++ /dev/null
@@ -1,9 +0,0 @@
-[[!comment format=mdwn
- ip="59.58.149.212"
- claimedauthor="kaewwern"
- url="http://www.kaewwern.com/"
- subject="kaewwern"
- date="2020-05-24T23:20:34Z"
- content="""
-<a href=\"http://www.taylorsifts.com/black-and-red-kansas-city-royals-hat-hats-hat_en\">black and red kansas city royals hat hats</a> <a href=\"http://www.nlmczech.com/adidas-yeezy-boost-350-release-date-quote-sneakers_de\">adidas yeezy boost 350 release date quote</a> <a href=\"http://www.sanbilizi.com/jordan-3-black-and-grey-for-canada-cheap_ca\">jordan 3 black and grey for canada</a> <a href=\"http://www.bordalba.com/nmd-adidas-us-sale-sports_it\">nmd adidas us sale</a> <a href=\"http://www.gliclub.com/jay-z-made-the-yankee-hat-famous-billig-hat__dk\">jay z made the yankee hat famous billig</a> <a href=\"http://www.detikwin.com/air-max-tailwind-8-release-date-youtube-shoe_es\">air max tailwind 8 release date youtube</a>
-"""]]

Added a comment: kaewwern
diff --git a/blog/2018-04-12-terminal-emulators-1/comment_5_fe2f89514a9d068be5378687d08bf384._comment b/blog/2018-04-12-terminal-emulators-1/comment_5_fe2f89514a9d068be5378687d08bf384._comment
new file mode 100644
index 00000000..ad54959c
--- /dev/null
+++ b/blog/2018-04-12-terminal-emulators-1/comment_5_fe2f89514a9d068be5378687d08bf384._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ ip="59.58.149.212"
+ claimedauthor="kaewwern"
+ url="http://www.kaewwern.com/"
+ subject="kaewwern"
+ date="2020-05-24T23:20:34Z"
+ content="""
+<a href=\"http://www.taylorsifts.com/black-and-red-kansas-city-royals-hat-hats-hat_en\">black and red kansas city royals hat hats</a> <a href=\"http://www.nlmczech.com/adidas-yeezy-boost-350-release-date-quote-sneakers_de\">adidas yeezy boost 350 release date quote</a> <a href=\"http://www.sanbilizi.com/jordan-3-black-and-grey-for-canada-cheap_ca\">jordan 3 black and grey for canada</a> <a href=\"http://www.bordalba.com/nmd-adidas-us-sale-sports_it\">nmd adidas us sale</a> <a href=\"http://www.gliclub.com/jay-z-made-the-yankee-hat-famous-billig-hat__dk\">jay z made the yankee hat famous billig</a> <a href=\"http://www.detikwin.com/air-max-tailwind-8-release-date-youtube-shoe_es\">air max tailwind 8 release date youtube</a>
+"""]]

removed
diff --git a/blog/2020-04-27-drowning-camera/comment_1_3bb1aac1fbdd5dad1fc2b39c7c5c8b2b._comment b/blog/2020-04-27-drowning-camera/comment_1_3bb1aac1fbdd5dad1fc2b39c7c5c8b2b._comment
deleted file mode 100644
index 9fb8f9bf..00000000
--- a/blog/2020-04-27-drowning-camera/comment_1_3bb1aac1fbdd5dad1fc2b39c7c5c8b2b._comment
+++ /dev/null
@@ -1,9 +0,0 @@
-[[!comment format=creole
- ip="37.229.204.155"
- claimedauthor="isaxoqhwouy"
- url="http://mewkid.net/when-is-xaxlop/"
- subject="Often healed, amylase benefits, undrainable ergonomic axillae. "
- date="2020-05-22T19:36:41Z"
- content="""
-http://mewkid.net/when-is-xaxlop/ - Buy Amoxil Online <a href=\"http://mewkid.net/when-is-xaxlop/\">Amoxicillin 500 Mg</a> awe.uwsx.davidalfonso.es.vwz.dv http://mewkid.net/when-is-xaxlop/
-"""]]

Added a comment: Often healed, amylase benefits, undrainable ergonomic axillae.
diff --git a/blog/2020-04-27-drowning-camera/comment_1_3bb1aac1fbdd5dad1fc2b39c7c5c8b2b._comment b/blog/2020-04-27-drowning-camera/comment_1_3bb1aac1fbdd5dad1fc2b39c7c5c8b2b._comment
new file mode 100644
index 00000000..9fb8f9bf
--- /dev/null
+++ b/blog/2020-04-27-drowning-camera/comment_1_3bb1aac1fbdd5dad1fc2b39c7c5c8b2b._comment
@@ -0,0 +1,9 @@
+[[!comment format=creole
+ ip="37.229.204.155"
+ claimedauthor="isaxoqhwouy"
+ url="http://mewkid.net/when-is-xaxlop/"
+ subject="Often healed, amylase benefits, undrainable ergonomic axillae. "
+ date="2020-05-22T19:36:41Z"
+ content="""
+http://mewkid.net/when-is-xaxlop/ - Buy Amoxil Online <a href=\"http://mewkid.net/when-is-xaxlop/\">Amoxicillin 500 Mg</a> awe.uwsx.davidalfonso.es.vwz.dv http://mewkid.net/when-is-xaxlop/
+"""]]

removed
diff --git a/blog/2020-04-27-drowning-camera/comment_1_c62ff2f3a183c66095e14d6a21d1698e._comment b/blog/2020-04-27-drowning-camera/comment_1_c62ff2f3a183c66095e14d6a21d1698e._comment
deleted file mode 100644
index a0dd318a..00000000
--- a/blog/2020-04-27-drowning-camera/comment_1_c62ff2f3a183c66095e14d6a21d1698e._comment
+++ /dev/null
@@ -1,9 +0,0 @@
-[[!comment format=rst
- ip="37.229.204.155"
- claimedauthor="miqeweuxooyah"
- url="http://mewkid.net/when-is-xaxlop/"
- subject="Hair spot return happy pneumoconiosis, there. "
- date="2020-05-22T19:19:22Z"
- content="""
-http://mewkid.net/when-is-xaxlop/ - Buy Amoxicillin <a href=\"http://mewkid.net/when-is-xaxlop/\">Amoxicillin Online</a> tyn.kilv.davidalfonso.es.hvv.xg http://mewkid.net/when-is-xaxlop/
-"""]]

Added a comment: Hair spot return happy pneumoconiosis, there.
diff --git a/blog/2020-04-27-drowning-camera/comment_1_c62ff2f3a183c66095e14d6a21d1698e._comment b/blog/2020-04-27-drowning-camera/comment_1_c62ff2f3a183c66095e14d6a21d1698e._comment
new file mode 100644
index 00000000..a0dd318a
--- /dev/null
+++ b/blog/2020-04-27-drowning-camera/comment_1_c62ff2f3a183c66095e14d6a21d1698e._comment
@@ -0,0 +1,9 @@
+[[!comment format=rst
+ ip="37.229.204.155"
+ claimedauthor="miqeweuxooyah"
+ url="http://mewkid.net/when-is-xaxlop/"
+ subject="Hair spot return happy pneumoconiosis, there. "
+ date="2020-05-22T19:19:22Z"
+ content="""
+http://mewkid.net/when-is-xaxlop/ - Buy Amoxicillin <a href=\"http://mewkid.net/when-is-xaxlop/\">Amoxicillin Online</a> tyn.kilv.davidalfonso.es.hvv.xg http://mewkid.net/when-is-xaxlop/
+"""]]

removed
diff --git a/blog/2018-04-12-terminal-emulators-1/comment_5_835d25eb114e2c54b3b063a81778d366._comment b/blog/2018-04-12-terminal-emulators-1/comment_5_835d25eb114e2c54b3b063a81778d366._comment
deleted file mode 100644
index 43848cba..00000000
--- a/blog/2018-04-12-terminal-emulators-1/comment_5_835d25eb114e2c54b3b063a81778d366._comment
+++ /dev/null
@@ -1,9 +0,0 @@
-[[!comment format=mdwn
- ip="59.58.148.13"
- claimedauthor="taylorsifts"
- url="http://www.taylorsifts.com/"
- subject="taylorsifts"
- date="2020-05-21T00:42:21Z"
- content="""
-<a href=\"http://www.nlmluo.com/jordan-supreme-hats-1984-hat_cz\">jordan supreme hats 1984</a> <a href=\"http://www.rinajordi.com/nike-blazer-print-black-running_de\">nike blazer print black</a> <a href=\"http://www.hultcos.com/women-air-max-2017-all-black-shoes-for-cheap-sneakers_nz\">women air max 2017 all black shoes for cheap</a> <a href=\"http://www.uzmanpet.com/white-green-nike-kd-6-elite-series-for-uk-sports_si\">white green nike kd 6 elite series for uk</a> <a href=\"http://www.kmcases.com/city-puma-kit-for-cheap-nfl_en\">city puma kit for cheap</a> <a href=\"http://www.kaewwern.com/womens-cincinnati-reds-hat-hat_sk\">womens cincinnati reds hat</a>
-"""]]

Added a comment: taylorsifts
diff --git a/blog/2018-04-12-terminal-emulators-1/comment_5_835d25eb114e2c54b3b063a81778d366._comment b/blog/2018-04-12-terminal-emulators-1/comment_5_835d25eb114e2c54b3b063a81778d366._comment
new file mode 100644
index 00000000..43848cba
--- /dev/null
+++ b/blog/2018-04-12-terminal-emulators-1/comment_5_835d25eb114e2c54b3b063a81778d366._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ ip="59.58.148.13"
+ claimedauthor="taylorsifts"
+ url="http://www.taylorsifts.com/"
+ subject="taylorsifts"
+ date="2020-05-21T00:42:21Z"
+ content="""
+<a href=\"http://www.nlmluo.com/jordan-supreme-hats-1984-hat_cz\">jordan supreme hats 1984</a> <a href=\"http://www.rinajordi.com/nike-blazer-print-black-running_de\">nike blazer print black</a> <a href=\"http://www.hultcos.com/women-air-max-2017-all-black-shoes-for-cheap-sneakers_nz\">women air max 2017 all black shoes for cheap</a> <a href=\"http://www.uzmanpet.com/white-green-nike-kd-6-elite-series-for-uk-sports_si\">white green nike kd 6 elite series for uk</a> <a href=\"http://www.kmcases.com/city-puma-kit-for-cheap-nfl_en\">city puma kit for cheap</a> <a href=\"http://www.kaewwern.com/womens-cincinnati-reds-hat-hat_sk\">womens cincinnati reds hat</a>
+"""]]

removed
diff --git a/blog/2018-04-12-terminal-emulators-1/comment_5_f80f267c9dc82a1821b161c2d22d0662._comment b/blog/2018-04-12-terminal-emulators-1/comment_5_f80f267c9dc82a1821b161c2d22d0662._comment
deleted file mode 100644
index 9a826317..00000000
--- a/blog/2018-04-12-terminal-emulators-1/comment_5_f80f267c9dc82a1821b161c2d22d0662._comment
+++ /dev/null
@@ -1,10 +0,0 @@
-[[!comment format=mdwn
- ip="36.250.184.89"
- claimedauthor="uapole"
- url="http://www.uapole.com/"
- subject="uapole"
- date="2020-05-20T20:34:31Z"
- content="""
-<a href=\"http://www.gudangrumus.com/iphone-8-plus-case-power-bank-caseo\">iphone 8 plus case power bank</a> <a href=\"http://www.vidisurf.com/emu-rozowe-tenisq\">emu rozowe</a> <a href=\"http://www.freezingwind.com/pool-shoes-sports-direct-bootss\">pool shoes sports direct</a> <a href=\"http://www.oldzeros.com/nike-metcon-5.5-trainersp\">nike metcon 5.5</a> <a href=\"http://www.elliethedog.com/black-harrison-smith-jersey-nfld\">black harrison smith jersey</a> <a href=\"http://www.fyeahco.com/opinion-dr-martens-botap\">opinion dr martens</a>
- <a href=\"http://www.uapole.com/\" >uapole</a> [url=http://www.uapole.com/]uapole[/url]
-"""]]

Added a comment: uapole
diff --git a/blog/2018-04-12-terminal-emulators-1/comment_5_f80f267c9dc82a1821b161c2d22d0662._comment b/blog/2018-04-12-terminal-emulators-1/comment_5_f80f267c9dc82a1821b161c2d22d0662._comment
new file mode 100644
index 00000000..9a826317
--- /dev/null
+++ b/blog/2018-04-12-terminal-emulators-1/comment_5_f80f267c9dc82a1821b161c2d22d0662._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ ip="36.250.184.89"
+ claimedauthor="uapole"
+ url="http://www.uapole.com/"
+ subject="uapole"
+ date="2020-05-20T20:34:31Z"
+ content="""
+<a href=\"http://www.gudangrumus.com/iphone-8-plus-case-power-bank-caseo\">iphone 8 plus case power bank</a> <a href=\"http://www.vidisurf.com/emu-rozowe-tenisq\">emu rozowe</a> <a href=\"http://www.freezingwind.com/pool-shoes-sports-direct-bootss\">pool shoes sports direct</a> <a href=\"http://www.oldzeros.com/nike-metcon-5.5-trainersp\">nike metcon 5.5</a> <a href=\"http://www.elliethedog.com/black-harrison-smith-jersey-nfld\">black harrison smith jersey</a> <a href=\"http://www.fyeahco.com/opinion-dr-martens-botap\">opinion dr martens</a>
+ <a href=\"http://www.uapole.com/\" >uapole</a> [url=http://www.uapole.com/]uapole[/url]
+"""]]

renew pgp key
diff --git a/.well-known/openpgpkey/hu/myctwj4an6ne7htuzyoo8osctuji68xe b/.well-known/openpgpkey/hu/myctwj4an6ne7htuzyoo8osctuji68xe
index 6e4e226c..87688745 100644
Binary files a/.well-known/openpgpkey/hu/myctwj4an6ne7htuzyoo8osctuji68xe and b/.well-known/openpgpkey/hu/myctwj4an6ne7htuzyoo8osctuji68xe differ

document more of the OpenPGP renewal procedure
diff --git a/.well-known/openpgpkey/Makefile b/.well-known/openpgpkey/Makefile
index ede803e0..6636f2e8 100644
--- a/.well-known/openpgpkey/Makefile
+++ b/.well-known/openpgpkey/Makefile
@@ -1,7 +1,28 @@
-.PHONY: hu
+.PHONY: all hu upload renew upload-tpo
 
 ADDRESS=anarcat@debian.org
+FINGERPRINT=8DC901CE64146C048AD50FBB792152527B75921E
+NEXT_EXPIRE=$(shell date -d '+1 year +1 month')
+TPO_KEYRING=~/src/tor/account-keyring/
+
+all: hu upload
+	@echo "run $(MAKE) renew all upload-tpo to make a full renewal"
+	@echo "this is not default because 'renew' and 'upload-tpo' are no idempotent"
 
 hu:
 	@echo "Consider switching to weasel's version in https://kushaldas.in/posts/setting-up-wkd.html"
 	generate-openpgpkey-hu-3 --address $(ADDRESS) --exist-ok
+
+upload:
+	gpg --keyserver keyring.debian.org --send-keys $(FINGERPRINT)
+	gpg --keyserver keys.openpgp.org --send-keys $(FINGERPRINT)
+	gpg --keyserver pool.sks-keyservers.net --send-keys $(FINGERPRINT)
+
+renew:
+	gpg --quick-set-expire $(FINGERPRINT) $(NEXT_EXPIRE)
+
+upload-tpo:
+	git -C $(TPO_KEYRING) pull
+	gpg --export --export-options export-minimal $(FINGERPRINT) > $(TPO_KEYRING)/torproject-keyring/anarcat-$(FINGERPRINT).gpg
+	git -C $(TPO_KEYRING) commit torproject-keyring/anarcat-$(FINGERPRINT).gpg
+	git -C $(TPO_KEYRING) push

silence a command
diff --git a/.well-known/openpgpkey/Makefile b/.well-known/openpgpkey/Makefile
index a3a985e1..ede803e0 100644
--- a/.well-known/openpgpkey/Makefile
+++ b/.well-known/openpgpkey/Makefile
@@ -3,5 +3,5 @@
 ADDRESS=anarcat@debian.org
 
 hu:
-	echo "Consider switching to weasel's version in https://kushaldas.in/posts/setting-up-wkd.html"
+	@echo "Consider switching to weasel's version in https://kushaldas.in/posts/setting-up-wkd.html"
 	generate-openpgpkey-hu-3 --address $(ADDRESS) --exist-ok

removed
diff --git a/blog/2020-04-27-drowning-camera/comment_1_9ae2ceaefdac171fa2bee26495f46d21._comment b/blog/2020-04-27-drowning-camera/comment_1_9ae2ceaefdac171fa2bee26495f46d21._comment
deleted file mode 100644
index f7d3509c..00000000
--- a/blog/2020-04-27-drowning-camera/comment_1_9ae2ceaefdac171fa2bee26495f46d21._comment
+++ /dev/null
@@ -1,9 +0,0 @@
-[[!comment format=rst
- ip="37.115.223.45"
- claimedauthor="imoseyue"
- url="http://mewkid.net/when-is-xaxlop/"
- subject="Pericardial site short-lived protrusions gel. "
- date="2020-05-18T20:37:14Z"
- content="""
-http://mewkid.net/when-is-xaxlop/ - 18 <a href=\"http://mewkid.net/when-is-xaxlop/\">Buy Amoxicillin</a> qbf.iwtc.davidalfonso.es.tbb.nz http://mewkid.net/when-is-xaxlop/
-"""]]

Added a comment: Pericardial site short-lived protrusions gel.
diff --git a/blog/2020-04-27-drowning-camera/comment_1_9ae2ceaefdac171fa2bee26495f46d21._comment b/blog/2020-04-27-drowning-camera/comment_1_9ae2ceaefdac171fa2bee26495f46d21._comment
new file mode 100644
index 00000000..f7d3509c
--- /dev/null
+++ b/blog/2020-04-27-drowning-camera/comment_1_9ae2ceaefdac171fa2bee26495f46d21._comment
@@ -0,0 +1,9 @@
+[[!comment format=rst
+ ip="37.115.223.45"
+ claimedauthor="imoseyue"
+ url="http://mewkid.net/when-is-xaxlop/"
+ subject="Pericardial site short-lived protrusions gel. "
+ date="2020-05-18T20:37:14Z"
+ content="""
+http://mewkid.net/when-is-xaxlop/ - 18 <a href=\"http://mewkid.net/when-is-xaxlop/\">Buy Amoxicillin</a> qbf.iwtc.davidalfonso.es.tbb.nz http://mewkid.net/when-is-xaxlop/
+"""]]

removed
diff --git a/blog/2020-04-27-drowning-camera/comment_1_2d854bc88485e11c6d94dccb0be28edc._comment b/blog/2020-04-27-drowning-camera/comment_1_2d854bc88485e11c6d94dccb0be28edc._comment
deleted file mode 100644
index 235a7da9..00000000
--- a/blog/2020-04-27-drowning-camera/comment_1_2d854bc88485e11c6d94dccb0be28edc._comment
+++ /dev/null
@@ -1,9 +0,0 @@
-[[!comment format=creole
- ip="5.188.210.39"
- claimedauthor="Abermottom"
- url="http://amunlabs.com/rezz-dating.html"
- subject="birthday gift for someone you just started dating reddit  pfxs36"
- date="2020-05-18T06:46:34Z"
- content="""
-vice magazine online dating  <a href=\" http://amunlabs.com/dating-online-kauai.html \">dating online kauai</a>  subtitle dating alone  <a href=\" http://amunlabs.com/funny-chinese-dating-show.html \">funny chinese dating show</a>  dating with std websites  http://amunlabs.com/yeah-dating-is-cool-but.html  wife dating while separated 
-"""]]

Added a comment: birthday gift for someone you just started dating reddit pfxs36
diff --git a/blog/2020-04-27-drowning-camera/comment_1_2d854bc88485e11c6d94dccb0be28edc._comment b/blog/2020-04-27-drowning-camera/comment_1_2d854bc88485e11c6d94dccb0be28edc._comment
new file mode 100644
index 00000000..235a7da9
--- /dev/null
+++ b/blog/2020-04-27-drowning-camera/comment_1_2d854bc88485e11c6d94dccb0be28edc._comment
@@ -0,0 +1,9 @@
+[[!comment format=creole
+ ip="5.188.210.39"
+ claimedauthor="Abermottom"
+ url="http://amunlabs.com/rezz-dating.html"
+ subject="birthday gift for someone you just started dating reddit  pfxs36"
+ date="2020-05-18T06:46:34Z"
+ content="""
+vice magazine online dating  <a href=\" http://amunlabs.com/dating-online-kauai.html \">dating online kauai</a>  subtitle dating alone  <a href=\" http://amunlabs.com/funny-chinese-dating-show.html \">funny chinese dating show</a>  dating with std websites  http://amunlabs.com/yeah-dating-is-cool-but.html  wife dating while separated 
+"""]]

pinetab update
diff --git a/hardware/tablet.mdwn b/hardware/tablet.mdwn
index 23b6684b..72141ab4 100644
--- a/hardware/tablet.mdwn
+++ b/hardware/tablet.mdwn
@@ -484,6 +484,9 @@ Pine64
 Those guys known for their cheap [[laptop]] are [making a cheap
 tablet](https://www.omgubuntu.co.uk/2019/01/pine-tab-linux-tablet) as well, running Ubuntu.
 
+Update: this is in [pre-order now](https://www.pine64.org/2020/05/15/may-update-pinetab-pre-orders-pinephone-qi-charging-more/), at 100$ a pop (plus 20$ for the
+magnetic keyboard), it looks real promising.
+
 Phones
 ======
 

moar spam
diff --git a/blog/2018-04-12-terminal-emulators-1/comment_5_6f229cb35dd3ed639885f941819eb76e._comment b/blog/2018-04-12-terminal-emulators-1/comment_5_6f229cb35dd3ed639885f941819eb76e._comment
deleted file mode 100644
index 8328afa3..00000000
--- a/blog/2018-04-12-terminal-emulators-1/comment_5_6f229cb35dd3ed639885f941819eb76e._comment
+++ /dev/null
@@ -1,10 +0,0 @@
-[[!comment format=mdwn
- ip="36.250.184.89"
- claimedauthor="browncowbooks"
- url="http://www.browncowbooks.com/"
- subject="browncowbooks"
- date="2020-05-11T20:50:42Z"
- content="""
-<a href=\"http://www.alisonphilps.com/air-jordan-4-oreo-kj%C3%B8pe-shoesg\">air jordan 4 oreo kj酶pe</a> <a href=\"http://www.rbvhpetrehab.com/nike-flyknit-trainer-r%C3%B8d-sort-vampire-sportsj\">nike flyknit trainer r酶d sort vampire</a> <a href=\"http://www.sieuthisonvn.com/nike-air-max-penny-1-lil-penny-685153-400-butyf\">nike air max penny 1 lil penny 685153 400</a> <a href=\"http://www.lnischmidlin.com/us-polo-half-jacket-polop\">us polo half jacket</a> <a href=\"http://www.guerillafilme.com/lebron-13-elite-bl%C3%A5-zapatosg\">lebron 13 elite bl氓</a> <a href=\"http://www.xoenergydrink.com/iphone-6-logo-cut-back-cover-cases\">iphone 6 logo cut back cover</a>
- <a href=\"http://www.browncowbooks.com/\" >browncowbooks</a> [url=http://www.browncowbooks.com/]browncowbooks[/url]
-"""]]
diff --git a/blog/2018-04-12-terminal-emulators-1/comment_6_b8ff6b01cdc20d1c09bc086094eaf488._comment b/blog/2018-04-12-terminal-emulators-1/comment_6_b8ff6b01cdc20d1c09bc086094eaf488._comment
deleted file mode 100644
index b24ecedf..00000000
--- a/blog/2018-04-12-terminal-emulators-1/comment_6_b8ff6b01cdc20d1c09bc086094eaf488._comment
+++ /dev/null
@@ -1,10 +0,0 @@
-[[!comment format=mdwn
- ip="36.250.184.89"
- claimedauthor="buyloudon"
- url="http://www.buyloudon.com/"
- subject="buyloudon"
- date="2020-05-15T01:37:00Z"
- content="""
-<a href=\"http://www.arnaell.com/superga-purple-bootss\">superga purple</a> <a href=\"http://www.kobemonkeys.com/nike-air-urban-jungle-trainersp\">nike air urban jungle</a> <a href=\"http://www.usajunglegym.com/new-england-patriots-10-jimmy-garoppolo-elite-jersey-white-pro-line-gold-collection-nfld\">new england patriots 10 jimmy garoppolo elite jersey white pro line gold collection</a> <a href=\"http://www.morvanladies.com/aliexpress-botas-mujer-botap\">aliexpress botas mujer</a> <a href=\"http://www.egeszsegliget.com/sneakers-nike-flyknit-shoeso\">sneakers nike flyknit</a> <a href=\"http://www.nodigpoland.com/hot-salg-nike-roshe-wool-skin-online-bl%C3%A5-hvit-sportsj\">hot salg nike roshe wool skin online bl氓 hvit</a>
- <a href=\"http://www.buyloudon.com/\" >buyloudon</a> [url=http://www.buyloudon.com/]buyloudon[/url]
-"""]]
diff --git a/blog/2018-04-12-terminal-emulators-1/comment_7_7b0143a9ba7a41b040c7368b126b5c99._comment b/blog/2018-04-12-terminal-emulators-1/comment_7_7b0143a9ba7a41b040c7368b126b5c99._comment
deleted file mode 100644
index cb6f92e5..00000000
--- a/blog/2018-04-12-terminal-emulators-1/comment_7_7b0143a9ba7a41b040c7368b126b5c99._comment
+++ /dev/null
@@ -1,9 +0,0 @@
-[[!comment format=mdwn
- ip="59.58.148.13"
- claimedauthor="hopcoz"
- url="http://www.hopcoz.com/"
- subject="hopcoz"
- date="2020-05-16T21:33:10Z"
- content="""
-<a href=\"http://www.tomecko.com/34-pegasus-cheap_au\">34 pegasus</a> <a href=\"http://www.stcglaw.com/nike-lunar-force-1-price-philippines-kd_es\">nike lunar force 1 price philippines</a> <a href=\"http://www.taylorsifts.com/nike-air-max-90-ultra-womens-all-red-green-uk-running_es\">nike air max 90 ultra womens all red green uk</a> <a href=\"http://www.nlmczech.com/nike-mercurial-vapor-12-360-elite-nfl_no\">nike mercurial vapor 12 360 elite</a> <a href=\"http://www.bordalba.com/hypervenomx-proximo-ii-cheap-all-white-shoes-sports_fr\">hypervenomx proximo ii cheap all white shoes</a> <a href=\"http://www.scriptmask.com/nike-hyperdunk-vs-hyperrev-store_fr\">nike hyperdunk vs hyperrev</a>
-"""]]

Added a comment: hopcoz
diff --git a/blog/2018-04-12-terminal-emulators-1/comment_7_7b0143a9ba7a41b040c7368b126b5c99._comment b/blog/2018-04-12-terminal-emulators-1/comment_7_7b0143a9ba7a41b040c7368b126b5c99._comment
new file mode 100644
index 00000000..cb6f92e5
--- /dev/null
+++ b/blog/2018-04-12-terminal-emulators-1/comment_7_7b0143a9ba7a41b040c7368b126b5c99._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ ip="59.58.148.13"
+ claimedauthor="hopcoz"
+ url="http://www.hopcoz.com/"
+ subject="hopcoz"
+ date="2020-05-16T21:33:10Z"
+ content="""
+<a href=\"http://www.tomecko.com/34-pegasus-cheap_au\">34 pegasus</a> <a href=\"http://www.stcglaw.com/nike-lunar-force-1-price-philippines-kd_es\">nike lunar force 1 price philippines</a> <a href=\"http://www.taylorsifts.com/nike-air-max-90-ultra-womens-all-red-green-uk-running_es\">nike air max 90 ultra womens all red green uk</a> <a href=\"http://www.nlmczech.com/nike-mercurial-vapor-12-360-elite-nfl_no\">nike mercurial vapor 12 360 elite</a> <a href=\"http://www.bordalba.com/hypervenomx-proximo-ii-cheap-all-white-shoes-sports_fr\">hypervenomx proximo ii cheap all white shoes</a> <a href=\"http://www.scriptmask.com/nike-hyperdunk-vs-hyperrev-store_fr\">nike hyperdunk vs hyperrev</a>
+"""]]

Added a comment: buyloudon
diff --git a/blog/2018-04-12-terminal-emulators-1/comment_6_b8ff6b01cdc20d1c09bc086094eaf488._comment b/blog/2018-04-12-terminal-emulators-1/comment_6_b8ff6b01cdc20d1c09bc086094eaf488._comment
new file mode 100644
index 00000000..b24ecedf
--- /dev/null
+++ b/blog/2018-04-12-terminal-emulators-1/comment_6_b8ff6b01cdc20d1c09bc086094eaf488._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ ip="36.250.184.89"
+ claimedauthor="buyloudon"
+ url="http://www.buyloudon.com/"
+ subject="buyloudon"
+ date="2020-05-15T01:37:00Z"
+ content="""
+<a href=\"http://www.arnaell.com/superga-purple-bootss\">superga purple</a> <a href=\"http://www.kobemonkeys.com/nike-air-urban-jungle-trainersp\">nike air urban jungle</a> <a href=\"http://www.usajunglegym.com/new-england-patriots-10-jimmy-garoppolo-elite-jersey-white-pro-line-gold-collection-nfld\">new england patriots 10 jimmy garoppolo elite jersey white pro line gold collection</a> <a href=\"http://www.morvanladies.com/aliexpress-botas-mujer-botap\">aliexpress botas mujer</a> <a href=\"http://www.egeszsegliget.com/sneakers-nike-flyknit-shoeso\">sneakers nike flyknit</a> <a href=\"http://www.nodigpoland.com/hot-salg-nike-roshe-wool-skin-online-bl%C3%A5-hvit-sportsj\">hot salg nike roshe wool skin online bl氓 hvit</a>
+ <a href=\"http://www.buyloudon.com/\" >buyloudon</a> [url=http://www.buyloudon.com/]buyloudon[/url]
+"""]]

notes from the tothewoods.com site
diff --git a/hardware/radio.mdwn b/hardware/radio.mdwn
index 895602b4..0b079bda 100644
--- a/hardware/radio.mdwn
+++ b/hardware/radio.mdwn
@@ -47,6 +47,28 @@ Stuff to buy next
 * <del>J146/440 - dual band VHF/UHF antenna (2m-70cm) [40$ at radioworld](http://radioworld.ca/product_info.php?cPath=73_191_193&products_id=886)</del> /!\ backorder
 * <del>MFJ-260C - 300W dummy load  0-150Mhz dry [50$ at radiowrodl](http://radioworld.ca/product_info.php?products_id=8098)</del> built into the tuner now
 
+There's a [great guide](https://www.tothewoods.net/Comms-Yaesu-817-818-Manpack-Mobile-QRP-Ham-Radio-Kit.php) on how to setup a mobile HF rig that I
+could reuse with my FT-100d. It seems I am missing:
+
+ * a (smaller, automatic) antenna tuner
+ * a [Condor pack insert](https://condoroutdoor.com/va7-pack-insert.html)
+ * a [Bienno LiFePO4 battery](https://www.bioennopower.com/collections/lifepo4-batteries-for-communication-equipment-ham-radio) - smaller, lighter and safer than SLA
+   batteries
+ * some sort of powerpole adapter for the FT-100d, maybe [this thing
+   from Powererx](https://powerwerx.com/radio-power-cable-yaesu-kenwood-icom)?
+
+That guy also made an [emcomm kit guide](https://www.tothewoods.net/Comms-vehicle-emergency-communications-EMCOMM-kit.php) (emergency communications)
+that we might want to learn from. In particular, it ships:
+
+ * a UV-5R USB charger
+ * a [Nagoya UT-72](https://baofengtech.com/NAGOYA-UT-72) magmount antenna with RP-SMA connector
+ * a waterproof box - i would rather use a metal box to provide some
+   sort of shielding, some people use ammo boxes for that reason
+ * the [ARRL repeater handbook](http://www.arrl.org/shop/ARRL-Repeater-Directory-2020-Edition/?xid=63655e533df16c5c92eddbbc91e0628a), which does include Canada listings
+ * a tutorial card
+ * the radio's manual
+ * a bandplan
+
 I did a review of [[FmTransmitter]]s a long time ago that is probably
 now completely useless.
 

removed
diff --git a/blog/2020-02-02-most-significant-programming-languages-history/comment_10_72cbde5f24976a10073723d5f283b06a._comment b/blog/2020-02-02-most-significant-programming-languages-history/comment_10_72cbde5f24976a10073723d5f283b06a._comment
deleted file mode 100644
index 9bd46c3c..00000000
--- a/blog/2020-02-02-most-significant-programming-languages-history/comment_10_72cbde5f24976a10073723d5f283b06a._comment
+++ /dev/null
@@ -1,10 +0,0 @@
-[[!comment format=mdwn
- ip="101.85.5.255"
- claimedauthor="A-ee"
- subject="significant-programming-languages-history"
- date="2020-05-12T04:15:56Z"
- content="""
-SQL seems to be developed by IBM, not Oracle.
-
-\"In 1974, the SQL language was put forward by Boyce Chamberlin who are working at the IBM company, and was first implemented in SystemR.
-"""]]

Added a comment: significant-programming-languages-history
diff --git a/blog/2020-02-02-most-significant-programming-languages-history/comment_10_72cbde5f24976a10073723d5f283b06a._comment b/blog/2020-02-02-most-significant-programming-languages-history/comment_10_72cbde5f24976a10073723d5f283b06a._comment
new file mode 100644
index 00000000..9bd46c3c
--- /dev/null
+++ b/blog/2020-02-02-most-significant-programming-languages-history/comment_10_72cbde5f24976a10073723d5f283b06a._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ ip="101.85.5.255"
+ claimedauthor="A-ee"
+ subject="significant-programming-languages-history"
+ date="2020-05-12T04:15:56Z"
+ content="""
+SQL seems to be developed by IBM, not Oracle.
+
+\"In 1974, the SQL language was put forward by Boyce Chamberlin who are working at the IBM company, and was first implemented in SystemR.
+"""]]

Added a comment: browncowbooks
diff --git a/blog/2018-04-12-terminal-emulators-1/comment_5_6f229cb35dd3ed639885f941819eb76e._comment b/blog/2018-04-12-terminal-emulators-1/comment_5_6f229cb35dd3ed639885f941819eb76e._comment
new file mode 100644
index 00000000..8328afa3
--- /dev/null
+++ b/blog/2018-04-12-terminal-emulators-1/comment_5_6f229cb35dd3ed639885f941819eb76e._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ ip="36.250.184.89"
+ claimedauthor="browncowbooks"
+ url="http://www.browncowbooks.com/"
+ subject="browncowbooks"
+ date="2020-05-11T20:50:42Z"
+ content="""
+<a href=\"http://www.alisonphilps.com/air-jordan-4-oreo-kj%C3%B8pe-shoesg\">air jordan 4 oreo kj酶pe</a> <a href=\"http://www.rbvhpetrehab.com/nike-flyknit-trainer-r%C3%B8d-sort-vampire-sportsj\">nike flyknit trainer r酶d sort vampire</a> <a href=\"http://www.sieuthisonvn.com/nike-air-max-penny-1-lil-penny-685153-400-butyf\">nike air max penny 1 lil penny 685153 400</a> <a href=\"http://www.lnischmidlin.com/us-polo-half-jacket-polop\">us polo half jacket</a> <a href=\"http://www.guerillafilme.com/lebron-13-elite-bl%C3%A5-zapatosg\">lebron 13 elite bl氓</a> <a href=\"http://www.xoenergydrink.com/iphone-6-logo-cut-back-cover-cases\">iphone 6 logo cut back cover</a>
+ <a href=\"http://www.browncowbooks.com/\" >browncowbooks</a> [url=http://www.browncowbooks.com/]browncowbooks[/url]
+"""]]

removed
diff --git a/blog/2018-04-12-terminal-emulators-1/comment_5_03bb735a93b0791934cc027f6078906a._comment b/blog/2018-04-12-terminal-emulators-1/comment_5_03bb735a93b0791934cc027f6078906a._comment
deleted file mode 100644
index 5276e7fd..00000000
--- a/blog/2018-04-12-terminal-emulators-1/comment_5_03bb735a93b0791934cc027f6078906a._comment
+++ /dev/null
@@ -1,9 +0,0 @@
-[[!comment format=mdwn
- ip="27.150.195.113"
- claimedauthor="nlmkorea"
- url="http://www.nlmkorea.com/"
- subject="nlmkorea"
- date="2020-05-11T17:08:11Z"
- content="""
-<a href=\"http://www.sehrinet.com/compton-fitted-hat-new-era-deck-hat_at\">compton fitted hat new era deck</a> <a href=\"http://www.limoind.com/air-jordan-6-white-blue-for-cheap-kd_si\">air jordan 6 white blue for cheap</a> <a href=\"http://www.farsmizban.com/nike-cortez-green-uk-running_pt\">nike cortez green uk</a> <a href=\"http://www.muroumido.com/nike-kobe-9-elite-price-in-india-limited-sneakers_sk\">nike kobe 9 elite price in india limited</a> <a href=\"http://www.nsihorwitz.com/nike-air-max-thea-white-mono-sports_si\">nike air max thea white mono</a> <a href=\"http://www.kamillesk.com/pink-and-white-fake-yeezy-for-sale-shoes-uk-store_nz\">pink and white fake yeezy for sale shoes uk</a>
-"""]]

Added a comment: nlmkorea
diff --git a/blog/2018-04-12-terminal-emulators-1/comment_5_03bb735a93b0791934cc027f6078906a._comment b/blog/2018-04-12-terminal-emulators-1/comment_5_03bb735a93b0791934cc027f6078906a._comment
new file mode 100644
index 00000000..5276e7fd
--- /dev/null
+++ b/blog/2018-04-12-terminal-emulators-1/comment_5_03bb735a93b0791934cc027f6078906a._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ ip="27.150.195.113"
+ claimedauthor="nlmkorea"
+ url="http://www.nlmkorea.com/"
+ subject="nlmkorea"
+ date="2020-05-11T17:08:11Z"
+ content="""
+<a href=\"http://www.sehrinet.com/compton-fitted-hat-new-era-deck-hat_at\">compton fitted hat new era deck</a> <a href=\"http://www.limoind.com/air-jordan-6-white-blue-for-cheap-kd_si\">air jordan 6 white blue for cheap</a> <a href=\"http://www.farsmizban.com/nike-cortez-green-uk-running_pt\">nike cortez green uk</a> <a href=\"http://www.muroumido.com/nike-kobe-9-elite-price-in-india-limited-sneakers_sk\">nike kobe 9 elite price in india limited</a> <a href=\"http://www.nsihorwitz.com/nike-air-max-thea-white-mono-sports_si\">nike air max thea white mono</a> <a href=\"http://www.kamillesk.com/pink-and-white-fake-yeezy-for-sale-shoes-uk-store_nz\">pink and white fake yeezy for sale shoes uk</a>
+"""]]

Added a comment: thanks
diff --git a/blog/2020-04-09-mumble-dreams/comment_4_40daac51ae5a82011e5b36ec23230cd1._comment b/blog/2020-04-09-mumble-dreams/comment_4_40daac51ae5a82011e5b36ec23230cd1._comment
new file mode 100644
index 00000000..085b789a
--- /dev/null
+++ b/blog/2020-04-09-mumble-dreams/comment_4_40daac51ae5a82011e5b36ec23230cd1._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ ip="185.200.118.102"
+ claimedauthor="bob"
+ subject="thanks"
+ date="2020-05-08T11:24:36Z"
+ content="""
+i've recently set up a mumble server after using many other tools including teamspeak, discord, riot and jitsi. i feel like i have the most control here and it is lightweight and 'just works'. 
+
+it feels odd that given mumble has so many things going for it, the folks working on it give a sense of just having had enough. it took me a while to get mumble bot set up as all the guides were at least 10 years out of date and the only one that ended up working was in German.
+
+so i'm totally with you 
+"""]]

removed
diff --git a/blog/2018-04-12-terminal-emulators-1/comment_5_bb20f7c7a0d69ad97e7a9f9aec5818fb._comment b/blog/2018-04-12-terminal-emulators-1/comment_5_bb20f7c7a0d69ad97e7a9f9aec5818fb._comment
deleted file mode 100644
index 67192277..00000000
--- a/blog/2018-04-12-terminal-emulators-1/comment_5_bb20f7c7a0d69ad97e7a9f9aec5818fb._comment
+++ /dev/null
@@ -1,9 +0,0 @@
-[[!comment format=mdwn
- ip="218.6.104.40"
- claimedauthor="brandiali"
- url="http://www.brandiali.com/"
- subject="brandiali"
- date="2020-05-06T18:57:36Z"
- content="""
-<a href=\"http://www.sehrinet.com/nike-lebron-11-cheap-all-grey-shoes-cheap_nl\">nike lebron 11 cheap all grey shoes</a> <a href=\"http://www.limoind.com/nike-kobe-10-usa-price-korea-kd_nl\">nike kobe 10 usa price korea</a> <a href=\"http://www.farsmizban.com/flapper-style-knit-hats-recipes-hat_cz\">flapper style knit hats recipes</a> <a href=\"http://www.muroumido.com/nike-hyperdunk-2016-us-700-sneakers_si\">nike hyperdunk 2016 us 700</a> <a href=\"http://www.nsihorwitz.com/dodgers-36-jersey-nfl_sk\">dodgers 36 jersey</a> <a href=\"http://www.kamillesk.com/adidas-f50-adizero-black-and-green-store_si\">adidas f50 adizero black and green</a>
-"""]]

Added a comment: brandiali
diff --git a/blog/2018-04-12-terminal-emulators-1/comment_5_bb20f7c7a0d69ad97e7a9f9aec5818fb._comment b/blog/2018-04-12-terminal-emulators-1/comment_5_bb20f7c7a0d69ad97e7a9f9aec5818fb._comment
new file mode 100644
index 00000000..67192277
--- /dev/null
+++ b/blog/2018-04-12-terminal-emulators-1/comment_5_bb20f7c7a0d69ad97e7a9f9aec5818fb._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ ip="218.6.104.40"
+ claimedauthor="brandiali"
+ url="http://www.brandiali.com/"
+ subject="brandiali"
+ date="2020-05-06T18:57:36Z"
+ content="""
+<a href=\"http://www.sehrinet.com/nike-lebron-11-cheap-all-grey-shoes-cheap_nl\">nike lebron 11 cheap all grey shoes</a> <a href=\"http://www.limoind.com/nike-kobe-10-usa-price-korea-kd_nl\">nike kobe 10 usa price korea</a> <a href=\"http://www.farsmizban.com/flapper-style-knit-hats-recipes-hat_cz\">flapper style knit hats recipes</a> <a href=\"http://www.muroumido.com/nike-hyperdunk-2016-us-700-sneakers_si\">nike hyperdunk 2016 us 700</a> <a href=\"http://www.nsihorwitz.com/dodgers-36-jersey-nfl_sk\">dodgers 36 jersey</a> <a href=\"http://www.kamillesk.com/adidas-f50-adizero-black-and-green-store_si\">adidas f50 adizero black and green</a>
+"""]]

one more radio shop
diff --git a/hardware/radio.mdwn b/hardware/radio.mdwn
index ff6a3013..895602b4 100644
--- a/hardware/radio.mdwn
+++ b/hardware/radio.mdwn
@@ -56,6 +56,7 @@ Stores
  * [Radioworld](https://radioworld.ca/)
  * [Universal Radio](https://www.universal-radio.com/)
  * [GPS Central](https://www.gpscentral.ca/amateur-radio.html)
+ * [dx engineering](https://www.dxengineering.com/)
  * [eBay](http://shop.ebay.com/Fixed-/163857/i.html)
  * [local](http://www.raqi.ca/~ve2bzl/)
 

one more local radio shop
diff --git a/hardware/radio.mdwn b/hardware/radio.mdwn
index 1cf6c0cc..ff6a3013 100644
--- a/hardware/radio.mdwn
+++ b/hardware/radio.mdwn
@@ -55,6 +55,7 @@ Stores
 
  * [Radioworld](https://radioworld.ca/)
  * [Universal Radio](https://www.universal-radio.com/)
+ * [GPS Central](https://www.gpscentral.ca/amateur-radio.html)
  * [eBay](http://shop.ebay.com/Fixed-/163857/i.html)
  * [local](http://www.raqi.ca/~ve2bzl/)
 

more ham stuff
diff --git a/hardware/radio.mdwn b/hardware/radio.mdwn
index 3f329944..1cf6c0cc 100644
--- a/hardware/radio.mdwn
+++ b/hardware/radio.mdwn
@@ -12,7 +12,7 @@ Hardware
 
 * Hand helds:
   * Baofeng UV-3R MKII radio (<50$)
-  * Baofeng UV-5R
+  * [Baofeng UV-5R](https://baofengtech.com/uv-5r)
   * Wouxun KG-UVD1P
 * Transceiver: Yaesu FT-100D, bought around 600$ on ebay in 2010
 * Antenna/tuner kit:
@@ -43,10 +43,6 @@ Stuff to buy next
 * <del>Cabling</del> - got plenty of spare cable now that my main
   setup was destroyed
   * 100' of RG8 cabling
-* Another HF radio?
-  * [ebay](http://shop.ebay.com/Fixed-/163857/i.html)
-  * [radioworld](http://radioworld.ca/index.php?cPath=184_72)
-  * [local](http://www.raqi.ca/~ve2bzl/hf.htm)
 * [Call those guys?](http://www.paratonnerres.qc.ca/produits.html)
 * <del>J146/440 - dual band VHF/UHF antenna (2m-70cm) [40$ at radioworld](http://radioworld.ca/product_info.php?cPath=73_191_193&products_id=886)</del> /!\ backorder
 * <del>MFJ-260C - 300W dummy load  0-150Mhz dry [50$ at radiowrodl](http://radioworld.ca/product_info.php?products_id=8098)</del> built into the tuner now
@@ -54,6 +50,14 @@ Stuff to buy next
 I did a review of [[FmTransmitter]]s a long time ago that is probably
 now completely useless.
 
+Stores
+------
+
+ * [Radioworld](https://radioworld.ca/)
+ * [Universal Radio](https://www.universal-radio.com/)
+ * [eBay](http://shop.ebay.com/Fixed-/163857/i.html)
+ * [local](http://www.raqi.ca/~ve2bzl/)
+
 Quad antenna project
 ====================
 
@@ -167,6 +171,8 @@ This needs to be merged into [[Software]]
   * http://packages.debian.org/fldigi - also looks interesting and fairly complete, not tested
   * http://packages.debian.org/gpsk31, DebianPackage:linpsk, DebianPackage:phaseshift - same?
   * http://packages.debian.org/fbb - mailboxes?
+* programming:
+  * [Chirp](https://chirp.danplanet.com/) ([Debian](https://tracker.debian.org/pkg/chirp)) - programming radios
 * to be tested:
   * http://packages.debian.org/grig - can control your radio from your computer
   * http://packages.debian.org/splat 

clarify other radio stuff
diff --git a/hardware/radio.mdwn b/hardware/radio.mdwn
index 0b920f43..3f329944 100644
--- a/hardware/radio.mdwn
+++ b/hardware/radio.mdwn
@@ -1,6 +1,10 @@
 I am a ham radio operator since October 2010, when I passed my "Basic
 Qualification" in Canada, which gave me the callsign `VA2ANK`.
 
+I also volunteered at [CKUT](https://ckut.ca/) for a while, but I didn't have time to
+commit long term. It was still a pretty awesome experience. See
+[[communication]] for more details on that side.
+
 [[!toc levels=3]]
 
 Hardware
@@ -47,6 +51,9 @@ Stuff to buy next
 * <del>J146/440 - dual band VHF/UHF antenna (2m-70cm) [40$ at radioworld](http://radioworld.ca/product_info.php?cPath=73_191_193&products_id=886)</del> /!\ backorder
 * <del>MFJ-260C - 300W dummy load  0-150Mhz dry [50$ at radiowrodl](http://radioworld.ca/product_info.php?products_id=8098)</del> built into the tuner now
 
+I did a review of [[FmTransmitter]]s a long time ago that is probably
+now completely useless.
+
 Quad antenna project
 ====================
 

cleanup hardware section
diff --git a/hardware/radio.mdwn b/hardware/radio.mdwn
index 019a923f..0b920f43 100644
--- a/hardware/radio.mdwn
+++ b/hardware/radio.mdwn
@@ -3,9 +3,13 @@ Qualification" in Canada, which gave me the callsign `VA2ANK`.
 
 [[!toc levels=3]]
 
-My rig
-======
+Hardware
+========
 
+* Hand helds:
+  * Baofeng UV-3R MKII radio (<50$)
+  * Baofeng UV-5R
+  * Wouxun KG-UVD1P
 * Transceiver: Yaesu FT-100D, bought around 600$ on ebay in 2010
 * Antenna/tuner kit:
  * MFJ-941E - antenna tuner and switch [155$ at radioworld](http://radioworld.ca/product_info.php?products_id=2885)
@@ -13,6 +17,7 @@ My rig
  * 100' of RG8 coax cabling [65$ at radioworld](http://radioworld.ca/product_info.php?cPath=73_394&products_id=6831)
  * 3 PL259 connectors [4$ at radioworld](http://radioworld.ca/product_info.php?cPath=73_394&products_id=3244)
  * Total, incl. shipping: 452.35$
+* VHF/UHF meter: [workman 50$](http://www.ebay.com/itm/SWR-Power-500-Watt-METER-120-500-MHz-UHF-VHF-Ham-Radio-w-RG8X-Jumper-/380424888249)  ([17 reviews: 3.5/5](http://www.eham.net/reviews/detail/3905))
 * Ferrites: ~40$ + 24$ customs fees (PN: 2643167851 from [IBS electronics](http://www.ibselectronics.com/search_r.asp?mfgpn=2643167851))
 * some PL259 connectors, usually around 2$ each
 * Books:
@@ -25,6 +30,23 @@ Total rig cost so far: 1242.60$ (not counting the quad project below)
 
 I uploaded a few photos [in this album](https://photos.anarc.at/documentation/radio/#/0).
 
+Stuff to buy next
+-----------------
+
+* <del>VHF/UHF SWR meter</del> Got a workman, above
+  * [Daiwa CN-801V](http://www.universal-radio.com/catalog/meters/2140.html) 150$ 140-525 MHz.	20/200 Watts ([5 reviews: 4.2/5](http://www.eham.net/reviews/detail/7378))
+  * [the bird 43](http://www.universal-radio.com/catalog/meters/1739.html) 85$ (but only one way at a time) 200-500 MHz.	    50 Watts ([39 reviews: 4.5/5](http://www.eham.net/reviews/detail/7378))
+* <del>Cabling</del> - got plenty of spare cable now that my main
+  setup was destroyed
+  * 100' of RG8 cabling
+* Another HF radio?
+  * [ebay](http://shop.ebay.com/Fixed-/163857/i.html)
+  * [radioworld](http://radioworld.ca/index.php?cPath=184_72)
+  * [local](http://www.raqi.ca/~ve2bzl/hf.htm)
+* [Call those guys?](http://www.paratonnerres.qc.ca/produits.html)
+* <del>J146/440 - dual band VHF/UHF antenna (2m-70cm) [40$ at radioworld](http://radioworld.ca/product_info.php?cPath=73_191_193&products_id=886)</del> /!\ backorder
+* <del>MFJ-260C - 300W dummy load  0-150Mhz dry [50$ at radiowrodl](http://radioworld.ca/product_info.php?products_id=8098)</del> built into the tuner now
+
 Quad antenna project
 ====================
 
@@ -150,22 +172,3 @@ This needs to be merged into [[Software]]
   * http://packages.debian.org/predict and http://packages.debian.org/predict-gsat - console only, doesn't bring much the gorgeous visuals of DebianPackage:gpredict
 
 ... others to follow, there's a whole [hamradio section](http://packages.debian.org/sid/hamradio/) in debian.
-
-Stuff to buy next
-=================
-
-* VHF/UHF SWR meter
-  * [Daiwa CN-801V](http://www.universal-radio.com/catalog/meters/2140.html) 150$ 140-525 MHz.	20/200 Watts ([5 reviews: 4.2/5](http://www.eham.net/reviews/detail/7378))
-  * [workman 50$](http://www.ebay.com/itm/SWR-Power-500-Watt-METER-120-500-MHz-UHF-VHF-Ham-Radio-w-RG8X-Jumper-/380424888249)  ([17 reviews: 3.5/5](http://www.eham.net/reviews/detail/3905))
-  * [the bird 43](http://www.universal-radio.com/catalog/meters/1739.html) 85$ (but only one way at a time) 200-500 MHz.	    50 Watts ([39 reviews: 4.5/5](http://www.eham.net/reviews/detail/7378))
-* Handhelds:
-  * Baofeng UV-3R MKII radio (<50$) avec cable de prog ou UV-5R
-* Cabling:
-  * 100' of RG8 cabling
-* Another HF radio?
-  * [ebay](http://shop.ebay.com/Fixed-/163857/i.html)
-  * [radioworld](http://radioworld.ca/index.php?cPath=184_72)
-  * [local](http://www.raqi.ca/~ve2bzl/hf.htm)
-* [Call those guys?](http://www.paratonnerres.qc.ca/produits.html)
-* <del>J146/440 - dual band VHF/UHF antenna (2m-70cm) [40$ at radioworld](http://radioworld.ca/product_info.php?cPath=73_191_193&products_id=886)</del> /!\ backorder
-* <del>MFJ-260C - 300W dummy load  0-150Mhz dry [50$ at radiowrodl](http://radioworld.ca/product_info.php?products_id=8098)</del> built into the tuner now

fix toc
diff --git a/hardware/radio.mdwn b/hardware/radio.mdwn
index f9cfddda..019a923f 100644
--- a/hardware/radio.mdwn
+++ b/hardware/radio.mdwn
@@ -1,6 +1,8 @@
 I am a ham radio operator since October 2010, when I passed my "Basic
 Qualification" in Canada, which gave me the callsign `VA2ANK`.
 
+[[!toc levels=3]]
+
 My rig
 ======
 
@@ -28,14 +30,14 @@ Quad antenna project
 
 I am working on building a new antenna. It is based on [this design](http://www.hamuniverse.com/n1uue2el1011quad.html), which uses a mix of PVC pipes and fiberglass rods, except I adapt it to a 20m antenna and replace the PVC with aluminium for solidity. It should be possible to take the antenna apart and rebuild it if necessary.
 
-Parts list
-----------
-
 <figure> 
 <img src="Quad-sketch0001.jpg" alt="Hand-drawn sketch of a Quad antenna" />
 <figcaption>Sketch of my antenna</figcaption>
 </figure>
 
+Parts list
+----------
+
 ### Mast
 
 | Part                | Amount | Where          | Weight   | Price  | Notes                                                                                                                                                        |

use <figure> for image, sigh
Previous version looked like crap
diff --git a/hardware/radio.mdwn b/hardware/radio.mdwn
index 04139eac..f9cfddda 100644
--- a/hardware/radio.mdwn
+++ b/hardware/radio.mdwn
@@ -31,7 +31,10 @@ I am working on building a new antenna. It is based on [this design](http://www.
 Parts list
 ----------
 
-[[!img Quad-sketch0001.jpg]]
+<figure> 
+<img src="Quad-sketch0001.jpg" alt="Hand-drawn sketch of a Quad antenna" />
+<figcaption>Sketch of my antenna</figcaption>
+</figure>
 
 ### Mast
 

fix link to image
diff --git a/hardware/radio.mdwn b/hardware/radio.mdwn
index dda50f5f..04139eac 100644
--- a/hardware/radio.mdwn
+++ b/hardware/radio.mdwn
@@ -31,7 +31,7 @@ I am working on building a new antenna. It is based on [this design](http://www.
 Parts list
 ----------
 
-[sketch of my antenna]([File:Quad-sketch0001.jpg|400px|thumb|right|A)] 
+[[!img Quad-sketch0001.jpg]]
 
 ### Mast
 
diff --git a/hardware/radio/Quad-sketch0001.jpg b/hardware/radio/Quad-sketch0001.jpg
new file mode 100644
index 00000000..a57c6330
Binary files /dev/null and b/hardware/radio/Quad-sketch0001.jpg differ

fix tables again
diff --git a/hardware/radio.mdwn b/hardware/radio.mdwn
index 92a03c90..dda50f5f 100644
--- a/hardware/radio.mdwn
+++ b/hardware/radio.mdwn
@@ -36,6 +36,7 @@ Parts list
 ### Mast
 
 | Part                | Amount | Where          | Weight   | Price  | Notes                                                                                                                                                        |
+| ------------------- | ------ | -------------- | -------- | ------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------ |
 | tripod              | 1      | addison        | ?        | 45.56$ | ~2' x 2'                                                                                                                                                     |
 | 3m steel pole       | 1      | downstairs     | ?        | 0$     | to connect the boom and tripod, 1-1¼"                                                                                                                        |
 | sandbags            | 3      | home depot     | 30kg ea. | 10.76$ | one per leg                                                                                                                                                  |
@@ -46,18 +47,19 @@ Parts list
 
 ### Antenna and accessories
 
-| Part               | Amount  | Where                             | Weight  | Price                        | Notes                                                                                                         |
-| 1" hose clamps     | 8       | home depot                        | ?       | ?                            | to tie the antenna line to the spreaders                                                                      |
-| tie wraps, small   | 100     | hardware store                    | ?       | 3.09$                        | to tie the antenna line to the spreaders                                                                      |
-| 2"½ hose clamps    | 19      | hardware store                    | ?       | 26.41$                       | to tie-up the boom together (2), the spreaders to the spider (8) and the spreaders themselves (8), +spare (1) |
-| 8"x½" plastic tube | 1       | home depot                        | ~0      | 0$                           | for spreader/wire attachment - found some                                                                     |
-| 15' 1¼" fiberglass | 8       | [mgs4u.com](http://www.mgs4u.com/fiberglass-cubical-quad-spreaders.htm) (type 1)           | 17.6lbs | ~160$ - actual: 255$CAD (!!) | 4.4lbs ea, unit price 19.80$                                                                                  |
-| Clamps             | 10-pack | [dxengineering](http://www.dxengineering.com/Parts.asp?ID=1868&PLID=161&SecID=129&DeptID=36&PartNo=DXE-CPC-375)                | ~0      | 14.95$                       | to secure the feedline                                                                                        |
-| 4m aluminium boom  | 2       | [DX engineering](http://www.dxengineering.com/Parts.asp?ID=5107&PLID=364&SecID=136&DeptID=43&PartNo=DXE-AT1492)               | 2.5lbs  | 24.90$                       |                                                                                                               |
-| 500' of wiring     | 1       | [DX engineering](http://www.dxengineering.com/Parts.asp?ID=2012&PLID=159&SecID=77&DeptID=40&PartNo=DXE-ANTW-500)               | N/A     | 74.95$                       | only parts of this will be used (120' to be more precise)                                                     |
-| U clamps and bolts | 4       | <s>home depot</s> [Rick Adams](http://www.rickadams.net/) | ~0      | 0$                           | included in the beam/pole fitting                                                                             |
-| boom/pole plate    | 1       | [Rick Adams](http://www.rickadams.net/)                   | ?       | 45$ + 30$ shipping           | need to drill holes, includes reinforcement pole                                                              |
-| spider             | 2       | [Rick Adams](http://www.rickadams.net/)                   | 2.3lbs  | 70$USD                       | 14oz ea. 40$/ea, seems strong and sturdy, and Rick helped me through email, let's try!                        |
+| Part               | Amount  | Where                              | Weight   | Price                        | Notes                                                                                                                                                        |
+| ------------------ | ------  | ---------------------------------- | -------- | ---------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------ |
+| 1" hose clamps     | 8       | home depot                         | ?        | ?                            | to tie the antenna line to the spreaders                                                                                                                     |
+| tie wraps, small   | 100     | hardware store                     | ?        | 3.09$                        | to tie the antenna line to the spreaders                                                                                                                     |
+| 2"½ hose clamps    | 19      | hardware store                     | ?        | 26.41$                       | to tie-up the boom together (2), the spreaders to the spider (8) and the spreaders themselves (8), +spare (1)                                                |
+| 8"x½" plastic tube | 1       | home depot                         | ~0       | 0$                           | for spreader/wire attachment - found some                                                                                                                    |
+| 15' 1¼" fiberglass | 8       | [mgs4u.com](http://www.mgs4u.com/fiberglass-cubical-quad-spreaders.htm) (type 1)            | 17.6lbs  | ~160$ - actual: 255$CAD (!!) | 4.4lbs ea, unit price 19.80$                                                                                                                                 |
+| Clamps             | 10-pack | [dxengineering](http://www.dxengineering.com/Parts.asp?ID=1868&PLID=161&SecID=129&DeptID=36&PartNo=DXE-CPC-375)                 | ~0       | 14.95$                       | to secure the feedline                                                                                                                                       |
+| 4m aluminium boom  | 2       | [DX engineering](http://www.dxengineering.com/Parts.asp?ID=5107&PLID=364&SecID=136&DeptID=43&PartNo=DXE-AT1492)                | 2.5lbs   | 24.90$                       |                                                                                                                                                              |
+| 500' of wiring     | 1       | [DX engineering](http://www.dxengineering.com/Parts.asp?ID=2012&PLID=159&SecID=77&DeptID=40&PartNo=DXE-ANTW-500)                | N/A      | 74.95$                       | only parts of this will be used (120' to be more precise)                                                                                                    |
+| U clamps and bolts | 4       | <s>home depot</s> [Rick Adams](http://www.rickadams.net/)  | ~0       | 0$                           | included in the beam/pole fitting                                                                                                                            |
+| boom/pole plate    | 1       | [Rick Adams](http://www.rickadams.net/)                    | ?        | 45$ + 30$ shipping           | need to drill holes, includes reinforcement pole                                                                                                             |
+| spider             | 2       | [Rick Adams](http://www.rickadams.net/)                    | 2.3lbs   | 70$USD                       | 14oz ea. 40$/ea, seems strong and sturdy, and Rick helped me through email, let's try!                                                                       |
 
 Total planned price: ~373.77$
 

fix tables
diff --git a/hardware/radio.mdwn b/hardware/radio.mdwn
index 368cd649..92a03c90 100644
--- a/hardware/radio.mdwn
+++ b/hardware/radio.mdwn
@@ -33,62 +33,31 @@ Parts list
 
 [sketch of my antenna]([File:Quad-sketch0001.jpg|400px|thumb|right|A)] 
 
-{| class="wikitable"
-|+
-!colspan="6"|Mast
-|+
-! Part               || Amount || Where || Weight || Price || Notes
-|-
-| tripod             || 1    || addison    || ? || 45.56$ || ~2' x 2'
-|-
-| 3m steel pole      || 1    || downstairs || ? || 0$ || to connect the boom and tripod, 1-1¼"
-|-
-| sandbags           || 3    || home depot || 30kg ea. || 10.76$ || one per leg
-|-
-| plywood            || 3'x4' || attic || ? || 0$ || <s>1' x 2' used for the beam/pole fitting</s> - found some
-|-
-| Mast clamps (1"3/4)|| 4 || hardware store || ? || 4.92$ || to connect the boom with the mast, bigger mast, 1.23¢ ea
-|-
-| Mast clamps (1"3/8)|| 2 || hardware store || ? || 1.60$ || to connect the boom with the mast, 80¢ ea
-|-
-| guy rope           || 2x100' || hardware store || ? || 63.98$ || to secure the mast, using poplypropylene/nylon rope, each line should support around 300lbs of pressure, enough for the 500lbs of pressure with a 90mph wind
-|+
-!colspan="6"|Antenna and accessories
-|+
-! Part               || Amount || Where || Weight || Price || Notes
-|-
-| 1" hose clamps        || 8    || home depot || ? || ? || to tie the antenna line to the spreaders
-|-
-| tie wraps, small   || 100 || hardware store || ? || 3.09$ || to tie the antenna line to the spreaders
-|-
-| 2"½ hose clamps    || 19 || hardware store || ? || 26.41$ || to tie-up the boom together (2), the spreaders to the spider (8) and the spreaders themselves (8), +spare (1)
-|-
-| 8"x½" plastic tube || 1    || home depot || ~0 ||  0$|| for spreader/wire attachment - found some
-|-
-| 15' 1¼" fiberglass || 8    || [mgs4u.com](http://www.mgs4u.com/fiberglass-cubical-quad-spreaders.htm) (type 1) || 17.6lbs || ~160$ - actual: 255$CAD (!!)  || 4.4lbs ea, unit price 19.80$
-|-
-| Clamps     || 10-pack || [dxengineering](http://www.dxengineering.com/Parts.asp?ID=1868&PLID=161&SecID=129&DeptID=36&PartNo=DXE-CPC-375) || ~0 || 14.95$ || to secure the feedline
-|-
-| 4m aluminium boom  || 2     ||  [DX engineering](http://www.dxengineering.com/Parts.asp?ID=5107&PLID=364&SecID=136&DeptID=43&PartNo=DXE-AT1492) || 2.5lbs || 24.90$ ||
-|-
-| 500' of wiring     || 1     || [DX engineering](http://www.dxengineering.com/Parts.asp?ID=2012&PLID=159&SecID=77&DeptID=40&PartNo=DXE-ANTW-500) || N/A    || 74.95$ || only parts of this will be used (120' to be more precise)
-|-
-| U clamps and bolts || 4    || <s>home depot</s> [Rick Adams](http://www.rickadams.net/) || ~0 || 0$ || included in the beam/pole fitting
-|-
-| boom/pole plate    || 1    || [Rick Adams](http://www.rickadams.net/)  || ? || 45$ + 30$ shipping || need to drill holes, includes reinforcement pole
-|-
-| spider             || 2     || [Rick Adams](http://www.rickadams.net/) || 2.3lbs || 70$USD || 14oz ea. 40$/ea, seems strong and sturdy, and Rick helped me through email, let's try!
-|+
-!colspan="6"|Antenna (parts in shipping)
-|-
-|colspan="6"|Nothing!
-|+
-!colspan="6"|Antenna (parts to order)
-|+
-! Part               || Amount || Where || Weight || Price || Notes
-|-
-| more sandbags?     || 3  || hardware store || ? || ? || to attach the tower?
-|}
+### Mast
+
+| Part                | Amount | Where          | Weight   | Price  | Notes                                                                                                                                                        |
+| tripod              | 1      | addison        | ?        | 45.56$ | ~2' x 2'                                                                                                                                                     |
+| 3m steel pole       | 1      | downstairs     | ?        | 0$     | to connect the boom and tripod, 1-1¼"                                                                                                                        |
+| sandbags            | 3      | home depot     | 30kg ea. | 10.76$ | one per leg                                                                                                                                                  |
+| plywood             | 3'x4'  | attic          | ?        | 0$     | <s>1' x 2' used for the beam/pole fitting</s> - found some                                                                                                   |
+| Mast clamps (1"3/4) | 4      | hardware store | ?        | 4.92$  | to connect the boom with the mast, bigger mast, 1.23¢ ea                                                                                                     |
+| Mast clamps (1"3/8) | 2      | hardware store | ?        | 1.60$  | to connect the boom with the mast, 80¢ ea                                                                                                                    |
+| guy rope            | 2x100' | hardware store | ?        | 63.98$ | to secure the mast, using poplypropylene/nylon rope, each line should support around 300lbs of pressure, enough for the 500lbs of pressure with a 90mph wind |
+
+### Antenna and accessories
+
+| Part               | Amount  | Where                             | Weight  | Price                        | Notes                                                                                                         |
+| 1" hose clamps     | 8       | home depot                        | ?       | ?                            | to tie the antenna line to the spreaders                                                                      |
+| tie wraps, small   | 100     | hardware store                    | ?       | 3.09$                        | to tie the antenna line to the spreaders                                                                      |
+| 2"½ hose clamps    | 19      | hardware store                    | ?       | 26.41$                       | to tie-up the boom together (2), the spreaders to the spider (8) and the spreaders themselves (8), +spare (1) |
+| 8"x½" plastic tube | 1       | home depot                        | ~0      | 0$                           | for spreader/wire attachment - found some                                                                     |
+| 15' 1¼" fiberglass | 8       | [mgs4u.com](http://www.mgs4u.com/fiberglass-cubical-quad-spreaders.htm) (type 1)           | 17.6lbs | ~160$ - actual: 255$CAD (!!) | 4.4lbs ea, unit price 19.80$                                                                                  |
+| Clamps             | 10-pack | [dxengineering](http://www.dxengineering.com/Parts.asp?ID=1868&PLID=161&SecID=129&DeptID=36&PartNo=DXE-CPC-375)                | ~0      | 14.95$                       | to secure the feedline                                                                                        |
+| 4m aluminium boom  | 2       | [DX engineering](http://www.dxengineering.com/Parts.asp?ID=5107&PLID=364&SecID=136&DeptID=43&PartNo=DXE-AT1492)               | 2.5lbs  | 24.90$                       |                                                                                                               |
+| 500' of wiring     | 1       | [DX engineering](http://www.dxengineering.com/Parts.asp?ID=2012&PLID=159&SecID=77&DeptID=40&PartNo=DXE-ANTW-500)               | N/A     | 74.95$                       | only parts of this will be used (120' to be more precise)                                                     |
+| U clamps and bolts | 4       | <s>home depot</s> [Rick Adams](http://www.rickadams.net/) | ~0      | 0$                           | included in the beam/pole fitting                                                                             |
+| boom/pole plate    | 1       | [Rick Adams](http://www.rickadams.net/)                   | ?       | 45$ + 30$ shipping           | need to drill holes, includes reinforcement pole                                                              |
+| spider             | 2       | [Rick Adams](http://www.rickadams.net/)                   | 2.3lbs  | 70$USD                       | 14oz ea. 40$/ea, seems strong and sturdy, and Rick helped me through email, let's try!                        |
 
 Total planned price: ~373.77$
 
@@ -107,22 +76,14 @@ Discarded approaches
 
 Those parts were considered during the design phase but were discarded for various reasons.
 
-{| class="wikitable"
-|+
-! Part               || Amount || Where || Price || Notes
-|-
-| welding wire aluminium || 270' spool || [canadian tire](http://www.canadiantire.ca/AST/browse/6/Tools/WeldingSoldering/AccessoriesRodsWire.jsp)? || ? || example: [Aluminium 5356 MIG alloy](http://www.harrisproductsgroup.com/en/Products/Alloys/Welding/Aluminum-Alloy/Alloy-5356-MIG.aspx) - too hard to find
-|-
-| <s>4m 1"PVC</s>           || 1    || home depot || ? || according to Rick, this could create interference
-|-
-| <s>5-way 1"PVC conn.</s>  || 2    || [creativeshelters.com](http://www.creativeshelters.com/Fittings/PVC-Structure-Fitting.aspx) || 3.08$ || couldn't order, they don't accept canadian zip codes, and shipping is 30$ anyways, and I don't trust PVC
-|-
-| <s>1"x½" copper pipe</s>  || 8    || home depot || ~5$ || we'll use tie-wraps instead for spreader/wire attachment
-|-
-| <s>8m ½"PVC</s>           || 4    || home depot || ? || PVC pipes are too flexible to hold properly, we need fiberglass
-|-
-| <s>AUG 12 copper wire</s> || 44.4m  || ???   || 29.32$ (addison?) 48.64$ pour 2x12 22m (dubo) || <s>addison doesn't have bare wire, and [dubo](http://www.dubo.qc.ca/) only has bare up to 8 gage, too big (it's mainly for grounds)</s> copper wire never comes bare, and i may have better luck finding mig soldering wire like [Aluminium-5356](http://www.harrisproductsgroup.com/en/Products/Alloys/Welding/Aluminum-Alloy/Alloy-5356-MIG.aspx)
-|}
+| Part                      | Amount     | Where                     | Price                                         | Notes                                                                                                                                                                                                                             |
+| ------------------------- | ---------- | ------------------------- | --------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| welding wire aluminium    | 270' spool | [canadian tire](http://www.canadiantire.ca/AST/browse/6/Tools/WeldingSoldering/AccessoriesRodsWire.jsp)?       | ?                                             | example: [Aluminium 5356 MIG alloy](http://www.harrisproductsgroup.com/en/Products/Alloys/Welding/Aluminum-Alloy/Alloy-5356-MIG.aspx) - too hard to find                                                                                                                                                                         |
+| <s>4m 1"PVC</s>           | 1          | home depot                | ?                                             | according to Rick, this could create interference                                                                                                                                                                                 |
+| <s>5-way 1"PVC conn.</s>  | 2          | [creativeshelters.com](http://www.creativeshelters.com/Fittings/PVC-Structure-Fitting.aspx) | 3.08$                                         | couldn't order, they don't accept canadian zip codes, and shipping is 30$ anyways, and I don't trust PVC                                                                                                                          |
+| <s>1"x½" copper pipe</s>  | 8          | home depot                | ~5$                                           | we'll use tie-wraps instead for spreader/wire attachment                                                                                                                                                                          |
+| <s>8m ½"PVC</s>           | 4          | home depot                | ?                                             | PVC pipes are too flexible to hold properly, we need fiberglass                                                                                                                                                                   |
+| <s>AUG 12 copper wire</s> | 44.4m      | ???                       | 29.32$ (addison?) 48.64$ pour 2x12 22m (dubo) | <s>addison doesn't have bare wire, and [dubo](http://www.dubo.qc.ca/) only has bare up to 8 gage, too big (it's mainly for grounds)</s> copper wire never comes bare, and i may have better luck finding mig soldering wire like [Aluminium-5356](http://www.harrisproductsgroup.com/en/Products/Alloys/Welding/Aluminum-Alloy/Alloy-5356-MIG.aspx) |
 
 I had a lot of problems finding proper parts (pipes, raw materials like wiring and so on) in Montreal, which made building the antenna quite tricky, as a lot of things needed to be ordered online, which raised the overall costs because of shipping.
 

convert to markdown
diff --git a/hardware/radio.mdwn b/hardware/radio.mdwn
index 0aaf8063..368cd649 100644
--- a/hardware/radio.mdwn
+++ b/hardware/radio.mdwn
@@ -1,35 +1,37 @@
-I am [https://wiki.koumbit.net/TheAnarcat anarcat]. I just passed my basic qualitification in Canada, with honors (so I can operate HF), yay! I am now AKA VA2ANK. -- [[User:TheAnarcat|TheAnarcat]] 21:50, 10 October 2010 (CDT)
+I am a ham radio operator since October 2010, when I passed my "Basic
+Qualification" in Canada, which gave me the callsign `VA2ANK`.
 
-= My rig =
+My rig
+======
 
-* Transceiver:
-** Yaesu FT-100D - [http://cgi.ebay.com/ws/eBayISAPI.dll?ViewItem&item=180565016542&ssPageName=STRK:MEWNX:IT 499$ on ebay] - actual price: ~570$ (to be verified)
-* Antennas and gizmos at radioworld, first pass:
-** MFJ-941E - antenna tuner and switch [http://radioworld.ca/product_info.php?products_id=2885 155$ at radioworld]
-** MAP-G5RV 1/2 - G5RV 50' dipole antenna (10-40m) [http://radioworld.ca/product_info.php?manufacturers_id=121&products_id=7788 85$ at radioworld]
-** <del>J146/440 - dual band VHF/UHF antenna (2m-70cm) [http://radioworld.ca/product_info.php?cPath=73_191_193&products_id=886 40$ at radioworld]</del> /!\ backorder
-** 100' of RG8 coax cabling [http://radioworld.ca/product_info.php?cPath=73_394&products_id=6831 65$ at radioworld]
-** <del>MFJ-260C - 300W dummy load  0-150Mhz dry [http://radioworld.ca/product_info.php?products_id=8098 50$ at radiowrodl]</del> built into the tuner now
-** 3 PL259 connectors [http://radioworld.ca/product_info.php?cPath=73_394&products_id=3244 4$ at radioworld]
-** Total, incl. shipping: 452.35$
-* Ferrites: ~40$ + 24$ customs fees (PN: 2643167851 from [http://www.ibselectronics.com/search_r.asp?mfgpn=2643167851 IBS electronics])
-* A shitload of PL259 connectors, usually around 2$ each
-* Documentation:
-** [http://www.coaxpublications.ca/  Canadian Amateur Radio Basic Qualification Study Guide]: 40$
-** [https://www.rac.ca/store/operating-manual.htm The RAC Operating Manual]: 42$ (note: i didn't find this one really useful)
-** ARRL Handbook 2011, Softcover: 49.95$USD
-** ARRL Antenna Book: 44.95$USD
-* Total rig cost so far: 1242.60$ (not counting the quad project below)
+* Transceiver: Yaesu FT-100D, bought around 600$ on ebay in 2010
+* Antenna/tuner kit:
+ * MFJ-941E - antenna tuner and switch [155$ at radioworld](http://radioworld.ca/product_info.php?products_id=2885)
+ * MAP-G5RV 1/2 - G5RV 50' dipole antenna (10-40m) [85$ at radioworld](http://radioworld.ca/product_info.php?manufacturers_id=121&products_id=7788)
+ * 100' of RG8 coax cabling [65$ at radioworld](http://radioworld.ca/product_info.php?cPath=73_394&products_id=6831)
+ * 3 PL259 connectors [4$ at radioworld](http://radioworld.ca/product_info.php?cPath=73_394&products_id=3244)
+ * Total, incl. shipping: 452.35$
+* Ferrites: ~40$ + 24$ customs fees (PN: 2643167851 from [IBS electronics](http://www.ibselectronics.com/search_r.asp?mfgpn=2643167851))
+* some PL259 connectors, usually around 2$ each
+* Books:
+ * [Canadian Amateur Radio Basic Qualification Study Guide](http://www.coaxpublications.ca/ ): 40$
+ * [The RAC Operating Manual](https://www.rac.ca/store/operating-manual.htm): 42$
+ * ARRL Handbook 2011, Softcover: 49.95$USD
+ * ARRL Antenna Book: 44.95$USD
 
-I uploaded a few photos [http://photos.anarcat.koumbit.org/main.php?g2_itemId=4619 in this album].
+Total rig cost so far: 1242.60$ (not counting the quad project below)
 
-== New quad antenna project ==
+I uploaded a few photos [in this album](https://photos.anarc.at/documentation/radio/#/0).
 
-I am working on building a new antenna. It is based on [http://www.hamuniverse.com/n1uue2el1011quad.html this design], which uses a mix of PVC pipes and fiberglass rods, except I adapt it to a 20m antenna and replace the PVC with aluminium for solidity. It should be possible to take the antenna apart and rebuild it if necessary.
+Quad antenna project
+====================
 
-=== Parts list ===
+I am working on building a new antenna. It is based on [this design](http://www.hamuniverse.com/n1uue2el1011quad.html), which uses a mix of PVC pipes and fiberglass rods, except I adapt it to a 20m antenna and replace the PVC with aluminium for solidity. It should be possible to take the antenna apart and rebuild it if necessary.
 
-[[File:Quad-sketch0001.jpg|400px|thumb|right|A sketch of my antenna]] 
+Parts list
+----------
+
+[sketch of my antenna]([File:Quad-sketch0001.jpg|400px|thumb|right|A)] 
 
 {| class="wikitable"
 |+
@@ -63,19 +65,19 @@ I am working on building a new antenna. It is based on [http://www.hamuniverse.c
 |-
 | 8"x½" plastic tube || 1    || home depot || ~0 ||  0$|| for spreader/wire attachment - found some
 |-
-| 15' 1¼" fiberglass || 8    || [http://www.mgs4u.com/fiberglass-cubical-quad-spreaders.htm mgs4u.com] (type 1) || 17.6lbs || ~160$ - actual: 255$CAD (!!)  || 4.4lbs ea, unit price 19.80$
+| 15' 1¼" fiberglass || 8    || [mgs4u.com](http://www.mgs4u.com/fiberglass-cubical-quad-spreaders.htm) (type 1) || 17.6lbs || ~160$ - actual: 255$CAD (!!)  || 4.4lbs ea, unit price 19.80$
 |-
-| Clamps     || 10-pack || [http://www.dxengineering.com/Parts.asp?ID=1868&PLID=161&SecID=129&DeptID=36&PartNo=DXE-CPC-375 dxengineering] || ~0 || 14.95$ || to secure the feedline
+| Clamps     || 10-pack || [dxengineering](http://www.dxengineering.com/Parts.asp?ID=1868&PLID=161&SecID=129&DeptID=36&PartNo=DXE-CPC-375) || ~0 || 14.95$ || to secure the feedline
 |-
-| 4m aluminium boom  || 2     ||  [http://www.dxengineering.com/Parts.asp?ID=5107&PLID=364&SecID=136&DeptID=43&PartNo=DXE-AT1492 DX engineering] || 2.5lbs || 24.90$ ||
+| 4m aluminium boom  || 2     ||  [DX engineering](http://www.dxengineering.com/Parts.asp?ID=5107&PLID=364&SecID=136&DeptID=43&PartNo=DXE-AT1492) || 2.5lbs || 24.90$ ||
 |-
-| 500' of wiring     || 1     || [http://www.dxengineering.com/Parts.asp?ID=2012&PLID=159&SecID=77&DeptID=40&PartNo=DXE-ANTW-500 DX engineering] || N/A    || 74.95$ || only parts of this will be used (120' to be more precise)
+| 500' of wiring     || 1     || [DX engineering](http://www.dxengineering.com/Parts.asp?ID=2012&PLID=159&SecID=77&DeptID=40&PartNo=DXE-ANTW-500) || N/A    || 74.95$ || only parts of this will be used (120' to be more precise)
 |-
-| U clamps and bolts || 4    || <s>home depot</s> [http://www.rickadams.net/ Rick Adams] || ~0 || 0$ || included in the beam/pole fitting
+| U clamps and bolts || 4    || <s>home depot</s> [Rick Adams](http://www.rickadams.net/) || ~0 || 0$ || included in the beam/pole fitting
 |-
-| boom/pole plate    || 1    || [http://www.rickadams.net/ Rick Adams]  || ? || 45$ + 30$ shipping || need to drill holes, includes reinforcement pole
+| boom/pole plate    || 1    || [Rick Adams](http://www.rickadams.net/)  || ? || 45$ + 30$ shipping || need to drill holes, includes reinforcement pole
 |-
-| spider             || 2     || [http://www.rickadams.net/ Rick Adams] || 2.3lbs || 70$USD || 14oz ea. 40$/ea, seems strong and sturdy, and Rick helped me through email, let's try!
+| spider             || 2     || [Rick Adams](http://www.rickadams.net/) || 2.3lbs || 70$USD || 14oz ea. 40$/ea, seems strong and sturdy, and Rick helped me through email, let's try!
 |+
 !colspan="6"|Antenna (parts in shipping)
 |-
@@ -92,17 +94,16 @@ Total planned price: ~373.77$
 
 Total planned weight: ~25lbs++ - not including 180lbs of sandbags, the pole and tripod.
 
-=== Notes ===
-
-* Gauge: 10-16 AWG is okay (see [http://en.wikipedia.org/wiki/American_wire_gauge AWG], that is 1.2-2.5mm or 1/10" - 1/20"), and can be insulated, according to [http://n6ach.com/calc/quad.html this page]
-* Using welding wire is a good idea, as the [http://www.qsl.net/w3df/quad2/quad.html lightning bolt quad] uses
-* I was suggested [http://www.dubo.qc.ca/ Dubo] for electric supplies
+Notes:
 
-=== Current blocker(s) ===
+* Gauge: 10-16 AWG is okay (see [AWG](http://en.wikipedia.org/wiki/American_wire_gauge), that is 1.2-2.5mm or 1/10" - 1/20"), and can be insulated, according to [this page](http://n6ach.com/calc/quad.html)
+* Using welding wire is a good idea, as the [lightning bolt quad](http://www.qsl.net/w3df/quad2/quad.html) uses
+* I was suggested [Dubo](http://www.dubo.qc.ca/) for electric supplies
 
-Waiting for parts to be shipped and for the rain to stop.
+Current blocker(s): Waiting for parts to be shipped and for the rain to stop.
 
-=== Discarded approaches ===
+Discarded approaches
+--------------------
 
 Those parts were considered during the design phase but were discarded for various reasons.
 
@@ -110,89 +111,93 @@ Those parts were considered during the design phase but were discarded for vario
 |+
 ! Part               || Amount || Where || Price || Notes
 |-
-| welding wire aluminium || 270' spool || [http://www.canadiantire.ca/AST/browse/6/Tools/WeldingSoldering/AccessoriesRodsWire.jsp canadian tire]? || ? || example: [http://www.harrisproductsgroup.com/en/Products/Alloys/Welding/Aluminum-Alloy/Alloy-5356-MIG.aspx Aluminium 5356 MIG alloy] - too hard to find
+| welding wire aluminium || 270' spool || [canadian tire](http://www.canadiantire.ca/AST/browse/6/Tools/WeldingSoldering/AccessoriesRodsWire.jsp)? || ? || example: [Aluminium 5356 MIG alloy](http://www.harrisproductsgroup.com/en/Products/Alloys/Welding/Aluminum-Alloy/Alloy-5356-MIG.aspx) - too hard to find
 |-
 | <s>4m 1"PVC</s>           || 1    || home depot || ? || according to Rick, this could create interference
 |-
-| <s>5-way 1"PVC conn.</s>  || 2    || [http://www.creativeshelters.com/Fittings/PVC-Structure-Fitting.aspx creativeshelters.com] || 3.08$ || couldn't order, they don't accept canadian zip codes, and shipping is 30$ anyways, and I don't trust PVC
+| <s>5-way 1"PVC conn.</s>  || 2    || [creativeshelters.com](http://www.creativeshelters.com/Fittings/PVC-Structure-Fitting.aspx) || 3.08$ || couldn't order, they don't accept canadian zip codes, and shipping is 30$ anyways, and I don't trust PVC
 |-
 | <s>1"x½" copper pipe</s>  || 8    || home depot || ~5$ || we'll use tie-wraps instead for spreader/wire attachment
 |-
 | <s>8m ½"PVC</s>           || 4    || home depot || ? || PVC pipes are too flexible to hold properly, we need fiberglass
 |-
-| <s>AUG 12 copper wire</s> || 44.4m  || ???   || 29.32$ (addison?) 48.64$ pour 2x12 22m (dubo) || <s>addison doesn't have bare wire, and [http://www.dubo.qc.ca/ dubo] only has bare up to 8 gage, too big (it's mainly for grounds)</s> copper wire never comes bare, and i may have better luck finding mig soldering wire like [http://www.harrisproductsgroup.com/en/Products/Alloys/Welding/Aluminum-Alloy/Alloy-5356-MIG.aspx Aluminium-5356]
+| <s>AUG 12 copper wire</s> || 44.4m  || ???   || 29.32$ (addison?) 48.64$ pour 2x12 22m (dubo) || <s>addison doesn't have bare wire, and [dubo](http://www.dubo.qc.ca/) only has bare up to 8 gage, too big (it's mainly for grounds)</s> copper wire never comes bare, and i may have better luck finding mig soldering wire like [Aluminium-5356](http://www.harrisproductsgroup.com/en/Products/Alloys/Welding/Aluminum-Alloy/Alloy-5356-MIG.aspx)
 |}
 
 I had a lot of problems finding proper parts (pipes, raw materials like wiring and so on) in Montreal, which made building the antenna quite tricky, as a lot of things needed to be ordered online, which raised the overall costs because of shipping.
 
-= Références =
+Références
+==========
 
 Je collecte ici des bons sites au sujet du ham radio.
 
 * Manuals, courses
-** [http://www.visi.com/~tneu/whatsham.html Good overview]
-** [http://www.emergencyradio.ca/course/ Emergencyradio.ca online course]
-** [http://kb6nu.com/tech-manual/ tech manual]
-** [http://www.baproducts.com/ham.htm HAM Radio primer] - un peu vieux (14 ans!) dit que son kit a coûté 1000$
+  * [Good overview](http://www.visi.com/~tneu/whatsham.html)
+  * [Emergencyradio.ca online course](http://www.emergencyradio.ca/course/)
+  * [tech manual](http://kb6nu.com/tech-manual/)
+  * [HAM Radio primer](http://www.baproducts.com/ham.htm) - un peu vieux (14 ans!) dit que son kit a coûté 1000$
 * Hardware
-** [http://batlabs.com/ hardware guide] - motorola
+  * [hardware guide](http://batlabs.com/) - motorola
 * Exams
-** [http://www.ic.gc.ca/eic/site/smt-gst.nsf/fra/h_sf01709.html certification pour licence canadienne]
-** [http://wiki.hope.net/index.php/TLH_Amateur_Radio_License_Exams Exams at the Last HOPE]
+  * [certification pour licence canadienne](http://www.ic.gc.ca/eic/site/smt-gst.nsf/fra/h_sf01709.html)
+  * [Exams at the Last HOPE](http://wiki.hope.net/index.php/TLH_Amateur_Radio_License_Exams)
 * Clubs
-** [http://www.marc.qc.ca/ Montreal Amateur Radio Club] - Dorval est. 1932, mostly english and west-island-ish
-** [http://www.ve2clm.ca/ Rive sud]
-** [http://www.rac.ca/ Radio Amateur Canada]
+  * [Montreal Amateur Radio Club](http://www.marc.qc.ca/) - Dorval est. 1932, mostly english and west-island-ish
+  * [Rive sud](http://www.ve2clm.ca/)
+  * [Radio Amateur Canada](http://www.rac.ca/)
 * Other documentation
-** [http://www.irlp.net/ IRLP] -  Internet Radio Linking Project - using the internet to link stations
-** [http://hamcall.net/call Call sign lookup]
-** [http://www.rac.ca/acl/ Available call signs in Canada]
-** [http://www.arrl.org/FandES/field/regulations/bands.html US Ham bands]
-** [[Wikipedia:Family_Radio_Service]] - intéressant pour commencer, comme le CB mais plus puissant et sans interférence, pas cher, j'ai acheté un [http://radioworld.ca/product_info.php?cPath=161_381&products_id=5790 cobra FRS]
+  * [IRLP](http://www.irlp.net/) -  Internet Radio Linking Project - using the internet to link stations
+  * [Call sign lookup](http://hamcall.net/call)
+  * [Available call signs in Canada](http://www.rac.ca/acl/)
+  * [US Ham bands](http://www.arrl.org/FandES/field/regulations/bands.html)
+  * [Family_Radio_Service](https://en.wikipedia.org/wiki/Family_Radio_Service) - intéressant pour commencer, comme le CB mais plus puissant et sans interférence, pas cher, j'ai acheté un [cobra FRS](http://radioworld.ca/product_info.php?cPath=161_381&products_id=5790)
 
-== Software ==
+Software
+========
 
 This needs to be merged into [[Software]]
 
 * the oracles
-** http://packages.debian.org/gpredict
-** http://packages.debian.org/minimuf - allows you to compute the WikiPedia:MUF depending on salar activity and so on, but has an unusuable interface (you need to enter a series of digits... how about a GUI?!)
-** http://packages.debian.org/gcb - calculates the right angle for your antenna
-** http://packages.debian.org/xplanet - can show azimuthal projections of the earth on your background, screensaver or window - I use this in myxsession:
-   xplanet -latitude 45.5 -longitude -73.66 -wait 60 -label -projection azimuthal -fork -radius 90
+  * http://packages.debian.org/gpredict
+  * http://packages.debian.org/minimuf - allows you to compute the WikiPedia:MUF depending on salar activity and so on, but has an unusuable interface (you need to enter a series of digits... how about a GUI?!)
+  * http://packages.debian.org/gcb - calculates the right angle for your antenna
+  * http://packages.debian.org/xplanet - can show azimuthal projections of the earth on your background, screensaver or window - I use this in myxsession:
+    xplanet -latitude 45.5 -longitude -73.66 -wait 60 -label -projection azimuthal -fork -radius 90

(Diff truncated)
import from a backup of the amateur-radio-wiki
diff --git a/hardware/radio.mdwn b/hardware/radio.mdwn
new file mode 100644
index 00000000..0aaf8063
--- /dev/null
+++ b/hardware/radio.mdwn
@@ -0,0 +1,198 @@
+I am [https://wiki.koumbit.net/TheAnarcat anarcat]. I just passed my basic qualitification in Canada, with honors (so I can operate HF), yay! I am now AKA VA2ANK. -- [[User:TheAnarcat|TheAnarcat]] 21:50, 10 October 2010 (CDT)
+
+= My rig =
+
+* Transceiver:
+** Yaesu FT-100D - [http://cgi.ebay.com/ws/eBayISAPI.dll?ViewItem&item=180565016542&ssPageName=STRK:MEWNX:IT 499$ on ebay] - actual price: ~570$ (to be verified)
+* Antennas and gizmos at radioworld, first pass:
+** MFJ-941E - antenna tuner and switch [http://radioworld.ca/product_info.php?products_id=2885 155$ at radioworld]
+** MAP-G5RV 1/2 - G5RV 50' dipole antenna (10-40m) [http://radioworld.ca/product_info.php?manufacturers_id=121&products_id=7788 85$ at radioworld]
+** <del>J146/440 - dual band VHF/UHF antenna (2m-70cm) [http://radioworld.ca/product_info.php?cPath=73_191_193&products_id=886 40$ at radioworld]</del> /!\ backorder
+** 100' of RG8 coax cabling [http://radioworld.ca/product_info.php?cPath=73_394&products_id=6831 65$ at radioworld]
+** <del>MFJ-260C - 300W dummy load  0-150Mhz dry [http://radioworld.ca/product_info.php?products_id=8098 50$ at radiowrodl]</del> built into the tuner now
+** 3 PL259 connectors [http://radioworld.ca/product_info.php?cPath=73_394&products_id=3244 4$ at radioworld]
+** Total, incl. shipping: 452.35$
+* Ferrites: ~40$ + 24$ customs fees (PN: 2643167851 from [http://www.ibselectronics.com/search_r.asp?mfgpn=2643167851 IBS electronics])
+* A shitload of PL259 connectors, usually around 2$ each
+* Documentation:
+** [http://www.coaxpublications.ca/  Canadian Amateur Radio Basic Qualification Study Guide]: 40$
+** [https://www.rac.ca/store/operating-manual.htm The RAC Operating Manual]: 42$ (note: i didn't find this one really useful)
+** ARRL Handbook 2011, Softcover: 49.95$USD
+** ARRL Antenna Book: 44.95$USD
+* Total rig cost so far: 1242.60$ (not counting the quad project below)
+
+I uploaded a few photos [http://photos.anarcat.koumbit.org/main.php?g2_itemId=4619 in this album].
+
+== New quad antenna project ==
+
+I am working on building a new antenna. It is based on [http://www.hamuniverse.com/n1uue2el1011quad.html this design], which uses a mix of PVC pipes and fiberglass rods, except I adapt it to a 20m antenna and replace the PVC with aluminium for solidity. It should be possible to take the antenna apart and rebuild it if necessary.
+
+=== Parts list ===
+
+[[File:Quad-sketch0001.jpg|400px|thumb|right|A sketch of my antenna]] 
+
+{| class="wikitable"
+|+
+!colspan="6"|Mast
+|+
+! Part               || Amount || Where || Weight || Price || Notes
+|-
+| tripod             || 1    || addison    || ? || 45.56$ || ~2' x 2'
+|-
+| 3m steel pole      || 1    || downstairs || ? || 0$ || to connect the boom and tripod, 1-1¼"
+|-
+| sandbags           || 3    || home depot || 30kg ea. || 10.76$ || one per leg
+|-
+| plywood            || 3'x4' || attic || ? || 0$ || <s>1' x 2' used for the beam/pole fitting</s> - found some
+|-
+| Mast clamps (1"3/4)|| 4 || hardware store || ? || 4.92$ || to connect the boom with the mast, bigger mast, 1.23¢ ea
+|-
+| Mast clamps (1"3/8)|| 2 || hardware store || ? || 1.60$ || to connect the boom with the mast, 80¢ ea
+|-
+| guy rope           || 2x100' || hardware store || ? || 63.98$ || to secure the mast, using poplypropylene/nylon rope, each line should support around 300lbs of pressure, enough for the 500lbs of pressure with a 90mph wind
+|+
+!colspan="6"|Antenna and accessories
+|+
+! Part               || Amount || Where || Weight || Price || Notes
+|-
+| 1" hose clamps        || 8    || home depot || ? || ? || to tie the antenna line to the spreaders
+|-
+| tie wraps, small   || 100 || hardware store || ? || 3.09$ || to tie the antenna line to the spreaders
+|-
+| 2"½ hose clamps    || 19 || hardware store || ? || 26.41$ || to tie-up the boom together (2), the spreaders to the spider (8) and the spreaders themselves (8), +spare (1)
+|-
+| 8"x½" plastic tube || 1    || home depot || ~0 ||  0$|| for spreader/wire attachment - found some
+|-
+| 15' 1¼" fiberglass || 8    || [http://www.mgs4u.com/fiberglass-cubical-quad-spreaders.htm mgs4u.com] (type 1) || 17.6lbs || ~160$ - actual: 255$CAD (!!)  || 4.4lbs ea, unit price 19.80$
+|-
+| Clamps     || 10-pack || [http://www.dxengineering.com/Parts.asp?ID=1868&PLID=161&SecID=129&DeptID=36&PartNo=DXE-CPC-375 dxengineering] || ~0 || 14.95$ || to secure the feedline
+|-
+| 4m aluminium boom  || 2     ||  [http://www.dxengineering.com/Parts.asp?ID=5107&PLID=364&SecID=136&DeptID=43&PartNo=DXE-AT1492 DX engineering] || 2.5lbs || 24.90$ ||
+|-
+| 500' of wiring     || 1     || [http://www.dxengineering.com/Parts.asp?ID=2012&PLID=159&SecID=77&DeptID=40&PartNo=DXE-ANTW-500 DX engineering] || N/A    || 74.95$ || only parts of this will be used (120' to be more precise)
+|-
+| U clamps and bolts || 4    || <s>home depot</s> [http://www.rickadams.net/ Rick Adams] || ~0 || 0$ || included in the beam/pole fitting
+|-
+| boom/pole plate    || 1    || [http://www.rickadams.net/ Rick Adams]  || ? || 45$ + 30$ shipping || need to drill holes, includes reinforcement pole
+|-
+| spider             || 2     || [http://www.rickadams.net/ Rick Adams] || 2.3lbs || 70$USD || 14oz ea. 40$/ea, seems strong and sturdy, and Rick helped me through email, let's try!
+|+
+!colspan="6"|Antenna (parts in shipping)
+|-
+|colspan="6"|Nothing!
+|+
+!colspan="6"|Antenna (parts to order)
+|+
+! Part               || Amount || Where || Weight || Price || Notes
+|-
+| more sandbags?     || 3  || hardware store || ? || ? || to attach the tower?
+|}
+
+Total planned price: ~373.77$
+
+Total planned weight: ~25lbs++ - not including 180lbs of sandbags, the pole and tripod.
+
+=== Notes ===
+
+* Gauge: 10-16 AWG is okay (see [http://en.wikipedia.org/wiki/American_wire_gauge AWG], that is 1.2-2.5mm or 1/10" - 1/20"), and can be insulated, according to [http://n6ach.com/calc/quad.html this page]
+* Using welding wire is a good idea, as the [http://www.qsl.net/w3df/quad2/quad.html lightning bolt quad] uses
+* I was suggested [http://www.dubo.qc.ca/ Dubo] for electric supplies
+
+=== Current blocker(s) ===
+
+Waiting for parts to be shipped and for the rain to stop.
+
+=== Discarded approaches ===
+
+Those parts were considered during the design phase but were discarded for various reasons.
+
+{| class="wikitable"
+|+
+! Part               || Amount || Where || Price || Notes
+|-
+| welding wire aluminium || 270' spool || [http://www.canadiantire.ca/AST/browse/6/Tools/WeldingSoldering/AccessoriesRodsWire.jsp canadian tire]? || ? || example: [http://www.harrisproductsgroup.com/en/Products/Alloys/Welding/Aluminum-Alloy/Alloy-5356-MIG.aspx Aluminium 5356 MIG alloy] - too hard to find
+|-
+| <s>4m 1"PVC</s>           || 1    || home depot || ? || according to Rick, this could create interference
+|-
+| <s>5-way 1"PVC conn.</s>  || 2    || [http://www.creativeshelters.com/Fittings/PVC-Structure-Fitting.aspx creativeshelters.com] || 3.08$ || couldn't order, they don't accept canadian zip codes, and shipping is 30$ anyways, and I don't trust PVC
+|-
+| <s>1"x½" copper pipe</s>  || 8    || home depot || ~5$ || we'll use tie-wraps instead for spreader/wire attachment
+|-
+| <s>8m ½"PVC</s>           || 4    || home depot || ? || PVC pipes are too flexible to hold properly, we need fiberglass
+|-
+| <s>AUG 12 copper wire</s> || 44.4m  || ???   || 29.32$ (addison?) 48.64$ pour 2x12 22m (dubo) || <s>addison doesn't have bare wire, and [http://www.dubo.qc.ca/ dubo] only has bare up to 8 gage, too big (it's mainly for grounds)</s> copper wire never comes bare, and i may have better luck finding mig soldering wire like [http://www.harrisproductsgroup.com/en/Products/Alloys/Welding/Aluminum-Alloy/Alloy-5356-MIG.aspx Aluminium-5356]
+|}
+
+I had a lot of problems finding proper parts (pipes, raw materials like wiring and so on) in Montreal, which made building the antenna quite tricky, as a lot of things needed to be ordered online, which raised the overall costs because of shipping.
+
+= Références =
+
+Je collecte ici des bons sites au sujet du ham radio.
+
+* Manuals, courses
+** [http://www.visi.com/~tneu/whatsham.html Good overview]
+** [http://www.emergencyradio.ca/course/ Emergencyradio.ca online course]
+** [http://kb6nu.com/tech-manual/ tech manual]
+** [http://www.baproducts.com/ham.htm HAM Radio primer] - un peu vieux (14 ans!) dit que son kit a coûté 1000$
+* Hardware
+** [http://batlabs.com/ hardware guide] - motorola
+* Exams
+** [http://www.ic.gc.ca/eic/site/smt-gst.nsf/fra/h_sf01709.html certification pour licence canadienne]
+** [http://wiki.hope.net/index.php/TLH_Amateur_Radio_License_Exams Exams at the Last HOPE]
+* Clubs
+** [http://www.marc.qc.ca/ Montreal Amateur Radio Club] - Dorval est. 1932, mostly english and west-island-ish
+** [http://www.ve2clm.ca/ Rive sud]
+** [http://www.rac.ca/ Radio Amateur Canada]
+* Other documentation
+** [http://www.irlp.net/ IRLP] -  Internet Radio Linking Project - using the internet to link stations
+** [http://hamcall.net/call Call sign lookup]
+** [http://www.rac.ca/acl/ Available call signs in Canada]
+** [http://www.arrl.org/FandES/field/regulations/bands.html US Ham bands]
+** [[Wikipedia:Family_Radio_Service]] - intéressant pour commencer, comme le CB mais plus puissant et sans interférence, pas cher, j'ai acheté un [http://radioworld.ca/product_info.php?cPath=161_381&products_id=5790 cobra FRS]
+
+== Software ==
+
+This needs to be merged into [[Software]]
+
+* the oracles
+** http://packages.debian.org/gpredict
+** http://packages.debian.org/minimuf - allows you to compute the WikiPedia:MUF depending on salar activity and so on, but has an unusuable interface (you need to enter a series of digits... how about a GUI?!)
+** http://packages.debian.org/gcb - calculates the right angle for your antenna
+** http://packages.debian.org/xplanet - can show azimuthal projections of the earth on your background, screensaver or window - I use this in myxsession:
+   xplanet -latitude 45.5 -longitude -73.66 -wait 60 -label -projection azimuthal -fork -radius 90
+* testing tools
+** http://packages.debian.org/ibp - very useful for training to receive distant comms: show you which beacon is active when, with a map
+   ibp FN35EM
+* packet:
+** http://packages.debian.org/gmfsk - for packet radio
+** http://packages.debian.org/fldigi - also looks interesting and fairly complete, not tested
+** http://packages.debian.org/gpsk31, DebianPackage:linpsk, DebianPackage:phaseshift - same?
+** http://packages.debian.org/fbb - mailboxes?
+* to be tested:
+** http://packages.debian.org/grig - can control your radio from your computer
+** http://packages.debian.org/splat 
+** http://packages.debian.org/wwl
+** http://packages.debian.org/wsjt
+** http://packages.debian.org/xastir
+** http://packages.debian.org/xwota
+** http://packages.debian.org/xdemorse
+* dismissed:
+** http://packages.debian.org/predict and http://packages.debian.org/predict-gsat - console only, doesn't bring much the gorgeous visuals of DebianPackage:gpredict
+
+... others to follow, there's a whole [http://packages.debian.org/sid/hamradio/ hamradio section] in debian.
+
+= Stuff to buy next =
+
+* VHF/UHF SWR meter
+** [http://www.universal-radio.com/catalog/meters/2140.html Daiwa CN-801V] 150$ 140-525 MHz.	20/200 Watts ([http://www.eham.net/reviews/detail/7378 5 reviews: 4.2/5])
+** [http://www.ebay.com/itm/SWR-Power-500-Watt-METER-120-500-MHz-UHF-VHF-Ham-Radio-w-RG8X-Jumper-/380424888249 workman 50$]  ([http://www.eham.net/reviews/detail/3905 17 reviews: 3.5/5])
+** [http://www.universal-radio.com/catalog/meters/1739.html the bird 43] 85$ (but only one way at a time) 200-500 MHz.	    50 Watts ([http://www.eham.net/reviews/detail/7378 39 reviews: 4.5/5])
+* Handhelds:
+** Baofeng UV-3R MKII radio (<50$) avec cable de prog ou UV-5R
+* Cabling:
+** 100' of RG8 cabling
+* Another HF radio?

(Diff truncated)
remove more spam
diff --git a/blog/2019-12-10-evitez-fizz/comment_10_9bc76dfbded127690e132f3955e244cb._comment b/blog/2019-12-10-evitez-fizz/comment_10_9bc76dfbded127690e132f3955e244cb._comment
deleted file mode 100644
index 6ef736e7..00000000
--- a/blog/2019-12-10-evitez-fizz/comment_10_9bc76dfbded127690e132f3955e244cb._comment
+++ /dev/null
@@ -1,9 +0,0 @@
-[[!comment format=mdwn
- ip="37.162.121.88"
- claimedauthor="Gaia1956"
- subject="comment 10"
- date="2020-05-05T11:36:30Z"
- content="""
-<a href=\"https://pharmacy44.com\">goodrx discount</a> 
-
-"""]]
diff --git a/blog/2019-12-10-evitez-fizz/comment_11_7bb98e7e94c6f45772c36a1c1f96ae95._comment b/blog/2019-12-10-evitez-fizz/comment_11_7bb98e7e94c6f45772c36a1c1f96ae95._comment
deleted file mode 100644
index e5757ee5..00000000
--- a/blog/2019-12-10-evitez-fizz/comment_11_7bb98e7e94c6f45772c36a1c1f96ae95._comment
+++ /dev/null
@@ -1,9 +0,0 @@
-[[!comment format=mdwn
- ip="37.162.121.88"
- claimedauthor="Gaia1956"
- subject="comment 11"
- date="2020-05-05T11:38:02Z"
- content="""
-<a href=\"https://swiindex.com\">disciplinary </a> 
-
-"""]]
diff --git a/blog/2019-12-10-evitez-fizz/comment_12_d75abf9ad3605d77069a4219ebc8b86e._comment b/blog/2019-12-10-evitez-fizz/comment_12_d75abf9ad3605d77069a4219ebc8b86e._comment
deleted file mode 100644
index 018f8cbd..00000000
--- a/blog/2019-12-10-evitez-fizz/comment_12_d75abf9ad3605d77069a4219ebc8b86e._comment
+++ /dev/null
@@ -1,8 +0,0 @@
-[[!comment format=mdwn
- ip="37.162.121.88"
- claimedauthor="Gaia1956"
- subject="comment 12"
- date="2020-05-05T11:38:41Z"
- content="""
-<a href=\"https://clinicsz.com\">clinicsz.com</a>
-"""]]
diff --git a/blog/2019-12-10-evitez-fizz/comment_13_5d09ae69132aa51b3a46ac9cd5dc2425._comment b/blog/2019-12-10-evitez-fizz/comment_13_5d09ae69132aa51b3a46ac9cd5dc2425._comment
deleted file mode 100644
index b60be3f3..00000000
--- a/blog/2019-12-10-evitez-fizz/comment_13_5d09ae69132aa51b3a46ac9cd5dc2425._comment
+++ /dev/null
@@ -1,9 +0,0 @@
-[[!comment format=mdwn
- ip="37.162.121.88"
- claimedauthor="Gaia1956"
- subject="comment 13"
- date="2020-05-05T11:39:11Z"
- content="""
-<a href=\"https://freshseo.com.au\">Fresh</a> 
-
-"""]]
diff --git a/blog/2019-12-10-evitez-fizz/comment_2_22798c2abeacdd671c5a0dd65b936303._comment b/blog/2019-12-10-evitez-fizz/comment_2_22798c2abeacdd671c5a0dd65b936303._comment
deleted file mode 100644
index 5fefa245..00000000
--- a/blog/2019-12-10-evitez-fizz/comment_2_22798c2abeacdd671c5a0dd65b936303._comment
+++ /dev/null
@@ -1,9 +0,0 @@
-[[!comment format=mdwn
- ip="37.162.121.88"
- claimedauthor="Gaia1956"
- subject="comment 2"
- date="2020-05-05T11:31:30Z"
- content="""
-<a href=\"https://www.123.clinic\">dick size pills</a> 
-
-"""]]
diff --git a/blog/2019-12-10-evitez-fizz/comment_3_e24ac0438210e770da1fad6bfd30473c._comment b/blog/2019-12-10-evitez-fizz/comment_3_e24ac0438210e770da1fad6bfd30473c._comment
deleted file mode 100644
index bc830fd5..00000000
--- a/blog/2019-12-10-evitez-fizz/comment_3_e24ac0438210e770da1fad6bfd30473c._comment
+++ /dev/null
@@ -1,10 +0,0 @@
-[[!comment format=mdwn
- ip="37.162.121.88"
- claimedauthor="Gaia1956"
- subject="comment 3"
- date="2020-05-05T11:31:56Z"
- content="""
-<a href=\"https://americandry.com\">crawl space dehumidifier amazon</a> 
-
-10
-"""]]
diff --git a/blog/2019-12-10-evitez-fizz/comment_4_c69ae8db5e6a023c3960245f329df62a._comment b/blog/2019-12-10-evitez-fizz/comment_4_c69ae8db5e6a023c3960245f329df62a._comment
deleted file mode 100644
index c41c144b..00000000
--- a/blog/2019-12-10-evitez-fizz/comment_4_c69ae8db5e6a023c3960245f329df62a._comment
+++ /dev/null
@@ -1,9 +0,0 @@
-[[!comment format=mdwn
- ip="37.162.121.88"
- claimedauthor="Gaia1956"
- subject="comment 4"
- date="2020-05-05T11:32:56Z"
- content="""
-<a href=\"https://amoura.com.au\">business startup loans and grants</a> 
-
-"""]]
diff --git a/blog/2019-12-10-evitez-fizz/comment_5_535b1b7f6b3b8f55d8891dc08242040d._comment b/blog/2019-12-10-evitez-fizz/comment_5_535b1b7f6b3b8f55d8891dc08242040d._comment
deleted file mode 100644
index af17ad40..00000000
--- a/blog/2019-12-10-evitez-fizz/comment_5_535b1b7f6b3b8f55d8891dc08242040d._comment
+++ /dev/null
@@ -1,9 +0,0 @@
-[[!comment format=mdwn
- ip="37.162.121.88"
- claimedauthor="Gaia1956"
- subject="comment 5"
- date="2020-05-05T11:34:01Z"
- content="""
-<a href=\"https://basementideas.us/\">pictures of finished basements on a budget</a> 
-
-"""]]
diff --git a/blog/2019-12-10-evitez-fizz/comment_6_d9b07cc8b2d5230251f2f9219b04124f._comment b/blog/2019-12-10-evitez-fizz/comment_6_d9b07cc8b2d5230251f2f9219b04124f._comment
deleted file mode 100644
index 35611251..00000000
--- a/blog/2019-12-10-evitez-fizz/comment_6_d9b07cc8b2d5230251f2f9219b04124f._comment
+++ /dev/null
@@ -1,9 +0,0 @@
-[[!comment format=mdwn
- ip="37.162.121.88"
- claimedauthor="Gaia1956"
- subject="comment 6"
- date="2020-05-05T11:34:31Z"
- content="""
-<a href=\"https://cleanings4u.com.au\">all purpose cleaner</a> 
-
-"""]]
diff --git a/blog/2019-12-10-evitez-fizz/comment_7_020131e1d3fc2667054e68741d8cb9e7._comment b/blog/2019-12-10-evitez-fizz/comment_7_020131e1d3fc2667054e68741d8cb9e7._comment
deleted file mode 100644
index 0091af75..00000000
--- a/blog/2019-12-10-evitez-fizz/comment_7_020131e1d3fc2667054e68741d8cb9e7._comment
+++ /dev/null
@@ -1,9 +0,0 @@
-[[!comment format=mdwn
- ip="37.162.121.88"
- claimedauthor="Gaia1956"
- subject="comment 7"
- date="2020-05-05T11:35:01Z"
- content="""
-<a href=\"https://clipotech.com\"> affiliate program sign up</a> 
-
-"""]]
diff --git a/blog/2019-12-10-evitez-fizz/comment_8_341b2f45c29e16fb076570dcfe74644b._comment b/blog/2019-12-10-evitez-fizz/comment_8_341b2f45c29e16fb076570dcfe74644b._comment
deleted file mode 100644
index 6fe2acd8..00000000
--- a/blog/2019-12-10-evitez-fizz/comment_8_341b2f45c29e16fb076570dcfe74644b._comment
+++ /dev/null
@@ -1,9 +0,0 @@
-[[!comment format=mdwn
- ip="37.162.121.88"
- claimedauthor="Gaia1956"
- subject="comment 8"
- date="2020-05-05T11:35:29Z"
- content="""
-<a href=\"https://fixfactor.co.uk\">asoftech photo y</a> 
-
-"""]]
diff --git a/blog/2019-12-10-evitez-fizz/comment_9_ef5e4ab5a8715978da16f5f28939eafc._comment b/blog/2019-12-10-evitez-fizz/comment_9_ef5e4ab5a8715978da16f5f28939eafc._comment
deleted file mode 100644
index 27fb4114..00000000
--- a/blog/2019-12-10-evitez-fizz/comment_9_ef5e4ab5a8715978da16f5f28939eafc._comment
+++ /dev/null
@@ -1,9 +0,0 @@
-[[!comment format=mdwn
- ip="37.162.121.88"
- claimedauthor="Gaia1956"
- subject="comment 9"
- date="2020-05-05T11:36:00Z"
- content="""
-<a href=\"https://www.mallacoota.org.au/\">blue cross  care</a> 
-
-"""]]

removed
diff --git a/blog/2019-12-10-evitez-fizz/comment_1_bfc47d664c2ff421ceb1fcaa79ca4d6b._comment b/blog/2019-12-10-evitez-fizz/comment_1_bfc47d664c2ff421ceb1fcaa79ca4d6b._comment
deleted file mode 100644
index d51609b5..00000000
--- a/blog/2019-12-10-evitez-fizz/comment_1_bfc47d664c2ff421ceb1fcaa79ca4d6b._comment
+++ /dev/null
@@ -1,9 +0,0 @@
-[[!comment format=rst
- ip="46.185.13.122"
- claimedauthor="arucwcico"
- url="http://mewkid.net/who-is-xandra/"
- subject="A symmetrical next supply, wide-necked; consultants. "
- date="2020-02-20T23:27:35Z"
- content="""
-http://mewkid.net/who-is-xandra/ - Amoxil Dose For 55 Pounds <a href=\"http://mewkid.net/who-is-xandra/\">Amoxicillin 500mg Capsules</a> guy.abjy.anarc.at.utu.vi http://mewkid.net/who-is-xandra/
-"""]]

Added a comment
diff --git a/blog/2019-12-10-evitez-fizz/comment_13_5d09ae69132aa51b3a46ac9cd5dc2425._comment b/blog/2019-12-10-evitez-fizz/comment_13_5d09ae69132aa51b3a46ac9cd5dc2425._comment
new file mode 100644
index 00000000..b60be3f3
--- /dev/null
+++ b/blog/2019-12-10-evitez-fizz/comment_13_5d09ae69132aa51b3a46ac9cd5dc2425._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ ip="37.162.121.88"
+ claimedauthor="Gaia1956"
+ subject="comment 13"
+ date="2020-05-05T11:39:11Z"
+ content="""
+<a href=\"https://freshseo.com.au\">Fresh</a> 
+
+"""]]

Added a comment
diff --git a/blog/2019-12-10-evitez-fizz/comment_12_d75abf9ad3605d77069a4219ebc8b86e._comment b/blog/2019-12-10-evitez-fizz/comment_12_d75abf9ad3605d77069a4219ebc8b86e._comment
new file mode 100644
index 00000000..018f8cbd
--- /dev/null
+++ b/blog/2019-12-10-evitez-fizz/comment_12_d75abf9ad3605d77069a4219ebc8b86e._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ ip="37.162.121.88"
+ claimedauthor="Gaia1956"
+ subject="comment 12"
+ date="2020-05-05T11:38:41Z"
+ content="""
+<a href=\"https://clinicsz.com\">clinicsz.com</a>
+"""]]

Added a comment
diff --git a/blog/2019-12-10-evitez-fizz/comment_11_7bb98e7e94c6f45772c36a1c1f96ae95._comment b/blog/2019-12-10-evitez-fizz/comment_11_7bb98e7e94c6f45772c36a1c1f96ae95._comment
new file mode 100644
index 00000000..e5757ee5
--- /dev/null
+++ b/blog/2019-12-10-evitez-fizz/comment_11_7bb98e7e94c6f45772c36a1c1f96ae95._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ ip="37.162.121.88"
+ claimedauthor="Gaia1956"
+ subject="comment 11"
+ date="2020-05-05T11:38:02Z"
+ content="""
+<a href=\"https://swiindex.com\">disciplinary </a> 
+
+"""]]

Added a comment
diff --git a/blog/2019-12-10-evitez-fizz/comment_10_9bc76dfbded127690e132f3955e244cb._comment b/blog/2019-12-10-evitez-fizz/comment_10_9bc76dfbded127690e132f3955e244cb._comment
new file mode 100644
index 00000000..6ef736e7
--- /dev/null
+++ b/blog/2019-12-10-evitez-fizz/comment_10_9bc76dfbded127690e132f3955e244cb._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ ip="37.162.121.88"
+ claimedauthor="Gaia1956"
+ subject="comment 10"
+ date="2020-05-05T11:36:30Z"
+ content="""
+<a href=\"https://pharmacy44.com\">goodrx discount</a> 
+
+"""]]

Added a comment
diff --git a/blog/2019-12-10-evitez-fizz/comment_9_ef5e4ab5a8715978da16f5f28939eafc._comment b/blog/2019-12-10-evitez-fizz/comment_9_ef5e4ab5a8715978da16f5f28939eafc._comment
new file mode 100644
index 00000000..27fb4114
--- /dev/null
+++ b/blog/2019-12-10-evitez-fizz/comment_9_ef5e4ab5a8715978da16f5f28939eafc._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ ip="37.162.121.88"
+ claimedauthor="Gaia1956"
+ subject="comment 9"
+ date="2020-05-05T11:36:00Z"
+ content="""
+<a href=\"https://www.mallacoota.org.au/\">blue cross  care</a> 
+
+"""]]

Added a comment
diff --git a/blog/2019-12-10-evitez-fizz/comment_8_341b2f45c29e16fb076570dcfe74644b._comment b/blog/2019-12-10-evitez-fizz/comment_8_341b2f45c29e16fb076570dcfe74644b._comment
new file mode 100644
index 00000000..6fe2acd8
--- /dev/null
+++ b/blog/2019-12-10-evitez-fizz/comment_8_341b2f45c29e16fb076570dcfe74644b._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ ip="37.162.121.88"
+ claimedauthor="Gaia1956"
+ subject="comment 8"
+ date="2020-05-05T11:35:29Z"
+ content="""
+<a href=\"https://fixfactor.co.uk\">asoftech photo y</a> 
+
+"""]]

Added a comment
diff --git a/blog/2019-12-10-evitez-fizz/comment_7_020131e1d3fc2667054e68741d8cb9e7._comment b/blog/2019-12-10-evitez-fizz/comment_7_020131e1d3fc2667054e68741d8cb9e7._comment
new file mode 100644
index 00000000..0091af75
--- /dev/null
+++ b/blog/2019-12-10-evitez-fizz/comment_7_020131e1d3fc2667054e68741d8cb9e7._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ ip="37.162.121.88"
+ claimedauthor="Gaia1956"
+ subject="comment 7"
+ date="2020-05-05T11:35:01Z"
+ content="""
+<a href=\"https://clipotech.com\"> affiliate program sign up</a> 
+
+"""]]

Added a comment
diff --git a/blog/2019-12-10-evitez-fizz/comment_6_d9b07cc8b2d5230251f2f9219b04124f._comment b/blog/2019-12-10-evitez-fizz/comment_6_d9b07cc8b2d5230251f2f9219b04124f._comment
new file mode 100644
index 00000000..35611251
--- /dev/null
+++ b/blog/2019-12-10-evitez-fizz/comment_6_d9b07cc8b2d5230251f2f9219b04124f._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ ip="37.162.121.88"
+ claimedauthor="Gaia1956"
+ subject="comment 6"
+ date="2020-05-05T11:34:31Z"
+ content="""
+<a href=\"https://cleanings4u.com.au\">all purpose cleaner</a> 
+
+"""]]

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 .