From owner-dev-commits-doc-all@freebsd.org Thu Feb 4 17:11:14 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C949952962B for ; Thu, 4 Feb 2021 17:11:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DWlSf5PLrz4cNt; Thu, 4 Feb 2021 17:11:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AC7FA7882; Thu, 4 Feb 2021 17:11:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 114HBEml083944; Thu, 4 Feb 2021 17:11:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 114HBE4f083942; Thu, 4 Feb 2021 17:11:14 GMT (envelope-from git) Date: Thu, 4 Feb 2021 17:11:14 GMT Message-Id: <202102041711.114HBE4f083942@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Li-Wen Hsu Subject: git: eec3d286df - main - Fix 12.2 release information MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eec3d286df24332c227d107df55cb379558dc366 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Feb 2021 17:11:14 -0000 The branch main has been updated by lwhsu (ports, src committer): URL: https://cgit.FreeBSD.org/doc/commit/?id=eec3d286df24332c227d107df55cb379558dc366 commit eec3d286df24332c227d107df55cb379558dc366 Author: Li-Wen Hsu AuthorDate: 2021-02-04 17:11:01 +0000 Commit: Li-Wen Hsu CommitDate: 2021-02-04 17:11:01 +0000 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