small Makefile fixes
[~bandali/bndl.org] / contact.html
index cbece68..fd14ff5 100644 (file)
@@ -3,82 +3,84 @@
   <head>
     <meta charset="utf-8" />
     <meta name=viewport content="width=device-width, initial-scale=1" />
-    <title>Amin Bandali's Contact Information</title>
+    <title>Contact Information | Amin Bandali</title>
     <meta
       name="description"
       content="Amin Bandali's contact information" />
     <link rel="stylesheet" href="/style.css" />
   </head>
   <body>
+    <nav><a href="/">bandali.eu.org</a> / contact.html</nav>
     <main>
-      <header>
-        <h1 id="title"><a href="/">bandali</a></h1>
-        <h2 id="subtitle">Contact info</h2>
-      </header>
-      <section>
-        <p>
-          Email is by far my preferred method of communication.  I may
-          be contacted at bandali&nbsp;at&nbsp;gnu&nbsp;dot&nbsp;org.
-          If you want to send me GPG-encrypted mail, you can use my
-          <a href="bandali-pubkey.txt">public key</a> with the
-          fingerprint<br/>
-          <code>
-            BE62 7373 8E61 6D6D 1B3A  08E8 A21A 0202 4881 6103</code>.
-        </p>
+      <h1>Contact information</h1>
+      <p>
+        Email is by far my preferred method of communication.  I may
+        be contacted at any of the following addresses (choose the
+        most closely related):
 
-        <table>
-          <tbody>
-            <tr>
-              <td>IRC</td>
-              <td>
-                <code>bandali</code> on
-                <a href="https://freenode.net">freenode</a> and
-                <a href="https://wiki.mozilla.org/IRC">moznet</a>
-              </td>
-            </tr>
-            <tr>
-              <td>XMPP</td>
-              <td><a href="xmpp:bandali@member.fsf.org">
-                <code>bandali@member.fsf.org</code></a>
-              </td>
-            </tr>
-            <tr>
-              <td>Matrix</td>
-              <td><a href="https://matrix.to/#/@bandali:matrix.org">
-                <code>@bandali:matrix.org</code></a>
-              </td>
-            </tr>
-            <tr>
-              <td>Fediverse</td>
-              <td><a href="https://pleroma.site/bandali">
-                <code>@bandali@pleroma.site</code></a>
-              </td>
-            </tr>
-          </tbody>
-        </table>
-      </section>
-
-      <h3>Elsewhere</h3>
-      <section>
-        <p>
-          You may also find me at a few other places online.  Stricken
-          through accounts are those I don’t use anymore, unless
-          absolutely necessary.
-        </p>
         <ul>
-          <li><a href="https://libreplanet.org/wiki/User:Bandali">Bandali</a> on LibrePlanet</li>
-          <li><a href="https://emacsconf.org/bandali">bandali</a> on EmacsConf</li>
-          <li><a href="https://savannah.gnu.org/users/bandali">bandali</a> on Savannah</li>
-          <li><a href="https://git.sr.ht/~bandali">bandali</a> on SourceHut</li>
-          <li><a href="https://lobste.rs/u/bandali">bandali</a> on Lobsters</li>
-          <li><a href="https://hackage.haskell.org/user/bandali">bandali</a> on Hackage</li>
-          <li><a href="https://gitlab.com/bandali">bandali</a> on GitLab</li>
-          <li><a href="https://news.ycombinator.com/user?id=bandali">bandali</a> on HN</li>
-          <li><a href="https://www.reddit.com/u/bandali">bandali</a> on reddit</li>
-          <li><del><a href="https://github.com/bandali0">bandali0</a> on GitHub</del></li>
-          <li><del><a href="https://twitter.com/bandali0">bandali0</a> on Twitter</del></li>
+          <li>bandali@gnu.org</li>
+          <li>bandali@uwaterloo.ca</li>
+          <li>bandali@csclub.uwaterloo.ca</li>
         </ul>
-      </section>
+
+        If you want to send me GPG-encrypted mail, you can use my
+        <a href="bandali-pubkey.txt">public key</a> with the
+        fingerprint&nbsp;
+        <code>BE62 7373 8E61 6D6D 1B3A  08E8 A21A 0202 4881 6103</code>.
+      </p>
+
+      <table>
+        <tbody>
+          <tr>
+            <td>IRC</td>
+            <td>
+              bandali on
+              <a href="https://freenode.net">freenode</a> and
+              <a href="https://wiki.mozilla.org/IRC">moznet</a>
+            </td>
+          </tr>
+          <tr>
+            <td>XMPP</td>
+            <td>
+              <a href="xmpp:bandali@member.fsf.org">
+                bandali@member.fsf.org</a>
+            </td>
+          </tr>
+          <tr>
+            <td>Matrix</td>
+            <td><a href="https://matrix.to/#/@bandali:matrix.org">
+              @bandali:matrix.org</a>
+            </td>
+          </tr>
+          <tr>
+            <td>Fediverse</td>
+            <td><a href="https://pleroma.site/bandali">
+              @bandali@pleroma.site</a>
+            </td>
+          </tr>
+        </tbody>
+      </table>
+
+      <h3>Elsewhere</h3>
+      <p>
+        You may also find me at a few other places online.  Stricken
+        through accounts are those I don’t use anymore, unless
+        absolutely necessary.
+      </p>
+      <ul>
+        <li><a href="https://libreplanet.org/wiki/User:Bandali">bandali</a> on LibrePlanet</li>
+        <li><a href="https://emacsconf.org/bandali">bandali</a> on EmacsConf</li>
+        <li><a href="https://savannah.gnu.org/users/bandali">bandali</a> on Savannah</li>
+        <li><a href="https://git.sr.ht/~bandali">bandali</a> on SourceHut</li>
+        <li><a href="https://lobste.rs/u/bandali">bandali</a> on Lobsters</li>
+        <li><a href="https://hackage.haskell.org/user/bandali">bandali</a> on Hackage</li>
+        <li><a href="https://gitlab.com/bandali">bandali</a> on GitLab</li>
+        <li><a href="https://news.ycombinator.com/user?id=bandali">bandali</a> on HN</li>
+        <li><a href="https://www.reddit.com/u/bandali">bandali</a> on reddit</li>
+        <li><del><a href="https://github.com/bandali0">bandali0</a> on GitHub</del></li>
+        <li><del><a href="https://twitter.com/bandali0">bandali0</a> on Twitter</del></li>
+      </ul>
     </main>
   </body>
 </html>