Merge branches 'helvetica', 'mail' and 'mpack'

diff --git a/ordersatz.tex b/ordersatz.tex
index 9790a0b..79c27dc 100644 (file)
--- a/ordersatz.tex
+++ b/ordersatz.tex
@@ -1,4 +1,6 @@
 \documentclass{dinbrief}
+\usepackage{helvet}
+\renewcommand*\familydefault{\sfdefault}
 \usepackage[T1]{fontenc}
 \usepackage[latin1]{inputenc}
 \usepackage{german}
@@ -41,7 +43,6 @@
 
 
 \begin{document}
-\begin{sffamily}
 
 \begin{letter}{An den\\
                Metro Store Oldenburg\\
@@ -91,5 +92,4 @@ Bitte die Waren noch nicht durch die Kasse ziehen.
 
 \end{letter}
 
-\end{sffamily}
 \end{document}

diff --git a/utils.php b/utils.php
index dbf113f..2afa57b 100644 (file)
--- a/utils.php
+++ b/utils.php
@@ -6,7 +6,7 @@ define('FNAME_VARS', 'ordersatz_vars.tex');
 define('FNAME_ITEMS', 'ordersatz_items.tex');
 define('FAXNUMBER','2002-364');
 define('ERROR_SAFT','joey@finlandia');
-define('ERROR_MAIL','joey@finlandia');
+define('ERROR_MAIL','joey@finlandia.infodrom.org');
 
 function mk_tempdir()
 {