mention my employment at SFL

diff --git a/GNUmakefile b/GNUmakefile
index fb9fc11..3f2c9be 100644 (file)
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -24,8 +24,8 @@ clean:
        rm -rf out/
 
 deploy:
        rm -rf out/
 
 deploy:

-       rsync -avzLP out/ abandali@bndl.org:www/site/
-       ssh abandali@bndl.org mv www/site/.htaccess-www www/.htaccess
+       rsync -avzLP out/ abandali@bndl.org:www/bndl.org/
+       ssh abandali@bndl.org mv www/bndl.org/.htaccess-www www/.htaccess

 
 watch:
        while true; do \
 
 watch:
        while true; do \

diff --git a/index.m4 b/index.m4
index 2a9ef01..3767710 100644 (file)
--- a/index.m4
+++ b/index.m4
@@ -11,13 +11,23 @@ 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
 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>
 
 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>
 

+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.
+

 <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>
 <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>