From eec3d286df24332c227d107df55cb379558dc366 Mon Sep 17 00:00:00 2001
From: Li-Wen Hsu <lwhsu@FreeBSD.org>
Date: Fri, 5 Feb 2021 01:11:01 +0800
Subject: [PATCH] Fix 12.2 release information
Approved by: carlavilla (implicitly)
---
website/content/en/releases/12.2R/_index.adoc | 6 +-----
website/content/en/releases/12.2R/hardware.adoc | 4 ++--
website/content/en/releases/12.2R/installation.adoc | 6 +++---
website/content/en/releases/12.2R/readme.adoc | 10 +++++-----
website/content/en/releases/12.2R/schedule.adoc | 3 ++-
5 files changed, 13 insertions(+), 16 deletions(-)
diff --git a/website/content/en/releases/12.2R/_index.adoc b/website/content/en/releases/12.2R/_index.adoc
index a5b0462b64..fee85151b1 100644
--- a/website/content/en/releases/12.2R/_index.adoc
+++ b/website/content/en/releases/12.2R/_index.adoc
@@ -3,7 +3,7 @@ title: "FreeBSD 12.2 Release Information"
sidenav: download
---
-:localRel: "12.2"
+:localRel: 12.2
:localBranchStable: "stable/12"
:localBranchReleng: "releng/12.2"
@@ -11,10 +11,6 @@ sidenav: download
== 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/12.2R/hardware.adoc b/website/content/en/releases/12.2R/hardware.adoc
index f6df331e97..6d1be12936 100644
--- a/website/content/en/releases/12.2R/hardware.adoc
+++ b/website/content/en/releases/12.2R/hardware.adoc
@@ -1,9 +1,9 @@
---
-title: "FreeBSD 12.1-RELEASE Hardware Notes"
+title: "FreeBSD 12.2-RELEASE Hardware Notes"
sidenav: download
---
-:releaseCurrent: "12.1-RELEASE"
+:releaseCurrent: 12.2-RELEASE
= FreeBSD {releaseCurrent} Hardware Notes
diff --git a/website/content/en/releases/12.2R/installation.adoc b/website/content/en/releases/12.2R/installation.adoc
index dd1712989b..0f13ce11a1 100644
--- a/website/content/en/releases/12.2R/installation.adoc
+++ b/website/content/en/releases/12.2R/installation.adoc
@@ -3,8 +3,8 @@ title: "FreeBSD 12.2-RELEASE Installation Instructions"
sidenav: download
---
-:releaseCurrent: "12.2-RELEASE"
-:localRel: "12.2"
+:releaseCurrent: 12.2-RELEASE
+:localRel: 12.2
= 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 12.1-RELEASE
# freebsd-update install
----
diff --git a/website/content/en/releases/12.2R/readme.adoc b/website/content/en/releases/12.2R/readme.adoc
index ba2cc5ecf6..ab12b7b425 100644
--- a/website/content/en/releases/12.2R/readme.adoc
+++ b/website/content/en/releases/12.2R/readme.adoc
@@ -1,13 +1,13 @@
---
-title: "FreeBSD 12.1-RELEASE README"
+title: "FreeBSD 12.2-RELEASE README"
sidenav: download
---
-:releaseCurrent: "12.1-RELEASE"
+:releaseCurrent: 12.2-RELEASE
:releaseType: "release"
-:releaseBranch: "12-STABLE"
-:releasePrevStable: "11.3-RELEASE"
-:releasePrev: "12.0-RELEASE"
+:releaseBranch: 12-STABLE
+:releasePrevStable: 11.4-RELEASE
+:releasePrev: 12.1-RELEASE
include::shared/releases.adoc[]
include::shared/en/urls.adoc[]
diff --git a/website/content/en/releases/12.2R/schedule.adoc b/website/content/en/releases/12.2R/schedule.adoc
index 8b7ec6b1c3..33acab49f4 100644
--- a/website/content/en/releases/12.2R/schedule.adoc
+++ b/website/content/en/releases/12.2R/schedule.adoc
@@ -3,7 +3,7 @@ title: "FreeBSD 12.2 Release Process"
sidenav: download
---
-:localRel: "12.2"
+:localRel: 12.2
:localBranchHead: "head"
:localBranchStable: "stable/12"
:localBranchReleng: "releng/12.2"
@@ -22,6 +22,7 @@ General discussions about the pending release and known issues should be sent to
== Schedule
+[.tblbasic]
[cols=",,,",]
|===
|Action |Expected |Actual |Description