fix two links

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

diff --git a/index.m4 b/index.m4
index de2891c..a760e7f 100644 (file)
--- a/index.m4
+++ b/index.m4
@@ -1,73 +1,62 @@
 dnl -*- html -*-
 dnl -*- html -*-

-define(__title, `Bandali''`s Personal Site')dnl
+define(__title, __site__title)dnl

 define(__slug, `home')dnl
 define(__nts)dnl
 include(header.html)dnl
 
 define(__slug, `home')dnl
 define(__nts)dnl
 include(header.html)dnl
 

-<section id="intro" class="justify">
-<p>Hi, I'm bandali.  I am
-a <a href="//www.gnu.org/philosophy/free-sw.html">free software</a>
-activist and a computing scientist.  I graduated from the University
-of Waterloo with a <a href="/mmath">Master of Mathematics</a> degree
-in Computer Science, where I did research in formal logic, model
-checking, and verification supervised
-by <a href="//cs.uwaterloo.ca/~nday/">Dr.&nbsp;Nancy Day</a>.  The main
-goal of my research is improving <strong>software and systems
-reliability</strong> through application of
-<a href="//en.wikipedia.org/wiki/Formal_methods">formal methods</a>.
-My research areas of interest include programming languages, proof
-assistants, and their type systems.</p>
+<section id="intro">
+<p>I am a <a href="https://www.gnu.org/philosophy/free-sw.html">free
+software</a> activist and <a href="mmath.html">computing
+scientist</a>.  I'm a GNU maintainer
+of <a href="https://jami.net">Jami</a>
+and <a href="https://www.gnu.org/software/gnuzilla/">GNUzilla and
+IceCat</a>, and I wear a few other hats around GNU, like helping run
+the Savannah forge for GNU and non-GNU projects as a Savannah hacker.
+My current <code>$dayjob</code> is working on Jami as a Free Software
+Consultant, which includes hacking on various parts of Jami and its
+packaging for various GNU/Linux distributions.</p>

 
 

-<p>On the side, I
-enjoy <a href="//stallman.org/articles/on-hacking.html">hacking</a>
-on <a href="//www.gnu.org/software/emacs/manual/elisp.html">elisp</a>
-and <a href="//www.gnu.org/software/guile/">guile</a>.  I'm a
-GNU <a href="//www.gnu.org/people/people.html#bandali">maintainer</a>,
-<a href="//www.gnu.org/people/webmeisters.html#bandali">webmaster</a>,
-and <a href="//savannah.gnu.org/maintenance/SavannahHacker/">Savannah
-hacker</a>; and an <a href="//www.fsf.org/associate/">associate
-member</a> of the Free Software Foundation (FSF).  I'm currently the
-chief organizer of the <a href="//emacsconf.org">EmacsConf</a>
-conference, and the co-host of
-the <a href="//emacsel.com">Emacs.el</a> podcast with
-<a href="//www.pygopar.com">Daniel Gopar</a>.  I am also a member of
-the Systems Committee of the
-<a href="//csclub.uwaterloo.ca">Computer Science Club</a> of the
-University of Waterloo.</p>
-
-<p>Starting in spring 2020, I am an intern with the FSF tech team.</p>
+<p>On the side, I enjoy
+<a href="https://stallman.org/articles/on-hacking.html">hacking on</a>
+GNU Emacs and Emacs Lisp.  I'm the current maintainer of
+<a href="https://www.gnu.org/software/emacs/erc.html">ERC</a> the
+powerful and modular IRC client built into GNU Emacs, an organizer of
+the <a href="https://emacsconf.org">EmacsConf</a> conference, and
+co-host of the <a href="https://emacsel.com">Emacs.el</a> podcast with
+<a href="https://www.pygopar.com">Gopar</a>.</p>

 </section>
 
 </section>
 

-<section id="notes" class="justify">
-<h2>Notes</h2>
-<p>Here are notes about a variety of topics and issues I care about.
-They're also available via
-<a href="notes.atom">
-<img class="feed-icon" src="icon-12px.png"
-     alt="subscribe to Atom feed">Atom</a>
-and
-<a href="notes.rss">
-<img class="feed-icon" src="icon-12px.png"
-     alt="subscribe to RSS feed">RSS</a> feeds.</p>
+<section id="notes">
+<h2>notes __anc(`notes')</h2>
+<p>Here are notes about various topics or issues I care about.
+You can also read them via
+<a class="feed-icon" href="notes.atom">Atom</a> or
+<a class="feed-icon" href="notes.rss">RSS</a>.</p>

 
 <table class="post-list">
 <tbody>
 <tr>
 
 <table class="post-list">
 <tbody>
 <tr>

-<td><a href="fsf-internship/intro">Internship with the FSF tech team</a>
-(intro)</td>
-<td><small>May 29, 2020</small></td>
+<td><a href="lp2021.html">LibrePlanet 2021: Jami and how it empowers
+users</a></td>
+<td><small>March 20, 2021</small></td>

 </tr>
 <tr>
 </tr>
 <tr>

-<td><a href="computing">How I do my Computing</a></td>
-<td><small>September 14, 2019</small></td>
+<td><a href="fsf-internship-beyond.html">My internship with the FSF
+tech team and beyond</a> (concluding)</td>
+<td><small>December 18, 2020</small></td>

 </tr>
 <tr>
 </tr>
 <tr>

-<td><a href="arch-macbook-air">Arch GNU/Linux on MacBook Air 2013</a></td>
-<td><small>November 1, 2016</small></td>
+<td><a href="fsf-internship-intro.html">Internship with the FSF tech
+team</a> (intro)</td>
+<td><small>May 29, 2020</small></td>
+</tr>
+<tr>
+<td><a href="computing.html">How I do my Computing</a></td>
+<td><small>September 14, 2019</small></td>

 </tr>
 </tbody>
 </table>
 </section>
 
 </tr>
 </tbody>
 </table>
 </section>
 

-define(__copy, `2016&ndash;2020')dnl
+define(__copy, `2016&ndash;2021')dnl

 include(footer.html)dnl
 include(footer.html)dnl