git: 4d36b9edf3 - main - Fix 11.4 release information

Fri Feb 5 17:28:03 UTC 2021

The branch main has been updated by lwhsu (ports, src committer):

URL: https://cgit.FreeBSD.org/doc/commit/?id=4d36b9edf37c0b706e5ea4ae9ace8c2572c50fbb

commit 4d36b9edf37c0b706e5ea4ae9ace8c2572c50fbb
Author:     Li-Wen Hsu <lwhsu at FreeBSD.org>
AuthorDate: 2021-02-05 17:27:43 +0000
Commit:     Li-Wen Hsu <lwhsu at FreeBSD.org>
CommitDate: 2021-02-05 17:27:43 +0000

    Fix 11.4 release information
    
    Approved by:    carlavilla (implicitly)
---
 website/content/en/releases/11.4R/_index.adoc       | 12 +++---------
 website/content/en/releases/11.4R/errata.adoc       |  2 +-
 website/content/en/releases/11.4R/installation.adoc |  6 +++---
 website/content/en/releases/11.4R/schedule.adoc     | 14 ++++++--------
 website/content/en/releases/11.4R/signatures.adoc   | 18 +++++++++---------
 5 files changed, 22 insertions(+), 30 deletions(-)

diff --git a/website/content/en/releases/11.4R/_index.adoc b/website/content/en/releases/11.4R/_index.adoc
index ba2ca258dc..d27791390e 100644
--- a/website/content/en/releases/11.4R/_index.adoc
+++ b/website/content/en/releases/11.4R/_index.adoc
@@ -3,18 +3,12 @@ title: "FreeBSD 11.4 Release Information"
 sidenav: download
 ---
 
-:localRel: "11.4"
-:localBranchStable: "stable/11"
-:localBranchReleng: "releng/11.4"
+:localRel: 11.4
+:localBranchStable: stable/11
+:localBranchReleng: releng/11.4
 
 = FreeBSD {localRel}-RELEASE Announcement
 
-== Introduction
-
-This is the index page for FreeBSD {localRel}. For more information about the release engineering process, please see the link:../[Release Engineering] section of the web site.
-
-== Introduction
-
 This is the index page for FreeBSD {localRel}. For more information about the release engineering process, please see the link:../../releng/[Release Engineering] section of the web site.
 
 == Detailed Information
diff --git a/website/content/en/releases/11.4R/errata.adoc b/website/content/en/releases/11.4R/errata.adoc
index 80aab43423..57a6fa8c5f 100644
--- a/website/content/en/releases/11.4R/errata.adoc
+++ b/website/content/en/releases/11.4R/errata.adoc
@@ -9,7 +9,7 @@ sidenav: download
 
 This document lists errata items for FreeBSD 11.4-RELEASE, containing significant information discovered after the release or too late in the release cycle to be otherwise included in the release documentation. This information includes security advisories, as well as news relating to the software or documentation that could affect its operation or usability. An up-to-date version of this document should always be consulted before installing this version of FreeBSD.
 
-This errata document for FreeBSD 11.4-RELEASE will be maintained until the release of FreeBSD 11.4-STABLE (if applicable).
+This errata document for FreeBSD 11.4-RELEASE will be maintained until FreeBSD 11.4-RELEASE reaches end-of-life.
 
 === Table of Contents
 
diff --git a/website/content/en/releases/11.4R/installation.adoc b/website/content/en/releases/11.4R/installation.adoc
index 3fbecac2b7..a7e5f75fa3 100644
--- a/website/content/en/releases/11.4R/installation.adoc
+++ b/website/content/en/releases/11.4R/installation.adoc
@@ -3,8 +3,8 @@ title: "FreeBSD 11.4-RELEASE Installation Instructions"
 sidenav: download
 ---
 
-:releaseCurrent: "11.4-RELEASE"
-:localRel: "11.4"
+:releaseCurrent: 11.4-RELEASE
+:localRel: 11.4
 
 = FreeBSD {localRel}-RELEASE Installation Instructions
 
@@ -51,7 +51,7 @@ Now the {{< manpage "freebsd-update" "8">}} utility can fetch bits belonging to
 
 [.screen]
 ----
-# freebsd-update upgrade -r {localRel}-RELEASE
+# freebsd-update upgrade -r 11.4-RELEASE
 # freebsd-update install
 ----
 
diff --git a/website/content/en/releases/11.4R/schedule.adoc b/website/content/en/releases/11.4R/schedule.adoc
index b030233b91..9b9abf733a 100644
--- a/website/content/en/releases/11.4R/schedule.adoc
+++ b/website/content/en/releases/11.4R/schedule.adoc
@@ -3,9 +3,9 @@ title: "FreeBSD 11.4 Release Process"
 sidenav: download
 ---
 
-:localRel: "11.4"
-:localBranchStable: "stable/11"
-:localBranchReleng: "releng/11.4"
+:localRel: 11.4
+:localBranchStable: stable/11
+:localBranchReleng: releng/11.4
 
 include::shared/en/urls.adoc[]
 
@@ -15,13 +15,11 @@ include::shared/en/urls.adoc[]
 
 This is the release schedule for FreeBSD {localRel}. For more information about the release engineering process, please see the link:../../../releng/[Release Engineering] section of the web site.
 
