fix some contact page links

[~bandali/bndl.org] / index.html

diff --git a/index.html b/index.html
index fb82602..d6c0d3b 100644 (file)
--- a/index.html
+++ b/index.html
@@ -1,12 +1,12 @@
-<!--# include virtual="/common/header.html" -->
+<!--# include virtual="common/header.html" -->
 <meta
   name="description"
   content="Amin Bandali is a graduate student at WatForm, the
-        co-host of the Emacs.el podcast, a free software advocate,
+        co-host of the Emacs.el podcast, a free software activist,
         and a volunteer webmaster for the GNU project."/>
 <title>Amin Bandali</title>
 <!--#set var="bpage" value="Home" -->
-<!--# include virtual="/common/banner.html" -->
+<!--# include virtual="common/banner.html" -->
 <main>
   <section>
     <h2 id="contact">Contact</h2>
@@ -14,26 +14,34 @@
       <tbody>
         <tr>
           <th></th>
-          <th>academic</th>
-          <th>personal</th>
+          <th>email</th>
+          <th>projects</th>
         </tr>
         <tr>
-          <td>email</td>
+          <td>academic</td>
           <td><a href="mailto:abandali@uwaterloo.ca">abandali@uwaterloo.ca</a></td>
-          <td><a href="mailto:bandali@gnu.org">bandali@gnu.org</a>
-            (<a href="gpg">gpg</a>)</td>
+          <td><a href="https://git.uwaterloo.ca/abandali">git.uwaterloo.ca/abandali</a></td>
         </tr>
         <tr>
-          <td>git repos</td>
-          <td><a href="https://git.uwaterloo.ca/abandali">git.uwaterloo.ca/abandali</a></td>
-          <td><a href="https://git.sr.ht/~bandali">git.sr.ht/~bandali</a></td>
+          <td>personal</td>
+          <td><a href="mailto:amin@shemshak.org">amin@shemshak.org</a></td>
+          <td>
+            <a href="https://git.shemshak.org/amin">shemshak</a>
+            |
+            <a href="https://git.sr.ht/~bandali">sourcehut</a>
+          </td>
         </tr>
         <tr>
-          <td>other means</td>
-          <td>see <a href="contact">contact</a> page</td>
+          <td>gnu</td>
+          <td><a href="mailto:mab@gnu.org">mab@gnu.org</a>
+          <td><a href="https://sv.gnu.org/u/bandali">sv.gnu.org/u/bandali</a></td>
         </tr>
       </tbody>
     </table>
+    <p>
+      See my <a href="contact.html">contact</a> and
+      <a href="gpg.html">gpg</a> pages for more details.
+    </p>
   </section>
 
   <section>
@@ -57,15 +65,6 @@
       interactive theorem proving.
     </p>
 
-    <p>
-      On the side, I dabble in <a href="https://leanprover.github.io">Lean</a>
-      and enjoy <a href="https://stallman.org/articles/on-hacking.html">hacking</a> on
-      <a href="https://www.gnu.org/software/emacs/manual/elisp.html">Emacs Lisp</a>.
-      I&rsquo;m also a <a href="https://www.gnu.org/philosophy/free-sw.en.html">free software</a>
-      and <a href="https://www.gnu.org/licenses/copyleft.en.html">copyleft</a>
-      advocate, and a volunteer webmaster for the GNU project.
-    </p>
-
     <p>
       You may wish to view my academic <a href="bandali-cv.pdf">curriculum vitae</a>.
     </p>
@@ -98,23 +97,21 @@
     <h2 id="presentations">Presentations</h2>
     <dl>
       <dt>
-        <strong>The Magic of Specifications and Type
-          Systems</strong>
+        <strong>The Magic of Specifications and Type Systems</strong>
       </dt>
-      <dd><strong>Amin Bandali</strong>, Simon Hudon,
-        Jonathan Ostroff
+      <dd>
+        <strong>Amin Bandali</strong>, Simon Hudon, Jonathan Ostroff
       </dd>
       <dd><a href="presentations/cucsc-2017-slides.pdf">Slides</a>
         presented at
-        <abbr title="Canadian Undergraduate Computer Science Conference">
-          CUCSC 2017</abbr>, University of Toronto, Canada, June
-        15-17, 2017.
+        <abbr title="Canadian Undergraduate Computer Science Conference">CUCSC 2017</abbr>,
+        University of Toronto, Canada, June 15-17, 2017.
+      </dd>
+      <dd>
+        <a href="presentations/eecs4080-poster.pdf">Poster</a> presented at
+        <abbr title="Lassonde Undergraduate Summer Student Research Conference">Lassonde USSR Conference</abbr>,
+        York University, Toronto, Canada, August 15, 2017.
       </dd>
-      <dd><a href="presentations/eecs4080-poster.pdf">Poster</a>
-        presented at
-        <abbr title="Lassonde Undergraduate Summer Student Research Conference">
-          Lassonde USSR Conference</abbr>, York University, Toronto, Canada,
-        August 15, 2017.</dd>
     </dl>
   </section>
 
@@ -125,5 +122,18 @@
       <!-- <dd></dd> -->
     </dl>
   </section>
+
+  <section>
+    <h2 id="other-interests">Other interests</h2>
+    <p>
+      On the side, I dabble in <a href="https://leanprover.github.io">Lean</a>
+      and enjoy <a href="https://stallman.org/articles/on-hacking.html">hacking</a> on
+      <a href="https://www.gnu.org/software/emacs/manual/elisp.html">Emacs Lisp</a>.
+      I&rsquo;m also a <a href="https://www.gnu.org/philosophy/free-sw.en.html">free software</a>
+      and <a href="https://www.gnu.org/licenses/copyleft.en.html">copyleft</a>
+      activist, a <a href="https://www.gnu.org/people/webmeisters.html#bandali">volunteer webmaster</a>
+      for the GNU project, and a co-host of the <a href="https://emacsel.com">Emacs.el</a> podcast.
+    </p>
+  </section>
 </main>
-<!--# include virtual="/common/footer.html" -->
+<!--# include virtual="common/footer.html" -->