Merge branch 'master' into archive-master

diff --cc config.sh.sed.in
index 25db2cc6510b5e5e1e8c33f16aaf16a8f0743370,92679b8a6f3f35a4cce0b15c9df9f3feddfe9b1a..4590580b40551dcc79d26cbdf8d0d4c5be628e2b
--- 1/config.sh.sed.in
--- 2/config.sh.sed.in
+++ b/config.sh.sed.in
@@@ -39,22 -40,22 +39,22 @@@ search_url="/search
  
  # Architectures
  #
- polangs="bg de fi fr hu ja nl ru sk sv uk zh-cn"
+ polangs="bg de fi fr hu ja nl ru sk sv uk zh-cn zh-tw"
  ddtplangs="ca cs da de eo es eu fi fr hu it ja km ko nl pl pt pt-br ru sk sv uk zh zh-cn zh-tw"
 -archives="us security debports backports volatile"
 +archives="us security backports volatile"
  sections="main contrib non-free"
  parts="$sections"
 -suites="etch etch-m68k etch-volatile etch-backports lenny lenny-volatile lenny-backports squeeze sid experimental"
 +suites="bo hamm slink potato woody sarge sarge-volatile sarge-backports"
  priorities="required important standard optional extra"
  dists="$suites"
 -architectures="alpha amd64 arm armel avr32 hppa hurd-i386 i386 ia64 kfreebsd-i386 kfreebsd-amd64 m68k mips mipsel powerpc s390 sparc"
 +architectures="alpha amd64 arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc"
 +arch_bo="i386"
 +arch_hamm="i386 m68k"
 +arch_slink="alpha i386 m68k sparc"
 +arch_potato="alpha arm i386 ia64 m68k powerpc sparc"
 +arch_woody="alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc"
 +arch_sarge="${arch_woody}"
  arch_etch="alpha amd64 arm hppa i386 ia64 mips mipsel powerpc s390 sparc"
 -arch_lenny="${arch_etch} armel"
 -arch_squeeze="alpha amd64 armel hppa i386 ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel powerpc s390 sparc"
 -arch_sid="${arch_squeeze} avr32 hurd-i386 m68k"
 -arch_experimental="${arch_sid}"
 -arch_lenny_proposed_updates="${arch_lenny}"
 -arch_etch_proposed_updates="${arch_etch}"
  
  # Miscellaneous
  #

diff --cc templates/config.tmpl
index 8c86558b798b15496752b00186ef91f11327a5ad,aa1dee5f3fcf536de220f42bcd5b603c4e0f2b08..1500a8f245cae58fc82ccf7df7ca6165a772fc26
--- 1/templates/config.tmpl
--- 2/templates/config.tmpl
+++ b/templates/config.tmpl
@@@ -15,13 -16,15 +15,15 @@@
     ddpo_url = 'http://qa.debian.org/developer.php?login='
     src_bugs_url = bugs_url _ 'src:'
     mirror_url = 'http://ftp.debian.org/'
 -   security_mirror = 'security.debian.org'
 +   security_mirror = 'archive.debian.org'
     security_mirror_url = security_mirror _ '/debian-security'
     security_suite_suffix = '/updates'
 -   changelogs_url = 'http://packages.debian.org/changelogs/'
 +   changelogs_url = 'http://archive.debian.net/changelogs/'
     policy_url = 'http://www.debian.org/doc/debian-policy/'
     cn_help_url = project_homepage _ 'intro/cn'
 -   patch_tracking_url = 'http://patch-tracker.debian.org/package'
 -   screenshots_url = 'http://screenshots.debian.net/package/'
 -   screenshots_thumb_url = 'http://screenshots.debian.net/thumbnail/'
 +#   patch_tracking_url = 'http://patch-tracker.debian.org/package'
++#   screenshots_url = 'http://screenshots.debian.net/package/'
++#   screenshots_thumb_url = 'http://screenshots.debian.net/thumbnail/'
     logo = {
        url => project_homepage,
          src => '/Pics/openlogo-nd-25.png',