X-Git-Url: https://git.shemshak.org/gitweb.cgi/~bandali/bndl.org/blobdiff_plain/7602da8369400d57d81c4dccd3f05071547d7850..553a0296a5df508f36f9332170ba5037a7d2bf8e:/index.m4

diff --git a/index.m4 b/index.m4
index 2a9ef01..02fc07d 100644
--- a/index.m4
+++ b/index.m4
@@ -11,31 +11,41 @@ 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/">Prof. Nancy Day</a>.  The main
-goal of my research is improving <strong>software and systems
+by <a href="//cs.uwaterloo.ca/~nday/">Prof. Nancy Day</a>, with the
+main goal of 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>
 
+<p>I am currently employed
+by <a href="//savoirfairelinux.com/en">Savoir-faire Linux</a> as a
+Free Software Consultant, where I get to hack on various parts
+of <a href="//jami.net">Jami</a>, work with the maintainers of Jami
+packages in various GNU/Linux distributions like Debian and Trisquel
+to help keep up-to-date the version of Jami available in the official
+repositories of those distributions, and generally serve as a
+community liaison between the Jami core development team and the wider
+free software community around Jami.  To be sure, the views or
+opinions expressed on this site are solely my own, and do not
+necessarily represent those of my employer or anyone else.</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
+on <a href="//www.gnu.org/software/emacs/manual/elisp.html">Emacs
+Lisp</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
+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>
 </section>
 
 <section id="notes" class="justify">
@@ -53,7 +63,7 @@ and
 <table class="post-list">
 <tbody>
 <tr>
-<td><a href="fsf-internship/intro">Internship with the FSF tech team</a>
+<td><a href="fsf-internship-intro">Internship with the FSF tech team</a>
 (intro)</td>
 <td><small>May 29, 2020</small></td>
 </tr>