[??] sync with ftp-master/dak master

[dak.git] / templates / security-install.advisory

diff --git a/templates/security-install.advisory b/templates/security-install.advisory
index ff2e549c6c8be8dbb007e4d8fb7a9ed03ad6d6de..baebe9166661b1c2de77c043cece2f7b62e3f504 100644 (file)
--- a/templates/security-install.advisory
+++ b/templates/security-install.advisory
@@ -4,9 +4,9 @@ __BCC__
 Subject: Template Advisory __ADVISORY__
 
 ------------------------------------------------------------------------
-Debian Security Advisory __ADVISORY__              security@debian.org
+Debian Security Advisory __ADVISORY__                  security@debian.org
 http://www.debian.org/security/                         __WHOAMI__
-__DATE__
+__DATE__                   http://www.debian.org/security/faq
 ------------------------------------------------------------------------
 
 Package        : __PACKAGE__
@@ -18,20 +18,27 @@ CERT advisory  : XXX
 BugTraq ID     : XXX
 Debian Bug     : XXX
 
-...
+Several local/remote vulnerabilities have been discovered in...
+The Common
+Vulnerabilities and Exposures project identifies the following problems:
 
 [single issue]
-For the stable distribution (woody), this problem has been fixed in version XXX
+Foo discovered that
 
-For the old stable distribution (potato), this problem has been fixed in
-version XXX
+
+[single issue]
+For the stable distribution (etch), this problem has been fixed in version XXX
+__PACKAGE__
+
+For the old stable distribution (sarge), this problem has been fixed in
+version __PACKAGE__
 
 [multiple issues]
-For the stable distribution (woody), these problems have been fixed in version
-XXX
+For the stable distribution (etch), these problems have been fixed in version
+__PACKAGE__
 
-For the old stable distribution (potato), these problems have been fixed in
-version XXX
+For the old stable distribution (sarge), these problems have been fixed in
+version __PACKAGE__
 
 
 We recommend that you upgrade your __PACKAGE__ package.
@@ -55,6 +62,14 @@ apt-get upgrade
 You may use an automated update by adding the resources from the
 footer to the proper configuration.
 
+
+Debian GNU/Linux 3.1 alias sarge
+--------------------------------
+
+Debian GNU/Linux 4.0 alias etch
+-------------------------------
+
+
 __ADVISORY_TEXT__