From: Martin Zobel-Helas <zobel@debian.org>
Date: Fri, 6 Jan 2012 12:05:13 +0000 (+0100)
Subject: Merge branch 'master' of git+ssh://db.debian.org/git/dsa-wiki
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=71276bb00d80d4169cbfa2b07e508a3f11e7c05b;hp=310051f8594cda4a443aecaec98dfb4c1fcb3b28;p=mirror%2Fdsa-wiki.git

Merge branch 'master' of git+ssh://db.debian.org/git/dsa-wiki

* 'master' of git+ssh://db.debian.org/git/dsa-wiki:
  Fix path to libvirt xml files
  Document /SWAPFILES in script
---

diff --git a/templates/page.tmpl b/templates/page.tmpl
index 39acf3c..86cf620 100644
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -178,12 +178,12 @@
 <!--/UdmComment-->
 </div> <!-- end footermap -->
 <div id="fineprint">
-  <p>To report a problem with the web site, e-mail <a href="http://www.debian.org/mailto:debian-www@lists.debian.org">debian-www@lists.debian.org</a>. For other contact information, see the Debian <a href="http://www.debian.org/../contact">contact page</a>.</p>
+  <p>To report a problem with the web site, e-mail <a href="http://www.debian.org/mailto:debian-admin@lists.debian.org">debian-admin@lists.debian.org</a>. For other contact information, see the Debian <a href="http://www.debian.org/../contact">contact page</a>.</p>
 <p>
 Last Modified: <TMPL_VAR NAME=MTIME> 
   <br />
 
-  Copyright &copy; 1997-2010
+  Copyright &copy; 1997-2012
  <a href="http://www.debian.org/http://www.spi-inc.org/">SPI</a>; See <a href="http://www.debian.org/../license" rel="copyright">license terms</a><br />
   Debian is a registered <a href="http://www.debian.org/../trademark">trademark</a> of Software in the Public Interest, Inc.
 </p>