Revert "Merge master into website"

This reverts commit 0a5e38e.

Makefile

@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-VOL			?= 5
+VOL			?= 3
 
 NAME		=	vol_$(VOL)/newsletter_$(VOL)
 OUTPUT_HTML	=	$(NAME).html
@@ -38,9 +38,9 @@ clean:
 	maxpasses=5; \
 	file=`basename $< .tex`; \
 	cd `dirname $<` || exit 1; \
-	pdflatex $(PDFLATEX_FLAGS) "$$file.tex" >/dev/null || exit 2; \
+	pdflatex $(PDFLATEX_FLAGS) "$$file.tex" >/dev/null || exit 1; \
 	while test $$maxpasses -gt 0 && grep -q -i 'rerun' $$file.log; do \
-		pdflatex $(PDFLATEX_FLAGS) "$$file.tex" >/dev/null || exit 3; \
+		pdflatex $(PDFLATEX_FLAGS) "$$file.tex" >/dev/null || exit 1; \
 		maxpasses=`expr $$maxpasses - 1`; \
 	done; \
 	rm -f "$$file.log" "$$file.toc" "$$file.out" "$$file.aux"

rst2latex.sed

@@ -12,5 +12,4 @@
 
 # center images and reduce them to something moderated fitting the page
 # also force an empty line before: fixes placement after \paragraph and with previous text
-# we ignore any option the input may have for \includegraphics
-s/(.*\\includegraphics)(\[.*\])?(.*)/\\begin{center}\\begin{minipage}[c]{\\linewidth}\\begin{center}\1[width=\\textwidth,height=0.25\\textheight,keepaspectratio=true]\3\\end{center}\\end{minipage}\\end{center}/
+s/(.*\\includegraphics)(.*)/\\begin{center}\\begin{minipage}[c]{\\linewidth}\\begin{center}\1[width=\\textwidth,height=0.25\\textheight,keepaspectratio=true]\2\\end{center}\\end{minipage}\\end{center}/

template.tex

@@ -15,7 +15,6 @@
 \usepackage{fixltx2e} % LaTeX patches, \textsubscript
 \usepackage{cmap} % fix search and cut-and-paste in PDF
 \usepackage[pdfborder={0 0 0}]{hyperref}
-\usepackage{helvet}
 $requirements
 %%% Custom LaTeX preamble
 \hypersetup{%
@@ -28,7 +27,6 @@
 %%% Fallback definitions for Docutils-specific commands
 $fallbacks
 $pdfsetup
-$titledata
 %%% Body
 \begin{document}
 $body_pre_docinfo