From 204e2fd74ccf1a1f55b15c78c4d7dec0f208b4b7 Mon Sep 17 00:00:00 2001
From: Ed Maste <emaste@FreeBSD.org>
Date: Mon, 11 Nov 2019 20:22:17 +0000
Subject: [PATCH] Update FreeBSD releases in errata/SA templates

11.2 is no longer supported
12.1 exists
---
 en_US.ISO8859-1/htdocs/security/advisory-template.txt | 6 +++---
 en_US.ISO8859-1/htdocs/security/errata-template.txt   | 7 ++++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/en_US.ISO8859-1/htdocs/security/advisory-template.txt b/en_US.ISO8859-1/htdocs/security/advisory-template.txt
index 9f8cf519ad..0c906e6768 100644
--- a/en_US.ISO8859-1/htdocs/security/advisory-template.txt
+++ b/en_US.ISO8859-1/htdocs/security/advisory-template.txt
@@ -12,10 +12,10 @@ Affects:        <affected versions>
                 <e.g., "All supported versions of FreeBSD.", "FreeBSD
                 12.0 and later.", "FreeBSD 12.x", or "FreeBSD 11.3">
 Corrected:      2019-XX-XX XX:XX:XX UTC (stable/12, 12.0-STABLE)
+                2019-XX-XX XX:XX:XX UTC (releng/12.1, 12.1-RELEASE-pXX)
                 2019-XX-XX XX:XX:XX UTC (releng/12.0, 12.0-RELEASE-pXX)
                 2019-XX-XX XX:XX:XX UTC (stable/11, 11.3-STABLE)
                 2019-XX-XX XX:XX:XX UTC (releng/11.3, 11.3-RELEASE-pXX)
-                2019-XX-XX XX:XX:XX UTC (releng/11.2, 11.2-RELEASE-pXX)
 CVE Name:       CVE-XXXX-XXXX
 
 For general information regarding FreeBSD Security Advisories,
@@ -73,7 +73,7 @@ FreeBSD release branches.
 a) Download the relevant patch from the location below, and verify the
 detached PGP signature using your PGP utility.
 
-[FreeBSD 11.2]
+[FreeBSD 11.3]
 # fetch https://security.FreeBSD.org/patches/SA-XX:XX/XXXX.patch
 # fetch https://security.FreeBSD.org/patches/SA-XX:XX/XXXX.patch.asc
 # gpg --verify XXXX.patch.asc
@@ -116,10 +116,10 @@ affected branch.
 Branch/path                                                      Revision
 -------------------------------------------------------------------------
 stable/12/                                                        rXXXXXX
+releng/12.1/                                                      rXXXXXX
 releng/12.0/                                                      rXXXXXX
 stable/11/                                                        rXXXXXX
 releng/11.3/                                                      rXXXXXX
-releng/11.2/                                                      rXXXXXX
 -------------------------------------------------------------------------
 
 To see which files were modified by a particular revision, run the
diff --git a/en_US.ISO8859-1/htdocs/security/errata-template.txt b/en_US.ISO8859-1/htdocs/security/errata-template.txt
index d611d4b991..6155056e07 100644
--- a/en_US.ISO8859-1/htdocs/security/errata-template.txt
+++ b/en_US.ISO8859-1/htdocs/security/errata-template.txt
@@ -12,10 +12,10 @@ Affects:        <affected versions>
                 <e.g., "All supported versions of FreeBSD.", "FreeBSD
                 12.0 and later.", "FreeBSD 12.x", or "FreeBSD 11.3">
 Corrected:      2019-XX-XX XX:XX:XX UTC (stable/12, 12.0-STABLE)
+                2019-XX-XX XX:XX:XX UTC (releng/12.1, 12.1-RELEASE-pXX)
                 2019-XX-XX XX:XX:XX UTC (releng/12.0, 12.0-RELEASE-pXX)
                 2019-XX-XX XX:XX:XX UTC (stable/11, 11.3-STABLE)
                 2019-XX-XX XX:XX:XX UTC (releng/11.3, 11.3-RELEASE-pXX)
-                2019-XX-XX XX:XX:XX UTC (releng/11.2, 11.2-RELEASE-pXX)
 
 For general information regarding FreeBSD Errata Notices and Security
 Advisories, including descriptions of the fields above, security
@@ -73,7 +73,7 @@ FreeBSD release branches.
 a) Download the relevant patch from the location below, and verify the
 detached PGP signature using your PGP utility.
 
-[FreeBSD 11.2]
+[FreeBSD 11.3]
 # fetch https://security.FreeBSD.org/patches/EN-XX:XX/XXXX.patch
 # fetch https://security.FreeBSD.org/patches/EN-XX:XX/XXXX.patch.asc
 # gpg --verify XXXX.patch.asc
@@ -116,9 +116,10 @@ affected branch.
 Branch/path                                                      Revision
 -------------------------------------------------------------------------
 stable/12/                                                        rXXXXXX
+releng/12.1/                                                      rXXXXXX
 releng/12.0/                                                      rXXXXXX
 stable/11/                                                        rXXXXXX
-releng/11.2/                                                      rXXXXXX
+releng/11.3/                                                      rXXXXXX
 -------------------------------------------------------------------------
 
 To see which files were modified by a particular revision, run the