-General discussions about the pending release and known issues should be sent to the public mailto:FreeBSD-current at FreeBSD.org[freebsd-current] mailing list. link:{handbook}#mfc-glossary[MFC] requests are no longer being accepted for {localBranchReleng}.
+General discussions about the pending release and known issues should be sent to the public mailto:FreeBSD-stable at FreeBSD.org[freebsd-stable] mailing list.
 
-== Schedule
-
-During the {localBranchHead} freeze, the Release Engineering Team may create ALPHA snapshots to publish for testing purposes. As the frequency and total number of the ALPHA snapshots will depend on the length of time the {localBranchHead} branch is frozen, no official schedule is provided.
+link:{handbook}#mfc-glossary[MFC] requests are no longer being accepted.
 
-Announcements regarding the availability of the ALPHA snapshots will be sent to the mailto:freebsd-current at FreeBSD.org[freebsd-current] and mailto:freebsd-snapshots at FreeBSD.org[freebsd-snapshots] mailing lists.
+== Schedule
 
 [.tblbasic]
 [cols=",,,",]
diff --git a/website/content/en/releases/11.4R/signatures.adoc b/website/content/en/releases/11.4R/signatures.adoc
index 290882a8a5..a38af3f907 100644
--- a/website/content/en/releases/11.4R/signatures.adoc
+++ b/website/content/en/releases/11.4R/signatures.adoc
@@ -51,13 +51,13 @@ This page contains links to the PGP-signed checksum files for FreeBSD {localRel}
 [cols=",,",options="header",]
 |===
 |Board Name |`SHA512` |`SHA256`
-|BANANAPI |link:{localRelSha512}-arm-armv6-BANANAPI.asc |{localRelSha256}-arm-armv6-BANANAPI.asc
-|BEAGLEBONE |link:{localRelSha512}-arm-armv6-BEAGLEBONE.asc |{localRelSha256}-arm-armv6-BEAGLEBONE.asc
-|CUBIEBOARD |link:{localRelSha512}-arm-armv6-CUBIEBOARD.asc |{localRelSha256}-arm-armv6-CUBIEBOARD.asc
-|CUBIEBOARD2 |link:{localRelSha512}-arm-armv6-CUBIEBOARD2.asc |{localRelSha256}-arm-armv6-CUBIEBOARD2.asc
-|CUBOX/HUMMINGBOARD |link:{localRelSha512}-arm-armv6-CUBOX-HUMMINGBOARD.asc |{localRelSha256}-arm-armv6-CUBOX-HUMMINGBOARD.asc
-//|PANDABOARD |link:{localRelSha512}-arm-armv6-PANDABOARD.asc |{localRelSha256}-arm-armv6-PANDABOARD.asc
-|RPI-B |link:{localRelSha512}-arm-armv6-RPI-B.asc |{localRelSha256}-arm-armv6-RPI-B.asc
-|RPI2 |link:{localRelSha512}-arm-armv6-RPI2.asc |{localRelSha256}-arm-armv6-RPI2.asc
-|WANDBOARD |link:{localRelSha512}-arm-armv6-WANDBOARD.asc |{localRelSha256}-arm-armv6-WANDBOARD.asc
+|BANANAPI |link:{localRelSha512}-arm-armv6-BANANAPI.asc[SHA512] |link:{localRelSha256}-arm-armv6-BANANAPI.asc[SHA256]
+|BEAGLEBONE |link:{localRelSha512}-arm-armv6-BEAGLEBONE.asc[SHA512] |link:{{localRelSha256}-arm-armv6-BEAGLEBONE.asc[SHA256]
+|CUBIEBOARD |link:{localRelSha512}-arm-armv6-CUBIEBOARD.asc[SHA512] |link:{{localRelSha256}-arm-armv6-CUBIEBOARD.asc[SHA256]
+|CUBIEBOARD2 |link:{localRelSha512}-arm-armv6-CUBIEBOARD2.asc[SHA512] |link:{{localRelSha256}-arm-armv6-CUBIEBOARD2.asc[SHA256]
+|CUBOX/HUMMINGBOARD |link:{localRelSha512}-arm-armv6-CUBOX-HUMMINGBOARD.asc[SHA512] |link:{{localRelSha256}-arm-armv6-CUBOX-HUMMINGBOARD.asc[SHA256]
+//|PANDABOARD |link:{localRelSha512}-arm-armv6-PANDABOARD.asc[SHA512] |link:{{localRelSha256}-arm-armv6-PANDABOARD.asc[SHA256]
+|RPI-B |link:{localRelSha512}-arm-armv6-RPI-B.asc[SHA512] |link:{{localRelSha256}-arm-armv6-RPI-B.asc[SHA256]
+|RPI2 |link:{localRelSha512}-arm-armv6-RPI2.asc[SHA512] |link:{{localRelSha256}-arm-armv6-RPI2.asc[SHA256]
+|WANDBOARD |link:{localRelSha512}-arm-armv6-WANDBOARD.asc[SHA512] |link:{{localRelSha256}-arm-armv6-WANDBOARD.asc[SHA256]
 |===
