From: Martin Zobel-Helas <zobel@draghi.debian.org>
Date: Sat, 6 Jun 2009 21:31:32 +0000 (+0000)
Subject: Merge branch 'master' of /git/dsa-wiki
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=d8cd3acc5bfdefcae225139933a7212e1ce3d203;hp=-c;p=mirror%2Fdsa-wiki.git

Merge branch 'master' of /git/dsa-wiki
---

d8cd3acc5bfdefcae225139933a7212e1ce3d203
diff --combined bin/update-wiki
index d5ee8e1,3be2046..f671b23
--- a/bin/update-wiki
+++ b/bin/update-wiki
@@@ -3,8 -3,8 +3,8 @@@
  set -e
  umask 0002
  
 -WC="/org/dsa.debian.org/dsa-wiki"
 -DEST="/org/dsa.debian.org/htdocs"
 +WC="/srv/dsa.debian.org/dsa-wiki"
 +DEST="/srv/dsa.debian.org/htdocs"
  URL="http://dsa.debian.org/"
  UPDATE=1
  
@@@ -21,6 -21,8 +21,8 @@@ env -i ikiwiki 
  	--templatedir "$WC/templates" \
  	--no-discussion \
  	--rebuild \
+         --atom \
+         --rss \
  	--plugin template \
  	--plugin toggle \
  	--plugin inline \