From 3fdab855a4dd23026c0320dbb01a58acbfd7c728 Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Fri, 10 Jul 2020 00:21:50 -0400
Subject: [PATCH 1/1] bandali.eu.org -> bndl.org

---
 Makefile             |  4 ++--
 computing.m4         | 34 ++++++++++++++++------------------
 cv.m4                |  2 +-
 header.html          | 10 +++++-----
 index.m4             | 10 +++++-----
 license.m4           |  2 +-
 meta_feed_atom.m4    |  6 +++---
 meta_feed_rss.m4     |  2 +-
 static/.htaccess-www |  4 ++--
 static/404.html      |  2 +-
 10 files changed, 37 insertions(+), 39 deletions(-)

diff --git a/Makefile b/Makefile
index 3d667cb..353cbb8 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@ clean:
 	rm -rf out/
 
 deploy:
-	rsync -avzLP out/ abandali@bandali.eu.org:www/site/
-	ssh abandali@bandali.eu.org mv www/site/.htaccess-www www/.htaccess
+	rsync -avzLP out/ abandali@bndl.org:www/site/
+	ssh abandali@bndl.org mv www/site/.htaccess-www www/.htaccess
 
 .PHONY: deploy
diff --git a/computing.m4 b/computing.m4
index d9f1c6e..7f6c64d 100644
--- a/computing.m4
+++ b/computing.m4
@@ -1,7 +1,7 @@
 dnl -*- html -*-
 define(__title, `How I do my Computing')dnl
 define(__pub, 2019-09-14T12:00:00Z)dnl
-define(__upd, 2019-11-30T23:00:00Z)dnl
+define(__upd, 2020-07-02T12:00:00Z)dnl
 define(__id, 2)dnl
 include(header.html)dnl
 
@@ -10,30 +10,28 @@ include(header.html)dnl
 <a href="//blog.vimuser.org/leah-computing.html">Leah Rowe</a>)</p>
 
 <h2>Computers</h2>
-<p>My main computer is a
-soon-to-be-<a href="https://libreboot.org">librebooted</a>
-ThinkPad X200.  This is the machine I use the most in or out the
-house.  I also own and occasionally use a Dell XPS 15 more as a
-&ldquo;Desktop&rdquo;, and a ThinkPad X220T tablet I use when reading
-(and annotating) research papers.</p>
+<p>My main computer is a <a href="//libreboot.org">librebooted</a>
+ThinkPad X200, and is the machine I use the most.  I also own a
+ThinkPad X220T tablet that I occasionally use for reading and
+annotating research papers, and a Dell XPS 15 I use every now and
+again more as a &ldquo;desktop&rdquo;.</p>
 
 <p>I also have the privilege of having access to a fleet of beefy
 servers through our school's
-<a href="https://csclub.uwaterloo.ca">Computer Science Club</a>,
-which I use for some heavier computations every now and
-again.</p>
+<a href="//csclub.uwaterloo.ca">Computer Science Club</a>, which I use
+for some heavier computations every now and again.</p>
 
 <h2>GNU/Linux distros</h2>
-<p>I've used a large number of GNU/Linux distributions throughout the
-years, but as of late, my favourite distros are
+<p>I've used a wide variety of GNU/Linux distributions over the years;
+but as of late, I find myself using
 <a href="//trisquel.info">Trisquel</a>,
 <a href="//guix.gnu.org">Guix System</a>, and
 <a href="//www.debian.org">Debian</a> (with no <code>contrib</code> or
-<code>non-free</code>).  I mostly use the
-<a href="//www.fsfla.org/ikiwiki/selibre/linux-libre/">GNU Linux-libre</a> kernel.
-Guix&nbsp;System comes with GNU Linux-libre out of the box, and on
-Debian-based distros I install it from jxself's
-<a href="//jxself.org/linux-libre/">APT repository</a>.</p>
+<code>non-free</code>).  For the kernel, I mostly use
+<a href="//www.fsfla.org/ikiwiki/selibre/linux-libre/">GNU
+Linux-libre</a>.  Guix&nbsp;System comes with GNU Linux-libre out of
+the box, and on Debian-based distros I tend to install it from
+jxself's <a href="//jxself.org/linux-libre/">APT repository</a>.</p>
 
 <h2>Actual computing</h2>
 <p>I spend most of my time in
@@ -48,5 +46,5 @@ for functioning.  I can't wait for lxo's
 reality fast enough.
 <span class="smly">:-)</span></p>
 
-define(__copy, `2019')dnl
+define(__copy, `2019, 2020')dnl
 include(footer.html)dnl
diff --git a/cv.m4 b/cv.m4
index 8a7bf94..9d4d254 100644
--- a/cv.m4
+++ b/cv.m4
@@ -9,7 +9,7 @@ include(header.html)dnl
 <tbody>
 <tr>
 <td>Site</td>
-<td><a href="//bandali.eu.org">bandali.eu.org</a></td>
+<td><a href="//bndl.org">bndl.org</a></td>
 </tr>
 <tr>
 <td>Email</td>
diff --git a/header.html b/header.html
index 33ac3e5..2cc6c75 100644
--- a/header.html
+++ b/header.html
@@ -1,19 +1,19 @@
 include(meta_notes.m4)dnl
 ifdef(`__slug',,`define(__slug, _get(`notes', __id))')dnl
 ifdef(`__feed_atom',
-`<entry xml:base="https://bandali.eu.org">
+`<entry xml:base="https://bndl.org">
 <author><name>Amin Bandali</name></author>
-<id>tag:bandali.eu.org,atom,notes:__slug</id>
+<id>tag:bndl.org,atom,notes:__slug</id>
 <published>__pub</published>
 <updated>__upd</updated>
-<link href="https://bandali.eu.org/__slug" rel="alternate" type="text/html"/>
+<link href="https://bndl.org/__slug" rel="alternate" type="text/html"/>
 <title>__title</title>
 <content type="html">',
 `ifdef(`__feed_rss',
 `<item>
 <title>__title</title>
-<link>https://bandali.eu.org/__slug</link>
-<guid isPermaLink="false">tag:bandali.eu.org,rss,notes:__slug</guid>
+<link>https://bndl.org/__slug</link>
+<guid isPermaLink="false">tag:bndl.org,rss,notes:__slug</guid>
 <pubDate>syscmd(date "-uRd __pub" | tr -d \\n)</pubDate>
 <description>',
 `<!doctype html>
diff --git a/index.m4 b/index.m4
index fa7f4b0..2459b42 100644
--- a/index.m4
+++ b/index.m4
@@ -37,13 +37,13 @@ co-host of the <a href="//emacsel.com">Emacs.el</a> podcast with
 the Systems Committee of the
 <a href="//csclub.uwaterloo.ca">Computer Science Club</a> of the
 University of Waterloo, and an intern with the FSF tech team starting
-in May 2020.</p>
+in spring 2020.</p>
 </section>
 
 <section id="papers">
 <h2>Papers</h2>
 <dl>
-<dt>A Comparison of the Declarative Modelling Languages B, DASH, and
+<dt>A Comparison of the Declarative Modelling Languages B, Dash, and
 TLA<sup>+</sup>
 <small>
 [ <a href="//p.bndl.org/modre2018-declarative.pdf">pdf</a>
@@ -52,7 +52,7 @@ TLA<sup>+</sup>
 </small>
 </dt>
 <dd>
-Ali Abbassi, <a href="//bandali.eu.org">Amin Bandali</a>,
+Ali Abbassi, <a href="//bndl.org">Amin Bandali</a>,
 <a href="//cs.uwaterloo.ca/~nday/">Nancy A. Day</a>, Jose Serna<br/>
 <em>2018 IEEE 8th International Model-Driven Requirements Engineering
 Workshop (MoDRE)</em><br/>
@@ -76,7 +76,7 @@ York University, Toronto, Canada, August 15, 2017">poster</a>
 </small>
 </dt>
 <dd>
-<a href="//bandali.eu.org">Amin Bandali</a>,
+<a href="//bndl.org">Amin Bandali</a>,
 <a href="//github.com/cipher1024">Simon Hudon</a>,
 <a href="//www.cse.yorku.ca/~jonathan/">Jonathan S. Ostroff</a>
 </dd>
@@ -136,5 +136,5 @@ and
 </table>
 </section>
 
-define(__copy, `2016&ndash;2019')dnl
+define(__copy, `2016&ndash;2020')dnl
 include(footer.html)dnl
diff --git a/license.m4 b/license.m4
index 35e5912..8809dd6 100644
--- a/license.m4
+++ b/license.m4
@@ -4,7 +4,7 @@ define(__slug, `license')dnl
 include(header.html)dnl
 
 <article>
-<h1>License information for bandali.eu.org</h1>
+<h1>License information for bndl.org</h1>
 <p>I strongly believe in
 <a href="//questioncopyright.org/what_is_free_culture">free culture</a>
 and that all creative works everywhere should be
diff --git a/meta_feed_atom.m4 b/meta_feed_atom.m4
index f0c9a46..a425652 100644
--- a/meta_feed_atom.m4
+++ b/meta_feed_atom.m4
@@ -2,9 +2,9 @@ include(meta_notes.m4)dnl
 <?xml version="1.0" encoding="UTF-8"?>
 <feed xml:lang="en-US" xmlns="http://www.w3.org/2005/Atom">
 <title>Amin Bandali's Personal Site</title>
-<id>tag:bandali.eu.org,atom,notes/</id>
-<link href="https://bandali.eu.org/notes.atom" rel="self" type="application/atom+xml"/>
-<link href="https://bandali.eu.org" rel="alternate" type="text/html"/>
+<id>tag:bndl.org,atom,notes/</id>
+<link href="https://bndl.org/notes.atom" rel="self" type="application/atom+xml"/>
+<link href="https://bndl.org" rel="alternate" type="text/html"/>
 <updated>syscmd(date -Iseconds -u | tr -d \\n)</updated>
 define(__feed_atom)dnl
 define(`fordown',`ifelse($#,0,``$0'',`ifelse(eval($2>=$3),1,
diff --git a/meta_feed_rss.m4 b/meta_feed_rss.m4
index 8ebecd8..cc24c84 100644
--- a/meta_feed_rss.m4
+++ b/meta_feed_rss.m4
@@ -4,7 +4,7 @@ include(meta_notes.m4)dnl
 <channel>
 <title>Amin Bandali's Personal Site</title>
 <description>Notes and blog posts by Amin Bandali</description>
-<link>https://bandali.eu.org</link>
+<link>https://bndl.org</link>
 <lastBuildDate>syscmd(date -uR | tr -d \\n)</lastBuildDate>
 <pubDate>syscmd(date -uR | tr -d \\n)</pubDate>
 <ttl>1800</ttl>
diff --git a/static/.htaccess-www b/static/.htaccess-www
index 87c80d1..9d6976c 100644
--- a/static/.htaccess-www
+++ b/static/.htaccess-www
@@ -4,7 +4,7 @@ Options -MultiViews
 
 RewriteEngine On
 RewriteBase /
-# if on csclub.uwaterloo.ca, redirect to bandali.eu.org
+# if on csclub.uwaterloo.ca, redirect to bndl.org
 RewriteCond %{HTTP_HOST} ^csclub\.uwaterloo\.ca$
-RewriteRule ^(.*)$ https://bandali.eu.org/$1 [R]
+RewriteRule ^(.*)$ https://bndl.org/$1 [R]
 </IfModule>
diff --git a/static/404.html b/static/404.html
index 26f3f81..883067e 100644
--- a/static/404.html
+++ b/static/404.html
@@ -8,7 +8,7 @@
 <link rel="stylesheet" href="/style.css"/>
 </head>
 <body>
-<nav><a href="/">bandali.eu.org</a></nav>
+<nav><a href="/">bndl.org</a></nav>
 <main>
 <h1>404</h1>
 <p>Sorry, that page does not exist.</p>
-- 
2.20.1