From 553a0296a5df508f36f9332170ba5037a7d2bf8e Mon Sep 17 00:00:00 2001 From: Amin Bandali Date: Fri, 11 Dec 2020 22:54:35 -0500 Subject: [PATCH 1/1] 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.

On the side, I enjoy hacking -on elisp -and guile. I'm a +on Emacs +Lisp. I'm a GNU maintainer, webmaster, and Savannah hacker; and an associate member of the Free Software Foundation (FSF). I'm currently the chief organizer of the EmacsConf -conference, and the co-host of -the Emacs.el podcast with +conference, and the co-host of the +Emacs.el podcast with Daniel Gopar. I am also a member of the Systems Committee of the Computer Science Club of the University of Waterloo.

- -

Starting in spring 2020, I am an intern with the FSF tech team.

@@ -65,7 +63,7 @@ and - 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, `')dnl define(__smly, `:-)')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] 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] +AddType application/atom+xml .atom +AddType application/rss+xml .rss + AddType text/plain .bib .org AddCharset utf-8 .bib .org -- 2.20.1
Internship with the FSF tech team +Internship with the FSF tech team (intro) May 29, 2020