various small changes

diff --git a/GNUmakefile b/GNUmakefile
index 3f2c9be..4eaaf04 100644 (file)
--- 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/.*)))
 
 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
new file mode 100644 (file)
index 0000000..f09d1ba
--- /dev/null
+++ b/fsf-internship-intro.m4
@@ -0,0 +1,71 @@
+dnl -*- html -*-
+define(__title, `Internship with the FSF tech team')dnl
+define(__pub, 2020-05-29T14:38:00-04:00)dnl
+define(__id, 3)dnl
+include(header.html)dnl
+
+<p>Originally published on the Free Software Foundation's sysadmin
+blog:<br/>
+<a href="https://www.fsf.org/blogs/sysadmin/introducing-bandali-intern-with-the-fsf-tech-team">Introducing
+Amin Bandali, intern with the FSF tech team</a>.</p>
+
+<p>Hi there, I'm Amin Bandali, often just <code>bandali</code> on the
+interwebs.  I wear a few different hats around GNU as a maintainer,
+webmaster, and Savannah hacker, and I'm very excited to be extending
+that to the Free Software Foundation (FSF) as an intern with the FSF
+tech team for spring 2020.</p>
+
+<p>Growing up around parents with backgrounds in computer engineering
+and programming, it did not take long for me to find an interest in
+tinkering and playing with computers as a kid, and I first came into
+contact with GNU/Linux in my teenage years.  My first introduction to
+the world of free software came a few years later, when a friend
+kindly pointed out to me that what I had vaguely known and referred to
+as "open source" software is more properly referred to as free
+software, and helped me see
+<a href="https://www.gnu.org/philosophy/open-source-misses-the-point.html">why
+"open source" misses the point of free software</a>.  After learning
+about and absorbing the ideas and ideals of free software, I have
+since become a free software activist.  As a computer scientist who
+enjoys studying and hacking on various programs and sometimes writing
+my own, I have made a point of releasing all I can under strong
+copyleft licenses, particularly the
+<a href="https://www.gnu.org/licenses/agpl.html">GNU AGPL</a>
+license.</p>
+
+<p>My involvement with the <a href="https://www.gnu.org">GNU
+Project</a> started in 2016, first as a volunteer webmaster, and later
+as one of the maintainers of
+<a href="https://www.gnu.org/software/gnuzilla/">GNUzilla and
+IceCat</a> late last year.  Also around the same time, I led a group
+of volunteers in organizing and holding
+<a href="https://emacsconf.org/2019">EmacsConf 2019</a> as a
+completely online conference, using only free software tools, much
+like the excellent
+<a href="https://libreplanet.org/wiki/LibrePlanet:Conference/2020">LibrePlanet
+2020</a>.  I love <a href="https://www.gnu.org/software/emacs/">GNU
+Emacs</a>, and use it more than any other program.  GNU Emacs helps me
+do a wide variety of tasks such as programming, reading and composing
+emails, and chatting via IRC.</p>
+
+<p>More closely related to my internship with the FSF tech team, I
+have been familiarizing myself with various pieces of the
+<a href="https://savannah.gnu.org">GNU Savannah</a> infrastructure
+with help from veteran Savannah hacker Bob Proulx, gradually learning
+and picking up tasks helping with the administration and maintenance
+of Savannah.  I am also a member of the Systems Committee of my
+university's computer science club, overseeing and maintaining a large
+fleet of GNU/Linux servers for our club members.</p>
+
+<p>For my internship with the Free Software Foundation, I will be
+working with the FSF tech team on a number of tasks, including helping
+with
+the <a href="https://www.fsf.org/blogs/sysadmin/coming-soon-a-new-site-for-fully-free-collaboration">free
+software forge</a> project, as well as various improvements for
+gnu.org.  I look forward to learning many new things and picking up
+valuable skills through my internship with the FSF's exceptional tech
+team, who do <em>so much</em> for the GNU project and the wider free
+software community.</p>
+
+define(__copy, `2020')dnl
+include(footer.html)dnl

diff --git a/fsf-internship/intro.m4 b/fsf-internship/intro.m4
deleted file mode 100644 (file)
index f09d1ba..0000000
--- a/fsf-internship/intro.m4
+++ /dev/null
@@ -1,71 +0,0 @@
-dnl -*- html -*-
-define(__title, `Internship with the FSF tech team')dnl
-define(__pub, 2020-05-29T14:38:00-04:00)dnl
-define(__id, 3)dnl
-include(header.html)dnl
-
-<p>Originally published on the Free Software Foundation's sysadmin
-blog:<br/>
-<a href="https://www.fsf.org/blogs/sysadmin/introducing-bandali-intern-with-the-fsf-tech-team">Introducing
-Amin Bandali, intern with the FSF tech team</a>.</p>
-
-<p>Hi there, I'm Amin Bandali, often just <code>bandali</code> on the
-interwebs.  I wear a few different hats around GNU as a maintainer,
-webmaster, and Savannah hacker, and I'm very excited to be extending
-that to the Free Software Foundation (FSF) as an intern with the FSF
-tech team for spring 2020.</p>
-
-<p>Growing up around parents with backgrounds in computer engineering
-and programming, it did not take long for me to find an interest in
-tinkering and playing with computers as a kid, and I first came into
-contact with GNU/Linux in my teenage years.  My first introduction to
-the world of free software came a few years later, when a friend
-kindly pointed out to me that what I had vaguely known and referred to
-as "open source" software is more properly referred to as free
-software, and helped me see
-<a href="https://www.gnu.org/philosophy/open-source-misses-the-point.html">why
-"open source" misses the point of free software</a>.  After learning
-about and absorbing the ideas and ideals of free software, I have
-since become a free software activist.  As a computer scientist who
-enjoys studying and hacking on various programs and sometimes writing
-my own, I have made a point of releasing all I can under strong
-copyleft licenses, particularly the
-<a href="https://www.gnu.org/licenses/agpl.html">GNU AGPL</a>
-license.</p>
-
-<p>My involvement with the <a href="https://www.gnu.org">GNU
-Project</a> started in 2016, first as a volunteer webmaster, and later
-as one of the maintainers of
-<a href="https://www.gnu.org/software/gnuzilla/">GNUzilla and
-IceCat</a> late last year.  Also around the same time, I led a group
-of volunteers in organizing and holding
-<a href="https://emacsconf.org/2019">EmacsConf 2019</a> as a
-completely online conference, using only free software tools, much
-like the excellent
-<a href="https://libreplanet.org/wiki/LibrePlanet:Conference/2020">LibrePlanet
-2020</a>.  I love <a href="https://www.gnu.org/software/emacs/">GNU
-Emacs</a>, and use it more than any other program.  GNU Emacs helps me
-do a wide variety of tasks such as programming, reading and composing
-emails, and chatting via IRC.</p>
-
-<p>More closely related to my internship with the FSF tech team, I
-have been familiarizing myself with various pieces of the
-<a href="https://savannah.gnu.org">GNU Savannah</a> infrastructure
-with help from veteran Savannah hacker Bob Proulx, gradually learning
-and picking up tasks helping with the administration and maintenance
-of Savannah.  I am also a member of the Systems Committee of my
-university's computer science club, overseeing and maintaining a large
-fleet of GNU/Linux servers for our club members.</p>
-
-<p>For my internship with the Free Software Foundation, I will be
-working with the FSF tech team on a number of tasks, including helping
-with
-the <a href="https://www.fsf.org/blogs/sysadmin/coming-soon-a-new-site-for-fully-free-collaboration">free
-software forge</a> project, as well as various improvements for
-gnu.org.  I look forward to learning many new things and picking up
-valuable skills through my internship with the FSF's exceptional tech
-team, who do <em>so much</em> for the GNU project and the wider free
-software community.</p>
-
-define(__copy, `2020')dnl
-include(footer.html)dnl

diff --git a/index.m4 b/index.m4
index 04a3831..02fc07d 100644 (file)
--- 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>
 
 <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>
 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>
 <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">
 </section>
 
 <section id="notes" class="justify">


@@ -65,7 +63,7 @@ and
 <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>
+<td><a href="fsf-internship-intro">Internship with the FSF tech team</a>

 (intro)</td>
 <td><small>May 29, 2020</small></td>
 </tr>
 (intro)</td>
 <td><small>May 29, 2020</small></td>
 </tr>

diff --git a/meta_defs.m4 b/meta_defs.m4
index aad4d83..fa970b2 100644 (file)
--- 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
 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
 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 (file)
--- a/static/.htaccess
+++ b/static/.htaccess
@@ -4,4 +4,6 @@
 # .html files
 RewriteCond %{REQUEST_FILENAME}.html -f
 RewriteRule !.*\.html$ %{REQUEST_FILENAME}.html [L]
 # .html files
 RewriteCond %{REQUEST_FILENAME}.html -f
 RewriteRule !.*\.html$ %{REQUEST_FILENAME}.html [L]

+
+RewriteRule ^fsf-internship/intro$ /fsf-internship-intro [R]

 </IfModule>
 </IfModule>

diff --git a/static/.htaccess-www b/static/.htaccess-www
index 69dab1d..35d52d1 100644 (file)
--- 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>
 
 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
 AddType text/plain .bib .org
 AddCharset utf-8 .bib .org