From 553a0296a5df508f36f9332170ba5037a7d2bf8e Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Fri, 11 Dec 2020 22:54:35 -0500
Subject: [PATCH] various small changes

---
 GNUmakefile                                        |  2 +-
 fsf-internship/intro.m4 => fsf-internship-intro.m4 |  0
 index.m4                                           | 12 +++++-------
 meta_defs.m4                                       |  2 +-
 static/.htaccess                                   |  2 ++
 static/.htaccess-www                               |  3 +++
 6 files changed, 12 insertions(+), 9 deletions(-)
 rename fsf-internship/intro.m4 => fsf-internship-intro.m4 (100%)

diff --git a/GNUmakefile b/GNUmakefile
index 3f2c9be..4eaaf04 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -1,4 +1,4 @@
-SRC := $(filter-out $(wildcard meta_*), $(wildcard *.m4 fsf-internship/*.m4))
+SRC := $(filter-out $(wildcard meta_*), $(wildcard *.m4))
 OUTPUTS := $(patsubst %.m4,out/%.html, $(SRC))
 STATIC := $(patsubst static/%,out/%, $(filter-out static/GNUmakefile, $(wildcard static/* static/.*)))
 
diff --git a/fsf-internship/intro.m4 b/fsf-internship-intro.m4
similarity index 100%
rename from fsf-internship/intro.m4
rename to fsf-internship-intro.m4
diff --git a/index.m4 b/index.m4
index 04a3831..02fc07d 100644
--- a/index.m4
+++ b/index.m4
@@ -32,22 +32,20 @@ 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">
@@ -65,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>
diff --git a/meta_defs.m4 b/meta_defs.m4
index aad4d83..fa970b2 100644
--- a/meta_defs.m4
+++ b/meta_defs.m4
@@ -3,7 +3,7 @@ define(`_put', `define(`$1[$2]', `$3')')dnl
 define(`_get', `defn(`$1[$2]')')dnl
 _put(`notes', 1, `arch-macbook-air')dnl
 _put(`notes', 2, `computing')dnl
-_put(`notes', 3, `fsf-internship/intro')dnl
+_put(`notes', 3, `fsf-internship-intro')dnl
 dnl
 define(__latex, `<span class="t-logo">L<sup>a</sup>T<sub>e</sub>X</span>')dnl
 define(__smly, `<span class="smly">:-)</span>')dnl
diff --git a/static/.htaccess b/static/.htaccess
index fe09a63..c03a35b 100644
--- a/static/.htaccess
+++ b/static/.htaccess
@@ -4,4 +4,6 @@
 # .html files
 RewriteCond %{REQUEST_FILENAME}.html -f
 RewriteRule !.*\.html$ %{REQUEST_FILENAME}.html [L]
+
+RewriteRule ^fsf-internship/intro$ /fsf-internship-intro [R]
 </IfModule>
diff --git a/static/.htaccess-www b/static/.htaccess-www
index 69dab1d..35d52d1 100644
--- a/static/.htaccess-www
+++ b/static/.htaccess-www
@@ -9,5 +9,8 @@ RewriteCond %{HTTP_HOST} ^csclub\.uwaterloo\.ca$
 RewriteRule ^(.*)$ https://bndl.org/$1 [R]
 </IfModule>
 
+AddType application/atom+xml .atom
+AddType application/rss+xml .rss
+
 AddType text/plain .bib .org
 AddCharset utf-8 .bib .org
-- 
2.20.1