From owner-dev-commits-doc-all@freebsd.org  Mon Feb  1 00:28:24 2021
Return-Path: <owner-dev-commits-doc-all@freebsd.org>
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 E48A54ECF54
 for <dev-commits-doc-all@mailman.nyi.freebsd.org>;
 Mon,  1 Feb 2021 00:28:24 +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 4DTTLw5swgz4sK9;
 Mon,  1 Feb 2021 00:28:24 +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 BC8A211DCF;
 Mon,  1 Feb 2021 00:28:24 +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 1110SO46035017;
 Mon, 1 Feb 2021 00:28:24 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
 by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1110SOPH035016;
 Mon, 1 Feb 2021 00:28:24 GMT (envelope-from git)
Date: Mon, 1 Feb 2021 00:28:24 GMT
Message-Id: <202102010028.1110SOPH035016@gitrepo.freebsd.org>
To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org
From: Ed Maste <emaste@FreeBSD.org>
Subject: git: 2809e50c1d - main - Update SA/EN templates for 12.1 EOL
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: emaste
X-Git-Repository: doc
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 2809e50c1d19033ffd300e4b5697e98281da2935
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
 <dev-commits-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-doc-all/>
List-Post: <mailto:dev-commits-doc-all@freebsd.org>
List-Help: <mailto:dev-commits-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 01 Feb 2021 00:28:25 -0000

The branch main has been updated by emaste (src committer):

URL: https://cgit.FreeBSD.org/doc/commit/?id=2809e50c1d19033ffd300e4b5697e98281da2935

commit 2809e50c1d19033ffd300e4b5697e98281da2935
Author:     Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2021-02-01 00:26:31 +0000
Commit:     Ed Maste <emaste@FreeBSD.org>
CommitDate: 2021-02-01 00:27:53 +0000

    Update SA/EN templates for 12.1 EOL
    
    Sponsored by:   The FreeBSD Foundation
---
 website/static/security/advisory-template.txt | 4 +---
 website/static/security/errata-template.txt   | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/website/static/security/advisory-template.txt b/website/static/security/advisory-template.txt
index b9f1a329c1..8e63f61f09 100644
--- a/website/static/security/advisory-template.txt
+++ b/website/static/security/advisory-template.txt
@@ -10,10 +10,9 @@ Announced:      2021-XX-XX
 Credits:
 Affects:        <affected versions>
                 <e.g., "All supported versions of FreeBSD.", "FreeBSD
-                12.1 and later.", "FreeBSD 12.x", or "FreeBSD 11.4">
+                12.2 and later.", "FreeBSD 12.x", or "FreeBSD 11.4">
 Corrected:      2021-XX-XX XX:XX:XX UTC (stable/12, 12.2-STABLE)
                 2021-XX-XX XX:XX:XX UTC (releng/12.2, 12.2-RELEASE-pXX)
-                2021-XX-XX XX:XX:XX UTC (releng/12.1, 12.1-RELEASE-pXX)
                 2021-XX-XX XX:XX:XX UTC (stable/11, 11.4-STABLE)
                 2021-XX-XX XX:XX:XX UTC (releng/11.4, 11.4-RELEASE-pXX)
 CVE Name:       CVE-XXXX-XXXX
@@ -117,7 +116,6 @@ Branch/path                                                      Revision
 -------------------------------------------------------------------------
 stable/12/                                                        rXXXXXX
 releng/12.2/                                                      rXXXXXX
-releng/12.1/                                                      rXXXXXX
 stable/11/                                                        rXXXXXX
 releng/11.4/                                                      rXXXXXX
 -------------------------------------------------------------------------
diff --git a/website/static/security/errata-template.txt b/website/static/security/errata-template.txt
index 27e996e8c1..0ae8e44b89 100644
--- a/website/static/security/errata-template.txt
+++ b/website/static/security/errata-template.txt
@@ -10,10 +10,9 @@ Announced:      2021-XX-XX
 Credits:
 Affects:        <affected versions>
                 <e.g., "All supported versions of FreeBSD.", "FreeBSD
-                12.1 and later.", "FreeBSD 12.x", or "FreeBSD 11.4">
+                12.2 and later.", "FreeBSD 12.x", or "FreeBSD 11.4">
 Corrected:      2021-XX-XX XX:XX:XX UTC (stable/12, 12.2-STABLE)
                 2021-XX-XX XX:XX:XX UTC (releng/12.2, 12.2-RELEASE-pXX)
-                2021-XX-XX XX:XX:XX UTC (releng/12.1, 12.1-RELEASE-pXX)
                 2021-XX-XX XX:XX:XX UTC (stable/11, 11.4-STABLE)
                 2021-XX-XX XX:XX:XX UTC (releng/11.4, 11.4-RELEASE-pXX)
 
@@ -117,7 +116,6 @@ Branch/path                                                      Revision
 -------------------------------------------------------------------------
 stable/12/                                                        rXXXXXX
 releng/12.2/                                                      rXXXXXX
-releng/12.1/                                                      rXXXXXX
 stable/11/                                                        rXXXXXX
 releng/11.4/                                                      rXXXXXX
 -------------------------------------------------------------------------

From owner-dev-commits-doc-all@freebsd.org  Mon Feb  1 01:09:51 2021
Return-Path: <owner-dev-commits-doc-all@freebsd.org>
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 A23984EE0CB
 for <dev-commits-doc-all@mailman.nyi.freebsd.org>;
 Mon,  1 Feb 2021 01:09:51 +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 4DTVGl4FyPz4vG6;
 Mon,  1 Feb 2021 01:09:51 +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 85357122DB;
 Mon,  1 Feb 2021 01:09:51 +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 11119pXC087267;
 Mon, 1 Feb 2021 01:09:51 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
 by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 11119pOY087266;
 Mon, 1 Feb 2021 01:09:51 GMT (envelope-from git)
Date: Mon, 1 Feb 2021 01:09:51 GMT
Message-Id: <202102010109.11119pOY087266@gitrepo.freebsd.org>
To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org
From: Allan Jude <allanjude@FreeBSD.org>
Subject: git: bc185da8de - main - Improve the documentation front page with
 full book/article names
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: allanjude
X-Git-Repository: doc
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: bc185da8de5102c574e6dccbe3559591027a2d46
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
 <dev-commits-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-doc-all/>
List-Post: <mailto:dev-commits-doc-all@freebsd.org>
List-Help: <mailto:dev-commits-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 01 Feb 2021 01:09:51 -0000

The branch main has been updated by allanjude:

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

commit bc185da8de5102c574e6dccbe3559591027a2d46
Author:     Allan Jude <allanjude@FreeBSD.org>
AuthorDate: 2021-01-31 19:39:20 +0000
Commit:     Allan Jude <allanjude@FreeBSD.org>
CommitDate: 2021-02-01 01:09:37 +0000

    Improve the documentation front page with full book/article names
    
    Use the title of the book or article rather than the directory name
    Also use the full name of the language, not just the short code
    
    Sponsored by:   Klara Inc.
    Reviewed by:    carlavilla
    Differential Revision:  https://reviews.freebsd.org/D28440
---
 documentation/themes/beastie/layouts/index.html | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/documentation/themes/beastie/layouts/index.html b/documentation/themes/beastie/layouts/index.html
index e7c72d5ee3..1ba57c710a 100644
--- a/documentation/themes/beastie/layouts/index.html
+++ b/documentation/themes/beastie/layouts/index.html
@@ -19,15 +19,13 @@
           </ul>
         </li>
       </ul>
-      <h1 class="books-title">{{ i18n "books" }} - {{ $home.Language }}</h1>
+      <h1 class="books-title">{{ i18n "books" }} - {{ $home.Language.LanguageName }}</h1>
       {{ $books := slice}}
 
       {{ range where .Site.Pages "Section" "books" }}
-        {{ with .File }}
-          {{ $subDirsNumer := .File.Path | strings.Count "/" }}
-          {{ if eq $subDirsNumer 2 }}
-            {{ $books  = $books  | append (dict "page" . "path" .File.Path) }}
-          {{ end }}
+        {{ $subDirsNumer := .File.Path | strings.Count "/" }}
+        {{ if eq $subDirsNumer 2 }}
+          {{ $books  = $books  | append (dict "page" . "path" .File.Path) }}
         {{ end }}
       {{ end }}
 
@@ -36,20 +34,18 @@
         {{ if in .path "_index.adoc" }}
           {{ $bookPath := replaceRE "/_index.adoc" "" .path }}
           {{ $bookName := replaceRE "books/" "" $bookPath }}
-          <li><a href="{{ $bookPath }}">{{ $bookName }}</a></li>
+          <li><a href="{{ $bookPath }}">{{ .page.Title }}</a></li>
         {{ end }}
       {{ end }}
       </ul>
 
-      <h1 class="articles-title">{{ i18n "articles" }} - {{ $home.Language }}</h1>
+      <h1 class="articles-title">{{ i18n "articles" }} - {{ $home.Language.LanguageName }}</h1>
       {{ $articles := slice}}
 
       {{ range where .Site.Pages "Section" "articles" }}
-        {{ with .File }}
-          {{ $subDirsNumer := .File.Path | strings.Count "/" }}
-          {{ if eq $subDirsNumer 2 }}
-            {{ $articles  = $articles  | append (dict "page" . "path" .File.Path) }}
-          {{ end }}
+        {{ $subDirsNumer := .File.Path | strings.Count "/" }}
+        {{ if eq $subDirsNumer 2 }}
+          {{ $articles  = $articles  | append (dict "page" . "path" .File.Path) }}
         {{ end }}
       {{ end }}
 
@@ -58,7 +54,7 @@
         {{ if in .path "_index.adoc" }}
           {{ $articlePath := replaceRE "/_index.adoc" "" .path }}
           {{ $articleName := replaceRE "articles/" "" $articlePath }}
-          <li><a href="{{ $articlePath }}">{{ $articleName }}</a></li>
+          <li><a href="{{ $articlePath }}">{{ .page.Title }}</a></li>
         {{ end }}
       {{ end }}
       </ul>

From owner-dev-commits-doc-all@freebsd.org  Mon Feb  1 01:20:23 2021
Return-Path: <owner-dev-commits-doc-all@freebsd.org>
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 097D04EE4E0
 for <dev-commits-doc-all@mailman.nyi.freebsd.org>;
 Mon,  1 Feb 2021 01:20:23 +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 4DTVVt6v7Tz4vX1;
 Mon,  1 Feb 2021 01:20:22 +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 DF970125E7;
 Mon,  1 Feb 2021 01:20:22 +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 1111KMaE007691;
 Mon, 1 Feb 2021 01:20:22 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
 by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1111KMfe007690;
 Mon, 1 Feb 2021 01:20:22 GMT (envelope-from git)
Date: Mon, 1 Feb 2021 01:20:22 GMT
Message-Id: <202102010120.1111KMfe007690@gitrepo.freebsd.org>
To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org
From: Allan Jude <allanjude@FreeBSD.org>
Subject: git: a4b2772516 - main - Fix broken link to the BSD family tree in
 the FAQ
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: allanjude
X-Git-Repository: doc
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: a4b2772516612e5a38b5380a3566a2d33a3b18d0
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
 <dev-commits-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-doc-all/>
List-Post: <mailto:dev-commits-doc-all@freebsd.org>
List-Help: <mailto:dev-commits-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 01 Feb 2021 01:20:23 -0000

The branch main has been updated by allanjude:

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

commit a4b2772516612e5a38b5380a3566a2d33a3b18d0
Author:     Allan Jude <allanjude@FreeBSD.org>
AuthorDate: 2021-02-01 01:19:23 +0000
Commit:     Allan Jude <allanjude@FreeBSD.org>
CommitDate: 2021-02-01 01:19:23 +0000

    Fix broken link to the BSD family tree in the FAQ
---
 documentation/content/en/books/faq/_index.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/documentation/content/en/books/faq/_index.adoc b/documentation/content/en/books/faq/_index.adoc
index dfc43e455b..78c24c3fdd 100644
--- a/documentation/content/en/books/faq/_index.adoc
+++ b/documentation/content/en/books/faq/_index.adoc
@@ -129,7 +129,7 @@ It is worth pointing out that the word "free" is being used in two ways here: on
 [[differences-to-other-bsds]]
 === What are the differences between FreeBSD and NetBSD, OpenBSD, and other open source BSD operating systems?
 
-James Howard wrote a good explanation of the history and differences between the various projects, called https://jameshoward.us/archive/the-bsd-family-tree/[The BSD Family Tree] which goes a fair way to answering this question. Some of the information is out of date, but the history portion in particular remains accurate.
+James Howard wrote a good explanation of the history and differences between the various projects, called https://jameshoward.us/archive/bsd-family-tree/[The BSD Family Tree] which goes a fair way to answering this question. Some of the information is out of date, but the history portion in particular remains accurate.
 
 Most of the BSDs share patches and code, even today. All of the BSDs have common ancestry.
 

From owner-dev-commits-doc-all@freebsd.org  Mon Feb  1 07:54:18 2021
Return-Path: <owner-dev-commits-doc-all@freebsd.org>
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 D04454F430F
 for <dev-commits-doc-all@mailman.nyi.freebsd.org>;
 Mon,  1 Feb 2021 07:54:18 +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 4DTgFQ5THwz4tHv;
 Mon,  1 Feb 2021 07:54:18 +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 AEE9217A71;
 Mon,  1 Feb 2021 07:54:18 +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 1117sIRs021172;
 Mon, 1 Feb 2021 07:54:18 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
 by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1117sIPw021171;
 Mon, 1 Feb 2021 07:54:18 GMT (envelope-from git)
Date: Mon, 1 Feb 2021 07:54:18 GMT
Message-Id: <202102010754.1117sIPw021171@gitrepo.freebsd.org>
To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org
From: Vincenzo Maffione <vmaffione@FreeBSD.org>
Subject: git: bdb56d32ce - main - Update my PGP key (using addkey.sh)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: vmaffione
X-Git-Repository: doc
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: bdb56d32ce67e0be3e9c1acbe86bf2956be0feaf
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
 <dev-commits-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-doc-all/>
List-Post: <mailto:dev-commits-doc-all@freebsd.org>
List-Help: <mailto:dev-commits-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 01 Feb 2021 07:54:18 -0000

The branch main has been updated by vmaffione (src committer):

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

commit bdb56d32ce67e0be3e9c1acbe86bf2956be0feaf
Author:     Vincenzo Maffione <vmaffione@FreeBSD.org>
AuthorDate: 2021-02-01 07:48:16 +0000
Commit:     Vincenzo Maffione <vmaffione@FreeBSD.org>
CommitDate: 2021-02-01 07:50:02 +0000

    Update my PGP key (using addkey.sh)
---
 documentation/static/pgpkeys/vmaffione.key | 94 ++++++++++++++++--------------
 1 file changed, 49 insertions(+), 45 deletions(-)

diff --git a/documentation/static/pgpkeys/vmaffione.key b/documentation/static/pgpkeys/vmaffione.key
index 8f92c77d9d..ecdf5418a8 100644
--- a/documentation/static/pgpkeys/vmaffione.key
+++ b/documentation/static/pgpkeys/vmaffione.key
@@ -1,49 +1,53 @@
-// $FreeBSD: head/share/pgpkeys/vmaffione.key 53970 2020-03-10 22:47:01Z vmaffione $
-//
-// sh addkey.sh vmaffione D4F93098AA1FA8AA ;
+<!--
+sh addkey.sh vmaffione 3A3F58253F30A245 ;
+-->
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
+pub   3072R/3A3F58253F30A245 2021-02-01 [expires: 2024-02-01]
+      Key fingerprint = E42A 54BD 67B3 5721 1641  B144 3A3F 5825 3F30 A245
+uid                          Vincenzo Maffione <vmaffione@freebsd.org>
+sub   3072R/77769E9A73B79B2B 2021-02-01 [expires: 2024-02-01]
 
-
-[.literal-block-margin]
-....
-pub   rsa2048/D4F93098AA1FA8AA 2020-03-10 [SC] [expires: 2023-03-10]
-      Key fingerprint = 7E99 E2AD 9A8B 1C99 A98D  AF2E D4F9 3098 AA1F A8AA
-uid                            Vincenzo Maffione <vmaffione@freebsd.org>
-sub   rsa2048/B51B3033534F9949 2020-03-10 [E] [expires: 2023-03-10]
-
-....
-
-[.literal-block-margin]
-....
+]]></programlisting>
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
-mQENBF5oFowBCACgHAkBIXBFGf5dmLWbiSu4BQ1CMi0094l7Ov2d++9gRJBeX/98
-uWPJQTXHyEcexsEXyYmbH191fip7ccuvJiylnj3Sfn2FS11nc0fOMeJUExC22q5/
-LKuW3GfntSkQNd8Pt2F5bRakla20SC9l9ChwVWj+l6dxYXPmTVuIp4WkLc9zjeV3
-IYptvg/2wC5j/tIsbKLdB0ZXcrLQIXqVJIimE28bs1AEmkDfkL89YzPm9YoJeorJ
-yFI66aiUEeFg31H3fNMJ/daN5HVziSPW9WBy3+YLQE8P40Nkj7y4o0JZI6m2eQ9a
-Jm9t09c5HoUjkn+xQ7T2D9pN0JFGcf3Ro+UTABEBAAG0KVZpbmNlbnpvIE1hZmZp
-b25lIDx2bWFmZmlvbmVAZnJlZWJzZC5vcmc+iQFUBBMBCgA+FiEEfpnirZqLHJmp
-ja8u1PkwmKofqKoFAl5oFowCGwMFCQWjmoAFCwkIBwMFFQoJCAsFFgMCAQACHgEC
-F4AACgkQ1PkwmKofqKoFxwgAl6sSiFT/6MQx+6YXWFCH9ysO+eDKCNUwUHIxoHok
-buSHMwywXGo/PmW3j2ga1ZYht/1WP4xftsXCtBUw7ZblovSo3U7HPfbU90etHWcc
-V1Dq1uu7jjXYb9grmIqjXST3kbgJ+b7QJL9HpDU07/1Q+OKIem/2frBjNs6nH6ph
-NN/yZERW4J6gWzSfL3WItwbY6YCh4KcXWRO3rtkAVifBek0xEWmVYAlAXf7aEWhn
-Sm4yLdthbaKU7aKL+yId4rD5zFvZRDPJ2zdGuE5ZuHU5ZJpYPT6OUQAcqFgUMZ6m
-s40kXFK69OkxQnQEhXmZtMSwlpE6pcv4OhA+OxuXPr3mC7kBDQReaBaMAQgAuX0B
-+oIg56FYtaVJCGH0YQqTvK8XeEqr3ytD7NFYzZcQoOewDb98DVlHe2Rr/kKRP2vx
-igCATwP2JJIqAHQdYpEEWtXoWQ0PeP92J3j8kPvbK2f089xYFa2sWCmKDuYCPmbF
-66RoDuDtMIM4wl3I/vGw8+4bRXxk+GXcxrfhaKJyYkoPsWS3tSWyuuhdM4XgePOp
-+oRR9KyigNaoP/FQFADl3v1sv/jjqXLePPk0OM3NuuIoMOk/01UyR+W2n2c+ShjN
-CKUGkaBXLKFK+Y9aVhHgH5y+TXmAj9FCjGjaT3HXbhfNDcYDMRqXv18Vn+jJKhvC
-1B8ApJgcBmzmDaRJcQARAQABiQE8BBgBCgAmFiEEfpnirZqLHJmpja8u1PkwmKof
-qKoFAl5oFowCGwwFCQWjmoAACgkQ1PkwmKofqKpOEAgAgIoAyyXOsgIfepLHRXlz
-hsDcYUQvayaXryvGAU6FD/nR33ewpY/Qo0GATqHCzGk/1mGJrMBK+7aGUSuZ+9rS
-8EmjbyqzYJwQ/3gq/fSbc0blDl1cTfFQA/wjs4F6U8Txh8SoPkj+VhgRsBnSHdeg
-dLYsYQFIq5Xg9WbsteaIhGEnMy7oLViHG2IbK7A8JFa14Y50LMSzmQCO1Za06B/+
-j4VupRqKxs/7cncp4doSZRT8xA6fVGGswsT8cvXwfGJj5exb6ZJFdzz1c5bRdxdD
-A9KsoJaTqmPeQIsTfwsIkzvLL+/7z8pCVtmaMxRCFFaxD0nJWIpJbViPaWkvcMTt
-OQ==
-=ouk4
+mQGNBGAXrewBDADWAAzoNzWUJwkvsOr398w2C7Vpy7WlROBLd5StDH1Q/XSUJHlb
+i54rYggUvGy0jO39sFHMdV4ndm8IKy+C/d2KfSihMWCze7cenQWXTseq0oFIuwtw
+6HHA7B8s2VFvh3ixbNUvJy0OLQfzd1kxwn9L2XpOnTD9cc3tN42STCcwxRJWmHEg
+8TAsgxtzKS4tb4CISFfqbHVLBgb37EVz+bB7MwAUMMCx3gvi9brElOg/MlRo5RO5
++9/DZr+0dfqBeZUmOmyU1Q9owX4crB8RwEsKBuNhshYPMrQxe4RNM1zbb7k0Jia+
+j3MLERoaIQs02Mt3zqzTNuOkP3LInLegMMsRirZR3zDpdsx8Zj8iAQgt+BtRT/LK
+ALAMgBAS9YvS6Hd/yDuZLGNGignRC5BofVqgIiXDZWsUTjolM2JrNXU5bnUqH0Eb
+rpE9HvqE9miGbY5OsMXgmvlTBEm6NQyHF27CBPnXX0VMal54FRcJCl0x+2WTAVkb
+HIvywsbHBXFT9ikAEQEAAbQpVmluY2Vuem8gTWFmZmlvbmUgPHZtYWZmaW9uZUBm
+cmVlYnNkLm9yZz6JAdQEEwEKAD4WIQTkKlS9Z7NXIRZBsUQ6P1glPzCiRQUCYBet
+7AIbAwUJBaOagAULCQgHAwUVCgkICwUWAwIBAAIeAQIXgAAKCRA6P1glPzCiRVER
+DACVCrSfYIt2WIzuk2oPqeBLXmpt5U/UFYwz9qi9Feuq8jRJt8i2BtTv/VDrCYOG
+PBc4o4bRiOWgBgdnYi7oYHFRdMjbCekCw7Lqo6/i+tbFAv1GpcbY9j/wuFKnYcwh
+n9o+YuwBrKS22+Nubb2ieGNxS141Rum+DQ5AprCaSs5RX6rzF0cMjosEYW/qXVnp
+DkNMM/Y9QotOaec1krSjp+yo75aBbm/DhnPmnY/kVyuCQJHls2SNeBl3tYleUrhU
+C2opBv+zMn39x2P2ep6P9ctNh/ebPQzcYmY3dmVJALrs9C94A19/gvLiHn3FsBPd
+l+LodECP6GJqyM6tadPmUlgZkHdVGkfY9/9cuEKnpGJrukTXeyckaU0VTzZxORPB
+6Ap+ewMHjEEbu7DIy0cp1u4UBfZyyMHEpWNgWqP0K9CkpOZErx+nTbgRNc9R2J4N
+CL8sN4dK1JZP4BzAbK62RlpZRfcc5G+XG6CdUwKMG2F8kZT2xMM6k6hzXfPiViSi
+bQm5AY0EYBet7AEMAObsDEaXQMa13StXwBUu2nwWaX1Hu5v+kBrDhY4dd3FmdaqD
+UrCfnPT1zlIhK3HzsmAt8cMIJFkqLiZb+LYgmeEWcOvHJP7NTzrYC0KzB2C0PRqC
+QVbt6t0To8qwg1o2+/VHUIZpfQP+0fyAT77W+5G5sz1ZB98Ban17hsVDUpSydN3k
+74tTdTtg5BSur5caQkyimi+roh311xpKRdvwTB1VZxnDr3vuwq1nIRKRJtc0urFI
+UMqCMJ6lvXvOG8BKM8M/QchwzeXgXPUMX2n04Hmx7BPZ2e3tEsXZGgGohyAKyV7L
+zj6iYLOOnyzcuPnBGywrjUuyOybk0KXSC4aMIdDevpiyNtWpnzX0qvJl8GHodeqP
+f+vBhOYF5Y/0YHB0uvtkd33mVtP9EI4hIzSmLVoTq9uHeAo/bi6LtFlG+GrBgoQX
+6/K46TiBNw0UauXWVpg6K3j9flHCm+XqCMB6BcFaoGRk1mIXzpfKNZmpHRL13G+i
+Tru3uE2SiMPRg8SklQARAQABiQG8BBgBCgAmFiEE5CpUvWezVyEWQbFEOj9YJT8w
+okUFAmAXrewCGwwFCQWjmoAACgkQOj9YJT8wokU/7wwAi236opjv7QSrpiuqxDKa
+gZi8gw8bLzg6mEc3JF3pSCutuBbi8tImGqGa2bfAYxKRbcqVcr5gOtXOUa+I1aHa
+4vOwyKuWyfpzs50yuoXRN9fYdMtVlcfwpSBWNTf4KbBH/4AiCEuoO37SQwCso+jV
+KzyrRnPlMB4AWbe1Jw7ya6QBeursFXbC/HFPF5KN/rgVepcwa/AcDvXIzDTETdAq
+3GCEpQCcvYvFQWAJ77VZ+Nzyp0JiA5wOGCnrDgdIY8u29i69NdwALRmMmNBiCOqt
+Ay7KQ3YCY//Ej8p7UcvURfd823jRiObaJkqgna7ayAPjA5l7jasotsScge6//FZo
+MhT7CcJp7yWyfhuJj6mFvJelJidwiKSmm31fG3ZY5QEwZfK0mGercb9EdfGuA+JR
+f4Rnj/3zr45URrBDb2qZu3Vo0oqkYRHUwBnuZFT7m1ltg+wDd+wnGFrOYluHxXA+
+00pkx5aMAAYmXDDyNkpSQPHnJmN5kC/OkJ8Pc8HF2doT
+=re6k
 -----END PGP PUBLIC KEY BLOCK-----
-....
-
+]]></programlisting>

From owner-dev-commits-doc-all@freebsd.org  Mon Feb  1 11:19:45 2021
Return-Path: <owner-dev-commits-doc-all@freebsd.org>
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 19A744FB07B
 for <dev-commits-doc-all@mailman.nyi.freebsd.org>;
 Mon,  1 Feb 2021 11:19:45 +0000 (UTC)
 (envelope-from rene@freebsd.org)
Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132])
 (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 "freefall.freebsd.org", Issuer "R3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 4DTlpT0KHBz56d7;
 Mon,  1 Feb 2021 11:19:45 +0000 (UTC)
 (envelope-from rene@freebsd.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
 t=1612178385;
 h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
 to:to:cc:cc:mime-version:mime-version:content-type:content-type:
 content-transfer-encoding:content-transfer-encoding:
 in-reply-to:in-reply-to:references:references;
 bh=nzSJTClN+gwtqCTokHCzK6LWByIVimMgYamjOTi4jv8=;
 b=dpwqpaaWhN2tRqob1grfeRhqXBvX4Zv168IadW6IVJEn8Bbr9KmcL5mAnL1mKZMYWxu7hi
 qXMaiPkc/nkChEM5KLmuxjIOKFmvXy3/RPzD9IpWA0Dl4rwpMMiPHdxLELzrAEQ+Artp2+
 t3AjiX8LOIg6etxWzuTTQe1pEl92rfmWigmxCZBNYarGA/+mNXxckqngMO5C9Er2lSE3p+
 ODRY7IYVO8BGF0J13DWnYqQLzUBpjQRYvELB3wR5vePpg3ldtqYQ2bpUCtVirEax9zc4Pa
 gmsYeYevsF477A71Shy3rB/QEfiz8DzCjFL6C1akpYwig8SNgnSgkeLBZt/w+Q==
Received: by freefall.freebsd.org (Postfix, from userid 1185)
 id E9B781CD27; Mon,  1 Feb 2021 11:19:44 +0000 (UTC)
Date: Mon, 1 Feb 2021 11:19:44 +0000
From: Rene Ladan <rene@freebsd.org>
To: Vincenzo Maffione <vmaffione@freebsd.org>
Cc: doc-committers@freebsd.org, dev-commits-doc-all@freebsd.org
Subject: Re: git: bdb56d32ce - main - Update my PGP key (using addkey.sh)
Message-ID: <20210201111944.GA93410@freefall.freebsd.org>
References: <202102010754.1117sIPw021171@gitrepo.freebsd.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <202102010754.1117sIPw021171@gitrepo.freebsd.org>
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
 s=dkim; t=1612178385;
 h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
 to:to:cc:cc:mime-version:mime-version:content-type:content-type:
 content-transfer-encoding:content-transfer-encoding:
 in-reply-to:in-reply-to:references:references;
 bh=nzSJTClN+gwtqCTokHCzK6LWByIVimMgYamjOTi4jv8=;
 b=VbB7cCgZbPkMzTnfdJIZqrIe+S9EO5nyWQ5AYGdt5+ogDa/zH6R8o1AcipitIhpYswPTvI
 PSbPck3FoX6L5MI4AOaUowSsEGimBPcASR7QM9HiH4Aj4CrLTFPwOuGhXHkh5VvTPzyzL0
 0j+o5XqlwShDGyLgdDcBrgMwlbB9hFDuQeraZsKbnRdovpcKonq9a88I3gL+fBRJNdhEiw
 06y/ZNBnnEdaR6YujROfVN7xCoVjVNRlL3IZz2Zw5YJQ1z4qm3TiQN4FDKvb9IgD1mJsWj
 U1OElZEsKs65j18QUzzggIio9urxF8DgYbhHy7NSJg44cHIrVLz6HiB7tspcew==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1612178385; a=rsa-sha256; cv=none;
 b=I9r9VmfKNX8vEdpIH+TL8FXpm/XnF6vUXioICgdMtVJVmoIzYW8X3bD9nwV6FFDNtLdDf1
 VsyktMRo+FLM8jb+crLA2p6NKsrhQh+WafprLCmSVbLDCitj3SU/nCaUOG4p21gU3/3DK4
 Ez3lNxNSvqwnjqq1pDdE2AjEc5QnP/9eb9NhXW80ZLCnEKY17A8tqARRCNLLpQA0jXeyFo
 7FS/2l6NGc1rNEwjuNHH1YmHJKHRPKGzNbZghALu6d8BiB00hekS4Wkxu7L3oFtDLFFbOX
 CChr7RYm+3xuC0VxgQ+r2j0tQCbc04yQU3aP6/Vr8s5qieA/HIot2vCTZlBfAg==
ARC-Authentication-Results: i=1;
	mx1.freebsd.org;
	none
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
 <dev-commits-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-doc-all/>
List-Post: <mailto:dev-commits-doc-all@freebsd.org>
List-Help: <mailto:dev-commits-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 01 Feb 2021 11:19:45 -0000

On Mon, Feb 01, 2021 at 07:54:18AM +0000, Vincenzo Maffione wrote:
> The branch main has been updated by vmaffione (src committer):
> 
> URL: https://cgit.FreeBSD.org/doc/commit/?id=bdb56d32ce67e0be3e9c1acbe86bf2956be0feaf
> 
> commit bdb56d32ce67e0be3e9c1acbe86bf2956be0feaf
> Author:     Vincenzo Maffione <vmaffione@FreeBSD.org>
> AuthorDate: 2021-02-01 07:48:16 +0000
> Commit:     Vincenzo Maffione <vmaffione@FreeBSD.org>
> CommitDate: 2021-02-01 07:50:02 +0000
> 
>     Update my PGP key (using addkey.sh)
> ---
>  documentation/static/pgpkeys/vmaffione.key | 94 ++++++++++++++++--------------
>  1 file changed, 49 insertions(+), 45 deletions(-)
> 
> diff --git a/documentation/static/pgpkeys/vmaffione.key b/documentation/static/pgpkeys/vmaffione.key
> index 8f92c77d9d..ecdf5418a8 100644
> --- a/documentation/static/pgpkeys/vmaffione.key
> +++ b/documentation/static/pgpkeys/vmaffione.key
> @@ -1,49 +1,53 @@
> -// $FreeBSD: head/share/pgpkeys/vmaffione.key 53970 2020-03-10 22:47:01Z vmaffione $
> -//
> -// sh addkey.sh vmaffione D4F93098AA1FA8AA ;
> +<!--
> +sh addkey.sh vmaffione 3A3F58253F30A245 ;
> +-->
> +<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
> +pub   3072R/3A3F58253F30A245 2021-02-01 [expires: 2024-02-01]
> +      Key fingerprint = E42A 54BD 67B3 5721 1641  B144 3A3F 5825 3F30 A245
> +uid                          Vincenzo Maffione <vmaffione@freebsd.org>
> +sub   3072R/77769E9A73B79B2B 2021-02-01 [expires: 2024-02-01]
>  
> -
> -[.literal-block-margin]
> -....
> -pub   rsa2048/D4F93098AA1FA8AA 2020-03-10 [SC] [expires: 2023-03-10]
> -      Key fingerprint = 7E99 E2AD 9A8B 1C99 A98D  AF2E D4F9 3098 AA1F A8AA
> -uid                            Vincenzo Maffione <vmaffione@freebsd.org>
> -sub   rsa2048/B51B3033534F9949 2020-03-10 [E] [expires: 2023-03-10]
> -
> -....
> -
> -[.literal-block-margin]
> -....
> +]]></programlisting>
> +<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[

Hmm, it looks like we(TM) need to update addkey.sh to AsiiDoc too.

Ren�

From owner-dev-commits-doc-all@freebsd.org  Mon Feb  1 11:32:59 2021
Return-Path: <owner-dev-commits-doc-all@freebsd.org>
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 7528D4FB549
 for <dev-commits-doc-all@mailman.nyi.freebsd.org>;
 Mon,  1 Feb 2021 11:32:59 +0000 (UTC)
 (envelope-from carlavilla@freebsd.org)
Received: from smtp.freebsd.org (smtp.freebsd.org
 [IPv6:2610:1c1:1:606c::24b:4])
 (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 "smtp.freebsd.org", Issuer "R3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 4DTm5l2t0gz57P7;
 Mon,  1 Feb 2021 11:32:59 +0000 (UTC)
 (envelope-from carlavilla@freebsd.org)
Received: from mail-lf1-f51.google.com (mail-lf1-f51.google.com
 [209.85.167.51])
 (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
 (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK))
 (Authenticated sender: carlavilla)
 by smtp.freebsd.org (Postfix) with ESMTPSA id 553B3C7F5;
 Mon,  1 Feb 2021 11:32:59 +0000 (UTC)
 (envelope-from carlavilla@freebsd.org)
Received: by mail-lf1-f51.google.com with SMTP id m22so22219676lfg.5;
 Mon, 01 Feb 2021 03:32:59 -0800 (PST)
X-Gm-Message-State: AOAM530PTeIkQVdo6+IG5cWMfIb2Nt2uZu6iA4gg+9YpRmzI0534qW5o
 tjRZnx89ut5xQkSVKC2By5IAhklVMvItl0SQgZk=
X-Google-Smtp-Source: ABdhPJxA2n+RWzYGIFyMR1nJL52pp5Nt6iA0JNp4tUsuSAm+cc6sEyLdgq79XBseFE0O/w2f+vWoAJiXdvUMd2ILTAY=
X-Received: by 2002:a19:6b13:: with SMTP id d19mr8824801lfa.74.1612179177839; 
 Mon, 01 Feb 2021 03:32:57 -0800 (PST)
MIME-Version: 1.0
References: <202102010754.1117sIPw021171@gitrepo.freebsd.org>
 <20210201111944.GA93410@freefall.freebsd.org>
In-Reply-To: <20210201111944.GA93410@freefall.freebsd.org>
From: Sergio Carlavilla <carlavilla@freebsd.org>
Date: Mon, 1 Feb 2021 12:32:46 +0100
X-Gmail-Original-Message-ID: <CAFwocyP0a_wNssocn11bBFhKLj5u27y7P+vYEMbKy+WkR4=RNA@mail.gmail.com>
Message-ID: <CAFwocyP0a_wNssocn11bBFhKLj5u27y7P+vYEMbKy+WkR4=RNA@mail.gmail.com>
Subject: Re: git: bdb56d32ce - main - Update my PGP key (using addkey.sh)
To: Rene Ladan <rene@freebsd.org>
Cc: Vincenzo Maffione <vmaffione@freebsd.org>, doc-committers@freebsd.org, 
 dev-commits-doc-all@freebsd.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
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
 <dev-commits-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-doc-all/>
List-Post: <mailto:dev-commits-doc-all@freebsd.org>
List-Help: <mailto:dev-commits-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 01 Feb 2021 11:32:59 -0000

On Mon, 1 Feb 2021 at 12:19, Rene Ladan <rene@freebsd.org> wrote:
>
> On Mon, Feb 01, 2021 at 07:54:18AM +0000, Vincenzo Maffione wrote:
> > The branch main has been updated by vmaffione (src committer):
> >
> > URL: https://cgit.FreeBSD.org/doc/commit/?id=3Dbdb56d32ce67e0be3e9c1acb=
e86bf2956be0feaf
> >
> > commit bdb56d32ce67e0be3e9c1acbe86bf2956be0feaf
> > Author:     Vincenzo Maffione <vmaffione@FreeBSD.org>
> > AuthorDate: 2021-02-01 07:48:16 +0000
> > Commit:     Vincenzo Maffione <vmaffione@FreeBSD.org>
> > CommitDate: 2021-02-01 07:50:02 +0000
> >
> >     Update my PGP key (using addkey.sh)
> > ---
> >  documentation/static/pgpkeys/vmaffione.key | 94 ++++++++++++++++------=
--------
> >  1 file changed, 49 insertions(+), 45 deletions(-)
> >
> > diff --git a/documentation/static/pgpkeys/vmaffione.key b/documentation=
/static/pgpkeys/vmaffione.key
> > index 8f92c77d9d..ecdf5418a8 100644
> > --- a/documentation/static/pgpkeys/vmaffione.key
> > +++ b/documentation/static/pgpkeys/vmaffione.key
> > @@ -1,49 +1,53 @@
> > -// $FreeBSD: head/share/pgpkeys/vmaffione.key 53970 2020-03-10 22:47:0=
1Z vmaffione $
> > -//
> > -// sh addkey.sh vmaffione D4F93098AA1FA8AA ;
> > +<!--
> > +sh addkey.sh vmaffione 3A3F58253F30A245 ;
> > +-->
> > +<programlisting xmlns=3D"http://docbook.org/ns/docbook" role=3D"pgpfin=
gerprint"><![CDATA[
> > +pub   3072R/3A3F58253F30A245 2021-02-01 [expires: 2024-02-01]
> > +      Key fingerprint =3D E42A 54BD 67B3 5721 1641  B144 3A3F 5825 3F3=
0 A245
> > +uid                          Vincenzo Maffione <vmaffione@freebsd.org>
> > +sub   3072R/77769E9A73B79B2B 2021-02-01 [expires: 2024-02-01]
> >
> > -
> > -[.literal-block-margin]
> > -....
> > -pub   rsa2048/D4F93098AA1FA8AA 2020-03-10 [SC] [expires: 2023-03-10]
> > -      Key fingerprint =3D 7E99 E2AD 9A8B 1C99 A98D  AF2E D4F9 3098 AA1=
F A8AA
> > -uid                            Vincenzo Maffione <vmaffione@freebsd.or=
g>
> > -sub   rsa2048/B51B3033534F9949 2020-03-10 [E] [expires: 2023-03-10]
> > -
> > -....
> > -
> > -[.literal-block-margin]
> > -....
> > +]]></programlisting>
> > +<programlisting xmlns=3D"http://docbook.org/ns/docbook" role=3D"pgpkey=
"><![CDATA[
>
> Hmm, it looks like we(TM) need to update addkey.sh to AsiiDoc too.
>
> Ren=C3=A9

Hi,

Yes, I'm going to put this at the top of the TODO list.

Sorry.

From owner-dev-commits-doc-all@freebsd.org  Mon Feb  1 12:01:46 2021
Return-Path: <owner-dev-commits-doc-all@freebsd.org>
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 4EA974FCECF
 for <dev-commits-doc-all@mailman.nyi.freebsd.org>;
 Mon,  1 Feb 2021 12:01:46 +0000 (UTC)
 (envelope-from rene@freebsd.org)
Received: from freefall.freebsd.org (freefall.freebsd.org
 [IPv6:2610:1c1:1:6074::16:84])
 (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 "freefall.freebsd.org", Issuer "R3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 4DTmky1rMLz599l;
 Mon,  1 Feb 2021 12:01:46 +0000 (UTC)
 (envelope-from rene@freebsd.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
 t=1612180906;
 h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
 to:to:cc:cc:mime-version:mime-version:content-type:content-type:
 content-transfer-encoding:content-transfer-encoding:
 in-reply-to:in-reply-to:references:references;
 bh=axVkftOt+zJZPmuuSdOQpgeQegMkoGNFylKVfCW9ukY=;
 b=EFJ2FTSQiLSa62grVFT4hKBaOgcEl2cjJpRO94DHwByaZX60lsNpi/Q4DZTvhV0FdWYidI
 op5hau97u9pY2SLerPIhBXNxvZZ91yIbECIgIjw0eYCBnPZkDefB/+uJfK9S4fhX/OjM1i
 AZrgKJifitZoS3iSUznt9fPA4tcxH9N1/5AYJkzb/HnBIKUbr5bDBLAqkPL/fi8mx/6xIO
 DgWWF9udYMRmuoWhTSEUUxUFWu+sUz9be9yh0pUxgh0koJ4pohW64iaTNjQNghjR+qPnDs
 6EUx6x5uAyvzCkZyzHdhPRsXYOZVUBEIYEeH9jgZvuSO7/mgBYJLUCfPnPqy2w==
Received: by freefall.freebsd.org (Postfix, from userid 1185)
 id 16D561D31B; Mon,  1 Feb 2021 12:01:46 +0000 (UTC)
Date: Mon, 1 Feb 2021 12:01:46 +0000
From: Rene Ladan <rene@freebsd.org>
To: Sergio Carlavilla <carlavilla@freebsd.org>
Cc: Vincenzo Maffione <vmaffione@freebsd.org>, doc-committers@freebsd.org,
 dev-commits-doc-all@freebsd.org
Subject: Re: git: bdb56d32ce - main - Update my PGP key (using addkey.sh)
Message-ID: <20210201120146.GA31452@freefall.freebsd.org>
References: <202102010754.1117sIPw021171@gitrepo.freebsd.org>
 <20210201111944.GA93410@freefall.freebsd.org>
 <CAFwocyP0a_wNssocn11bBFhKLj5u27y7P+vYEMbKy+WkR4=RNA@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <CAFwocyP0a_wNssocn11bBFhKLj5u27y7P+vYEMbKy+WkR4=RNA@mail.gmail.com>
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
 s=dkim; t=1612180906;
 h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
 to:to:cc:cc:mime-version:mime-version:content-type:content-type:
 content-transfer-encoding:content-transfer-encoding:
 in-reply-to:in-reply-to:references:references;
 bh=axVkftOt+zJZPmuuSdOQpgeQegMkoGNFylKVfCW9ukY=;
 b=GeMYXeDLTSxwU+VrMlkJWK9Z4mmh1jw3e3CD0kakNNqalu0rdJtoxqD6mzR49bOVQv2bfF
 5MnS129tuJAQioL0GGHCkNZpNABqaAKHsoTX72/Z1CUO/AHJgkzBqC9BeVtXv5yX1Lj6JG
 fRGIESMIUEBykMOCNg2Dj9FVWXcOlPHp/a3cCKVXXjeLQfcgjLENnnlZ4SCi1uW6syZM1Z
 7M9UHCQdr58IITHa1Oms92vkSzVvsQB3MvMTypGdQU7BkSYi46VattbNY0q89RCS6sKu7g
 2seAAg0l7DqjtLLMhMdq1l/ee7Frjl8ZJR2FPIbBR8YBpmDDAI5mZXZAQplqFA==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1612180906; a=rsa-sha256; cv=none;
 b=qmduH/ZfOgOFfJhcmP6wqXsQ0/I++ZKvk/uh9OnMI+yWbUnJsgrm9j4C2YOABMMEUkdrSk
 WsNQwUgQvIllkA5bFkyWJRqEf1gn8vZI9MQk89HvjItNZ+chQ/TVxNv7Q8qNsXB4xIGw9C
 ZG3ON+v2qbu1AgL5LtIYUxOIS7b9b/72BWhTIhwZS2cSf4wlrWxvBOA9hOgCIURVI/ms00
 c47Lh5uIHtvZqTQki/txRBfVF7gw9crVYzCa1/tZy0uWBFA4Cff17g4xX3hMWVVRmjzB18
 lrDdh9A75ey/P9ihYGCNm4Bd3uR6rAyIbwurAUOge3W9x7vgkOaGHoo6PF/6hg==
ARC-Authentication-Results: i=1;
	mx1.freebsd.org;
	none
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
 <dev-commits-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-doc-all/>
List-Post: <mailto:dev-commits-doc-all@freebsd.org>
List-Help: <mailto:dev-commits-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 01 Feb 2021 12:01:46 -0000

On Mon, Feb 01, 2021 at 12:32:46PM +0100, Sergio Carlavilla wrote:
> On Mon, 1 Feb 2021 at 12:19, Rene Ladan <rene@freebsd.org> wrote:
> >
> > On Mon, Feb 01, 2021 at 07:54:18AM +0000, Vincenzo Maffione wrote:
> > > The branch main has been updated by vmaffione (src committer):
> > >
> > > URL: https://cgit.FreeBSD.org/doc/commit/?id=bdb56d32ce67e0be3e9c1acbe86bf2956be0feaf
> > >
> > > commit bdb56d32ce67e0be3e9c1acbe86bf2956be0feaf
> > > Author:     Vincenzo Maffione <vmaffione@FreeBSD.org>
> > > AuthorDate: 2021-02-01 07:48:16 +0000
> > > Commit:     Vincenzo Maffione <vmaffione@FreeBSD.org>
> > > CommitDate: 2021-02-01 07:50:02 +0000
> > >
> > >     Update my PGP key (using addkey.sh)
> > > ---
> > >  documentation/static/pgpkeys/vmaffione.key | 94 ++++++++++++++++--------------
> > >  1 file changed, 49 insertions(+), 45 deletions(-)
> > >
> > > diff --git a/documentation/static/pgpkeys/vmaffione.key b/documentation/static/pgpkeys/vmaffione.key
> > > index 8f92c77d9d..ecdf5418a8 100644
> > > --- a/documentation/static/pgpkeys/vmaffione.key
> > > +++ b/documentation/static/pgpkeys/vmaffione.key
> > > @@ -1,49 +1,53 @@
> > > -// $FreeBSD: head/share/pgpkeys/vmaffione.key 53970 2020-03-10 22:47:01Z vmaffione $
> > > -//
> > > -// sh addkey.sh vmaffione D4F93098AA1FA8AA ;
> > > +<!--
> > > +sh addkey.sh vmaffione 3A3F58253F30A245 ;
> > > +-->
> > > +<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
> > > +pub   3072R/3A3F58253F30A245 2021-02-01 [expires: 2024-02-01]
> > > +      Key fingerprint = E42A 54BD 67B3 5721 1641  B144 3A3F 5825 3F30 A245
> > > +uid                          Vincenzo Maffione <vmaffione@freebsd.org>
> > > +sub   3072R/77769E9A73B79B2B 2021-02-01 [expires: 2024-02-01]
> > >
> > > -
> > > -[.literal-block-margin]
> > > -....
> > > -pub   rsa2048/D4F93098AA1FA8AA 2020-03-10 [SC] [expires: 2023-03-10]
> > > -      Key fingerprint = 7E99 E2AD 9A8B 1C99 A98D  AF2E D4F9 3098 AA1F A8AA
> > > -uid                            Vincenzo Maffione <vmaffione@freebsd.org>
> > > -sub   rsa2048/B51B3033534F9949 2020-03-10 [E] [expires: 2023-03-10]
> > > -
> > > -....
> > > -
> > > -[.literal-block-margin]
> > > -....
> > > +]]></programlisting>
> > > +<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
> >
> > Hmm, it looks like we(TM) need to update addkey.sh to AsiiDoc too.
> >
> > Ren�
> 
> Hi,
> 
> Yes, I'm going to put this at the top of the TODO list.
> 
No problem, thanks for looking at it!

Ren�

From owner-dev-commits-doc-all@freebsd.org  Mon Feb  1 18:27:18 2021
Return-Path: <owner-dev-commits-doc-all@freebsd.org>
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 C1AF2531937
 for <dev-commits-doc-all@mailman.nyi.freebsd.org>;
 Mon,  1 Feb 2021 18:27:18 +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 4DTxHp56QPz4X8q;
 Mon,  1 Feb 2021 18:27:18 +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 A29E31FACF;
 Mon,  1 Feb 2021 18:27:18 +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 111IRIAF045290;
 Mon, 1 Feb 2021 18:27:18 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
 by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 111IRIm5045289;
 Mon, 1 Feb 2021 18:27:18 GMT (envelope-from git)
Date: Mon, 1 Feb 2021 18:27:18 GMT
Message-Id: <202102011827.111IRIm5045289@gitrepo.freebsd.org>
To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org
From: Gordon Bergling <gbe@FreeBSD.org>
Subject: git: fabd1efd2c - main - Handbook: ZFS chapter: Correct a grammar
 mistake (with -> will)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: gbe
X-Git-Repository: doc
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: fabd1efd2c7be058989277cb74c4144b9a74a242
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
 <dev-commits-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-doc-all/>
List-Post: <mailto:dev-commits-doc-all@freebsd.org>
List-Help: <mailto:dev-commits-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 01 Feb 2021 18:27:18 -0000

The branch main has been updated by gbe:

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

commit fabd1efd2c7be058989277cb74c4144b9a74a242
Author:     Gordon Bergling <gbe@FreeBSD.org>
AuthorDate: 2021-02-01 18:20:33 +0000
Commit:     Gordon Bergling <gbe@FreeBSD.org>
CommitDate: 2021-02-01 18:20:33 +0000

    Handbook: ZFS chapter: Correct a grammar mistake (with -> will)
    
    PR:     253153
    Submitted by:   Andreas Bjørnestad <panden at gmail dot com>
---
 documentation/content/en/books/handbook/zfs/_index.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/documentation/content/en/books/handbook/zfs/_index.adoc b/documentation/content/en/books/handbook/zfs/_index.adoc
index e4b1f6b6d0..e5a5806e92 100644
--- a/documentation/content/en/books/handbook/zfs/_index.adoc
+++ b/documentation/content/en/books/handbook/zfs/_index.adoc
@@ -1438,7 +1438,7 @@ mypool/var/newname   87.5K  93.2G  87.5K  /var/newname
 mypool/var/tmp        152K  93.2G   152K  /var/tmp
 ....
 
-Snapshots can also be renamed like this. Due to the nature of snapshots, they cannot be renamed into a different parent dataset. To rename a recursive snapshot, specify `-r`, and all snapshots with the same name in child datasets with also be renamed.
+Snapshots can also be renamed like this. Due to the nature of snapshots, they cannot be renamed into a different parent dataset. To rename a recursive snapshot, specify `-r`, and all snapshots with the same name in child datasets will also be renamed.
 
 [source,bash]
 ....

From owner-dev-commits-doc-all@freebsd.org  Mon Feb  1 20:14:39 2021
Return-Path: <owner-dev-commits-doc-all@freebsd.org>
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 414515354F9
 for <dev-commits-doc-all@mailman.nyi.freebsd.org>;
 Mon,  1 Feb 2021 20:14:39 +0000 (UTC)
 (envelope-from vmaffione@freebsd.org)
Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83])
 (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 "smtp.freebsd.org", Issuer "R3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 4DTzgg0t25z4t7N;
 Mon,  1 Feb 2021 20:14:39 +0000 (UTC)
 (envelope-from vmaffione@freebsd.org)
Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com
 [209.85.210.182])
 (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
 (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK))
 (Authenticated sender: vmaffione)
 by smtp.freebsd.org (Postfix) with ESMTPSA id 0BCC9213B0;
 Mon,  1 Feb 2021 20:14:39 +0000 (UTC)
 (envelope-from vmaffione@freebsd.org)
Received: by mail-pf1-f182.google.com with SMTP id o20so12377625pfu.0;
 Mon, 01 Feb 2021 12:14:38 -0800 (PST)
X-Gm-Message-State: AOAM5336+jwz8PjzvaEqILp3HyCeCYs9JPg2/jiLihIT4EK/PDok7Md7
 scRngIrZDlBxzP7M5hU7e50w9hAjkhFS9+1zJHE=
X-Google-Smtp-Source: ABdhPJygMt01mMrsKzzO2ucNigBj/LyqtnY+xEmNQDwqGSUOUnO0EbyQsHuRn3r+yPIJ1DN6W7iJO7tNdTeqvv5sFJ4=
X-Received: by 2002:a63:4859:: with SMTP id x25mr18254993pgk.289.1612210477813; 
 Mon, 01 Feb 2021 12:14:37 -0800 (PST)
MIME-Version: 1.0
References: <202102010754.1117sIPw021171@gitrepo.freebsd.org>
 <20210201111944.GA93410@freefall.freebsd.org>
 <CAFwocyP0a_wNssocn11bBFhKLj5u27y7P+vYEMbKy+WkR4=RNA@mail.gmail.com>
In-Reply-To: <CAFwocyP0a_wNssocn11bBFhKLj5u27y7P+vYEMbKy+WkR4=RNA@mail.gmail.com>
From: Vincenzo Maffione <vmaffione@freebsd.org>
Date: Mon, 1 Feb 2021 21:14:26 +0100
X-Gmail-Original-Message-ID: <CA+_eA9jhbP0t_mCNfmDeqkyv0r0tHtrO884zznnK-ARwLNrDyw@mail.gmail.com>
Message-ID: <CA+_eA9jhbP0t_mCNfmDeqkyv0r0tHtrO884zznnK-ARwLNrDyw@mail.gmail.com>
Subject: Re: git: bdb56d32ce - main - Update my PGP key (using addkey.sh)
To: Sergio Carlavilla <carlavilla@freebsd.org>
Cc: Rene Ladan <rene@freebsd.org>, doc-committers@freebsd.org, 
 dev-commits-doc-all@freebsd.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
X-Content-Filtered-By: Mailman/MimeDel 2.1.34
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
 <dev-commits-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-doc-all/>
List-Post: <mailto:dev-commits-doc-all@freebsd.org>
List-Help: <mailto:dev-commits-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 01 Feb 2021 20:14:39 -0000

Thanks.
Let me know if there is anything I can do.

Cheers,
  Vincenzo

Il giorno lun 1 feb 2021 alle ore 12:33 Sergio Carlavilla <
carlavilla@freebsd.org> ha scritto:

> On Mon, 1 Feb 2021 at 12:19, Rene Ladan <rene@freebsd.org> wrote:
> >
> > On Mon, Feb 01, 2021 at 07:54:18AM +0000, Vincenzo Maffione wrote:
> > > The branch main has been updated by vmaffione (src committer):
> > >
> > > URL:
> https://cgit.FreeBSD.org/doc/commit/?id=3Dbdb56d32ce67e0be3e9c1acbe86bf29=
56be0feaf
> > >
> > > commit bdb56d32ce67e0be3e9c1acbe86bf2956be0feaf
> > > Author:     Vincenzo Maffione <vmaffione@FreeBSD.org>
> > > AuthorDate: 2021-02-01 07:48:16 +0000
> > > Commit:     Vincenzo Maffione <vmaffione@FreeBSD.org>
> > > CommitDate: 2021-02-01 07:50:02 +0000
> > >
> > >     Update my PGP key (using addkey.sh)
> > > ---
> > >  documentation/static/pgpkeys/vmaffione.key | 94
> ++++++++++++++++--------------
> > >  1 file changed, 49 insertions(+), 45 deletions(-)
> > >
> > > diff --git a/documentation/static/pgpkeys/vmaffione.key
> b/documentation/static/pgpkeys/vmaffione.key
> > > index 8f92c77d9d..ecdf5418a8 100644
> > > --- a/documentation/static/pgpkeys/vmaffione.key
> > > +++ b/documentation/static/pgpkeys/vmaffione.key
> > > @@ -1,49 +1,53 @@
> > > -// $FreeBSD: head/share/pgpkeys/vmaffione.key 53970 2020-03-10
> 22:47:01Z vmaffione $
> > > -//
> > > -// sh addkey.sh vmaffione D4F93098AA1FA8AA ;
> > > +<!--
> > > +sh addkey.sh vmaffione 3A3F58253F30A245 ;
> > > +-->
> > > +<programlisting xmlns=3D"http://docbook.org/ns/docbook"
> role=3D"pgpfingerprint"><![CDATA[
> > > +pub   3072R/3A3F58253F30A245 2021-02-01 [expires: 2024-02-01]
> > > +      Key fingerprint =3D E42A 54BD 67B3 5721 1641  B144 3A3F 5825 3=
F30
> A245
> > > +uid                          Vincenzo Maffione <vmaffione@freebsd.or=
g
> >
> > > +sub   3072R/77769E9A73B79B2B 2021-02-01 [expires: 2024-02-01]
> > >
> > > -
> > > -[.literal-block-margin]
> > > -....
> > > -pub   rsa2048/D4F93098AA1FA8AA 2020-03-10 [SC] [expires: 2023-03-10]
> > > -      Key fingerprint =3D 7E99 E2AD 9A8B 1C99 A98D  AF2E D4F9 3098 A=
A1F
> A8AA
> > > -uid                            Vincenzo Maffione <
> vmaffione@freebsd.org>
> > > -sub   rsa2048/B51B3033534F9949 2020-03-10 [E] [expires: 2023-03-10]
> > > -
> > > -....
> > > -
> > > -[.literal-block-margin]
> > > -....
> > > +]]></programlisting>
> > > +<programlisting xmlns=3D"http://docbook.org/ns/docbook"
> role=3D"pgpkey"><![CDATA[
> >
> > Hmm, it looks like we(TM) need to update addkey.sh to AsiiDoc too.
> >
> > Ren=C3=A9
>
> Hi,
>
> Yes, I'm going to put this at the top of the TODO list.
>
> Sorry.
>

From owner-dev-commits-doc-all@freebsd.org  Mon Feb  1 21:15:30 2021
Return-Path: <owner-dev-commits-doc-all@freebsd.org>
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 6023C53731F
 for <dev-commits-doc-all@mailman.nyi.freebsd.org>;
 Mon,  1 Feb 2021 21:15:30 +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 4DV11t1pLjz3DlT;
 Mon,  1 Feb 2021 21:15:30 +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 304EF2206C;
 Mon,  1 Feb 2021 21:15:30 +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 111LFUEl065900;
 Mon, 1 Feb 2021 21:15:30 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
 by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 111LFUMh065899;
 Mon, 1 Feb 2021 21:15:30 GMT (envelope-from git)
Date: Mon, 1 Feb 2021 21:15:30 GMT
Message-Id: <202102012115.111LFUMh065899@gitrepo.freebsd.org>
To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org
From: Glen Barber <gjb@FreeBSD.org>
Subject: git: 790a769f67 - main - releng: fix rendering of replaceable
 variables
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: gjb
X-Git-Repository: doc
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 790a769f679e04ec816fa143a2e3c4d1fcd4bc0f
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
 <dev-commits-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-doc-all/>
List-Post: <mailto:dev-commits-doc-all@freebsd.org>
List-Help: <mailto:dev-commits-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 01 Feb 2021 21:15:30 -0000

The branch main has been updated by gjb:

URL: https://cgit.FreeBSD.org/doc/commit/?id=790a769f679e04ec816fa143a2e3c4d1fcd4bc0f

commit 790a769f679e04ec816fa143a2e3c4d1fcd4bc0f
Author:     Glen Barber <gjb@FreeBSD.org>
AuthorDate: 2021-02-01 21:15:09 +0000
Commit:     Glen Barber <gjb@FreeBSD.org>
CommitDate: 2021-02-01 21:15:09 +0000

    releng: fix rendering of replaceable variables
    
    Add 'subs="attributes"' to [source] and [.programlisting] blocks
    to properly replace variables in rendered output.
    
    Sponsored by:   Rubicon Communications, LLC ("Netgate")
---
 .../content/en/articles/freebsd-releng/_index.adoc | 26 +++++++++++-----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/documentation/content/en/articles/freebsd-releng/_index.adoc b/documentation/content/en/articles/freebsd-releng/_index.adoc
index b4d27feec0..a261876dd7 100644
--- a/documentation/content/en/articles/freebsd-releng/_index.adoc
+++ b/documentation/content/en/articles/freebsd-releng/_index.adoc
@@ -346,7 +346,7 @@ See <<releng-building>> for information on building the `ALPHA` images.
 
 When creating the {branchStable} branch, several changes are required in both the new {branchStable} branch and the {branchHead} branch. The files listed are relative to the repository root. To create the new {branchStablex} branch in Subversion:
 
-[source,bash]
+[source,bash,subs="attributes"]
 ....
 % svn cp ^/head {branchStablex}
 ....
@@ -365,7 +365,7 @@ Once the {branchStablex} branch has been committed, make the following edits:
 |[.filename]#stable/12/contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h#
 a|
 
-[source,bash]
+[source,bash,subs="attributes"]
 ....
 #ifndef MALLOC_PRODUCTION
 #define MALLOC_PRODUCTION
@@ -484,7 +484,7 @@ In the `doc` repository, also update [.filename]#head/en_US.ISO8859-1/htdocs/rel
 
 Following the code slush, the next phase of the release cycle is the code freeze. This is the point at which all commits to the stable branch require explicit approval from the {teamRe}. This is enforced by pre-commit hooks in the Subversion repository by editing [.filename]#base/svnadmin/conf/approvers# to include a regular expression matching the {branchStablex} branch for the release:
 
-[.programlisting]
+[.programlisting,subs="attributes"]
 ....
 ^/{branchStablex}	re
 ^/{branchRelengx}	re
@@ -504,7 +504,7 @@ Once this is done, the first set of `BETA` builds are started. Subsequent `BETA`
 
 When the first `RC` (Release Candidate) build is ready to begin, the {branchReleng} branch is created. This is a multi-step process that must be done in a specific order, in order to avoid anomalies such as overlaps with `__FreeBSD_version` values, for example. The paths listed below are relative to the repository root. The order of commits and what to change are:
 
-[source,bash]
+[source,bash,subs="attributes"]
 ....
 % svn cp ^/{branchStablex} {branchRelengx}
 ....
@@ -537,7 +537,7 @@ When the first `RC` (Release Candidate) build is ready to begin, the {branchRele
 |Add a new approvers line for the releng branch as was done for the stable branch
 |===
 
-[source,bash]
+[source,bash,subs="attributes"]
 ....
 % svn propdel -R svn:mergeinfo {branchRelengx}
 % svn commit {branchRelengx}
@@ -569,14 +569,14 @@ Prior to FreeBSD 9.2-RELEASE, [.filename]#src/release/release.sh# was introduced
 
 As a brief example of using [.filename]#src/release/release.sh# to build a single release in [.filename]#/scratch#:
 
-[source,bash]
+[source,bash,subs="attributes"]
 ....
 # /bin/sh /usr/src/release/release.sh
 ....
 
 As a brief example of using [.filename]#src/release/release.sh# to build a single, cross-built release using a different target directory, create a custom [.filename]#release.conf# containing:
 
-[.programlisting]
+[.programlisting,subs="attributes"]
 ....
 # release.sh configuration for powerpc/powerpc64
 CHROOTDIR="/scratch-powerpc64"
@@ -587,7 +587,7 @@ KERNEL="GENERIC64"
 
 Then invoke [.filename]#src/release/release.sh# as:
 
-[source,bash]
+[source,bash,subs="attributes"]
 ....
 # /bin/sh /usr/src/release/release.sh -c $HOME/release.conf
 ....
@@ -641,7 +641,7 @@ As [.filename]#thermite.sh# iterates through the master list of combinations and
 
 Assuming these filesystem paths, [.filename]#thermite.sh# would be invoked as:
 
-[source,bash]
+[source,bash,subs="attributes"]
 ....
 # cd /releng/scripts-snapshot/scripts
 # ./setrev.sh -b {branchStablex}
@@ -651,7 +651,7 @@ Assuming these filesystem paths, [.filename]#thermite.sh# would be invoked as:
 
 Once the builds have completed, additional helper scripts are available to generate development snapshot emails which are sent to the `freebsd-snapshots@freebsd.org` mailing list:
 
-[source,bash]
+[source,bash,subs="attributes"]
 ....
 # cd /releng/scripts-snapshot/scripts
 # ./get-checksums.sh -c ./builds-12.conf | ./generate-email.pl > snapshot-12-mail
@@ -698,7 +698,7 @@ In preparation for the release build, several files need to be updated:
 
 After building the final `RELEASE`, the {branchRelengx} branch is tagged as {branchReleasex} using the revision from which the `RELEASE` was built. Similar to creating the {branchStablex} and {branchRelengx} branches, this is done with `svn cp`. From the repository root:
 
-[source,bash]
+[source,bash,subs="attributes"]
 ....
 % svn cp ^/{branchRelengx}@r306420 {branchReleasex}
 % svn commit {branchReleasex}
@@ -718,7 +718,7 @@ Staging FreeBSD snapshots and releases is a two part process:
 + 
 If `EVERYTHINGISFINE` is defined in the build configuration files, [.filename]#main.conf# in the case of the build scripts referenced above, this happens automatically in the after the build is complete, creating the directory structure in [.filename]#${DESTDIR}/R/ftp-stage# with a path structure matching what is expected on `ftp-master`. This is equivalent to running the following in the directly:
 +
-[source,bash]
+[source,bash,subs="attributes"]
 ....
 # make -C /usr/src/release -f Makefile.mirrors EVERYTHINGISFINE=1 ftp-stage
 ....
@@ -752,7 +752,7 @@ As with the staging steps, this requires `root` level access, as this step must
 
 As the `archive` user:
 
-[source,bash]
+[source,bash,subs="attributes"]
 ....
 % cd /archive/tmp/snapshots
 % pax -r -w -l . /archive/pub/FreeBSD/snapshots

From owner-dev-commits-doc-all@freebsd.org  Mon Feb  1 21:23:13 2021
Return-Path: <owner-dev-commits-doc-all@freebsd.org>
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 E9183536FFD
 for <dev-commits-doc-all@mailman.nyi.freebsd.org>;
 Mon,  1 Feb 2021 21:23:13 +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 4DV1Bn6FJ3z3FWJ;
 Mon,  1 Feb 2021 21:23:13 +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 C9221222F7;
 Mon,  1 Feb 2021 21:23:13 +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 111LNDbr079153;
 Mon, 1 Feb 2021 21:23:13 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
 by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 111LNDn4079152;
 Mon, 1 Feb 2021 21:23:13 GMT (envelope-from git)
Date: Mon, 1 Feb 2021 21:23:13 GMT
Message-Id: <202102012123.111LNDn4079152@gitrepo.freebsd.org>
To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org
From: Sergio Carlavilla Delgado <carlavilla@FreeBSD.org>
Subject: git: 57930f3fd5 - main - Upgrade pgpkeys related tools and committers
 guide new committer section
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: carlavilla
X-Git-Repository: doc
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 57930f3fd58484bb834dfd0c76cb2ee1969e53cd
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
 <dev-commits-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-doc-all/>
List-Post: <mailto:dev-commits-doc-all@freebsd.org>
List-Help: <mailto:dev-commits-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 01 Feb 2021 21:23:14 -0000

The branch main has been updated by carlavilla:

URL: https://cgit.FreeBSD.org/doc/commit/?id=57930f3fd58484bb834dfd0c76cb2ee1969e53cd

commit 57930f3fd58484bb834dfd0c76cb2ee1969e53cd
Author:     Sergio Carlavilla Delgado <carlavilla@FreeBSD.org>
AuthorDate: 2021-02-01 21:21:57 +0000
Commit:     Sergio Carlavilla Delgado <carlavilla@FreeBSD.org>
CommitDate: 2021-02-01 21:23:03 +0000

    Upgrade pgpkeys related tools and committers guide new committer section
---
 .../en/articles/committers-guide/_index.adoc       | 20 ++++++------
 documentation/tools/addkey.sh                      | 37 ++++++----------------
 2 files changed, 19 insertions(+), 38 deletions(-)

diff --git a/documentation/content/en/articles/committers-guide/_index.adoc b/documentation/content/en/articles/committers-guide/_index.adoc
index dd0fee788a..8ddacc53b9 100644
--- a/documentation/content/en/articles/committers-guide/_index.adoc
+++ b/documentation/content/en/articles/committers-guide/_index.adoc
@@ -89,7 +89,7 @@ Cryptographic keys conforming to the OpenPGP (__Pretty Good Privacy__) standard
 [[pgpkeys-creating]]
 === Creating a Key
 
-Existing keys can be used, but should be checked with [.filename]#doc/head/shared/pgpkeys/checkkey.sh# first. In this case, make sure the key has a FreeBSD user ID.
+Existing keys can be used, but should be checked with [.filename]#documentation/tools/checkkey.sh# first. In this case, make sure the key has a FreeBSD user ID.
 
 For those who do not yet have an OpenPGP key, or need a new key to meet FreeBSD security requirements, here we show how to generate one.
 
@@ -155,14 +155,13 @@ You need a Passphrase to protect your secret key.
 <.> A three year key lifespan is short enough to obsolete keys weakened by advancing computer power, but long enough to reduce key management problems.
 
 <.> Use your real name here, preferably matching that shown on government-issued ID to make it easier for others to verify your identity. Text that may help others identify you can be entered in the `Comment` section.
-
 + 
 After the email address is entered, a passphrase is requested. Methods of creating a secure passphrase are contentious. Rather than suggest a single way, here are some links to sites that describe various methods: http://world.std.com/~reinhold/diceware.html[], http://www.iusmentis.com/security/passphrasefaq/[], http://xkcd.com/936/[], http://en.wikipedia.org/wiki/Passphrase[].
 ====
 
 Protect the private key and passphrase. If either the private key or passphrase may have been compromised or disclosed, immediately notify mailto:accounts@FreeBSD.org[accounts@FreeBSD.org] and revoke the key.
 
-Committing the new key is shown in <<commit-steps>>.
+Committing the new key is shown in <<commit-steps, Steps for New Committers>>.
 
 [[kerberos-ldap]]
 == Kerberos and LDAP web Password for FreeBSD Cluster
@@ -1231,24 +1230,23 @@ Those who have been given commit rights to the FreeBSD repositories must follow
 [.procedure]
 ====
 *Procedure 1. Steps for New Committers*
+
 . Add an Author Entity
 + 
-[.filename]#doc/head/shared/xml/authors.ent# - Add an author entity. Later steps depend on this entity, and missing this step will cause the [.filename]#doc/# build to fail. This is a relatively easy task, but remains a good first test of version control skills.
+[.filename]#shared/authors.toml# - Add an author entity. Later steps depend on this entity, and missing this step will cause the [.filename]#doc/# build to fail. This is a relatively easy task, but remains a good first test of version control skills.
 . Update the List of Developers and Contributors
 + 
-[.filename]#doc/head/en_US.ISO8859-1/articles/contributors/contrib.committers.xml# - Add an entry to the "Developers" section of the link:{contributors}#staff-committers[Contributors List]. Entries are sorted by last name.
+[.filename]#doc/en/articles/contributors/contrib-committers.adoc# - Add an entry to the "Developers" section of the link:{contributors}#staff-committers[Contributors List]. Entries are sorted by last name.
 + 
-[.filename]#doc/head/en_US.ISO8859-1/articles/contributors/contrib.additional.xml# - _Remove_ the entry from the "Additional Contributors" section. Entries are sorted by first name.
+[.filename]#doc/en/articles/contributors/contrib-additional.adoc# - _Remove_ the entry from the "Additional Contributors" section. Entries are sorted by first name.
 . Add a News Item
 + 
-[.filename]#doc/head/shared/xml/news.xml# - Add an entry. Look for the other entries that announce new committers and follow the format. Use the date from the commit bit approval email from mailto:core@FreeBSD.org[core@FreeBSD.org].
+[.filename]#website/data/en/news/news.toml# - Add an entry. Look for the other entries that announce new committers and follow the format. Use the date from the commit bit approval email from mailto:core@FreeBSD.org[core@FreeBSD.org].
 . Add a PGP Key
 + 
-[.filename]#doc/head/shared/pgpkeys/pgpkeys.ent# and [.filename]#doc/head/shared/pgpkeys/pgpkeys-developers.xml# - Add your PGP or GnuPG key. Those who do not yet have a key should see <<pgpkeys-creating>>.
-+ 
-`{des}` has written a shell script ([.filename]#doc/head/shared/pgpkeys/addkey.sh#) to make this easier. See the http://svnweb.FreeBSD.org/doc/head/shared/pgpkeys/README[README] file for more information.
+`{des}` has written a shell script ([.filename]#documentation/tools/addkey.sh#) to make this easier. See the http://svnweb.FreeBSD.org/doc/head/shared/pgpkeys/README[README] file for more information.
 + 
-Use [.filename]#doc/head/shared/pgpkeys/checkkey.sh# to verify that keys meet minimal best-practices standards.
+Use [.filename]#documentation/tools/checkkey.sh# to verify that keys meet minimal best-practices standards.
 + 
 After adding and checking a key, add both updated files to source control and then commit them. Entries in this file are sorted by last name.
 +
diff --git a/documentation/tools/addkey.sh b/documentation/tools/addkey.sh
index 36b0101c51..9ded01d68e 100755
--- a/documentation/tools/addkey.sh
+++ b/documentation/tools/addkey.sh
@@ -114,39 +114,22 @@ fi
 keyfile="${me}.key"
 info "Generating ${keyfile}..."
 (
-    echo '<!--'
-    echo "sh ${progname} ${me}" ${keyids} ";"
-    echo '-->'
-    echo '<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA['
+    echo "// sh ${progname} ${me}" ${keyids} ";"
+    echo ''
+    echo '[.literal-block-margin]'
+    echo '....'
     gpg --fingerprint ${keyids}
-    echo ']]></programlisting>'
-    echo '<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA['
+    echo '....'
+    echo ''
+    echo '[.literal-block-margin]'
+    echo '....'
     gpg --no-version --armor --export ${keyids}
-    echo ']]></programlisting>'
+    echo '....'
 ) >"${keyfile}"
 
-info "Adding key to entity list..."
-if ! grep -qwF "pgpkey.${me}" pgpkeys.ent ; then
-	mv pgpkeys.ent pgpkeys.ent.orig || exit 1
-	(
-		cat pgpkeys.ent.orig
-		echo "<!ENTITY pgpkey.${me} SYSTEM \"${keyfile}\">"
-	) | sort -u >pgpkeys.ent
-fi
-
 cat <<EOF
 
-Unless you are already listed there, you should now add the following
-text to pgpkeys-developers.xml.  Remember to keep the list sorted by
-last name!
-
-    <sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-${me}">
-      <title>&a.${me}.email;</title>
-      &pgpkey.${me};
-    </sect2>
-
-If this is a role key or you are a core member, you should add it to
-either pgpkeys-officers.xml or pgpkeys-core.xml instead.
+Remember to move ${keyfile} to /static/pgpkeys/
 
 If this is a new entry, don't forget to run the following commands
 before committing:

From owner-dev-commits-doc-all@freebsd.org  Mon Feb  1 21:33:46 2021
Return-Path: <owner-dev-commits-doc-all@freebsd.org>
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 E608B537D39
 for <dev-commits-doc-all@mailman.nyi.freebsd.org>;
 Mon,  1 Feb 2021 21:33:46 +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 4DV1Qy6630z3GYR;
 Mon,  1 Feb 2021 21:33:46 +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 C1BB322973;
 Mon,  1 Feb 2021 21:33:46 +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 111LXk8o092341;
 Mon, 1 Feb 2021 21:33:46 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
 by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 111LXkSl092339;
 Mon, 1 Feb 2021 21:33:46 GMT (envelope-from git)
Date: Mon, 1 Feb 2021 21:33:46 GMT
Message-Id: <202102012133.111LXkSl092339@gitrepo.freebsd.org>
To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org
From: Sergio Carlavilla Delgado <carlavilla@FreeBSD.org>
Subject: git: f777b95139 - main - Convert Vincenzo pgpkey to AsciiDoc
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: carlavilla
X-Git-Repository: doc
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: f777b9513983a17d6d5cbfcb37036deab1c21b97
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
 <dev-commits-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-doc-all/>
List-Post: <mailto:dev-commits-doc-all@freebsd.org>
List-Help: <mailto:dev-commits-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 01 Feb 2021 21:33:47 -0000

The branch main has been updated by carlavilla:

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

commit f777b9513983a17d6d5cbfcb37036deab1c21b97
Author:     Sergio Carlavilla Delgado <carlavilla@FreeBSD.org>
AuthorDate: 2021-02-01 21:33:12 +0000
Commit:     Sergio Carlavilla Delgado <carlavilla@FreeBSD.org>
CommitDate: 2021-02-01 21:33:12 +0000

    Convert Vincenzo pgpkey to AsciiDoc
---
 documentation/static/pgpkeys/vmaffione.key | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/documentation/static/pgpkeys/vmaffione.key b/documentation/static/pgpkeys/vmaffione.key
index ecdf5418a8..d9b5f6498f 100644
--- a/documentation/static/pgpkeys/vmaffione.key
+++ b/documentation/static/pgpkeys/vmaffione.key
@@ -1,14 +1,18 @@
-<!--
-sh addkey.sh vmaffione 3A3F58253F30A245 ;
--->
-<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
+//
+// sh addkey.sh vmaffione 3A3F58253F30A245 ;
+
+
+[.literal-block-margin]
+....
 pub   3072R/3A3F58253F30A245 2021-02-01 [expires: 2024-02-01]
       Key fingerprint = E42A 54BD 67B3 5721 1641  B144 3A3F 5825 3F30 A245
 uid                          Vincenzo Maffione <vmaffione@freebsd.org>
 sub   3072R/77769E9A73B79B2B 2021-02-01 [expires: 2024-02-01]
 
-]]></programlisting>
-<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
+....
+
+[.literal-block-margin]
+....
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
 mQGNBGAXrewBDADWAAzoNzWUJwkvsOr398w2C7Vpy7WlROBLd5StDH1Q/XSUJHlb
@@ -50,4 +54,4 @@ f4Rnj/3zr45URrBDb2qZu3Vo0oqkYRHUwBnuZFT7m1ltg+wDd+wnGFrOYluHxXA+
 00pkx5aMAAYmXDDyNkpSQPHnJmN5kC/OkJ8Pc8HF2doT
 =re6k
 -----END PGP PUBLIC KEY BLOCK-----
-]]></programlisting>
+....

From owner-dev-commits-doc-all@freebsd.org  Tue Feb  2 05:59:32 2021
Return-Path: <owner-dev-commits-doc-all@freebsd.org>
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 8223E4FF696
 for <dev-commits-doc-all@mailman.nyi.freebsd.org>;
 Tue,  2 Feb 2021 05:59:32 +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 4DVDfX3GRWz4WcX;
 Tue,  2 Feb 2021 05:59:32 +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 5CF9BFA7;
 Tue,  2 Feb 2021 05:59:32 +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 1125xWYc045529;
 Tue, 2 Feb 2021 05:59:32 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
 by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1125xWjd045528;
 Tue, 2 Feb 2021 05:59:32 GMT (envelope-from git)
Date: Tue, 2 Feb 2021 05:59:32 GMT
Message-Id: <202102020559.1125xWjd045528@gitrepo.freebsd.org>
To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org
From: Allan Jude <allanjude@FreeBSD.org>
Subject: git: 9374bec486 - main - bsdinstall: Fix corrupted table
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: allanjude
X-Git-Repository: doc
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 9374bec4869a9387f39e89abd26a8ebd2a626c4c
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
 <dev-commits-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-doc-all/>
List-Post: <mailto:dev-commits-doc-all@freebsd.org>
List-Help: <mailto:dev-commits-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 02 Feb 2021 05:59:32 -0000

The branch main has been updated by allanjude:

URL: https://cgit.FreeBSD.org/doc/commit/?id=9374bec4869a9387f39e89abd26a8ebd2a626c4c

commit 9374bec4869a9387f39e89abd26a8ebd2a626c4c
Author:     Allan Jude <allanjude@FreeBSD.org>
AuthorDate: 2021-02-02 05:58:44 +0000
Commit:     Allan Jude <allanjude@FreeBSD.org>
CommitDate: 2021-02-02 05:59:21 +0000

    bsdinstall: Fix corrupted table
    
    Sponsored By:   Klara Inc.
---
 documentation/content/en/books/handbook/bsdinstall/_index.adoc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/documentation/content/en/books/handbook/bsdinstall/_index.adoc b/documentation/content/en/books/handbook/bsdinstall/_index.adoc
index 3909b59d29..61f327c790 100644
--- a/documentation/content/en/books/handbook/bsdinstall/_index.adoc
+++ b/documentation/content/en/books/handbook/bsdinstall/_index.adoc
@@ -559,6 +559,8 @@ By default, FreeBSD's [.filename]#gptboot# expects the first UFS partition to be
 
 |`freebsd-boot`
 |`512K`
+|
+|
 
 |`freebsd-ufs`
 |`2G`

From owner-dev-commits-doc-all@freebsd.org  Tue Feb  2 12:25:34 2021
Return-Path: <owner-dev-commits-doc-all@freebsd.org>
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 8E22853074D
 for <dev-commits-doc-all@mailman.nyi.freebsd.org>;
 Tue,  2 Feb 2021 12:25:34 +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 4DVPCy3JnWz3C2f;
 Tue,  2 Feb 2021 12:25:34 +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 6436B6064;
 Tue,  2 Feb 2021 12:25:34 +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 112CPY40051933;
 Tue, 2 Feb 2021 12:25:34 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
 by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 112CPYeb051932;
 Tue, 2 Feb 2021 12:25:34 GMT (envelope-from git)
Date: Tue, 2 Feb 2021 12:25:34 GMT
Message-Id: <202102021225.112CPYeb051932@gitrepo.freebsd.org>
To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Subject: git: 32e2174cf3 - main - Document my bump for 1300139 and try to
 document mjg's missing one.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: bz
X-Git-Repository: doc
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 32e2174cf3cf32b0c5d4a81a2b54908b2165dd54
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
 <dev-commits-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-doc-all/>
List-Post: <mailto:dev-commits-doc-all@freebsd.org>
List-Help: <mailto:dev-commits-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 02 Feb 2021 12:25:34 -0000

The branch main has been updated by bz (src committer):

URL: https://cgit.FreeBSD.org/doc/commit/?id=32e2174cf3cf32b0c5d4a81a2b54908b2165dd54

commit 32e2174cf3cf32b0c5d4a81a2b54908b2165dd54
Author:     Bjoern A. Zeeb <bz@FreeBSD.org>
AuthorDate: 2021-02-02 12:16:53 +0000
Commit:     Bjoern A. Zeeb <bz@FreeBSD.org>
CommitDate: 2021-02-02 12:16:53 +0000

    Document my bump for 1300139 and try to document mjg's missing one.
    
    Sponsored-by:   The FreeBSD Foundation
---
 .../content/en/books/porters-handbook/versions/chapter.adoc    | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/documentation/content/en/books/porters-handbook/versions/chapter.adoc b/documentation/content/en/books/porters-handbook/versions/chapter.adoc
index 95815d845e..d89a32f386 100644
--- a/documentation/content/en/books/porters-handbook/versions/chapter.adoc
+++ b/documentation/content/en/books/porters-handbook/versions/chapter.adoc
@@ -779,6 +779,16 @@ Here is a convenient list of `__FreeBSD_version` values as defined in https://cg
 |link:https://cgit.freebsd.org/src/commit/?id=010196adcfaf2bb610725394d40691874b4ff2af[010196adcfaf]
 |January 30, 2020
 |13.0-CURRENT after fixing a clang assertion when building the package:devel/onetbb[] port.
+
+|1300138
+|link:https://cgit.freebsd.org/src/commit/?id=dcee9964238b12a8e55917f292139f074b1a80b2[dcee9964238b]
+|February 1, 20201
+|13.0-ALPHA3 after adding lockless symlink lookup to vfs cache.
+
+|1300139
+|link:https://cgit.freebsd.org/src/commit/?id=91a07ed50ffca4dfada3e7f1f050ea746c1bac66[91a07ed50ffc]
+|February 2, 2021
+|13.0-ALPHA3 after adding various LinuxKPI bits conflicting with drm-kmod.
 |===
 
 [[versions-12]]

From owner-dev-commits-doc-all@freebsd.org  Tue Feb  2 16:21:35 2021
Return-Path: <owner-dev-commits-doc-all@freebsd.org>
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 E15A95366A9
 for <dev-commits-doc-all@mailman.nyi.freebsd.org>;
 Tue,  2 Feb 2021 16:21:35 +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 4DVVSH65LMz3kQh;
 Tue,  2 Feb 2021 16:21:35 +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 C3FC4117B4;
 Tue,  2 Feb 2021 16:21:35 +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 112GLZG5062944;
 Tue, 2 Feb 2021 16:21:35 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
 by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 112GLZ8d062943;
 Tue, 2 Feb 2021 16:21:35 GMT (envelope-from git)
Date: Tue, 2 Feb 2021 16:21:35 GMT
Message-Id: <202102021621.112GLZ8d062943@gitrepo.freebsd.org>
To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org
From: Brandon Bergren <bdragon@FreeBSD.org>
Subject: git: bd3ec6a734 - main - Trivial change: Remove duplicated paragraph.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: bdragon
X-Git-Repository: doc
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: bd3ec6a734990eae7ee505280084555ced85ed5b
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
 <dev-commits-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-doc-all/>
List-Post: <mailto:dev-commits-doc-all@freebsd.org>
List-Help: <mailto:dev-commits-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 02 Feb 2021 16:21:35 -0000

The branch main has been updated by bdragon (src committer):

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

commit bd3ec6a734990eae7ee505280084555ced85ed5b
Author:     Brandon Bergren <bdragon@FreeBSD.org>
AuthorDate: 2021-02-02 16:19:12 +0000
Commit:     Brandon Bergren <bdragon@FreeBSD.org>
CommitDate: 2021-02-02 16:19:12 +0000

    Trivial change: Remove duplicated paragraph.
---
 .../content/en/books/fdp-primer/asciidoctor-primer/chapter.adoc         | 2 --
 1 file changed, 2 deletions(-)

diff --git a/documentation/content/en/books/fdp-primer/asciidoctor-primer/chapter.adoc b/documentation/content/en/books/fdp-primer/asciidoctor-primer/chapter.adoc
index 5c43a83c6f..1621a7a276 100644
--- a/documentation/content/en/books/fdp-primer/asciidoctor-primer/chapter.adoc
+++ b/documentation/content/en/books/fdp-primer/asciidoctor-primer/chapter.adoc
@@ -31,8 +31,6 @@ Most FDP documentation is written with AsciiDoc. This chapter explains what that
 
 In the original days of computers, electronic text was simple. There were a few character sets like ASCII or EBCDIC, but that was about it. Text was text, and what you saw really was what you got. No frills, no formatting, no intelligence.
 
-In the original days of computers, electronic text was simple. There were a few character sets like ASCII or EBCDIC, but that was about it. Text was text, and what you saw really was what you got. No frills, no formatting, no intelligence.
-
 Inevitably, this was not enough. When text is in a machine-usable format, machines are expected to be able to use and manipulate it intelligently. Authors want to indicate that certain phrases should be emphasized, or added to a glossary, or made into hyperlinks. Filenames could be shown in a “typewriter” style font for viewing on screen, but as “italics” when printed, or any of a myriad of other options for presentation.
 
 It was once hoped that Artificial Intelligence (AI) would make this easy. The computer would read the document and automatically identify key phrases, filenames, text that the reader should type in, examples, and more. Unfortunately, real life has not happened quite like that, and computers still require assistance before they can meaningfully process text.

From owner-dev-commits-doc-all@freebsd.org  Tue Feb  2 17:23:32 2021
Return-Path: <owner-dev-commits-doc-all@freebsd.org>
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 8007F538819
 for <dev-commits-doc-all@mailman.nyi.freebsd.org>;
 Tue,  2 Feb 2021 17:23:32 +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 4DVWqm2zssz3qph;
 Tue,  2 Feb 2021 17:23:32 +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 57DD212477;
 Tue,  2 Feb 2021 17:23:32 +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 112HNWCb044345;
 Tue, 2 Feb 2021 17:23:32 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
 by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 112HNWnl044344;
 Tue, 2 Feb 2021 17:23:32 GMT (envelope-from git)
Date: Tue, 2 Feb 2021 17:23:32 GMT
Message-Id: <202102021723.112HNWnl044344@gitrepo.freebsd.org>
To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org
From: Glen Barber <gjb@FreeBSD.org>
Subject: git: 15dddb70a9 - main - 13.0: fix releng branch declaration
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: gjb
X-Git-Repository: doc
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 15dddb70a9c7551e2d84c0b77c689dfadaedcd48
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
 <dev-commits-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-doc-all/>
List-Post: <mailto:dev-commits-doc-all@freebsd.org>
List-Help: <mailto:dev-commits-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 02 Feb 2021 17:23:32 -0000

The branch main has been updated by gjb:

URL: https://cgit.FreeBSD.org/doc/commit/?id=15dddb70a9c7551e2d84c0b77c689dfadaedcd48

commit 15dddb70a9c7551e2d84c0b77c689dfadaedcd48
Author:     Glen Barber <gjb@FreeBSD.org>
AuthorDate: 2021-02-02 17:23:11 +0000
Commit:     Glen Barber <gjb@FreeBSD.org>
CommitDate: 2021-02-02 17:23:11 +0000

    13.0: fix releng branch declaration
    
    Sponsored by:   Rubicon Communications, LLC ("Netgate")
---
 website/content/en/releases/13.0R/_index.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website/content/en/releases/13.0R/_index.adoc b/website/content/en/releases/13.0R/_index.adoc
index 04ca6add81..abb5d7dc9e 100644
--- a/website/content/en/releases/13.0R/_index.adoc
+++ b/website/content/en/releases/13.0R/_index.adoc
@@ -5,7 +5,7 @@ sidenav: download
 
 :localRel: 13.0
 :localBranchStable: "stable/13"
-:localBranchReleng: "stable/13"
+:localBranchReleng: "releng/13.0"
 
 = FreeBSD {localRel} Release Information
 

From owner-dev-commits-doc-all@freebsd.org  Wed Feb  3 17:03:53 2021
Return-Path: <owner-dev-commits-doc-all@freebsd.org>
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 18EBA53D014
 for <dev-commits-doc-all@mailman.nyi.freebsd.org>;
 Wed,  3 Feb 2021 17:03:53 +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 4DW7Ld065sz4tYP;
 Wed,  3 Feb 2021 17:03:53 +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 EAF0524A93;
 Wed,  3 Feb 2021 17:03:52 +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 113H3q4H096774;
 Wed, 3 Feb 2021 17:03:52 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
 by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 113H3qiE096773;
 Wed, 3 Feb 2021 17:03:52 GMT (envelope-from git)
Date: Wed, 3 Feb 2021 17:03:52 GMT
Message-Id: <202102031703.113H3qiE096773@gitrepo.freebsd.org>
To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org
From: Glen Barber <gjb@FreeBSD.org>
Subject: git: 1833fecccb - main - relnotes: add 13.0 hardware, installation,
 readme, relnotes pages
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: gjb
X-Git-Repository: doc
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 1833fecccb4136153a001734f933b30963eb7fdc
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
 <dev-commits-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-doc-all/>
List-Post: <mailto:dev-commits-doc-all@freebsd.org>
List-Help: <mailto:dev-commits-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 03 Feb 2021 17:03:53 -0000

The branch main has been updated by gjb:

URL: https://cgit.FreeBSD.org/doc/commit/?id=1833fecccb4136153a001734f933b30963eb7fdc

commit 1833fecccb4136153a001734f933b30963eb7fdc
Author:     Glen Barber <gjb@FreeBSD.org>
AuthorDate: 2021-02-03 17:00:30 +0000
Commit:     Glen Barber <gjb@FreeBSD.org>
CommitDate: 2021-02-03 17:00:30 +0000

    relnotes: add 13.0 hardware, installation, readme, relnotes pages
    
    Sponsored by:   Rubicon Communications, LLC ("Netgate")
---
 website/content/en/releases/13.0R/hardware.adoc    | 3158 ++++++++++++++++++++
 .../content/en/releases/13.0R/installation.adoc    |   86 +
 website/content/en/releases/13.0R/readme.adoc      |  158 +
 website/content/en/releases/13.0R/relnotes.adoc    |  186 ++
 4 files changed, 3588 insertions(+)

diff --git a/website/content/en/releases/13.0R/hardware.adoc b/website/content/en/releases/13.0R/hardware.adoc
new file mode 100644
index 0000000000..aca67a68b6
--- /dev/null
+++ b/website/content/en/releases/13.0R/hardware.adoc
@@ -0,0 +1,3158 @@
+---
+title: "FreeBSD 13.0-RELEASE Hardware Notes"
+sidenav: download
+---
+
+:releaseCurrent: "13.0-RELEASE"
+
+= FreeBSD {releaseCurrent} Hardware Notes
+
+== Table of Contents
+
+* <<intro,Introduction>>
+* <<proc,Supported Processors and System Boards>>
+* <<support,Supported Devices>>
+
+[[intro]]
+== Introduction
+
+This document contains the hardware compatibility notes for FreeBSD {releaseCurrent}. It lists the hardware platforms supported by FreeBSD, as well as the various types of hardware devices (storage controllers, network interfaces, and so on), along with known working instances of these devices.
+
+[[proc]]
+== Supported Processors and System Boards
+
+This section provides some architecture-specific information about the specific processors and systems that are supported by each architecture.
+
+[[proc-amd64]]
+=== amd64
+
+Since mid-2003 FreeBSD/amd64 has supported the AMD64 ("Hammer") and Intel(R) EM64T architecture, and is now one of the Tier-1 platforms (fully supported architecture), which are expected to be Production Quality with respects to all aspects of the FreeBSD operating system, including installation and development environments.
+
+Note that there are two names for this architecture, AMD64 (AMD) and Intel EM64T (Extended Memory 64-bit Technology). 64-bit mode of the two architectures are almost compatible with each other, and FreeBSD/amd64 supports them both.
+
+As of this writing, the following processors are supported:
+
+* AMD Athlon(TM)64 ("Clawhammer").
+* AMD Opteron(TM) ("Sledgehammer").
+* AMD Sempron(TM).
+* AMD Turion(TM).
+* AMD Phenom(TM).
+* All multi-core Intel(R) Xeon(TM) processors except Sossaman have EM64T support.
+* The single-core Intel(R) Xeon(TM) processors "Nocona", "Irwindale", "Potomac", and "Cranford" have EM64T support.
+* All Intel(R) Core(TM) 2 (not Core(TM) Duo) and later processors
+* All Intel(R) Core(TM) i range of processors
+* All Intel(R) Pentium(R) D processors
+* All Intel(R) Centrino(R) Duo and Centrino(R) Pro platforms
+* Intel(R) Pentium(R) 4s and Celeron(R) Ds using the "Cedar Mill" core have EM64T support.
+* Some Intel(R) Pentium(R) 4s and Celeron(R) Ds using the "Prescott" core have EM64T support. See the http://processorfinder.intel.com[Intel Processor Spec Finder] for the definitive answer about EM64T support in Intel processors.
+
+Intel(R) EM64T is an extended version of IA-32 (x86) and different from Intel(R) IA-64 (Itanium) architecture. Some of Intel(R)'s old documentation refers to Intel(R) EM64T as "64-bit extension technology" or "IA-32e".
+
+Both Uniprocessor (UP) and Symmetric Multi-processor (SMP) configurations are supported.
+
+In many respects, FreeBSD/amd64 is similar to FreeBSD/i386, in terms of drivers supported. Generally, drivers that already function correctly on other 64-bit platforms should work.
+
+[[proc-i386]]
+=== i386
+
+FreeBSD/i386 runs on a wide variety of "IBM PC compatible" machines. Due to the wide range of hardware available for this architecture, it is impossible to exhaustively list all combinations of equipment supported by FreeBSD. Nevertheless, some general guidelines are presented here.
+
+Almost all i386(TM)-compatible processors with a floating point unit are supported. All Intel(R) processors beginning with the 80486 are supported, including the 80486, Pentium(R), Pentium(R) Pro, Pentium(R) II, Pentium(R) III, Pentium(R) 4, and variants thereof, such as the Xeon(TM) and Celeron(R) processors. All i386(TM)-compatible AMD processors are also supported, including the Am486(R), Am5x86(R), K5, AMD-K6(R) (and variants), AMD Athlon(TM) (including Athlon-MP, Athlon-XP, Athlon-4, and Athlon Thunderbird), and Duron(TM) processors. The AMD Élan SC520 embedded processor is supported. The Transmeta Crusoe is recognized and supported, as are i386(TM)-compatible processors from Cyrix and NexGen.
+
+There is a wide variety of motherboards available for this architecture. Motherboards using the ISA, VLB, EISA, AGP, and PCI expansion buses are well-supported. There is some limited support for the MCA ("MicroChannel") expansion bus used in the IBM PS/2 line of PCs.
+
+Symmetric multi-processor (SMP) systems are generally supported by FreeBSD, although in some cases, BIOS or motherboard bugs may generate some problems. Perusal of the archives of the A.SMP may yield some clues.
+
+FreeBSD will take advantage of SMT (Symmetric MultiThreading, also known as HyperThreading on Intel(R) CPUs) on the supported CPUs. The `GENERIC` kernel which is installed by default will automatically detect the additional logical processors. The default FreeBSD scheduler recognizes processor topology on the system and selects logical and physical processors to obtain optimal performance. The {{< manpage "smp" "4">}} manual page has more details.
+
+FreeBSD will take advantage of Physical Address Extensions (PAE) support on CPUs that support this feature. A kernel with the `PAE` feature enabled will detect memory above 4 gigabytes and allow it to be used by the system. This feature places constraints on the device drivers and other features of FreeBSD which may be used; consult the {{< manpage "pae" "4">}} manual page for more details.
+
+FreeBSD will generally run on i386-based laptops, albeit with varying levels of support for certain hardware features such as sound, graphics, power management, and PCCARD expansion slots. These features tend to vary in idiosyncratic ways between machines, and frequently require special-case support in FreeBSD to work around hardware bugs or other oddities.
+
+Most modern laptops (as well as many desktops) use the Advanced Configuration and Power Management (ACPI) standard. FreeBSD supports ACPI via the ACPI Component Architecture reference implementation from Intel(R), as described in the {{< manpage "acpi" "4">}} manual page. The use of ACPI causes instabilities on some machines and it may be necessary to disable the ACPI driver, which is normally loaded via a kernel module. This may be accomplished by adding the following line to `/boot/device.hints`:
+
+[.programlisting]
+....
+hint.acpi.0.disabled="1"
+....
+
+Users debugging ACPI-related problems may find it useful to disable portions of the ACPI functionality. The {{< manpage "acpi" "4">}} manual page has more information on how to do this via loader tunables.
+
+ACPI depends on a Differentiated System Descriptor Table (DSDT) provided by each machine's BIOS. Some machines have bad or incomplete DSDTs, which prevents ACPI from functioning correctly. Replacement DSDTs for some machines can be found at the http://acpi.sourceforge.net/dsdt/index.php[DSDT] section of the http://acpi.sourceforge.net/[ACPI4Linux] project Web site. FreeBSD can use these DSDTs to override the DSDT provided by the BIOS; see the {{< manpage "acpi" "4">}} manual page for more information.
+
+[[proc-powerpc]]
+=== powerpc
+
+All Apple PowerPC machines with built-in USB are supported, as well a limited selection of non-Apple machines, including KVM on POWER7
+
+SMP is supported on all systems with more than 1 processor.
+
+[[proc-sparc64]]
+=== sparc64
+
+This section describes the systems currently known to be supported by FreeBSD on the Fujitsu SPARC64(R) and Sun UltraSPARC(R) platforms.
+
+SMP is supported on all systems with more than 1 processor.
+
+When using the `GENERIC` kernel, FreeBSD/sparc64 systems not equipped with a framebuffer supported by the {{< manpage "creator" "4">}} (Sun Creator, Sun Creator3D and Sun Elite3D) or {{< manpage "fetch" "4">}} (Sun PGX and Sun PGX64 as well as the ATI Mach64 chips found onboard in for example Sun Blade(TM) 100, Sun Blade(TM) 150, Sun Ultra(TM) 5 and Sun Ultra(TM) 10) driver must use the serial console.
+
+If you have a system that is not listed here, it may not have been tested with FreeBSD {releaseCurrent}. We encourage you to try it and send a note to the A.SPARC with your results, including which devices work and which do not.
+
+The following systems are fully supported by FreeBSD:
+
+* Naturetech GENIALstation 777S
+* Sun Blade(TM) 100
+* Sun Blade(TM) 150
+* Sun Enterprise(TM) 150
+* Sun Enterprise(TM) 220R
+* Sun Enterprise(TM) 250
+* Sun Enterprise(TM) 420R
+* Sun Enterprise(TM) 450
+* Sun Fire(TM) B100s (support for the on-board NICs first appeared in 8.1-RELEASE)
+* Sun Fire(TM) V100
+* Sun Fire(TM) V120
+* Sun Netra(TM) t1 100/105
+* Sun Netra(TM) T1 AC200/DC200
+* Sun Netra(TM) t 1100
+* Sun Netra(TM) t 1120
+* Sun Netra(TM) t 1125
+* Sun Netra(TM) t 1400/1405
+* Sun Netra(TM) 120
+* Sun Netra(TM) X1
+* Sun SPARCEngine(R) Ultra AX1105
+* Sun SPARCEngine(R) Ultra AXe
+* Sun SPARCEngine(R) Ultra AXi
+* Sun SPARCEngine(R) Ultra AXmp
+* Sun SPARCEngine(R) CP1500
+* Sun Ultra(TM) 1
+* Sun Ultra(TM) 1E
+* Sun Ultra(TM) 2
+* Sun Ultra(TM) 5
+* Sun Ultra(TM) 10
+* Sun Ultra(TM) 30
+* Sun Ultra(TM) 60
+* Sun Ultra(TM) 80
+* Sun Ultra(TM) 450
+
+The following systems are partially supported by FreeBSD. In particular the fiber channel controllers in SBus-based systems are not supported. However, it is possible to use these with a SCSI controller supported by the {{< manpage "esp" "4">}} driver (Sun ESP SCSI, Sun FAS Fast-SCSI and Sun FAS366 Fast-Wide SCSI controllers).
+
+* Sun Enterprise(TM) 3500
+* Sun Enterprise(TM) 4500
+
+Starting with 7.2-RELEASE, sparc64 systems based on Sun UltraSPARC(R) III and beyond are also supported by FreeBSD, which includes the following known working systems:
+
+* Sun Blade(TM) 1000
+* Sun Blade(TM) 1500
+* Sun Blade(TM) 2000
+* Sun Blade(TM) 2500
+* Sun Fire(TM) 280R
+* Sun Fire(TM) V210
+* Sun Fire(TM) V215 (support first appeared in 7.3-RELEASE and 8.1-RELEASE)
+* Sun Fire(TM) V240
+* Sun Fire(TM) V245 (support first appeared in 7.3-RELEASE and 8.1-RELEASE)
+* Sun Fire(TM) V250
+* Sun Fire(TM) V440 (support for the on-board NICs first appeared in 7.3-RELEASE and 8.0-RELEASE)
+* Sun Fire(TM) V480 (501-6780 and 501-6790 centerplanes only, for which support first appeared in 7.3-RELEASE and 8.1-RELEASE, other centerplanes might work beginning with 8.3-RELEASE and 9.0-RELEASE)
+* Sun Fire(TM) V880
+* Sun Fire(TM) V890 (support first appeared in 7.4-RELEASE and 8.1-RELEASE, non-mixed UltraSPARC(R) IV/IV+ CPU-configurations only)
+* Netra(TM) 20/Netra(TM) T4
+
+The following Sun UltraSPARC(R) systems are not tested but believed to be also supported by FreeBSD:
+
+* Sun Fire(TM) V125
+* Sun Fire(TM) V490 (support first appeared in 7.4-RELEASE and 8.1-RELEASE, non-mixed UltraSPARC(R) IV/IV+ CPU-configurations only)
+
+Starting with 7.4-RELEASE and 8.1-RELEASE, sparc64 systems based on Fujitsu SPARC64(R) V are also supported by FreeBSD, which includes the following known working systems:
+
+* Fujitsu PRIMEPOWER(R) 250
+
+The following Fujitsu PRIMEPOWER(R) systems are not tested but believed to be also supported by FreeBSD:
+
+* Fujitsu PRIMEPOWER(R) 450
+* Fujitsu PRIMEPOWER(R) 650
+* Fujitsu PRIMEPOWER(R) 850
+
+////
+The "Supported Devices" section of the release notes.
+
+Generally processor-independent, with conditional text inclusion handling any architecture-dependent text.
+
+Within each subsection describing a class of hardware (i.e. Ethernet interfaces), list broad groups of devices alphabetically as paragraphs sorted alphabetically (frequently these groups will be arranged by manufacturer, i.e. 3Com Ethernet interfaces).
+
+Where applicable, a "Miscellaneous" section may follow all other named sections.
+
+These guidelines are not hard-and-fast rules, and exceptions will occur. Following these guidelines (vague as they may be) is highly recommended to try to keep the formatting of this section consistent.
+
+We give manpage references using the &man entities where possible. If a driver has no manpage (and consequently no man page, we simply give the name of the driver).
+
+Please avoid doing man pages conversions unless you know for sure that an entity and manpage exist; sweeps through this file to fix "missed" conversions are likely to break the build.
+////
+
+[[support]]
+== Supported Devices
+
+This section describes the devices currently known to be supported by FreeBSD. Other configurations may also work, but simply have not been tested yet. Feedback, updates, and corrections to this list are encouraged.
+
+Where possible, the drivers applicable to each device or class of devices is listed. If the driver in question has a manual page in the FreeBSD base distribution (most should), it is referenced here. Information on specific models of supported devices, controllers, etc. can be found in the manual pages.
+
+[.note]
+*Note*: +
+The device lists in this document are being generated automatically from FreeBSD manual pages. This means that some devices, which are supported by multiple drivers, may appear multiple times.
+
+
+[[disk]]
+=== Disk Controllers
+
+[amd64, i386, sparc64] IDE/ATA controllers ({{< manpage "fetch" "4">}} driver)
+
+Controllers supported by the {{< manpage "aac" "4">}} driver include:
+
+* Adaptec AAC-364
+* Adaptec RAID 2045
+* Adaptec RAID 2405
+* Adaptec RAID 2445
+* Adaptec RAID 2805
+* Adaptec RAID 3085
+* Adaptec RAID 31205
+* Adaptec RAID 31605
+* Adaptec RAID 5085
+* Adaptec RAID 51205
+* Adaptec RAID 51245
+* Adaptec RAID 51605
+* Adaptec RAID 51645
+* Adaptec RAID 52445
+* Adaptec RAID 5405
+* Adaptec RAID 5445
+* Adaptec RAID 5805
+* Adaptec SAS RAID 3405
+* Adaptec SAS RAID 3805
+* Adaptec SAS RAID 4000SAS
+* Adaptec SAS RAID 4005SAS
+* Adaptec SAS RAID 4800SAS
+* Adaptec SAS RAID 4805SAS
+* Adaptec SATA RAID 2020SA ZCR
+* Adaptec SATA RAID 2025SA ZCR
+* Adaptec SATA RAID 2026ZCR
+* Adaptec SATA RAID 2410SA
+* Adaptec SATA RAID 2420SA
+* Adaptec SATA RAID 2610SA
+* Adaptec SATA RAID 2620SA
+* Adaptec SATA RAID 2810SA
+* Adaptec SATA RAID 2820SA
+* Adaptec SATA RAID 21610SA
+* Adaptec SCSI RAID 2020ZCR
+* Adaptec SCSI RAID 2025ZCR
+* Adaptec SCSI RAID 2120S
+* Adaptec SCSI RAID 2130S
+* Adaptec SCSI RAID 2130SLP
+* Adaptec SCSI RAID 2230SLP
+* Adaptec SCSI RAID 2200S
+* Adaptec SCSI RAID 2240S
+* Adaptec SCSI RAID 3230S
+* Adaptec SCSI RAID 3240S
+* Adaptec SCSI RAID 5400S
+* Dell CERC SATA RAID 2
+* Dell PERC 2/Si
+* Dell PERC 2/QC
+* Dell PERC 3/Si
+* Dell PERC 3/Di
+* Dell PERC 320/DC
+* HP ML110 G2 (Adaptec SATA RAID 2610SA)
+* HP NetRAID 4M
+* IBM ServeRAID 8i
+* IBM ServeRAID 8k
+* IBM ServeRAID 8s
+* ICP RAID ICP5045BL
+* ICP RAID ICP5085BL
+* ICP RAID ICP5085SL
+* ICP RAID ICP5125BR
+* ICP RAID ICP5125SL
+* ICP RAID ICP5165BR
+* ICP RAID ICP5165SL
+* ICP RAID ICP5445SL
+* ICP RAID ICP5805BL
+* ICP RAID ICP5805SL
+* ICP ICP5085BR SAS RAID
+* ICP ICP9085LI SAS RAID
+* ICP ICP9047MA SATA RAID
+* ICP ICP9067MA SATA RAID
+* ICP ICP9087MA SATA RAID
+* ICP ICP9014RO SCSI RAID
+* ICP ICP9024RO SCSI RAID
+* Legend S220
+* Legend S230
+* Sun STK RAID REM
+* Sun STK RAID EM
+* SG-XPCIESAS-R-IN
+* SG-XPCIESAS-R-EX
+* AOC-USAS-S4i
+* AOC-USAS-S8i
+* AOC-USAS-S4iR
+* AOC-USAS-S8iR
+* AOC-USAS-S8i-LP
+* AOC-USAS-S8iR-LP
+
+The {{< manpage "adv" "4">}} driver supports the following SCSI controllers:
+
+* AdvanSys ABP510/5150
+* AdvanSys ABP5140
+* AdvanSys ABP5142
+* AdvanSys ABP902/3902
+* AdvanSys ABP3905
+* AdvanSys ABP915
+* AdvanSys ABP920
+* AdvanSys ABP3922
+* AdvanSys ABP3925
+* AdvanSys ABP930, ABP930U, ABP930UA
+* AdvanSys ABP960, ABP960U
+* AdvanSys ABP542
+* AdvanSys ABP842
+* AdvanSys ABP940
+* AdvanSys ABP940UA/3940UA
+* AdvanSys ABP940U
+* AdvanSys ABP3960UA
+* AdvanSys ABP970, ABP970U
+* AdvanSys ABP852
+* AdvanSys ABP950
+* AdvanSys ABP980, ABP980U
+* AdvanSys ABP980UA/3980UA
+
+The {{< manpage "adw" "4">}} driver supports SCSI controllers including:
+
+* AdvanSys ABP940UW/ABP3940UW
+* AdvanSys ABP950UW
+* AdvanSys ABP970UW
+* AdvanSys ABP3940U2W
+* AdvanSys ABP3950U2W
+
+The {{< manpage "aha" "4">}} driver supports the following SCSI host adapters:
+
+* Adaptec AHA-154xB
+* Adaptec AHA-154xC
+* Adaptec AHA-154xCF
+* Adaptec AHA-154xCP
+* DTC 3290 SCSI controller in 1542 emulation mode
+* Tekram SCSI controllers in 154x emulation mode
+
+The {{< manpage "ahc" "4">}} driver supports the following SCSI host adapter chips and SCSI controller cards:
+
+* Adaptec AIC7770 host adapter chip
+* Adaptec AIC7850 host adapter chip
+* Adaptec AIC7860 host adapter chip
+* Adaptec AIC7870 host adapter chip
+* Adaptec AIC7880 host adapter chip
+* Adaptec AIC7890 host adapter chip
+* Adaptec AIC7891 host adapter chip
+* Adaptec AIC7892 host adapter chip
+* Adaptec AIC7895 host adapter chip
+* Adaptec AIC7896 host adapter chip
+* Adaptec AIC7897 host adapter chip
+* Adaptec AIC7899 host adapter chip
+* Adaptec 274X(W)
+* Adaptec 274X(T)
+* Adaptec 2910
+* Adaptec 2915
+* Adaptec 2920C
+* Adaptec 2930C
+* Adaptec 2930U2
+* Adaptec 2940
+* Adaptec 2940J
+* Adaptec 2940N
+* Adaptec 2940U
+* Adaptec 2940AU
+* Adaptec 2940UW
+* Adaptec 2940UW Dual
+* Adaptec 2940UW Pro
+* Adaptec 2940U2W
+* Adaptec 2940U2B
+* Adaptec 2950U2W
+* Adaptec 2950U2B
+* Adaptec 19160B
+* Adaptec 29160B
+* Adaptec 29160N
+* Adaptec 3940
+* Adaptec 3940U
+* Adaptec 3940AU
+* Adaptec 3940UW
+* Adaptec 3940AUW
+* Adaptec 3940U2W
+* Adaptec 3950U2
+* Adaptec 3960
+* Adaptec 39160
+* Adaptec 3985
+* Adaptec 4944UW
+* Many motherboards with on-board SCSI support
+
+The {{< manpage "ahci" "4">}} driver supports AHCI compatible controllers having PCI class 1 (mass storage), subclass 6 (SATA) and programming interface 1 (AHCI).
+
+Also, in cooperation with atamarvell and atajmicron drivers of {{< manpage "ata" "4">}}, it supports AHCI part of legacy-PATA + AHCI-SATA combined controllers, such as JMicron JMB36x and Marvell 88SE61xx.
+
+The {{< manpage "ahd" "4">}} driver supports the following:
+
+* Adaptec AIC7901 host adapter chip
+* Adaptec AIC7901A host adapter chip
+* Adaptec AIC7902 host adapter chip
+* Adaptec 29320 host adapter
+* Adaptec 39320 host adapter
+* Many motherboards with on-board SCSI support
+
+The adapters supported by the {{< manpage "aic" "4">}} driver include:
+
+* Adaptec AHA-1505 (ISA)
+* Adaptec AHA-1510A, AHA-1510B (ISA)
+* Adaptec AHA-1520A, AHA-1520B (ISA)
+* Adaptec AHA-1522A, AHA-1522B (ISA)
+* Adaptec AHA-1535 (ISA)
+* Creative Labs SoundBlaster SCSI host adapter (ISA)
+* Adaptec AHA-1460, AHA-1460B, AHA-1460C, AHA-1460D (PC Card)
+
+Controllers supported by the {{< manpage "amr" "4">}} driver include:
+
+* MegaRAID SATA 150-4
+* MegaRAID SATA 150-6
+* MegaRAID SATA 300-4X
+* MegaRAID SATA 300-8X
+* MegaRAID SCSI 320-1E
+* MegaRAID SCSI 320-2E
+* MegaRAID SCSI 320-4E
+* MegaRAID SCSI 320-0X
+* MegaRAID SCSI 320-2X
+* MegaRAID SCSI 320-4X
+* MegaRAID SCSI 320-0
+* MegaRAID SCSI 320-1
+* MegaRAID SCSI 320-2
+* MegaRAID SCSI 320-4
+* MegaRAID Series 418
+* MegaRAID i4 133 RAID
+* MegaRAID Elite 1500 (Series 467)
+* MegaRAID Elite 1600 (Series 493)
+* MegaRAID Elite 1650 (Series 4xx)
+* MegaRAID Enterprise 1200 (Series 428)
+* MegaRAID Enterprise 1300 (Series 434)
+* MegaRAID Enterprise 1400 (Series 438)
+* MegaRAID Enterprise 1500 (Series 467)
+* MegaRAID Enterprise 1600 (Series 471)
+* MegaRAID Express 100 (Series 466WS)
+* MegaRAID Express 200 (Series 466)
+* MegaRAID Express 300 (Series 490)
+* MegaRAID Express 500 (Series 475)
+* Dell PERC
+* Dell PERC 2/SC
+* Dell PERC 2/DC
+* Dell PERC 3/DCL
+* Dell PERC 3/QC
+* Dell PERC 4/DC
+* Dell PERC 4/IM
+* Dell PERC 4/SC
+* Dell PERC 4/Di
+* Dell PERC 4e/DC
+* Dell PERC 4e/Di
+* Dell PERC 4e/Si
+* Dell PERC 4ei
+* HP NetRAID-1/Si
+* HP NetRAID-3/Si (D4943A)
+* HP Embedded NetRAID
+* Intel RAID Controller SRCS16
+* Intel RAID Controller SRCU42X
+
+The {{< manpage "arcmsr" "4">}} driver supports the following cards:
+
+* ARC-1110
+* ARC-1120
+* ARC-1130
+* ARC-1160
+* ARC-1170
+* ARC-1110ML
+* ARC-1120ML
+* ARC-1130ML
+* ARC-1160ML
+* ARC-1200
+* ARC-1201
+* ARC-1203
+* ARC-1210
+* ARC-1212
+* ARC-1213
+* ARC-1214
+* ARC-1216
+* ARC-1220
+* ARC-1222
+* ARC-1223
+* ARC-1224
+* ARC-1226
+* ARC-1230
+* ARC-1231
+* ARC-1260
+* ARC-1261
+* ARC-1270
+* ARC-1280
+* ARC-1210ML
+* ARC-1220ML
+* ARC-1231ML
+* ARC-1261ML
+* ARC-1280ML
+* ARC-1380
+* ARC-1381
+* ARC-1680
+* ARC-1681
+* ARC-1880
+* ARC-1882
+* ARC-1883
+* ARC-1884
+
+The {{< manpage "bt" "4">}} driver supports the following BusLogic MultiMaster “W”, “C”, “S”, and “A” series and compatible SCSI host adapters:
+
+* BusLogic BT-445C
+* BusLogic BT-445S
+* BusLogic BT-540CF
+* BusLogic BT-542B
+* BusLogic BT-542B
+* BusLogic BT-542D
+* BusLogic BT-545C
+* BusLogic BT-545S
+* BusLogic/BusTek BT-640
+* BusLogic BT-946C
+* BusLogic BT-948
+* BusLogic BT-956C
+* BusLogic BT-956CD
+* BusLogic BT-958
+* BusLogic BT-958D
+* Storage Dimensions SDC3211B / SDC3211F
+    
+Controllers supported by the {{< manpage "ciss" "4">}} driver include:
+
+* Compaq Smart Array 5300 (simple mode only)
+* Compaq Smart Array 532
+* Compaq Smart Array 5i
+* HP Smart Array 5312
+* HP Smart Array 6i
+* HP Smart Array 641
+* HP Smart Array 642
+* HP Smart Array 6400
+* HP Smart Array 6400 EM
+* HP Smart Array E200
+* HP Smart Array E200i
+* HP Smart Array P212
+* HP Smart Array P220i
+* HP Smart Array P222
+* HP Smart Array P230i
+* HP Smart Array P400
+* HP Smart Array P400i
+* HP Smart Array P410
+* HP Smart Array P410i
+* HP Smart Array P411
+* HP Smart Array P420
+* HP Smart Array P420i
+* HP Smart Array P421
+* HP Smart Array P430
+* HP Smart Array P430i
+* HP Smart Array P431
+* HP Smart Array P530
+* HP Smart Array P531
+* HP Smart Array P600
+* HP Smart Array P721m
+* HP Smart Array P731m
+* HP Smart Array P800
+* HP Smart Array P812
+* HP Smart Array P830
+* HP Smart Array P830i
+* HP Modular Smart Array 20 (MSA20)
+* HP Modular Smart Array 500 (MSA500)
+
+The {{< manpage "dpt" "4">}} driver provides support for the following RAID adapters:
+
+* DPT Smart Cache Plus
+* Smart Cache II (PM2?2?, PM2024/PM2124 [PCI]) (Gen2)
+* Smart RAID II (PM3?2?, PM3021, PM3222)
+* Smart Cache III (PM2?3?)
+* Smart RAID III (PM3?3?, PM3334UW [PCI]) (Gen3)
+* Smart Cache IV (PM2?4?, PM2044/PM2144 [PCI]) (Gen4)
+* Smart RAID IV
+
+[.note]
+*Note*: +
+[amd64, i386] Booting from these controllers is supported. EISA adapters are not supported.
+
+Controllers supported by the {{< manpage "esp" "4">}} driver include:
+
+* Sun ESP family
+* Sun FAS family
+* Tekram DC390
+* Tekram DC390T
+
+The {{< manpage "hpt27xx" "4">}} driver supports the following SAS controllers:
+
+* HighPoint's RocketRAID 271x series
+* HighPoint's RocketRAID 272x series
+* HighPoint's RocketRAID 274x series
+* HighPoint's RocketRAID 276x series
+* HighPoint's RocketRAID 278x series
+
+The {{< manpage "hptiop" "4">}} driver supports the following SAS and SATA RAID controllers:
+
+* HighPoint RocketRAID 4522
+* HighPoint RocketRAID 4521
+* HighPoint RocketRAID 4520
+* HighPoint RocketRAID 4322
+* HighPoint RocketRAID 4321
+* HighPoint RocketRAID 4320
+* HighPoint RocketRAID 4311
+* HighPoint RocketRAID 4310
+* HighPoint RocketRAID 3640
+* HighPoint RocketRAID 3622
+* HighPoint RocketRAID 3620
+
+The {{< manpage "hptiop" "4">}} driver also supports the following SAS and SATA RAID controllers that are already End-of-Life:
+
+* HighPoint RocketRAID 4211
+* HighPoint RocketRAID 4210
+* HighPoint RocketRAID 3560
+* HighPoint RocketRAID 3540
+* HighPoint RocketRAID 3530
+* HighPoint RocketRAID 3522
+* HighPoint RocketRAID 3521
+* HighPoint RocketRAID 3520
+* HighPoint RocketRAID 3511
+* HighPoint RocketRAID 3510
+* HighPoint RocketRAID 3410
+* HighPoint RocketRAID 3320
+* HighPoint RocketRAID 3220
+* HighPoint RocketRAID 3122
+* HighPoint RocketRAID 3120
+* HighPoint RocketRAID 3020
+
+The {{< manpage "hptmv" "4">}} driver supports the following ATA RAID controllers:
+
+* HighPoint's RocketRAID 182x series
+
+The {{< manpage "hptrr" "4">}} driver supports the following RAID controllers:
+
+* RocketRAID 172x series
+* RocketRAID 174x series
+* RocketRAID 2210
+* RocketRAID 222x series
+* RocketRAID 2240
+* RocketRAID 230x series
+* RocketRAID 231x series
+* RocketRAID 232x series
+* RocketRAID 2340
+* RocketRAID 2522
+
+The following controllers are supported by the {{< manpage "ida" "4">}} driver:
+
+* Compaq SMART Array 221
+* Compaq Integrated SMART Array Controller
+* Compaq SMART Array 4200
+* Compaq SMART Array 4250ES
+* Compaq SMART 3200 Controller
+* Compaq SMART 3100ES Controller
+* Compaq SMART-2/DH Controller
+* Compaq SMART-2/SL Controller
+* Compaq SMART-2/P Controller
+
+Controllers supported by the {{< manpage "iir" "4">}} driver include:
+
+* Intel RAID Controller SRCMR
+* Intel Server RAID Controller U3-l (SRCU31a)
+* Intel Server RAID Controller U3-1L (SRCU31La)
+* Intel Server RAID Controller U3-2 (SRCU32)
+* All past and future releases of Intel and ICP RAID Controllers.
+* Intel RAID Controller SRCU21 (discontinued)
+* Intel RAID Controller SRCU31 (older revision, not compatible)
+* Intel RAID Controller SRCU31L (older revision, not compatible)
+
+The SRCU31 and SRCU31L can be updated via a firmware update available from Intel.
+
+Controllers supported by the {{< manpage "ips" "4">}} driver include:
+
+* IBM ServeRAID 3H
+* ServeRAID 4L/4M/4H
+* ServeRAID Series 5
+* ServeRAID 6i/6M
+* ServeRAID 7t/7k/7M
+
+Newer ServeRAID controllers are supported by the {{< manpage "aac" "4">}} or {{< manpage "mfi" "4">}} driver.
+
+The {{< manpage "isci" "4">}} driver provides support for Intel C600 SAS controllers.
+
+Cards supported by the {{< manpage "isp" "4">}} driver include:
+
+* Qlogic 1000
+* Qlogic 1020
+* Qlogic 1040
+* Qlogic 1080
+* Qlogic 10160
+* Qlogic 1240
+* Qlogic 1280
+* Qlogic 12160
+* Qlogic 210X
+* Qlogic 220X
+* Qlogic 2300
+* Qlogic 2312
+* Qlogic 234X
+* Qlogic 2322
+* Qlogic 200
+* Qlogic 2422
+* Qlogic 246x (aka 2432)
+* Qlogic 256x (aka 2532)
+* Qlogic 267x/836x (aka 2031/8031)
+* Qlogic 2690/2692/2694 (aka 2684/2692)
+* Qlogic 2740/2742/2764 (aka 2722/2714)
+
+The {{< manpage "mfi" "4">}} driver supports the following hardware:
+
+* LSI MegaRAID SAS 1078
+* LSI MegaRAID SAS 8408E
+* LSI MegaRAID SAS 8480E
+* LSI MegaRAID SAS 9240
+* LSI MegaRAID SAS 9260
+* Dell PERC5
+* Dell PERC6
+* IBM ServeRAID M1015 SAS/SATA
+* IBM ServeRAID M1115 SAS/SATA
+* IBM ServeRAID M5015 SAS/SATA
+* IBM ServeRAID M5110 SAS/SATA
+* IBM ServeRAID-MR10i
+* Intel RAID Controller SRCSAS18E
+* Intel RAID Controller SROMBSAS18E
+
+Controllers supported by the {{< manpage "mlx" "4">}} driver include:
+
+* Mylex DAC960P
+* Mylex DAC960PD / DEC KZPSC (Fast Wide)
+* Mylex DAC960PDU
+* Mylex DAC960PL
+* Mylex DAC960PJ
+* Mylex DAC960PG
+* Mylex DAC960PU / DEC PZPAC (Ultra Wide)
+* Mylex AcceleRAID 150 (DAC960PRL)
+* Mylex AcceleRAID 250 (DAC960PTL1)
+* Mylex eXtremeRAID 1100 (DAC1164P)
+* RAIDarray 230 controllers, aka the Ultra-SCSI DEC KZPAC-AA (1-ch, 4MB cache), KZPAC-CA (3-ch, 4MB), KZPAC-CB (3-ch, 8MB cache)
+
+All major firmware revisions (2.x, 3.x, 4.x and 5.x) are supported, however it is always advisable to upgrade to the most recent firmware available for the controller.
+
+Compatible Mylex controllers not listed should work, but have not been verified.
+
+[.note]
+*Note*: +
+[amd64, i386] Booting from these controllers is supported. EISA adapters are not supported.
+
+Controllers supported by the {{< manpage "mly" "4">}} driver include:
+
+* Mylex AcceleRAID 160
+* Mylex AcceleRAID 170
+* Mylex AcceleRAID 352
+* Mylex eXtremeRAID 2000
+* Mylex eXtremeRAID 3000
+
+Compatible Mylex controllers not listed should work, but have not been verified.
+
+These controllers are supported by the {{< manpage "mpr" "4">}} driver:
+
+* Broadcom Ltd./Avago Tech (LSI) SAS 3004 (4 Port SAS)
+* Broadcom Ltd./Avago Tech (LSI) SAS 3008 (8 Port SAS)
+* Broadcom Ltd./Avago Tech (LSI) SAS 3108 (8 Port SAS)
+* Broadcom Ltd./Avago Tech (LSI) SAS 3216 (16 Port SAS)
+* Broadcom Ltd./Avago Tech (LSI) SAS 3224 (24 Port SAS)
+* Broadcom Ltd./Avago Tech (LSI) SAS 3316 (16 Port SAS)
+* Broadcom Ltd./Avago Tech (LSI) SAS 3324 (24 Port SAS)
+* Broadcom Ltd./Avago Tech (LSI) SAS 3408 (8 Port SAS/PCIe)
+* Broadcom Ltd./Avago Tech (LSI) SAS 3416 (16 Port SAS/PCIe)
+* Broadcom Ltd./Avago Tech (LSI) SAS 3508 (8 Port SAS/PCIe)
+* Broadcom Ltd./Avago Tech (LSI) SAS 3516 (16 Port SAS/PCIe)
+* Broadcom Ltd./Avago Tech (LSI) SAS 3616 (16 Port SAS/PCIe)
+* Broadcom Ltd./Avago Tech (LSI) SAS 3708 (8 Port SAS/PCIe)
+* Broadcom Ltd./Avago Tech (LSI) SAS 3716 (16 Port SAS/PCIe)
+
+These controllers are supported by the {{< manpage "mps" "4">}} driver:
+
+* Broadcom Ltd./Avago Tech (LSI) SAS 2004 (4 Port SAS)
+* Broadcom Ltd./Avago Tech (LSI) SAS 2008 (8 Port SAS)
+* Broadcom Ltd./Avago Tech (LSI) SAS 2108 (8 Port SAS)
+* Broadcom Ltd./Avago Tech (LSI) SAS 2116 (16 Port SAS)
+* Broadcom Ltd./Avago Tech (LSI) SAS 2208 (8 Port SAS)
+* Broadcom Ltd./Avago Tech (LSI) SAS 2308 (8 Port SAS)
+* Broadcom Ltd./Avago Tech (LSI) SSS6200 Solid State Storage
+* Intel Integrated RAID Module RMS25JB040
+* Intel Integrated RAID Module RMS25JB080
+* Intel Integrated RAID Module RMS25KB040
+* Intel Integrated RAID Module RMS25KB080
+
+The following controllers are supported by the {{< manpage "mpt" "4">}} driver:
+    
+* LSI Logic 53c1030, LSI Logic LSI2x320-X (Single and Dual Ultra320 SCSI)
+* LSI Logic AS1064, LSI Logic AS1068
+* LSI Logic FC909 (1Gb/s Fibre Channel)
+* LSI Logic FC909A (Dual 1Gb/s Fibre Channel)
+* LSI Logic FC919, LSI Logic 7102XP-LC (Single 2Gb/s Fibre Channel)
+* LSI Logic FC929, LSI Logic FC929X, LSI Logic 7202XP-LC (Dual 2Gb/s Fibre Channel)
+* LSI Logic FC949X (Dual 4Gb/s Fibre Channel)
+* LSI Logic FC949E, LSI Logic FC949ES (Dual 4Gb/s Fibre Channel PCI-Express)
+
+The Ultra 320 SCSI controller chips supported by the {{< manpage "mpt" "4">}} driver can be found onboard on many systems including:
+
+* Dell PowerEdge 1750 thru 2850
+* IBM eServer xSeries 335
+
+These systems also contain Integrated RAID Mirroring and Integrated RAID Mirroring Enhanced which this driver also supports.
+
+The SAS controller chips are also present on many new AMD/Opteron based systems, like the Sun 4100. Note that this controller can drive both SAS and SATA drives or a mix of them at the same time. The Integrated RAID Mirroring available for these controllers is poorly supported at best.
+
+The Fibre Channel controller chipset are supported by a broad variety of speeds and systems. The Apple Fibre Channel HBA is in fact the FC949ES card.
+
+This driver also supports target mode for Fibre Channel cards. This support may be enabled by setting the desired role of the core via the LSI Logic firmware utility that establishes what roles the card can take on - no separate compilation is required.
+
+The {{< manpage "mrsas" "4">}} driver supports the following hardware:
+
+[ Thunderbolt 6Gb/s MR controller ]
+
+* LSI MegaRAID SAS 9265
+* LSI MegaRAID SAS 9266
+* LSI MegaRAID SAS 9267
+* LSI MegaRAID SAS 9270
+* LSI MegaRAID SAS 9271
+* LSI MegaRAID SAS 9272
+* LSI MegaRAID SAS 9285
+* LSI MegaRAID SAS 9286
+* DELL PERC H810
+* DELL PERC H710/P
+
+[ Invader/Fury 12Gb/s MR controller ]
+
+* LSI MegaRAID SAS 9380
+* LSI MegaRAID SAS 9361
+* LSI MegaRAID SAS 9341
+* DELL PERC H830
+* DELL PERC H730/P
+* DELL PERC H330
+
+The {{< manpage "mvs" "4">}} driver supports the following controllers:
+
+Gen-I (SATA 1.5Gbps):
+
+* 88SX5040
+* 88SX5041
+* 88SX5080
+* 88SX5081
+
+Gen-II (SATA 3Gbps, NCQ, PMP):
+
+* 88SX6040
+* 88SX6041 (including Adaptec 1420SA)
+* 88SX6080
+* 88SX6081
+
+Gen-IIe (SATA 3Gbps, NCQ, PMP with FBS):
+
+* 88SX6042
+* 88SX7042 (including Adaptec 1430SA)
+* 88F5182 SoC
+* 88F6281 SoC
+* MV78100 SoC
+
+Note, that this hardware supports command queueing and FIS-based switching only for ATA DMA commands. ATAPI and non-DMA ATA commands executed one by one for each port.
+
+The {{< manpage "ncr" "4">}} driver provides support for the following NCR/Symbios SCSI controller chips:
+
+* 53C810
+* 53C810A
+* 53C815
+* 53C820
+* 53C825A
+* 53C860
+* 53C875
+* 53C875J
+* 53C885
+* 53C895
+* 53C895A
+* 53C896
+* 53C1510D
+
+The following devices are currently supported by the {{< manpage "ncv" "4">}} driver:
+
+* I-O DATA PCSC-DV
+* KME KXLC002 (TAXAN ICD-400PN, etc.), KXLC004, and UJDCD450
+* Macnica Miracle SCSI-II mPS110
+* Media Intelligent MSC-110, MSC-200
+* New Media Corporation BASICS SCSI
+* Qlogic Fast SCSI
+* RATOC REX-9530, REX-5572 (SCSI only)
+
+Controllers supported by the {{< manpage "nsp" "4">}} driver include:
+
+* Alpha-Data AD-PCS201
+* I-O DATA CBSC16
+
+The {{< manpage "pms" "4">}} driver supports the following hardware:
+
+* Tachyon TS Fibre Channel Card
+* Tachyon TL Fibre Channel Card
+* Tachyon XL2 Fibre Channel Card
+* Tachyon DX2 Fibre Channel Card
+* Tachyon DX2+ Fibre Channel Card
+* Tachyon DX4+ Fibre Channel Card
+* Tachyon QX2 Fibre Channel Card
+* Tachyon QX4 Fibre Channel Card
+* Tachyon DE4 Fibre Channel Card
+* Tachyon QE4 Fibre Channel Card
+* Tachyon XL10 Fibre Channel Card
+* PMC Sierra SPC SAS-SATA Card
+* PMC Sierra SPC-V SAS-SATA Card
+* PMC Sierra SPC-VE SAS-SATA Card
+* PMC Sierra SPC-V 16 Port SAS-SATA Card
+* PMC Sierra SPC-VE 16 Port SAS-SATA Card
+* PMC Sierra SPC-V SAS-SATA Card 12Gig
+* PMC Sierra SPC-VE SAS-SATA Card 12Gig
+* PMC Sierra SPC-V 16 Port SAS-SATA Card 12Gig
+* PMC Sierra SPC-VE 16 Port SAS-SATA Card 12Gig
+* Adaptec Hialeah 4/8 Port SAS-SATA HBA Card 6Gig
+* Adaptec Hialeah 4/8 Port SAS-SATA RAID Card 6Gig
+* Adaptec Hialeah 8/16 Port SAS-SATA HBA Card 6Gig
+* Adaptec Hialeah 8/16 Port SAS-SATA RAID Card 6Gig
+* Adaptec Hialeah 8/16 Port SAS-SATA HBA Encryption Card 6Gig
+* Adaptec Hialeah 8/16 Port SAS-SATA RAID Encryption Card 6Gig
+* Adaptec Delray 8 Port SAS-SATA HBA Card 12Gig
+* Adaptec Delray 8 Port SAS-SATA HBA Encryption Card 12Gig
+* Adaptec Delray 16 Port SAS-SATA HBA Card 12Gig
+* Adaptec Delray 16 Port SAS-SATA HBA Encryption Card 12Gig
+
+The {{< manpage "pst" "4">}} driver supports the Promise Supertrak SX6000 ATA hardware RAID controller.
+
+The {{< manpage "siis" "4">}} driver supports the following controller chips:
+
+* SiI3124 (PCI-X 133MHz/64bit, 4 ports)
+* SiI3131 (PCIe 1.0 x1, 1 port)
+* SiI3132 (PCIe 1.0 x1, 2 ports)
+* SiI3531 (PCIe 1.0 x1, 1 port)
+
+Controllers supported by the {{< manpage "stg" "4">}} driver include:
+
+* Adaptec 2920/A
+* Future Domain SCSI2GO
+* Future Domain TMC-18XX/3260
+* IBM SCSI PCMCIA Card
+* ICM PSC-2401 SCSI
+* MELCO IFC-SC
+* RATOC REX-5536, REX-5536AM, REX-5536M, REX-9836A
+
+Note that the Adaptec 2920C is supported by the {{< manpage "ahc" "4">}} driver.
+
+The {{< manpage "sym" "4">}} driver provides support for the following Symbios/LSI Logic PCI SCSI controllers:
+
+* 53C810
+* 53C810A
+* 53C815
+* 53C825
+* 53C825A
+* 53C860
+* 53C875
+* 53C876
+* 53C895
+* 53C895A
+* 53C896
+* 53C897
+* 53C1000
+* 53C1000R
+* 53C1010-33
+* 53C1010-66
+* 53C1510D
+
+The SCSI controllers supported by {{< manpage "sym" "4">}} can be either embedded on a motherboard, or on one of the following add-on boards:
+
*** 2645 LINES SKIPPED ***

From owner-dev-commits-doc-all@freebsd.org  Wed Feb  3 17:03:54 2021
Return-Path: <owner-dev-commits-doc-all@freebsd.org>
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 34A9353D015
 for <dev-commits-doc-all@mailman.nyi.freebsd.org>;
 Wed,  3 Feb 2021 17:03:54 +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 4DW7Lf15k7z4tkl;
 Wed,  3 Feb 2021 17:03:54 +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 1888A242EF;
 Wed,  3 Feb 2021 17:03:54 +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 113H3swT096792;
 Wed, 3 Feb 2021 17:03:54 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
 by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 113H3skh096791;
 Wed, 3 Feb 2021 17:03:54 GMT (envelope-from git)
Date: Wed, 3 Feb 2021 17:03:54 GMT
Message-Id: <202102031703.113H3skh096791@gitrepo.freebsd.org>
To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org
From: Glen Barber <gjb@FreeBSD.org>
Subject: git: 249b053576 - main - relnotes: update version and indicate no
 SAs/ENs have been issued
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: gjb
X-Git-Repository: doc
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 249b05357680cb14e193e98cc3dd987effc4bd6e
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
 <dev-commits-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-doc-all/>
List-Post: <mailto:dev-commits-doc-all@freebsd.org>
List-Help: <mailto:dev-commits-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 03 Feb 2021 17:03:54 -0000

The branch main has been updated by gjb:

URL: https://cgit.FreeBSD.org/doc/commit/?id=249b05357680cb14e193e98cc3dd987effc4bd6e

commit 249b05357680cb14e193e98cc3dd987effc4bd6e
Author:     Glen Barber <gjb@FreeBSD.org>
AuthorDate: 2021-02-03 17:02:39 +0000
Commit:     Glen Barber <gjb@FreeBSD.org>
CommitDate: 2021-02-03 17:02:39 +0000

    relnotes: update version and indicate no SAs/ENs have been issued
    
    Sponsored by:   Rubicon Communications, LLC ("Netgate")
---
 website/content/en/releases/13.0R/errata.adoc | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/website/content/en/releases/13.0R/errata.adoc b/website/content/en/releases/13.0R/errata.adoc
index 3c872a920c..da8ae2e854 100644
--- a/website/content/en/releases/13.0R/errata.adoc
+++ b/website/content/en/releases/13.0R/errata.adoc
@@ -4,7 +4,7 @@ sidenav: download
 ---
 
 :release: "13.0-RELEASE"
-:releaseNext: "13.0-RELEASE"
+:releaseNext: "13.1-RELEASE"
 :releaseBranch: "13-STABLE"
 
 = FreeBSD {release} Errata
@@ -41,6 +41,8 @@ For a list of all FreeBSD CERT security advisories, see https://www.FreeBSD.org/
 |===
 |Advisory |Date |Topic
 
+|No advisories.||
+
 |===
 
 [[errata]]
@@ -50,10 +52,16 @@ For a list of all FreeBSD CERT security advisories, see https://www.FreeBSD.org/
 |===
 |Errata |Date |Topic
 
+|No errata notices.||
+
 |===
 
 [[open-issues]]
 == Open Issues
 
+No open issues.
+
 [[late-news]]
 == Late-Breaking News
+
+No late-breaking news.

From owner-dev-commits-doc-all@freebsd.org  Wed Feb  3 17:03:56 2021
Return-Path: <owner-dev-commits-doc-all@freebsd.org>
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 05B0253D018
 for <dev-commits-doc-all@mailman.nyi.freebsd.org>;
 Wed,  3 Feb 2021 17:03:56 +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 4DW7Lg3WrSz4tsJ;
 Wed,  3 Feb 2021 17:03:55 +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 535BC24840;
 Wed,  3 Feb 2021 17:03:55 +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 113H3t6n096815;
 Wed, 3 Feb 2021 17:03:55 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
 by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 113H3tPB096814;
 Wed, 3 Feb 2021 17:03:55 GMT (envelope-from git)
Date: Wed, 3 Feb 2021 17:03:55 GMT
Message-Id: <202102031703.113H3tPB096814@gitrepo.freebsd.org>
To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org
From: Glen Barber <gjb@FreeBSD.org>
Subject: git: 57bb2311b5 - main - relnotes: update main branch version and
 uncomment links to new pages
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: gjb
X-Git-Repository: doc
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 57bb2311b5a0baea415c84784898e0310a046766
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
 <dev-commits-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-doc-all/>
List-Post: <mailto:dev-commits-doc-all@freebsd.org>
List-Help: <mailto:dev-commits-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 03 Feb 2021 17:03:56 -0000

The branch main has been updated by gjb:

URL: https://cgit.FreeBSD.org/doc/commit/?id=57bb2311b5a0baea415c84784898e0310a046766

commit 57bb2311b5a0baea415c84784898e0310a046766
Author:     Glen Barber <gjb@FreeBSD.org>
AuthorDate: 2021-02-03 17:03:31 +0000
Commit:     Glen Barber <gjb@FreeBSD.org>
CommitDate: 2021-02-03 17:03:31 +0000

    relnotes: update main branch version and uncomment links to new pages
    
    Sponsored by:   Rubicon Communications, LLC ("Netgate")
---
 shared/releases.adoc                          | 2 +-
 website/content/en/releases/13.0R/_index.adoc | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/shared/releases.adoc b/shared/releases.adoc
index f0eae88be4..d77e1186bd 100644
--- a/shared/releases.adoc
+++ b/shared/releases.adoc
@@ -27,7 +27,7 @@
 :beta-local-where: IGNORE
 :beta2-local-where: IGNORE
 
-:rel-head-major: 13
+:rel-head-major: 14
 :rel-head: {rel-head-major}.0
 
 // If there is no release currently in the release cycle (i.e. we
diff --git a/website/content/en/releases/13.0R/_index.adoc b/website/content/en/releases/13.0R/_index.adoc
index abb5d7dc9e..f507f1fa18 100644
--- a/website/content/en/releases/13.0R/_index.adoc
+++ b/website/content/en/releases/13.0R/_index.adoc
@@ -19,9 +19,9 @@ More detailed information, such as release notes and hardware notes can be found
 
 //link:signatures[FreeBSD {localRel}-RELEASE signed checksum files] +
 //link:installation[FreeBSD {localRel}-RELEASE installation information] +
-//link:hardware[FreeBSD {localRel}-RELEASE hardware information] +
-//link:relnotes[FreeBSD {localRel}-RELEASE release notes] +
-//link:errata[FreeBSD {localRel}-RELEASE errata] +
-//link:readme[FreeBSD {localRel}-RELEASE readme] +
+link:hardware[FreeBSD {localRel}-RELEASE hardware information] +
+link:relnotes[FreeBSD {localRel}-RELEASE release notes] +
+link:errata[FreeBSD {localRel}-RELEASE errata] +
+link:readme[FreeBSD {localRel}-RELEASE readme] +
 link:schedule[FreeBSD {localRel}-RELEASE schedule] +
 //link:todo[FreeBSD Release Engineering TODO Page]

From owner-dev-commits-doc-all@freebsd.org  Wed Feb  3 17:07:21 2021
Return-Path: <owner-dev-commits-doc-all@freebsd.org>
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 DBD5C53CDF5
 for <dev-commits-doc-all@mailman.nyi.freebsd.org>;
 Wed,  3 Feb 2021 17:07:21 +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 4DW7Qd5pYyz4vTd;
 Wed,  3 Feb 2021 17:07:21 +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 BA67B246C3;
 Wed,  3 Feb 2021 17:07:21 +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 113H7Leb097565;
 Wed, 3 Feb 2021 17:07:21 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
 by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 113H7LQ5097564;
 Wed, 3 Feb 2021 17:07:21 GMT (envelope-from git)
Date: Wed, 3 Feb 2021 17:07:21 GMT
Message-Id: <202102031707.113H7LQ5097564@gitrepo.freebsd.org>
To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org
From: Glen Barber <gjb@FreeBSD.org>
Subject: git: ad7eecbea0 - main - relnotes: add a commented sample entry
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: gjb
X-Git-Repository: doc
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: ad7eecbea0868309fc55222c220347a2a0364fd2
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
 <dev-commits-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-doc-all/>
List-Post: <mailto:dev-commits-doc-all@freebsd.org>
List-Help: <mailto:dev-commits-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 03 Feb 2021 17:07:21 -0000

The branch main has been updated by gjb:

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

commit ad7eecbea0868309fc55222c220347a2a0364fd2
Author:     Glen Barber <gjb@FreeBSD.org>
AuthorDate: 2021-02-03 17:07:03 +0000
Commit:     Glen Barber <gjb@FreeBSD.org>
CommitDate: 2021-02-03 17:07:03 +0000

    relnotes: add a commented sample entry
    
    Sponsored by:   Rubicon Communications, LLC ("Netgate")
---
 website/content/en/releases/13.0R/relnotes.adoc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/website/content/en/releases/13.0R/relnotes.adoc b/website/content/en/releases/13.0R/relnotes.adoc
index f5db77e99d..f82e4f7204 100644
--- a/website/content/en/releases/13.0R/relnotes.adoc
+++ b/website/content/en/releases/13.0R/relnotes.adoc
@@ -88,6 +88,9 @@ This section lists the various Security Advisories and Errata Notices since {rel
 
 |===
 
+// Sample release notes entry.
+//The man:fsck_msdosfs[8] utility has been updated to include a variety of enhancements, including reducing the memory footprint, a new flag, `-M`, which disables the use of man:mmap[2], and others. {{< revision "357568" >}}
+
 [[userland]]
 == Userland
 

From owner-dev-commits-doc-all@freebsd.org  Wed Feb  3 19:18:09 2021
Return-Path: <owner-dev-commits-doc-all@freebsd.org>
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 8CBBB5288DA
 for <dev-commits-doc-all@mailman.nyi.freebsd.org>;
 Wed,  3 Feb 2021 19:18:09 +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 4DWBKY3Zp3z3LyL;
 Wed,  3 Feb 2021 19:18:09 +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 6D8F42626F;
 Wed,  3 Feb 2021 19:18:09 +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 113JI9Bs067102;
 Wed, 3 Feb 2021 19:18:09 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
 by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 113JI9Te067101;
 Wed, 3 Feb 2021 19:18:09 GMT (envelope-from git)
Date: Wed, 3 Feb 2021 19:18:09 GMT
Message-Id: <202102031918.113JI9Te067101@gitrepo.freebsd.org>
To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org
From: Glen Barber <gjb@FreeBSD.org>
Subject: git: 6331f27ce6 - main - relnotes: fix a typo
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: gjb
X-Git-Repository: doc
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 6331f27ce6e8c079e529fee3293cfbe88df5619c
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
 <dev-commits-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-doc-all/>
List-Post: <mailto:dev-commits-doc-all@freebsd.org>
List-Help: <mailto:dev-commits-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 03 Feb 2021 19:18:09 -0000

The branch main has been updated by gjb:

URL: https://cgit.FreeBSD.org/doc/commit/?id=6331f27ce6e8c079e529fee3293cfbe88df5619c

commit 6331f27ce6e8c079e529fee3293cfbe88df5619c
Author:     Glen Barber <gjb@FreeBSD.org>
AuthorDate: 2021-02-03 19:17:48 +0000
Commit:     Glen Barber <gjb@FreeBSD.org>
CommitDate: 2021-02-03 19:17:48 +0000

    relnotes: fix a typo
    
    Reported by:    Pau Amma
    Sponsored by:   Rubicon Communications, LLC ("Netgate")
---
 website/content/en/releases/13.0R/hardware.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website/content/en/releases/13.0R/hardware.adoc b/website/content/en/releases/13.0R/hardware.adoc
index aca67a68b6..8ef212ddb8 100644
--- a/website/content/en/releases/13.0R/hardware.adoc
+++ b/website/content/en/releases/13.0R/hardware.adoc
@@ -83,7 +83,7 @@ ACPI depends on a Differentiated System Descriptor Table (DSDT) provided by each
 [[proc-powerpc]]
 === powerpc
 
-All Apple PowerPC machines with built-in USB are supported, as well a limited selection of non-Apple machines, including KVM on POWER7
+All Apple PowerPC machines with built-in USB are supported, as well as limited selection of non-Apple machines, including KVM on POWER7
 
 SMP is supported on all systems with more than 1 processor.
 

From owner-dev-commits-doc-all@freebsd.org  Wed Feb  3 20:57:19 2021
Return-Path: <owner-dev-commits-doc-all@freebsd.org>
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 F1B8A52C584
 for <dev-commits-doc-all@mailman.nyi.freebsd.org>;
 Wed,  3 Feb 2021 20:57:19 +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 4DWDWz6Vskz3pFp;
 Wed,  3 Feb 2021 20:57:19 +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 C7A88277B2;
 Wed,  3 Feb 2021 20:57:19 +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 113KvJMH097755;
 Wed, 3 Feb 2021 20:57:19 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
 by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 113KvJCP097754;
 Wed, 3 Feb 2021 20:57:19 GMT (envelope-from git)
Date: Wed, 3 Feb 2021 20:57:19 GMT
Message-Id: <202102032057.113KvJCP097754@gitrepo.freebsd.org>
To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org
From: Rene Ladan <rene@FreeBSD.org>
Subject: git: aa3e793a71 - main - Update the portmgr/policies_eol web page.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: rene
X-Git-Repository: doc
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: aa3e793a71857255a9a39db15fb2c7aed127caae
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
 <dev-commits-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-doc-all/>
List-Post: <mailto:dev-commits-doc-all@freebsd.org>
List-Help: <mailto:dev-commits-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 03 Feb 2021 20:57:20 -0000

The branch main has been updated by rene:

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

commit aa3e793a71857255a9a39db15fb2c7aed127caae
Author:     Rene Ladan <rene@FreeBSD.org>
AuthorDate: 2021-02-03 20:56:20 +0000
Commit:     Rene Ladan <rene@FreeBSD.org>
CommitDate: 2021-02-03 20:56:44 +0000

    Update the portmgr/policies_eol web page.
    
    - prune architectures for which packages do not (seem to) get build [1]
    - update 11 and 12 branch information
    
    Obtained from: cluster/poudriere/all-release-building [1]
---
 website/content/en/portmgr/policies_eol.adoc | 38 +++++-----------------------
 1 file changed, 6 insertions(+), 32 deletions(-)

diff --git a/website/content/en/portmgr/policies_eol.adoc b/website/content/en/portmgr/policies_eol.adoc
index 29e04ecb0e..cf9199ed9e 100644
--- a/website/content/en/portmgr/policies_eol.adoc
+++ b/website/content/en/portmgr/policies_eol.adoc
@@ -19,47 +19,21 @@ The current package sets and estimated lifetimes of the currently supported bran
 [width="100%",cols="20%,20%,20%,20%,20%",options="header",]
 |===
 |Branch |Release |Package Branch |Package Set |Estimated EoL
-|stable/11 |n/a |releng/11.2 a|
-* FreeBSD:11:aarch64
+|stable/11 |n/a |releng/11.4 | |September 30, 2021
+|releng/11.4 |11.4-RELEASE |releng/11.4 a|
 * FreeBSD:11:amd64
-* FreeBSD:11:armv6
 * FreeBSD:11:i386
-* FreeBSD:11:mips
-* FreeBSD:11:mips64
 
 |September 30, 2021
-|releng/11.2 |11.2-RELEASE |releng/11.2 a|
-* FreeBSD:11:aarch64
-* FreeBSD:11:amd64
-* FreeBSD:11:armv6
-* FreeBSD:11:i386
-* FreeBSD:11:mips
-* FreeBSD:11:mips64
-
-|11.3-RELEASE + 3 months
-|stable/12 |n/a |releng/12.0 a|
-* FreeBSD:12:aarch64
-* FreeBSD:12:amd64
-* FreeBSD:12:armv6
-* FreeBSD:12:armv7
-* FreeBSD:12:i386
-* FreeBSD:12:mips
-* FreeBSD:12:mips64
-* FreeBSD:12:powerpc64
-
-|June 30, 2024
-|releng/12.0 |12.0-RELEASE |releng/12.0 a|
+|stable/12 |n/a |releng/12.2 | |June 30, 2024
+|releng/12.2 |12.2-RELEASE |releng/12.2 a|
 * FreeBSD:12:aarch64
 * FreeBSD:12:amd64
-* FreeBSD:12:armv6
-* FreeBSD:12:armv7
 * FreeBSD:12:i386
-* FreeBSD:12:mips
-* FreeBSD:12:mips64
 * FreeBSD:12:powerpc64
 
-|12.1-RELEASE + 3 months
-|HEAD |n/a |HEAD a|
+|12.3-RELEASE + 3 months
+|main |n/a |main a|
 * FreeBSD:13:aarch64
 * FreeBSD:13:amd64
 * FreeBSD:13:armv6

From owner-dev-commits-doc-all@freebsd.org  Wed Feb  3 21:43:47 2021
Return-Path: <owner-dev-commits-doc-all@freebsd.org>
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 1AB4D52D0F0
 for <dev-commits-doc-all@mailman.nyi.freebsd.org>;
 Wed,  3 Feb 2021 21:43:47 +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 4DWFYb070Yz3sDJ;
 Wed,  3 Feb 2021 21:43:47 +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 EAE7728508;
 Wed,  3 Feb 2021 21:43:46 +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 113Lhk2T062391;
 Wed, 3 Feb 2021 21:43:46 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
 by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 113Lhk6V062390;
 Wed, 3 Feb 2021 21:43:46 GMT (envelope-from git)
Date: Wed, 3 Feb 2021 21:43:46 GMT
Message-Id: <202102032143.113Lhk6V062390@gitrepo.freebsd.org>
To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org
From: Sergio Carlavilla Delgado <carlavilla@FreeBSD.org>
Subject: git: 354915f83a - main - Use manpage asciidoctor extension in 10.x
 and 11.x releases
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: carlavilla
X-Git-Repository: doc
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 354915f83a41f599636b00e941a1ec83de4040a7
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
 <dev-commits-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-doc-all/>
List-Post: <mailto:dev-commits-doc-all@freebsd.org>
List-Help: <mailto:dev-commits-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 03 Feb 2021 21:43:47 -0000

The branch main has been updated by carlavilla:

URL: https://cgit.FreeBSD.org/doc/commit/?id=354915f83a41f599636b00e941a1ec83de4040a7

commit 354915f83a41f599636b00e941a1ec83de4040a7
Author:     Sergio Carlavilla Delgado <carlavilla@FreeBSD.org>
AuthorDate: 2021-02-03 21:41:47 +0000
Commit:     Sergio Carlavilla Delgado <carlavilla@FreeBSD.org>
CommitDate: 2021-02-03 21:43:07 +0000

    Use manpage asciidoctor extension in 10.x and 11.x releases
    
    PR:             253171
    Submitted by:   wosch@
---
 website/content/en/releases/10.0R/hardware.adoc | 534 +++++++++----------
 website/content/en/releases/10.1R/hardware.adoc | 582 ++++++++++-----------
 website/content/en/releases/10.2R/hardware.adoc | 631 +++++++++++-----------
 website/content/en/releases/10.3R/hardware.adoc | 624 +++++++++++-----------
 website/content/en/releases/10.4R/hardware.adoc | 665 ++++++++++++------------
 website/content/en/releases/11.0R/hardware.adoc | 558 ++++++++++----------
 website/content/en/releases/11.1R/hardware.adoc | 578 ++++++++++----------
 website/content/en/releases/11.2R/hardware.adoc | 580 ++++++++++-----------
 website/content/en/releases/11.3R/hardware.adoc | 596 +++++++++++----------
 website/content/en/releases/11.4R/hardware.adoc | 596 +++++++++++----------
 10 files changed, 2907 insertions(+), 3037 deletions(-)

diff --git a/website/content/en/releases/10.0R/hardware.adoc b/website/content/en/releases/10.0R/hardware.adoc
index d25d6ddcdd..396ab57600 100644
--- a/website/content/en/releases/10.0R/hardware.adoc
+++ b/website/content/en/releases/10.0R/hardware.adoc
@@ -56,22 +56,22 @@ There is a wide variety of motherboards available for this architecture. Motherb
 
 Symmetric multi-processor (SMP) systems are generally supported by FreeBSD, although in some cases, BIOS or motherboard bugs may generate some problems. Perusal of the archives of the http://lists.FreeBSD.org/mailman/listinfo/freebsd-smp[FreeBSD symmetric multiprocessing mailing list] may yield some clues.
 
-FreeBSD will take advantage of SMT (Symmetric MultiThreading, also known as HyperThreading on Intel(R) CPUs) on the supported CPUs. The `GENERIC` kernel which is installed by default will automatically detect the additional logical processors. The default FreeBSD scheduler recognizes processor topology on the system and selects logical and physical processors to obtain optimal performance. The http://www.FreeBSD.org/cgi/man.cgi?query=smp&sektion=4[smp(4)] manual page has more details.
+FreeBSD will take advantage of SMT (Symmetric MultiThreading, also known as HyperThreading on Intel(R) CPUs) on the supported CPUs. The `GENERIC` kernel which is installed by default will automatically detect the additional logical processors. The default FreeBSD scheduler recognizes processor topology on the system and selects logical and physical processors to obtain optimal performance. The man:smp[4] manual page has more details.
 
-FreeBSD will take advantage of Physical Address Extensions (PAE) support on CPUs that support this feature. A kernel with the `PAE` feature enabled will detect memory above 4 gigabytes and allow it to be used by the system. This feature places constraints on the device drivers and other features of FreeBSD which may be used; consult the http://www.FreeBSD.org/cgi/man.cgi?query=pae&sektion=4[pae(4)] manual page for more details.
+FreeBSD will take advantage of Physical Address Extensions (PAE) support on CPUs that support this feature. A kernel with the `PAE` feature enabled will detect memory above 4 gigabytes and allow it to be used by the system. This feature places constraints on the device drivers and other features of FreeBSD which may be used; consult the man:pae[4] manual page for more details.
 
 FreeBSD will generally run on i386-based laptops, albeit with varying levels of support for certain hardware features such as sound, graphics, power management, and PCCARD expansion slots. These features tend to vary in idiosyncratic ways between machines, and frequently require special-case support in FreeBSD to work around hardware bugs or other oddities. When in doubt, a search of the archives of the http://lists.FreeBSD.org/mailman/listinfo/freebsd-mobile[FreeBSD laptop computer mailing list] may be useful.
 
-Most modern laptops (as well as many desktops) use the Advanced Configuration and Power Management (ACPI) standard. FreeBSD supports ACPI via the ACPI Component Architecture reference implementation from Intel(R), as described in the http://www.FreeBSD.org/cgi/man.cgi?query=acpi&sektion=4[acpi(4)] manual page. The use of ACPI causes instabilities on some machines and it may be necessary to disable the ACPI driver, which is normally loaded via a kernel module. This may be accomplished by adding the following line to `/boot/device.hints`:
+Most modern laptops (as well as many desktops) use the Advanced Configuration and Power Management (ACPI) standard. FreeBSD supports ACPI via the ACPI Component Architecture reference implementation from Intel(R), as described in the man:acpi[4] manual page. The use of ACPI causes instabilities on some machines and it may be necessary to disable the ACPI driver, which is normally loaded via a kernel module. This may be accomplished by adding the following line to `/boot/device.hints`:
 
 [.programlisting]
 ----
 hint.acpi.0.disabled="1"
 ----
 
-Users debugging ACPI-related problems may find it useful to disable portions of the ACPI functionality. The http://www.FreeBSD.org/cgi/man.cgi?query=acpi&sektion=4[acpi(4)] manual page has more information on how to do this via loader tunables.
+Users debugging ACPI-related problems may find it useful to disable portions of the ACPI functionality. The man:acpi[4] manual page has more information on how to do this via loader tunables.
 
-ACPI depends on a Differentiated System Descriptor Table (DSDT) provided by each machine's BIOS. Some machines have bad or incomplete DSDTs, which prevents ACPI from functioning correctly. Replacement DSDTs for some machines can be found at the http://acpi.sourceforge.net/dsdt/index.php[DSDT] section of the http://acpi.sourceforge.net/[ACPI4Linux] project Web site. FreeBSD can use these DSDTs to override the DSDT provided by the BIOS; see the http://www.FreeBSD.org/cgi/man.cgi?query=acpi&sektion=4[acpi(4)] manual page for more information.
+ACPI depends on a Differentiated System Descriptor Table (DSDT) provided by each machine's BIOS. Some machines have bad or incomplete DSDTs, which prevents ACPI from functioning correctly. Replacement DSDTs for some machines can be found at the http://acpi.sourceforge.net/dsdt/index.php[DSDT] section of the http://acpi.sourceforge.net/[ACPI4Linux] project Web site. FreeBSD can use these DSDTs to override the DSDT provided by the BIOS; see the man:acpi[4] manual page for more information.
 
 [[proc-ia64]]
 == 2.3. ia64
@@ -86,7 +86,7 @@ Supported chipsets include:
 
 Both Uniprocessor (UP) and Symmetric Multi-processor (SMP) configurations are supported.
 
-Most devices that can be found in or are compatible with ia64 machines are fully supported. The notable exception is the VGA console. The FreeBSD support for VGA consoles is at this time too much based on PC hardware and not all ia64 machines have chipsets that provide sufficient PC legacy support. As such http://www.FreeBSD.org/cgi/man.cgi?query=syscons&sektion=4[syscons(4)] can not be enabled and the use of a serial console is required.
+Most devices that can be found in or are compatible with ia64 machines are fully supported. The notable exception is the VGA console. The FreeBSD support for VGA consoles is at this time too much based on PC hardware and not all ia64 machines have chipsets that provide sufficient PC legacy support. As such man:syscons[4] can not be enabled and the use of a serial console is required.
 
 [[proc-pc98]]
 == 2.4. pc98
@@ -117,7 +117,7 @@ This section describes the systems currently known to be supported by FreeBSD on
 
 SMP is supported on all systems with more than 1 processor.
 
-When using the `GENERIC` kernel, FreeBSD/sparc64 systems not equipped with a framebuffer supported by the http://www.FreeBSD.org/cgi/man.cgi?query=creator&sektion=4[creator(4)] (Sun Creator, Sun Creator3D and Sun Elite3D) or http://www.FreeBSD.org/cgi/man.cgi?query=machfb&sektion=4[machfb(4)] (Sun PGX and Sun PGX64 as well as the ATI Mach64 chips found onboard in for example Sun Blade(TM) 100, Sun Blade(TM) 150, Sun Ultra(TM) 5 and Sun Ultra(TM) 10) driver must use the serial console.
+When using the `GENERIC` kernel, FreeBSD/sparc64 systems not equipped with a framebuffer supported by the man:creator[4] (Sun Creator, Sun Creator3D and Sun Elite3D) or man:machfb[4] (Sun PGX and Sun PGX64 as well as the ATI Mach64 chips found onboard in for example Sun Blade(TM) 100, Sun Blade(TM) 150, Sun Ultra(TM) 5 and Sun Ultra(TM) 10) driver must use the serial console.
 
 If you have a system that is not listed here, it may not have been tested with FreeBSD 10.0-RELEASE. We encourage you to try it and send a note to the http://lists.FreeBSD.org/mailman/listinfo/freebsd-sparc64[FreeBSD SPARC porting mailing list] with your results, including which devices work and which do not.
 
@@ -157,7 +157,7 @@ The following systems are fully supported by FreeBSD:
 * Sun Ultra(TM) 80
 * Sun Ultra(TM) 450
 
-The following systems are partially supported by FreeBSD. In particular the fiber channel controllers in SBus-based systems are not supported. However, it is possible to use these with a SCSI controller supported by the http://www.FreeBSD.org/cgi/man.cgi?query=esp&sektion=4[esp(4)] driver (Sun ESP SCSI, Sun FAS Fast-SCSI and Sun FAS366 Fast-Wide SCSI controllers).
+The following systems are partially supported by FreeBSD. In particular the fiber channel controllers in SBus-based systems are not supported. However, it is possible to use these with a SCSI controller supported by the man:esp[4] driver (Sun ESP SCSI, Sun FAS Fast-SCSI and Sun FAS366 Fast-Wide SCSI controllers).
 
 * Sun Enterprise(TM) 3500
 * Sun Enterprise(TM) 4500
@@ -202,20 +202,19 @@ This section describes the devices currently known to be supported by FreeBSD. O
 
 Where possible, the drivers applicable to each device or class of devices is listed. If the driver in question has a manual page in the FreeBSD base distribution (most should), it is referenced here. Information on specific models of supported devices, controllers, etc. can be found in the manual pages.
 
-[.note]
 *Note*: +
 The device lists in this document are being generated automatically from FreeBSD manual pages. This means that some devices, which are supported by multiple drivers, may appear multiple times.
 
 [[disk]]
 == 3.1. Disk Controllers
 
-[amd64, i386, ia64, pc98, sparc64] IDE/ATA controllers (http://www.FreeBSD.org/cgi/man.cgi?query=ata&sektion=4[ata(4)] driver)
+[amd64, i386, ia64, pc98, sparc64] IDE/ATA controllers (man:ata[4] driver)
 
 [pc98] IDE/ATA controllers (wdc driver)
 
 * On-board IDE controller
 
-[i386,ia64,amd64] Controllers supported by the http://www.FreeBSD.org/cgi/man.cgi?query=aac&sektion=4[aac(4)] driver include:
+[i386,ia64,amd64] Controllers supported by the man:aac[4] driver include:
 
 * Adaptec AAC-364
 * Adaptec RAID 2045
@@ -302,7 +301,7 @@ The device lists in this document are being generated automatically from FreeBSD
 * AOC-USAS-S8i-LP
 * AOC-USAS-S8iR-LP
 
-[i386,pc98,amd64] The http://www.FreeBSD.org/cgi/man.cgi?query=adv&sektion=4[adv(4)] driver supports the following SCSI controllers:
+[i386,pc98,amd64] The man:adv[4] driver supports the following SCSI controllers:
 
 * AdvanSys ABP510/5150
 * AdvanSys ABP5140
@@ -332,7 +331,7 @@ The device lists in this document are being generated automatically from FreeBSD
 * RATOC REX-PCI30 (PC-98)
 * @Nifty FNECHARD IFC-USUP-TX (PC-98)
 
-[i386,pc98,amd64] The http://www.FreeBSD.org/cgi/man.cgi?query=adw&sektion=4[adw(4)] driver supports SCSI controllers including:
+[i386,pc98,amd64] The man:adw[4] driver supports SCSI controllers including:
 
 * AdvanSys ABP940UW/ABP3940UW
 * AdvanSys ABP950UW
@@ -340,7 +339,7 @@ The device lists in this document are being generated automatically from FreeBSD
 * AdvanSys ABP3940U2W
 * AdvanSys ABP3950U2W
 
-[i386] The http://www.FreeBSD.org/cgi/man.cgi?query=aha&sektion=4[aha(4)] driver supports the following SCSI host adapters:
+[i386] The man:aha[4] driver supports the following SCSI host adapters:
 
 * Adaptec AHA-154xB
 * Adaptec AHA-154xC
@@ -351,14 +350,14 @@ The device lists in this document are being generated automatically from FreeBSD
 * DTC 3290 SCSI controller in 1542 emulation mode
 * Tekram SCSI controllers in 154x emulation mode
 
-[i386] The http://www.FreeBSD.org/cgi/man.cgi?query=ahb&sektion=4[ahb(4)] driver supports the following SCSI host adapters:
+[i386] The man:ahb[4] driver supports the following SCSI host adapters:
 
 * Adaptec AHA-1740
 * Adaptec AHA-1742
 * Adaptec AHA-1740A
 * Adaptec AHA-1742A
 
-The http://www.FreeBSD.org/cgi/man.cgi?query=ahc&sektion=4[ahc(4)] driver supports the following SCSI host adapter chips and SCSI controller cards:
+The man:ahc[4] driver supports the following SCSI host adapter chips and SCSI controller cards:
 
 * Adaptec AIC7770 host adapter chip
 * Adaptec AIC7850 host adapter chip
@@ -412,11 +411,11 @@ The http://www.FreeBSD.org/cgi/man.cgi?query=ahc&sektion=4[ahc(4)] driver suppor
 * NEC SV-98/2-B03 (PC-98)
 * Many motherboards with on-board SCSI support
 
-The http://www.FreeBSD.org/cgi/man.cgi?query=ahci&sektion=4[ahci(4)] driver supports AHCI compatible controllers having PCI class 1 (mass storage), subclass 6 (SATA) and programming interface 1 (AHCI).
+The man:ahci[4] driver supports AHCI compatible controllers having PCI class 1 (mass storage), subclass 6 (SATA) and programming interface 1 (AHCI).
 
 Also, in cooperation with atamarvell and atajmicron drivers of ata(4), it supports AHCI part of legacy-PATA + AHCI-SATA combined controllers, such as JMicron JMB36x and Marvell 88SE61xx.
 
-[i386,sparc64,ia64,amd64] The http://www.FreeBSD.org/cgi/man.cgi?query=ahd&sektion=4[ahd(4)] driver supports the following:
+[i386,sparc64,ia64,amd64] The man:ahd[4] driver supports the following:
 
 * Adaptec AIC7901 host adapter chip
 * Adaptec AIC7901A host adapter chip
@@ -425,7 +424,7 @@ Also, in cooperation with atamarvell and atajmicron drivers of ata(4), it suppor
 * Adaptec 39320 host adapter
 * Many motherboards with on-board SCSI support
 
-[i386,pc98,amd64] The adapters supported by the http://www.FreeBSD.org/cgi/man.cgi?query=aic&sektion=4[aic(4)] driver include:
+[i386,pc98,amd64] The adapters supported by the man:aic[4] driver include:
 
 * Adaptec AHA-1505 (ISA)
 * Adaptec AHA-1510A, AHA-1510B (ISA)
@@ -437,7 +436,7 @@ Also, in cooperation with atamarvell and atajmicron drivers of ata(4), it suppor
 * Adaptec AHA-1030B, AHA-1030P (PC98)
 * NEC PC-9801-100 (PC98)
 
-Controllers supported by the http://www.FreeBSD.org/cgi/man.cgi?query=amr&sektion=4[amr(4)] driver include:
+Controllers supported by the man:amr[4] driver include:
 
 * MegaRAID SATA 150-4
 * MegaRAID SATA 150-6
@@ -486,7 +485,7 @@ Controllers supported by the http://www.FreeBSD.org/cgi/man.cgi?query=amr&sektio
 * Intel RAID Controller SRCS16
 * Intel RAID Controller SRCU42X
 
-[i386,amd64] The http://www.FreeBSD.org/cgi/man.cgi?query=arcmsr&sektion=4[arcmsr(4)] driver supports the following cards:
+[i386,amd64] The man:arcmsr[4] driver supports the following cards:
 
 * ARC-1110
 * ARC-1120
@@ -525,7 +524,7 @@ Controllers supported by the http://www.FreeBSD.org/cgi/man.cgi?query=amr&sektio
 * ARC-1880
 * ARC-1882
 
-[i386] The adapters currently supported by the http://www.FreeBSD.org/cgi/man.cgi?query=asr&sektion=4[asr(4)] driver include the following:
+[i386] The adapters currently supported by the man:asr[4] driver include the following:
 
 * Adaptec Zero-Channel SCSI RAID 2000S, 2005S, 2010S, 2015S
 * Adaptec SCSI RAID 2100S, 2110S
@@ -544,7 +543,7 @@ Controllers supported by the http://www.FreeBSD.org/cgi/man.cgi?query=amr&sektio
 * Adaptec SmartRAID PM3757
 * DEC KZPCC-AC (LVD 1-ch, 4MB or 16MB cache), DEC KZPCC-CE (LVD 3-ch, 64MB cache), DEC KZPCC-XC (LVD 1-ch, 16MB cache), DEC KZPCC-XE (LVD 3-ch, 64MB cache) -- rebadged SmartRAID V Millennium
 
-[i386,amd64] The http://www.FreeBSD.org/cgi/man.cgi?query=bt&sektion=4[bt(4)] driver supports the following BusLogic MultiMaster "W", "C", "S", and "A" series and compatible SCSI host adapters:
+[i386,amd64] The man:bt[4] driver supports the following BusLogic MultiMaster "W", "C", "S", and "A" series and compatible SCSI host adapters:
 
 * BusLogic BT-445C
 * BusLogic BT-445S
@@ -572,9 +571,9 @@ Controllers supported by the http://www.FreeBSD.org/cgi/man.cgi?query=amr&sektio
 * BusLogic BT-958D
 * Storage Dimensions SDC3211B / SDC3211F
 
-AMI FastDisk Host Adapters that are true BusLogic MultiMaster clones are also supported by the http://www.FreeBSD.org/cgi/man.cgi?query=bt&sektion=4[bt(4)] driver.
+AMI FastDisk Host Adapters that are true BusLogic MultiMaster clones are also supported by the man:bt[4] driver.
 
-[i386,ia64,amd64] Controllers supported by the http://www.FreeBSD.org/cgi/man.cgi?query=ciss&sektion=4[ciss(4)] driver include:
+[i386,ia64,amd64] Controllers supported by the man:ciss[4] driver include:
 
 * Compaq Smart Array 5300 (simple mode only)
 * Compaq Smart Array 532
@@ -614,7 +613,7 @@ AMI FastDisk Host Adapters that are true BusLogic MultiMaster clones are also su
 * HP Modular Smart Array 20 (MSA20)
 * HP Modular Smart Array 500 (MSA500)
 
-[pc98] The http://www.FreeBSD.org/cgi/man.cgi?query=ct&sektion=4[ct(4)] driver supports the following adapters:
+[pc98] The man:ct[4] driver supports the following adapters:
 
 * ELECOM bus-master SCSI adapters
 * I-O DATA SC-98II
@@ -625,7 +624,7 @@ AMI FastDisk Host Adapters that are true BusLogic MultiMaster clones are also su
 * SMIT transfer type SCSI host adapters
 * TEXA HA-55BS2 and its later models
 
-[i386,ia64,amd64] The http://www.FreeBSD.org/cgi/man.cgi?query=dpt&sektion=4[dpt(4)] driver provides support for the following RAID adapters:
+[i386,ia64,amd64] The man:dpt[4] driver provides support for the following RAID adapters:
 
 * DPT Smart Cache Plus
 * Smart Cache II (PM2?2?, PM2022 [EISA], PM2024/PM2124 [PCI]) (Gen2)
@@ -635,11 +634,10 @@ AMI FastDisk Host Adapters that are true BusLogic MultiMaster clones are also su
 * Smart Cache IV (PM2?4?, PM2042 [EISA], PM2044/PM2144 [PCI]) (Gen4)
 * Smart RAID IV
 
-[.note]
 *Note*: +
 [amd64, i386] Booting from these controllers is supported. EISA adapters are not supported.
 
-[sparc64] Controllers supported by the http://www.FreeBSD.org/cgi/man.cgi?query=esp&sektion=4[esp(4)] driver include:
+[sparc64] Controllers supported by the man:esp[4] driver include:
 
 * MELCO IFC-DP (PC-98)
 * Sun ESP family
@@ -647,7 +645,7 @@ AMI FastDisk Host Adapters that are true BusLogic MultiMaster clones are also su
 * Tekram DC390
 * Tekram DC390T
 
-[i386,amd64] The http://www.FreeBSD.org/cgi/man.cgi?query=hpt27xx&sektion=4[hpt27xx(4)] driver supports the following SAS controllers:
+[i386,amd64] The man:hpt27xx[4] driver supports the following SAS controllers:
 
 * HighPoint's RocketRAID 271x series
 * HighPoint's RocketRAID 272x series
@@ -655,7 +653,7 @@ AMI FastDisk Host Adapters that are true BusLogic MultiMaster clones are also su
 * HighPoint's RocketRAID 276x series
 * HighPoint's RocketRAID 278x series
 
-[i386,amd64] The http://www.FreeBSD.org/cgi/man.cgi?query=hptiop&sektion=4[hptiop(4)] driver supports the following SAS and SATA RAID controllers:
+[i386,amd64] The man:hptiop[4] driver supports the following SAS and SATA RAID controllers:
 
 * HighPoint RocketRAID 4522
 * HighPoint RocketRAID 4521
@@ -669,7 +667,7 @@ AMI FastDisk Host Adapters that are true BusLogic MultiMaster clones are also su
 * HighPoint RocketRAID 3622
 * HighPoint RocketRAID 3620
 
-The http://www.FreeBSD.org/cgi/man.cgi?query=hptiop&sektion=4[hptiop(4)] driver also supports the following SAS and SATA RAID controllers that are already End-of-Life:
+The man:hptiop[4] driver also supports the following SAS and SATA RAID controllers that are already End-of-Life:
 
 * HighPoint RocketRAID 4211
 * HighPoint RocketRAID 4210
@@ -688,11 +686,11 @@ The http://www.FreeBSD.org/cgi/man.cgi?query=hptiop&sektion=4[hptiop(4)] driver
 * HighPoint RocketRAID 3120
 * HighPoint RocketRAID 3020
 
-[i386,amd64] The http://www.FreeBSD.org/cgi/man.cgi?query=hptmv&sektion=4[hptmv(4)] driver supports the following ATA RAID controllers:
+[i386,amd64] The man:hptmv[4] driver supports the following ATA RAID controllers:
 
 * HighPoint's RocketRAID 182x series
 
-[i386,amd64] The http://www.FreeBSD.org/cgi/man.cgi?query=hptrr&sektion=4[hptrr(4)] driver supports the following RAID controllers:
+[i386,amd64] The man:hptrr[4] driver supports the following RAID controllers:
 
 * RocketRAID 172x series
 * RocketRAID 174x series
@@ -705,7 +703,7 @@ The http://www.FreeBSD.org/cgi/man.cgi?query=hptiop&sektion=4[hptiop(4)] driver
 * RocketRAID 2340
 * RocketRAID 2522
 
-[i386] The following controllers are supported by the http://www.FreeBSD.org/cgi/man.cgi?query=ida&sektion=4[ida(4)] driver:
+[i386] The following controllers are supported by the man:ida[4] driver:
 
 * Compaq SMART Array 221
 * Compaq Integrated SMART Array Controller
@@ -719,7 +717,7 @@ The http://www.FreeBSD.org/cgi/man.cgi?query=hptiop&sektion=4[hptiop(4)] driver
 * Compaq SMART-2/E Controller
 * Compaq SMART Controller
 
-[i386,ia64,amd64] Controllers supported by the http://www.FreeBSD.org/cgi/man.cgi?query=iir&sektion=4[iir(4)] driver include:
+[i386,ia64,amd64] Controllers supported by the man:iir[4] driver include:
 
 * Intel RAID Controller SRCMR
 * Intel Server RAID Controller U3-l (SRCU31a)
@@ -733,7 +731,7 @@ The http://www.FreeBSD.org/cgi/man.cgi?query=hptiop&sektion=4[hptiop(4)] driver
 
 The SRCU31 and SRCU31L can be updated via a firmware update available from Intel.
 
-[i386,amd64] Controllers supported by the http://www.FreeBSD.org/cgi/man.cgi?query=ips&sektion=4[ips(4)] driver include:
+[i386,amd64] Controllers supported by the man:ips[4] driver include:
 
 * IBM ServeRAID 3H
 * ServeRAID 4L/4M/4H
@@ -743,9 +741,9 @@ The SRCU31 and SRCU31L can be updated via a firmware update available from Intel
 
 Newer ServeRAID controllers are supported by the aac(4) or mfi(4) driver.
 
-[i386,amd64] The http://www.%0AFreeBSD.org/cgi/man.cgi?query=isci&sektion=4[isci(4)] driver provides support for Intel C600 SAS controllers.
+[i386,amd64] The man:isci[4] driver provides support for Intel C600 SAS controllers.
 
-Cards supported by the http://www.FreeBSD.org/cgi/man.cgi?query=isp&sektion=4[isp(4)] driver include:
+Cards supported by the man:isp[4] driver include:
 
 * ISP1000
 * ISP1020
@@ -766,7 +764,7 @@ Cards supported by the http://www.FreeBSD.org/cgi/man.cgi?query=isp&sektion=4[is
 * Qlogic 2422
 * Qlogic 2432
 
-[i386,ia64,amd64] The http://www.FreeBSD.org/cgi/man.cgi?query=mfi&sektion=4[mfi(4)] driver supports the following hardware:
+[i386,ia64,amd64] The man:mfi[4] driver supports the following hardware:
 
 * LSI MegaRAID SAS 1078
 * LSI MegaRAID SAS 8408E
@@ -783,7 +781,7 @@ Cards supported by the http://www.FreeBSD.org/cgi/man.cgi?query=isp&sektion=4[is
 * Intel RAID Controller SRCSAS18E
 * Intel RAID Controller SROMBSAS18E
 
-[i386,ia64,amd64] Controllers supported by the http://www.FreeBSD.org/cgi/man.cgi?query=mlx&sektion=4[mlx(4)] driver include:
+[i386,ia64,amd64] Controllers supported by the man:mlx[4] driver include:
 
 * Mylex DAC960P
 * Mylex DAC960PD / DEC KZPSC (Fast Wide)
@@ -801,11 +799,10 @@ All major firmware revisions (2.x, 3.x, 4.x and 5.x) are supported, however it i
 
 Compatible Mylex controllers not listed should work, but have not been verified.
 
-[.note]
 *Note*: +
 [amd64, i386] Booting from these controllers is supported. EISA adapters are not supported.
 
-[i386,ia64,amd64] Controllers supported by the http://www.FreeBSD.org/cgi/man.cgi?query=mly&sektion=4[mly(4)] driver include:
+[i386,ia64,amd64] Controllers supported by the man:mly[4] driver include:
 
 * Mylex AcceleRAID 160
 * Mylex AcceleRAID 170
@@ -815,7 +812,7 @@ Compatible Mylex controllers not listed should work, but have not been verified.
 
 Compatible Mylex controllers not listed should work, but have not been verified.
 
-The http://www.FreeBSD.org/cgi/man.cgi?query=mps&sektion=4[mps(4)] driver supports the following hardware:
+The man:mps[4] driver supports the following hardware:
 
 * LSI Logic SAS2004 (4 Port SAS)
 * LSI Logic SAS2008 (8 Port SAS)
@@ -829,7 +826,7 @@ The http://www.FreeBSD.org/cgi/man.cgi?query=mps&sektion=4[mps(4)] driver suppor
 * Intel Integrated RAID Module RMS25KB040
 * Intel Integrated RAID Module RMS25KB080
 
-The following controllers are supported by the http://www.FreeBSD.org/cgi/man.cgi?query=mpt&sektion=4[mpt(4)] driver:
+The following controllers are supported by the man:mpt[4] driver:
 
 * LSI Logic 53c1030, LSI Logic LSI2x320-X (Single and Dual Ultra320 SCSI)
 * LSI Logic AS1064, LSI Logic AS1068
@@ -840,7 +837,7 @@ The following controllers are supported by the http://www.FreeBSD.org/cgi/man.cg
 * LSI Logic FC949X (Dual 4Gb/s Fibre Channel)
 * LSI Logic FC949E, LSI Logic FC949ES (Dual 4Gb/s Fibre Channel PCI-Express)
 
-The Ultra 320 SCSI controller chips supported by the http://www.FreeBSD.org/cgi/man.cgi?query=mpt&sektion=4[mpt(4)] driver can be found onboard on many systems including:
+The Ultra 320 SCSI controller chips supported by the man:mpt[4] driver can be found onboard on many systems including:
 
 * Dell PowerEdge 1750 thru 2850
 * IBM eServer xSeries 335
@@ -853,7 +850,7 @@ The Fibre Channel controller chipset are supported by a broad variety of speeds
 
 This driver also supports target mode for Fibre Channel cards. This support may be enabled by setting the desired role of the core via the LSI Logic firmware utility that establishes what roles the card can take on - no separate compilation is required.
 
-The http://www.FreeBSD.org/cgi/man.cgi?query=mvs&sektion=4[mvs(4)] driver supports the following controllers:
+The man:mvs[4] driver supports the following controllers:
 
 Gen-I (SATA 1.5Gbps):
 
@@ -879,7 +876,7 @@ Gen-IIe (SATA 3Gbps, NCQ, PMP with FBS):
 
 Note, that this hardware supports command queueing and FIS-based switching only for ATA DMA commands. ATAPI and non-DMA ATA commands executed one by one for each port.
 
-[i386,pc98,amd64] The http://www.FreeBSD.org/cgi/man.cgi?query=ncr&sektion=4[ncr(4)] driver provides support for the following NCR/Symbios SCSI controller chips:
+[i386,pc98,amd64] The man:ncr[4] driver provides support for the following NCR/Symbios SCSI controller chips:
 
 * 53C810
 * 53C810A
@@ -900,7 +897,7 @@ The following add-on boards are known to be supported:
 * I-O DATA SC-98/PCI (PC-98)
 * I-O DATA SC-PCI (PC-98)
 
-[i386,pc98] The following devices are currently supported by the http://www.FreeBSD.org/cgi/man.cgi?query=ncv&sektion=4[ncv(4)] driver:
+[i386,pc98] The following devices are currently supported by the man:ncv[4] driver:
 
 * I-O DATA PCSC-DV
 * KME KXLC002 (TAXAN ICD-400PN, etc.), KXLC004, and UJDCD450
@@ -911,21 +908,21 @@ The following add-on boards are known to be supported:
 * Qlogic Fast SCSI
 * RATOC REX-9530, REX-5572 (SCSI only)
 
-[i386,pc98] Controllers supported by the http://www.FreeBSD.org/cgi/man.cgi?query=nsp&sektion=4[nsp(4)] driver include:
+[i386,pc98] Controllers supported by the man:nsp[4] driver include:
 
 * Alpha-Data AD-PCS201
 * I-O DATA CBSC16
 
-[i386] The http://www.FreeBSD.org/cgi/man.cgi?query=pst&sektion=4[pst(4)] driver supports the Promise Supertrak SX6000 ATA hardware RAID controller.
+[i386] The man:pst[4] driver supports the Promise Supertrak SX6000 ATA hardware RAID controller.
 
-The http://www.FreeBSD.org/cgi/man.cgi?query=siis&sektion=4[siis(4)] driver supports the following controller chips:
+The man:siis[4] driver supports the following controller chips:
 
 * SiI3124 (PCI-X 133MHz/64bit, 4 ports)
 * SiI3131 (PCIe 1.0 x1, 1 port)
 * SiI3132 (PCIe 1.0 x1, 2 ports)
 * SiI3531 (PCIe 1.0 x1, 1 port)
 
-[i386,pc98] Controllers supported by the http://www.FreeBSD.org/cgi/man.cgi?query=stg&sektion=4[stg(4)] driver include:
+[i386,pc98] Controllers supported by the man:stg[4] driver include:
 
 * Adaptec 2920/A
 * Future Domain SCSI2GO
@@ -937,7 +934,7 @@ The http://www.FreeBSD.org/cgi/man.cgi?query=siis&sektion=4[siis(4)] driver supp
 
 Note that the Adaptec 2920C is supported by the ahc(4) driver.
 
-The http://www.FreeBSD.org/cgi/man.cgi?query=sym&sektion=4[sym(4)] driver provides support for the following Symbios/LSI Logic PCI SCSI controllers:
+The man:sym[4] driver provides support for the following Symbios/LSI Logic PCI SCSI controllers:
 
 * 53C810
 * 53C810A
@@ -957,7 +954,7 @@ The http://www.FreeBSD.org/cgi/man.cgi?query=sym&sektion=4[sym(4)] driver provid
 * 53C1010-66
 * 53C1510D
 
-The SCSI controllers supported by http://www.FreeBSD.org/cgi/man.cgi?query=sym&sektion=4[sym(4)] can be either embedded on a motherboard, or on one of the following add-on boards:
+The SCSI controllers supported by man:sym[4] can be either embedded on a motherboard, or on one of the following add-on boards:
 
 * ASUS SC-200, SC-896
 * Data Technology DTC3130 (all variants)
@@ -970,7 +967,7 @@ The SCSI controllers supported by http://www.FreeBSD.org/cgi/man.cgi?query=sym&s
 * Tekram DC390W, 390U, 390F, 390U2B, 390U2W, 390U3D, and 390U3W
 * Tyan S1365
 
-[i386,amd64] SCSI controllers supported by the http://www.FreeBSD.org/cgi/man.cgi?query=trm&sektion=4[trm(4)] driver include:
+[i386,amd64] SCSI controllers supported by the man:trm[4] driver include:
 
 * Tekram DC-315 PCI Ultra SCSI adapter without BIOS and internal SCSI connector
 * Tekram DC-315U PCI Ultra SCSI adapter without BIOS
@@ -981,7 +978,7 @@ The SCSI controllers supported by http://www.FreeBSD.org/cgi/man.cgi?query=sym&s
 
 For the Tekram DC-310/U and DC-390F/U/UW/U2B/U2W/U3W PCI SCSI host adapters, use the sym(4) driver.
 
-[i386,amd64] The http://www.FreeBSD.org/cgi/man.cgi?query=twa&sektion=4[twa(4)] driver supports the following SATA RAID controllers:
+[i386,amd64] The man:twa[4] driver supports the following SATA RAID controllers:
 
 * AMCC's 3ware 9500S-4LP
 * AMCC's 3ware 9500S-8
@@ -1005,7 +1002,7 @@ For the Tekram DC-310/U and DC-390F/U/UW/U2B/U2W/U3W PCI SCSI host adapters, use
 * AMCC's 3ware 9650SE-16ML
 * AMCC's 3ware 9650SE-24M8
 
-[i386,amd64] The http://www.FreeBSD.org/cgi/man.cgi?query=twe&sektion=4[twe(4)] driver supports the following PATA/SATA RAID controllers:
+[i386,amd64] The man:twe[4] driver supports the following PATA/SATA RAID controllers:
 
 * AMCC's 3ware 5000 series
 * AMCC's 3ware 6000 series
@@ -1027,7 +1024,7 @@ For the Tekram DC-310/U and DC-390F/U/UW/U2B/U2W/U3W PCI SCSI host adapters, use
 * AMCC's 3ware 8506-12
 * AMCC's 3ware 8506-12MI
 
-[i386] The http://www.FreeBSD.org/cgi/man.cgi?query=vpo&sektion=4[vpo(4)] driver supports the following parallel to SCSI interfaces:
+[i386] The man:vpo[4] driver supports the following parallel to SCSI interfaces:
 
 * Adaptec AIC-7110 Parallel to SCSI interface (built-in to Iomega ZIP drives)
 * Iomega Jaz Traveller interface
@@ -1035,29 +1032,28 @@ For the Tekram DC-310/U and DC-390F/U/UW/U2B/U2W/U3W PCI SCSI host adapters, use
 
 [i386] The wds(4) driver supports the WD7000 SCSI controller.
 
-With all supported SCSI controllers, full support is provided for SCSI-I, SCSI-II, and SCSI-III peripherals, including hard disks, optical disks, tape drives (including DAT, 8mm Exabyte, Mammoth, and DLT), medium changers, processor target devices and CD-ROM drives. WORM devices that support CD-ROM commands are supported for read-only access by the CD-ROM drivers (such as http://www.FreeBSD.org/cgi/man.cgi?query=cd&sektion=4[cd(4)]). WORM/CD-R/CD-RW writing support is provided by http://www.FreeBSD.org/cgi/man.cgi?query=cdrecord&sektion=1[cdrecord(1)], which is a part of the http://www.freebsd.org/cgi/url.cgi?ports/sysutils/cdrtools/pkg-descr[sysutils/cdrtools] port in the Ports Collection.
+With all supported SCSI controllers, full support is provided for SCSI-I, SCSI-II, and SCSI-III peripherals, including hard disks, optical disks, tape drives (including DAT, 8mm Exabyte, Mammoth, and DLT), medium changers, processor target devices and CD-ROM drives. WORM devices that support CD-ROM commands are supported for read-only access by the CD-ROM drivers (such as man:cd[4]). WORM/CD-R/CD-RW writing support is provided by man:cdrecord(1)], which is a part of the http://www.freebsd.org/cgi/url.cgi?ports/sysutils/cdrtools/pkg-descr[sysutils/cdrtools] port in the Ports Collection.
 
 The following CD-ROM type systems are supported at this time:
 
-* SCSI interface (also includes ProAudio Spectrum and SoundBlaster SCSI) (http://www.FreeBSD.org/cgi/man.cgi?query=cd&sektion=4[cd(4)])
-* [i386] Sony proprietary interface (all models) (http://www.FreeBSD.org/cgi/man.cgi?query=scd&sektion=4[scd(4)])
-* ATAPI IDE interface (http://www.FreeBSD.org/cgi/man.cgi?query=acd&sektion=4[acd(4)])
+* SCSI interface (also includes ProAudio Spectrum and SoundBlaster SCSI) (man:cd[4])
+* [i386] Sony proprietary interface (all models) (man:acd[4])
 
 [i386] The following device is unmaintained:
 
-* Mitsumi proprietary CD-ROM interface (all models) (http://www.FreeBSD.org/cgi/man.cgi?query=mcd&sektion=4[mcd(4)])
+* Mitsumi proprietary CD-ROM interface (all models) (man:mcd[4])
 
 [[ethernet]]
 == 3.2. Ethernet Interfaces
 
-The http://www.FreeBSD.org/cgi/man.cgi?query=ae&sektion=4[ae(4)] driver supports Attansic/Atheros L2 PCIe FastEthernet controllers, and is known to support the following hardware:
+The man:ae[4] driver supports Attansic/Atheros L2 PCIe FastEthernet controllers, and is known to support the following hardware:
 
 * ASUS EeePC 701
 * ASUS EeePC 900
 
 Other hardware may or may not work with this driver.
 
-The http://www.FreeBSD.org/cgi/man.cgi?query=age&sektion=4[age(4)] driver provides support for LOMs based on Attansic/Atheros L1 Gigabit Ethernet controller chips, including:
+The man:age[4] driver provides support for LOMs based on Attansic/Atheros L1 Gigabit Ethernet controller chips, including:
 
 * ASUS M2N8-VMX
 * ASUS M2V
@@ -1077,13 +1073,13 @@ The http://www.FreeBSD.org/cgi/man.cgi?query=age&sektion=4[age(4)] driver provid
 * ASUS P5L-VM 1394
 * ASUS G2S
 
-The http://www.FreeBSD.org/cgi/man.cgi?query=ale&sektion=4[ale(4)] device driver provides support for the following Ethernet controllers:
+The man:ale[4] device driver provides support for the following Ethernet controllers:
 
 * Atheros AR8113 PCI Express Fast Ethernet controller
 * Atheros AR8114 PCI Express Fast Ethernet controller
 * Atheros AR8121 PCI Express Gigabit Ethernet controller
 
-[i386,pc98,ia64,amd64,powerpc] Adapters supported by the http://www.FreeBSD.org/cgi/man.cgi?query=aue&sektion=4[aue(4)] driver include:
+[i386,pc98,ia64,amd64,powerpc] Adapters supported by the man:aue[4] driver include:
 
 * Abocom UFE1000, DSB650TX_NA
 * Accton USB320-EC, SpeedStream
@@ -1106,7 +1102,7 @@ The http://www.FreeBSD.org/cgi/man.cgi?query=ale&sektion=4[ale(4)] device driver
 * SMC 2202USB
 * SOHOware NUB100
 
-[i386,pc98,amd64,powerpc] The http://www.FreeBSD.org/cgi/man.cgi?query=axe&sektion=4[axe(4)] driver supports ASIX Electronics AX88172/AX88178/AX88772/AX88772A/AX88772B/AX88760 based USB Ethernet adapters including:
+[i386,pc98,amd64,powerpc] The man:axe[4] driver supports ASIX Electronics AX88172/AX88178/AX88772/AX88772A/AX88772B/AX88760 based USB Ethernet adapters including:
 
 AX88172:
 
@@ -1157,7 +1153,7 @@ AX88760:
 
 * ASIX AX88760
 
-[i386,amd64] The http://www.FreeBSD.org/cgi/man.cgi?query=bce&sektion=4[bce(4)] driver provides support for various NICs based on the Broadcom NetXtreme II family of Gigabit Ethernet controllers, including the following:
+[i386,amd64] The man:bce[4] driver provides support for various NICs based on the Broadcom NetXtreme II family of Gigabit Ethernet controllers, including the following:
 
 * Broadcom NetXtreme II BCM5706 1000Base-SX
 * Broadcom NetXtreme II BCM5706 1000Base-T
@@ -1183,9 +1179,9 @@ AX88760:
 * HP NC382i DP Multifunction Gigabit Server Adapter
 * HP NC382m DP 1GbE Multifunction BL-c Adapter
 
-[amd64, i386] Broadcom BCM4401 based Fast Ethernet adapters (http://www.FreeBSD.org/cgi/man.cgi?query=bfe&sektion=4[bfe(4)] driver)
+[amd64, i386] Broadcom BCM4401 based Fast Ethernet adapters (man:bfe[4] driver)
 
-[i386,pc98,sparc64,ia64,amd64] The http://www.FreeBSD.org/cgi/man.cgi?query=bge&sektion=4[bge(4)] driver provides support for various NICs based on the Broadcom BCM570x family of Gigabit Ethernet controller chips, including the following:
+[i386,pc98,sparc64,ia64,amd64] The man:bge[4] driver provides support for various NICs based on the Broadcom BCM570x family of Gigabit Ethernet controller chips, including the following:
 
 * 3Com 3c996-SX (1000baseSX)
 * 3Com 3c996-T (10/100/1000baseTX)
@@ -1204,7 +1200,7 @@ AX88760:
 * SysKonnect SK-9D21 (10/100/1000baseTX)
 * SysKonnect SK-9D41 (1000baseSX)
 
-[i386,amd64] The http://www.FreeBSD.org/cgi/man.cgi?query=bxe&sektion=4[bxe(4)] driver provides support for various NICs based on the Broadcom NetXtreme II family of 10Gb Ethernet controller chips, including the following:
+[i386,amd64] The man:bxe[4] driver provides support for various NICs based on the Broadcom NetXtreme II family of 10Gb Ethernet controller chips, including the following:
 
 * Broadcom NetXtreme II BCM57710 10Gb
 * Broadcom NetXtreme II BCM57711 10Gb
@@ -1218,13 +1214,13 @@ AX88760:
 * Broadcom NetXtreme II BCM57840 10Gb / 20Gb
 * Broadcom NetXtreme II BCM57840-MF 10Gb
 
-The chips supported by the http://www.FreeBSD.org/cgi/man.cgi?query=cas&sektion=4[cas(4)] driver are:
+The chips supported by the man:cas[4] driver are:
 
 * National Semiconductor DP83065 Saturn Gigabit Ethernet
 * Sun Cassini Gigabit Ethernet
 * Sun Cassini+ Gigabit Ethernet
 
-The following add-on cards are known to work with the http://www.FreeBSD.org/cgi/man.cgi?query=cas&sektion=4[cas(4)] driver at this time:
+The following add-on cards are known to work with the man:cas[4] driver at this time:
 
 * Sun GigaSwift Ethernet 1.0 MMF (Cassini Kuheen) (part no. 501-5524)
 * Sun GigaSwift Ethernet 1.0 UTP (Cassini) (part no. 501-5902)
@@ -1232,28 +1228,28 @@ The following add-on cards are known to work with the http://www.FreeBSD.org/cgi
 * Sun Quad GigaSwift Ethernet UTP (QGE) (part no. 501-6522)
 * Sun Quad GigaSwift Ethernet PCI-X (QGE-X) (part no. 501-6738)
 
-[i386,pc98,ia64,amd64,powerpc] The following devices are supported by the http://www.FreeBSD.org/cgi/man.cgi?query=cdce&sektion=4[cdce(4)] driver:
+[i386,pc98,ia64,amd64,powerpc] The following devices are supported by the man:cdce[4] driver:
 
 * Prolific PL-2501 Host-to-Host Bridge Controller
 * Sharp Zaurus PDA
 * Terayon TJ-715 DOCSIS Cable Modem
 
-[amd64, i386] Crystal Semiconductor CS89x0-based NICs (http://www.FreeBSD.org/cgi/man.cgi?query=cs&sektion=4[cs(4)] driver)
+[amd64, i386] Crystal Semiconductor CS89x0-based NICs (man:cs[4] driver)
 
-[i386,pc98,ia64,amd64,powerpc] The http://www.FreeBSD.org/cgi/man.cgi?query=cue&sektion=4[cue(4)] driver supports CATC USB-EL1210A based USB Ethernet adapters including:
+[i386,pc98,ia64,amd64,powerpc] The man:cue[4] driver supports CATC USB-EL1210A based USB Ethernet adapters including:
 
 * Belkin F5U011/F5U111
 * CATC Netmate
 * CATC Netmate II
 * SmartBridges SmartLink
 
-[i386,amd64] The http://www.FreeBSD.org/cgi/man.cgi?query=cxgb&sektion=4[cxgb(4)] driver supports 10 Gigabit and 1 Gigabit Ethernet adapters based on the T3 and T3B chipset:
+[i386,amd64] The man:cxgb[4] driver supports 10 Gigabit and 1 Gigabit Ethernet adapters based on the T3 and T3B chipset:
 
 * Chelsio 10GBase-CX4
 * Chelsio 10GBase-LR
 * Chelsio 10GBase-SR
 
-The http://www.FreeBSD.org/cgi/man.cgi?query=dc&sektion=4[dc(4)] driver provides support for the following chipsets:
+The man:dc[4] driver provides support for the following chipsets:
 
 * DEC/Intel 21143
 * ADMtek AL981 Comet, AN985 Centaur, ADM9511 Centaur II and ADM9513 Centaur II
@@ -1266,7 +1262,7 @@ The http://www.FreeBSD.org/cgi/man.cgi?query=dc&sektion=4[dc(4)] driver provides
 * Macronix 98713, 98713A, 98715, 98715A, 98715AEC-C, 98725, 98727 and 98732
 * Xircom X3201 (cardbus only)
 
-The following NICs are known to work with the http://www.FreeBSD.org/cgi/man.cgi?query=dc&sektion=4[dc(4)] driver at this time:
+The following NICs are known to work with the man:dc[4] driver at this time:
 
 * 3Com OfficeConnect 10/100B (ADMtek AN985 Centaur-P)
 * Abocom FE2500
@@ -1307,7 +1303,7 @@ The following NICs are known to work with the http://www.FreeBSD.org/cgi/man.cgi
 * Xircom Cardbus Ethernet 10/100
 * Xircom Cardbus Ethernet II 10/100
 
-[i386,pc98,ia64,amd64] Adapters supported by the http://www.FreeBSD.org/cgi/man.cgi?query=de&sektion=4[de(4)] driver include:
+[i386,pc98,ia64,amd64] Adapters supported by the man:de[4] driver include:
 
 * Adaptec ANA-6944/TX
 * Cogent EM100FX and EM440TX
@@ -1319,7 +1315,7 @@ The following NICs are known to work with the http://www.FreeBSD.org/cgi/man.cgi
 * SMC Etherpower 8432, 9332 and 9334
 * ZNYX ZX3xx
 
-[i386,pc98] The http://www.FreeBSD.org/cgi/man.cgi?query=ed&sektion=4[ed(4)] driver supports the following Ethernet NICs:
+[i386,pc98] The man:ed[4] driver supports the following Ethernet NICs:
 
 * 3Com 3c503 Etherlink II
 * AR-P500 Ethernet
@@ -1414,11 +1410,11 @@ The following NICs are known to work with the http://www.FreeBSD.org/cgi/man.cgi
 
 C-Bus, ISA, PCI and PC Card devices are supported.
 
-The http://www.FreeBSD.org/cgi/man.cgi?query=ed&sektion=4[ed(4)] driver does not support the following Ethernet NICs:
+The man:ed[4] driver does not support the following Ethernet NICs:
 
 * Mitsubishi LAN Adapter B8895
 
-The http://www.FreeBSD.org/cgi/man.cgi?query=em&sektion=4[em(4)] driver supports Gigabit Ethernet adapters based on the Intel 82540, 82541ER, 82541PI, 82542, 82543, 82544, 82545, 82546, 82546EB, 82546GB, 82547, 82571, 82572, 82573, and 82574 controller chips:
+The man:em[4] driver supports Gigabit Ethernet adapters based on the Intel 82540, 82541ER, 82541PI, 82542, 82543, 82544, 82545, 82546, 82546EB, 82546GB, 82547, 82571, 82572, 82573, and 82574 controller chips:
 
 * Intel PRO/1000 CT Network Connection (82547)
 * Intel PRO/1000 F Server Adapter (82543)
@@ -1444,7 +1440,7 @@ The http://www.FreeBSD.org/cgi/man.cgi?query=em&sektion=4[em(4)] driver supports
 * Intel PRO/1000 XF Server Adapter (82544)
 * Intel PRO/1000 XT Server Adapter (82544)
 
-[i386,pc98,amd64] The http://www.FreeBSD.org/cgi/man.cgi?query=ep&sektion=4[ep(4)] driver supports Ethernet adapters based on the 3Com 3C5x9 Etherlink III Parallel Tasking chipset, including:
+[i386,pc98,amd64] The man:ep[4] driver supports Ethernet adapters based on the 3Com 3C5x9 Etherlink III Parallel Tasking chipset, including:
 
 * 3Com 3C1 CF
 * 3Com 3C509-TP, 3C509-BNC, 3C509-Combo, 3C509-TPO, 3C509-TPC ISA
@@ -1461,9 +1457,9 @@ The http://www.FreeBSD.org/cgi/man.cgi?query=em&sektion=4[em(4)] driver supports
 * 3Com OfficeConnect 3CXSH572BT, 3CCSH572BT PCMCIA
 * Farallon EtherWave and EtherMac PC Card (P/n 595/895 with BLUE arrow)
 
-Agere ET1310 Gigabit Ethernet adapters (http://www.FreeBSD.org/cgi/man.cgi?query=et&sektion=4[et(4)] driver)
+Agere ET1310 Gigabit Ethernet adapters (man:et[4] driver)
 
-[i386,amd64] The http://www.FreeBSD.org/cgi/man.cgi?query=ex&sektion=4[ex(4)] driver supports the following Ethernet adapters:
+[i386,amd64] The man:ex[4] driver supports the following Ethernet adapters:
 
 * Intel EtherExpress Pro/10 ISA
 * Intel EtherExpress Pro/10+ ISA
@@ -1472,7 +1468,7 @@ Agere ET1310 Gigabit Ethernet adapters (http://www.FreeBSD.org/cgi/man.cgi?query
 * Silicom Ethernet LAN PC Card
 * Silicom EtherSerial LAN PC Card
 
-[i386,pc98,amd64] Controllers and cards supported by the http://www.FreeBSD.org/cgi/man.cgi?query=fe&sektion=4[fe(4)] driver include:
+[i386,pc98,amd64] Controllers and cards supported by the man:fe[4] driver include:
 
 * Allied Telesis RE1000, RE1000Plus, ME1500 (110-pin)
 * CONTEC C-NET(98)P2, C-NET (9N)E (110-pin), C-NET(9N)C (ExtCard)
@@ -1491,7 +1487,7 @@ Agere ET1310 Gigabit Ethernet adapters (http://www.FreeBSD.org/cgi/man.cgi?query
 * TDK LAK-CD011, LAK-CD021, LAK-CD021A, LAK-CD021BX
 * Ungermann-Bass Access/PC N98C+(PC85152, PC85142), Access/NOTE N98(PC86132) (110-pin)
 
-Adapters supported by the http://www.FreeBSD.org/cgi/man.cgi?query=fxp&sektion=4[fxp(4)] driver include:
+Adapters supported by the man:fxp[4] driver include:
 
 * Intel EtherExpress PRO/10
 * Intel InBusiness 10/100
@@ -1506,20 +1502,20 @@ Adapters supported by the http://www.FreeBSD.org/cgi/man.cgi?query=fxp&sektion=4
 * NEC PC-9821X-B06 (PC-98)
 * Many on-board network interfaces on Intel motherboards
 
-Chips supported by the http://www.FreeBSD.org/cgi/man.cgi?query=gem&sektion=4[gem(4)] driver include:
+Chips supported by the man:gem[4] driver include:
 
 * Apple GMAC
 * Sun ERI 10/100 Mbps Ethernet
 * Sun GEM Gigabit Ethernet
 
-The following add-on cards are known to work with the http://www.FreeBSD.org/cgi/man.cgi?query=gem&sektion=4[gem(4)] driver at this time:
+The following add-on cards are known to work with the man:gem[4] driver at this time:
 
 * Sun Gigabit Ethernet PCI 2.0/3.0 (GBE/P) (part no. 501-4373)
 * Sun Gigabit Ethernet SBus 2.0/3.0 (GBE/S) (part no. 501-4375)
 
-The http://www.FreeBSD.org/cgi/man.cgi?query=hme&sektion=4[hme(4)] driver supports the on-board Ethernet interfaces of many Sun UltraSPARC workstation and server models.
+The man:hme[4] driver supports the on-board Ethernet interfaces of many Sun UltraSPARC workstation and server models.
 
-Cards supported by the http://www.FreeBSD.org/cgi/man.cgi?query=hme&sektion=4[hme(4)] driver include:
+Cards supported by the man:hme[4] driver include:
 
 * Sun PCI SunSwift Adapter
 * Sun SBus SunSwift Adapter "( hme" and "SUNW,hme")
@@ -1528,7 +1524,7 @@ Cards supported by the http://www.FreeBSD.org/cgi/man.cgi?query=hme&sektion=4[hm
 * Sun PCI Quad FastEthernet Controller
 * Sun SBus Quad FastEthernet Controller
 
-[i386] The http://www.FreeBSD.org/cgi/man.cgi?query=ie&sektion=4[ie(4)] driver provides supports the following 8 and 16bit ISA Ethernet cards that are based on the Intel i82586 chip:
+[i386] The man:ie[4] driver provides supports the following 8 and 16bit ISA Ethernet cards that are based on the Intel i82586 chip:
 
 * 3COM 3C507
 * AT&T EN100
@@ -1537,31 +1533,31 @@ Cards supported by the http://www.FreeBSD.org/cgi/man.cgi?query=hme&sektion=4[hm
 * Intel EtherExpress 16
 * RACAL Interlan NI5210
 
-The http://www.FreeBSD.org/cgi/man.cgi?query=igb&sektion=4[igb(4)] driver supports Gigabit Ethernet adapters based on the Intel 82575 and 82576 controller chips:
+The man:igb[4] driver supports Gigabit Ethernet adapters based on the Intel 82575 and 82576 controller chips:
 
 * Intel Gigabit ET Dual Port Server Adapter (82576)
 * Intel Gigabit VT Quad Port Server Adapter (82575)
 
-[i386,amd64] The http://www.FreeBSD.org/cgi/man.cgi?query=ixgb&sektion=4[ixgb(4)] driver supports the following cards:
+[i386,amd64] The man:ixgb[4] driver supports the following cards:
 
 * Intel PRO/10GbE LR Server Adapter
 * Intel PRO/10GbE SR Server Adapter
 
-The http://www.FreeBSD.org/cgi/man.cgi?query=ixgbe&sektion=4[ixgbe(4)] driver supports the following cards:
+The man:ixgbe[4] driver supports the following cards:
 
 * Intel(R) 10 Gigabit XF SR/AF Dual Port Server Adapter
 * Intel(R) 10 Gigabit XF SR/LR Server Adapter
 * Intel(R) 82598EB 10 Gigabit AF Network Connection
 * Intel(R) 82598EB 10 Gigabit AT CX4 Network Connection
 
-The http://www.FreeBSD.org/cgi/man.cgi?query=jme&sektion=4[[.refentrytitle]#jme(4)] device driver provides support for the following Ethernet controllers:
+The man:jme[4] device driver provides support for the following Ethernet controllers:
 
 * JMicron JMC250 PCI Express Gigabit Ethernet controller
 * JMicron JMC251 PCI Express Gigabit Ethernet with Card Read Host controller
 * JMicron JMC260 PCI Express Fast Ethernet controller
 * JMicron JMC261 PCI Express Gigabit Ethernet with Card Read Host controller
 
-[i386,pc98,ia64,amd64,powerpc] The http://www.FreeBSD.org/cgi/man.cgi?query=kue&sektion=4[kue(4)] driver supports Kawasaki LSI KL5KLUSB101B based USB Ethernet adapters including:
+[i386,pc98,ia64,amd64,powerpc] The man:kue[4] driver supports Kawasaki LSI KL5KLUSB101B based USB Ethernet adapters including:
 
 * 3Com 3c19250
 * 3Com 3c460 HomeConnect Ethernet USB Adapter
@@ -1580,12 +1576,12 @@ The http://www.FreeBSD.org/cgi/man.cgi?query=jme&sektion=4[[.refentrytitle]#jme(
 * Psion Gold Port USB Ethernet adapter
 * SMC 2102USB, 2104USB
 
-[i386,pc98,amd64] Adapters supported by the http://www.FreeBSD.org/cgi/man.cgi?query=lge&sektion=4[lge(4)] driver include:
+[i386,pc98,amd64] Adapters supported by the man:lge[4] driver include:
 
 * SMC TigerCard 1000 (SMC9462SX)
 * D-Link DGE-500SX
 
-[i386,amd64] The http://www.FreeBSD.org/cgi/man.cgi?query=msk&sektion=4[msk(4)] driver provides support for various NICs based on the Marvell/SysKonnect Yukon II based Gigabit Ethernet controller chips, including:
+[i386,amd64] The man:msk[4] driver provides support for various NICs based on the Marvell/SysKonnect Yukon II based Gigabit Ethernet controller chips, including:
 
 * D- Link 550SX Gigabit Ethernet
 * D-Link 560SX Gigabit Ethernet
@@ -1621,19 +1617,19 @@ The http://www.FreeBSD.org/cgi/man.cgi?query=jme&sektion=4[[.refentrytitle]#jme(
 * SysKonnect SK-9Sxx Gigabit Ethernet
 * SysKonnect SK-9Exx Gigabit Ethernet
 
-[i386,amd64] The http://www.FreeBSD.org/cgi/man.cgi?query=mxge&%0Asektion=4[mxge(4)] driver supports 10 Gigabit Ethernet adapters based on the Myricom LANai Z8E chips:
+[i386,amd64] The man:mxge[4] driver supports 10 Gigabit Ethernet adapters based on the Myricom LANai Z8E chips:
 
 * Myricom 10GBase-CX4 (10G-PCIE-8A-C, 10G-PCIE-8AL-C)
 * Myricom 10GBase-R (10G-PCIE-8A-R, 10G-PCIE-8AL-R)
 * Myricom 10G XAUI over ribbon fiber (10G-PCIE-8A-Q, 10G-PCIE-8AL-Q)
 
-[i386,pc98] The http://www.FreeBSD.org/cgi/man.cgi?query=my&sektion=4[my(4)] driver provides support for various NICs based on the Myson chipset. Supported models include:
+[i386,pc98] The man:my[4] driver provides support for various NICs based on the Myson chipset. Supported models include:
 
 * Myson MTD800 PCI Fast Ethernet chip
 * Myson MTD803 PCI Fast Ethernet chip
 * Myson MTD89X PCI Gigabit Ethernet chip
 
-[i386,amd64] The http://www.FreeBSD.org/cgi/man.cgi?query=nfe&sektion=4[nfe(4)] driver supports the following NVIDIA MCP onboard adapters:
+[i386,amd64] The man:nfe[4] driver supports the following NVIDIA MCP onboard adapters:
 
 * NVIDIA nForce MCP Networking Adapter
 * NVIDIA nForce MCP04 Networking Adapter
@@ -1656,7 +1652,7 @@ The http://www.FreeBSD.org/cgi/man.cgi?query=jme&sektion=4[[.refentrytitle]#jme(
 * NVIDIA nForce4 CK804 MCP8 Networking Adapter
 * NVIDIA nForce4 CK804 MCP9 Networking Adapter
 
-The http://www.FreeBSD.org/cgi/man.cgi?query=nge&sektion=4[nge(4)] driver supports National Semiconductor DP83820 and DP83821 based Gigabit Ethernet adapters including:
+The man:nge[4] driver supports National Semiconductor DP83820 and DP83821 based Gigabit Ethernet adapters including:
 
 * Addtron AEG320T
 * Ark PC SOHO-GA2500T (32-bit PCI) and SOHO-GA2000T (64-bit PCI)
@@ -1669,22 +1665,22 @@ The http://www.FreeBSD.org/cgi/man.cgi?query=nge&sektion=4[nge(4)] driver suppor
 * Surecom Technology EP-320G-TX
 * Trendware TEG-PCITX (32-bit PCI) and TEG-PCITX2 (64-bit PCI)
 
-[i386,amd64] The http://www.FreeBSD.org/cgi/man.cgi?query=nve&sektion=4[nve(4)] driver supports the NVIDIA MCP onboard adapters of mainboards with the following chipsets:
+[i386,amd64] The man:nve[4] driver supports the NVIDIA MCP onboard adapters of mainboards with the following chipsets:
 
 * nForce
 * nForce2
 * nForce3
 * nForce4
 
-[i386,amd64] The http://www.FreeBSD.org/cgi/man.cgi?query=nxge&sektion=4[nxge(4)] driver supports Neterion Xframe 10 Gigabit Ethernet adapters listed in http://www.neterion.com/how/pricing.html.
+[i386,amd64] The man:nxge[4] driver supports Neterion Xframe 10 Gigabit Ethernet adapters listed in http://www.neterion.com/how/pricing.html.
 
-[i386,amd64] The http://www.FreeBSD.org/cgi/man.cgi?query=oce&sektion=4[oce(4)] driver supports the following network adapters:
+[i386,amd64] The man:oce[4] driver supports the following network adapters:
 
 * Emulex BladeEngine 2
 * Emulex BladeEngine 3
 * Emulex Lancer
 
-[i386,pc98,ia64,amd64] The http://www.FreeBSD.org/cgi/man.cgi?query=pcn&sektion=4[pcn(4)] driver supports adapters and embedded controllers based on the AMD PCnet/FAST, PCnet/FAST+, PCnet/FAST III, PCnet/PRO and PCnet/Home Fast Ethernet chips:
+[i386,pc98,ia64,amd64] The man:pcn[4] driver supports adapters and embedded controllers based on the AMD PCnet/FAST, PCnet/FAST+, PCnet/FAST III, PCnet/PRO and PCnet/Home Fast Ethernet chips:
 
 * AMD Am79C971 PCnet-FAST
 * AMD Am79C972 PCnet-FAST+
@@ -1693,12 +1689,12 @@ The http://www.FreeBSD.org/cgi/man.cgi?query=nge&sektion=4[nge(4)] driver suppor
 * AMD Am79C978 PCnet-Home
 * Allied-Telesis LA-PCI
 
-[amd64] The http://www.FreeBSD.org/cgi/man.cgi?query=qlxgb&sektion=4[qlxgb(4)] driver supports 10 Gigabit Ethernet & CNA Adapter based on the following chipsets:
+[amd64] The man:qlxgb[4] driver supports 10 Gigabit Ethernet & CNA Adapter based on the following chipsets:
 
 * QLogic 3200 series
 * QLogic 8200 series
 
-The http://www.FreeBSD.org/cgi/man.cgi?query=re&sektion=4[re(4)] driver supports RealTek RTL8139C+, RTL8169, RTL816xS, RTL811xS, RTL8168, RTL810xE and RTL8111 based Fast Ethernet and Gigabit Ethernet adapters including:
+The man:re[4] driver supports RealTek RTL8139C+, RTL8169, RTL816xS, RTL811xS, RTL8168, RTL810xE and RTL8111 based Fast Ethernet and Gigabit Ethernet adapters including:
 
 * Alloy Computer Products EtherGOLD 1439E 10/100 (8139C+)
 * Compaq Evo N1015v Integrated Ethernet (8139C+)
@@ -1711,7 +1707,7 @@ The http://www.FreeBSD.org/cgi/man.cgi?query=re&sektion=4[re(4)] driver supports
 * USRobotics USR997902 Gigabit Ethernet (8169S)
 * Xterasys XN-152 10/100/1000 NIC (8169)
 
-Adapters supported by the http://www.FreeBSD.org/cgi/man.cgi?query=rl&sektion=4[rl(4)] driver include:
+Adapters supported by the man:rl[4] driver include:
 
 * Accton "Cheetah" EN1207D (MPX 5030/5038; RealTek 8139 clone)
 * Allied Telesyn AT2550
@@ -1746,14 +1742,14 @@ Adapters supported by the http://www.FreeBSD.org/cgi/man.cgi?query=rl&sektion=4[
 * SMC EZ Card 10/100 PCI 1211-TX
 * SOHO (PRAGMATIC) UE-1211C
 
-[i386,pc98,amd64] The http://www.FreeBSD.org/cgi/man.cgi?query=rue&sektion=4[rue(4)] driver supports RealTek RTL8150 based USB Ethernet adapters including:
+[i386,pc98,amd64] The man:rue[4] driver supports RealTek RTL8150 based USB Ethernet adapters including:
 
 * Buffalo (Melco Inc.) LUA-KTX
 * Green House GH-USB100B
 * LinkSys USB100M
 * Billionton 10/100 FastEthernet USBKR2
 
-Adapters supported by the http://www.FreeBSD.org/cgi/man.cgi?query=sf&sektion=4[sf(4)] driver include:
+Adapters supported by the man:sf[4] driver include:
 
 * ANA-62011 64-bit single port 10/100baseTX adapter
 * ANA-62022 64-bit dual port 10/100baseTX adapter
@@ -1761,14 +1757,14 @@ Adapters supported by the http://www.FreeBSD.org/cgi/man.cgi?query=sf&sektion=4[
 * ANA-69011 32-bit single port 10/100baseTX adapter
 * ANA-62020 64-bit single port 100baseFX adapter
 
-The http://www.FreeBSD.org/cgi/man.cgi?query=sfxge&sektion=4[sfxge(4)] driver supports all 10Gb Ethernet adapters based on Solarflare SFC9000 family controllers.
+The man:sfxge[4] driver supports all 10Gb Ethernet adapters based on Solarflare SFC9000 family controllers.
 
-The http://www.FreeBSD.org/cgi/man.cgi?query=sge&sektion=4[sge(4)] device driver provides support for the following Ethernet controllers:
+The man:sge[4] device driver provides support for the following Ethernet controllers:
 
 * SiS190 Fast Ethernet controller
 * SiS191 Fast/Gigabit Ethernet controller
 
-The http://www.FreeBSD.org/cgi/man.cgi?query=sis&sektion=4[sis(4)] driver supports Silicon Integrated Systems SiS 900 and SiS 7016 based Fast Ethernet adapters and embedded controllers, as well as Fast Ethernet adapters based on the National Semiconductor DP83815 (MacPhyter) and DP83816 chips. Supported adapters include:
+The man:sis[4] driver supports Silicon Integrated Systems SiS 900 and SiS 7016 based Fast Ethernet adapters and embedded controllers, as well as Fast Ethernet adapters based on the National Semiconductor DP83815 (MacPhyter) and DP83816 chips. Supported adapters include:
 
 * @Nifty FNECHARD IFC USUP-TX
 * MELCO LGY-PCI-TXC
@@ -1777,7 +1773,7 @@ The http://www.FreeBSD.org/cgi/man.cgi?query=sis&sektion=4[sis(4)] driver suppor
 * SiS 630, 635, and 735 motherboard chipsets
 * Soekris Engineering net45xx, net48xx, lan1621, and lan1641
 
-Adapters supported by the http://www.FreeBSD.org/cgi/man.cgi?query=sk&sektion=4[sk(4)] driver include:
+Adapters supported by the man:sk[4] driver include:
 
 * 3Com 3C940 single port, 1000baseT adapter
 * 3Com 3C2000-T single port, 1000baseT adapter
@@ -1793,7 +1789,7 @@ Adapters supported by the http://www.FreeBSD.org/cgi/man.cgi?query=sk&sektion=4[
 * SK-9844 SK-NET GE-SX dual port, multimode fiber adapter
 * SMC 9452TX single port, 1000baseT adapter
 
-[i386,amd64] The http://www.FreeBSD.org/cgi/man.cgi?query=sn&sektion=4[sn(4)] driver supports SMC91Cxx based ISA and PCMCIA cards including:
+[i386,amd64] The man:sn[4] driver supports SMC91Cxx based ISA and PCMCIA cards including:
 
 * 3Com Megahertz X-Jack Ethernet PC Card XJ10BT, XJ10BC
 * 3Com Megahertz XJEM and CCEM series: CCEM3288C, CCEM3288T, CCEM3336, CEM3336C, CCEM3336T, XJEM1144C, XJEM1144T, XJEM3288C, XJEM3288T, XJEM3336
@@ -1807,11 +1803,11 @@ Adapters supported by the http://www.FreeBSD.org/cgi/man.cgi?query=sk&sektion=4[
 * SMC EZEther PC Card (8020BT)
 * SMC EZEther PC Card (8020T)
 
-The http://www.FreeBSD.org/cgi/man.cgi?query=sn&sektion=4[sn(4)] driver supports the SMC 91C90, SMC 91C92, SMC 91C94, SMC 91C95, SMC 91C96, SMC91C100 and SMC 91C100FD chips from SMC.
+The man:sn[4] driver supports the SMC 91C90, SMC 91C92, SMC 91C94, SMC 91C95, SMC 91C96, SMC91C100 and SMC 91C100FD chips from SMC.
 
-The Farallon EtherWave and EtherMac card came in two varieties. The ep(4) driver supports the 595 and 895 cards. These cards have the blue arrow on the front along with a 3Com logo. The Farallon 595a cards, which have a red arrow on the front, are also called EtherWave and EtherMac. They are supported by the http://www.FreeBSD.org/cgi/man.cgi?query=sn&sektion=4[sn(4)] driver.
+The Farallon EtherWave and EtherMac card came in two varieties. The ep(4) driver supports the 595 and 895 cards. These cards have the blue arrow on the front along with a 3Com logo. The Farallon 595a cards, which have a red arrow on the front, are also called EtherWave and EtherMac. They are supported by the man:sn[4] driver.
 
-[pc98] The http://www.FreeBSD.org/cgi/man.cgi?query=snc&sektion=4[snc(4)] driver supports the following cards:
+[pc98] The man:snc[4] driver supports the following cards:
 
 * National Semiconductor DP83934AVQB
 * NEC PC-9801-83
@@ -1823,15 +1819,15 @@ The Farallon EtherWave and EtherMac card came in two varieties. The ep(4) driver
 * NEC PC-9801N-J02 PCMCIA
 * NEC PC-9801N-J02R PCMCIA
 
-The http://www.FreeBSD.org/cgi/man.cgi?query=snc&sektion=4[snc(4)] driver also includes support for the National Semiconductor NS46C46 as 64 * 16 bits Microwave Serial EEPROM.
+The man:snc[4] driver also includes support for the National Semiconductor NS46C46 as 64 * 16 bits Microwave Serial EEPROM.
 
-The http://www.FreeBSD.org/cgi/man.cgi?query=ste&sektion=4[ste(4)] driver supports Sundance Technologies ST201 based Fast Ethernet adapters and embedded controllers including:
+The man:ste[4] driver supports Sundance Technologies ST201 based Fast Ethernet adapters and embedded controllers including:
 
 * D-Link DFE-530TXS
 * D-Link DFE-550TX
 * D-Link DFE-580TX
 
-The http://www.FreeBSD.org/cgi/man.cgi?query=stge&sektion=4[stge(4)] driver provides support for various NICs based on the Sundance/Tamarack TC9021 based Gigabit Ethernet controller chips, including:
+The man:stge[4] driver provides support for various NICs based on the Sundance/Tamarack TC9021 based Gigabit Ethernet controller chips, including:
 
 * Antares Microsystems Gigabit Ethernet
 * ASUS NX1101 Gigabit Ethernet
@@ -1842,7 +1838,7 @@ The http://www.FreeBSD.org/cgi/man.cgi?query=stge&sektion=4[stge(4)] driver prov
 * Sundance TC9021 Gigabit Ethernet
 * Tamarack TC9021 Gigabit Ethernet
 
-[i386,pc98,amd64,sparc64] The http://www.FreeBSD.org/cgi/man.cgi?query=ti&sektion=4[ti(4)] driver supports Gigabit Ethernet adapters based on the Alteon Tigon I and II chips. The http://www.FreeBSD.org/cgi/man.cgi?query=ti&sektion=4[ti(4)] driver has been tested with the following adapters:
+[i386,pc98,amd64,sparc64] The man:ti[4] driver supports Gigabit Ethernet adapters based on the Alteon Tigon I and II chips. The man:ti[4] driver has been tested with the following adapters:
 
 * 3Com 3c985-SX Gigabit Ethernet adapter (Tigon 1)
 * 3Com 3c985B-SX Gigabit Ethernet adapter (Tigon 2)
@@ -1860,14 +1856,14 @@ The following adapters should also be supported but have not yet been tested:
*** 19037 LINES SKIPPED ***

From owner-dev-commits-doc-all@freebsd.org  Wed Feb  3 21:55:18 2021
Return-Path: <owner-dev-commits-doc-all@freebsd.org>
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 4469952D651
 for <dev-commits-doc-all@mailman.nyi.freebsd.org>;
 Wed,  3 Feb 2021 21:55:18 +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 4DWFpt1Wsyz3sN0;
 Wed,  3 Feb 2021 21:55:18 +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 2731D2859A;
 Wed,  3 Feb 2021 21:55:18 +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 113LtIVv075587;
 Wed, 3 Feb 2021 21:55:18 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
 by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 113LtIQ4075586;
 Wed, 3 Feb 2021 21:55:18 GMT (envelope-from git)
Date: Wed, 3 Feb 2021 21:55:18 GMT
Message-Id: <202102032155.113LtIQ4075586@gitrepo.freebsd.org>
To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org
From: Sergio Carlavilla Delgado <carlavilla@FreeBSD.org>
Subject: git: d531d228bf - main - Fix link in errata notices
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: carlavilla
X-Git-Repository: doc
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: d531d228bf03f218f444f7690fe1acf2cf7d8379
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
 <dev-commits-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-doc-all/>
List-Post: <mailto:dev-commits-doc-all@freebsd.org>
List-Help: <mailto:dev-commits-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 03 Feb 2021 21:55:18 -0000

The branch main has been updated by carlavilla:

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

commit d531d228bf03f218f444f7690fe1acf2cf7d8379
Author:     Sergio Carlavilla Delgado <carlavilla@FreeBSD.org>
AuthorDate: 2021-02-03 21:54:27 +0000
Commit:     Sergio Carlavilla Delgado <carlavilla@FreeBSD.org>
CommitDate: 2021-02-03 21:54:27 +0000

    Fix link in errata notices
    
    PR:             253109
    Submitted by:   dennis.r.friedrichsen(at)gmail.com
---
 website/themes/beastie/layouts/partials/errata-notices.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website/themes/beastie/layouts/partials/errata-notices.html b/website/themes/beastie/layouts/partials/errata-notices.html
index 5c75aa6c52..e08168452e 100644
--- a/website/themes/beastie/layouts/partials/errata-notices.html
+++ b/website/themes/beastie/layouts/partials/errata-notices.html
@@ -5,7 +5,7 @@
       <p>
         <span class="txtdate">{{ .date }}</span>
         <br />
-        <a href="{{.Site.BaseURL | relLangURL }}security/notices/{{ .name }}.asc">{{ .name }}</a>
+        <a href="{{.Site.BaseURL | relLangURL }}security/advisories/{{ .name }}.asc">{{ .name }}</a>
       </p>
     {{ end }}
     {{ $errataCounter = add $errataCounter 1 }}

From owner-dev-commits-doc-all@freebsd.org  Thu Feb  4 00:40:48 2021
Return-Path: <owner-dev-commits-doc-all@freebsd.org>
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 AA7985317DA
 for <dev-commits-doc-all@mailman.nyi.freebsd.org>;
 Thu,  4 Feb 2021 00:40:48 +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 4DWKTr4VM5z4Xdk;
 Thu,  4 Feb 2021 00:40:48 +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 8C9922AA07;
 Thu,  4 Feb 2021 00:40:48 +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 1140emPj092531;
 Thu, 4 Feb 2021 00:40:48 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
 by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1140emS8092530;
 Thu, 4 Feb 2021 00:40:48 GMT (envelope-from git)
Date: Thu, 4 Feb 2021 00:40:48 GMT
Message-Id: <202102040040.1140emS8092530@gitrepo.freebsd.org>
To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org
From: Warner Losh <imp@FreeBSD.org>
Subject: git: 32f3af824f - main - Remove old, draft version of git primer.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: imp
X-Git-Repository: doc
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 32f3af824fa59aeeaffc52cd3b8fc99658a267ef
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
 <dev-commits-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-doc-all/>
List-Post: <mailto:dev-commits-doc-all@freebsd.org>
List-Help: <mailto:dev-commits-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Feb 2021 00:40:48 -0000

The branch main has been updated by imp:

URL: https://cgit.FreeBSD.org/doc/commit/?id=32f3af824fa59aeeaffc52cd3b8fc99658a267ef

commit 32f3af824fa59aeeaffc52cd3b8fc99658a267ef
Author:     Warner Losh <imp@FreeBSD.org>
AuthorDate: 2021-01-27 00:19:02 +0000
Commit:     Warner Losh <imp@FreeBSD.org>
CommitDate: 2021-02-03 22:15:08 +0000

    Remove old, draft version of git primer.
    
    This contains a very early version of the git primer that's incomplete. It's
    also unreferenced in the tree. Remove it.
---
 .../content/en/articles/git-primer/_index.adoc     | 590 ---------------------
 1 file changed, 590 deletions(-)

diff --git a/documentation/content/en/articles/git-primer/_index.adoc b/documentation/content/en/articles/git-primer/_index.adoc
deleted file mode 100644
index be1209b8ac..0000000000
--- a/documentation/content/en/articles/git-primer/_index.adoc
+++ /dev/null
@@ -1,590 +0,0 @@
----
-title: FreeBSD Git Primer (Don’t PANIC)
-releaseinfo: "$FreeBSD$" 
-trademarks: ["freebsd", "general"]
----
-
-= FreeBSD Git Primer (Don’t PANIC)
-:doctype: article
-:toc: macro
-:toclevels: 1
-:icons: font
-:sectnums:
-:sectnumlevels: 6
-:source-highlighter: rouge
-:experimental:
-
-New committers are assumed to already be familiar with the basic operation of Git. If not, start by reading the link:https://git-scm.com/book/en/v2[Git Book].
-
-toc::[]
-
-== Introduction
-
-Git is a distributed version control system (DVCS), which means that the entire repository, including all of the history, is maintained along with each copy (clone). A developer makes changes to their local repository, then shares those changes with other repositories. Git uses *fetch*, *pull*, and *push* to refer to these sharing operations.
-
-In the DVCS model there are multiple repositories, each with their own view of history. A canonical or "source of truth" repository is established by convention - cgit-beta.freebsd.org is FreeBSD's canonical repository. We'll refer to the canonical  repository as "upstream."
-
-The simplest case of making a change in the FreeBSD tree involves three steps:
-* Acquire latest changes from upstream
-* Commit change locally
-* Push to upstream
-
-In some cases there will be newer changes in the upstream repository, as well as local changes that have not yet been pushed there.
-
-There are two main approaches for dealing with this in a DVCS world - a rebase workflow, or a merge workflow. The rebase workflow "replays" the local commits on top of the upstream history, and maintains a linear progression. The merge workflow adds the new commits via a merge. The history logically diverges into two or more branches, coming back together via the merge.
-
-In FreeBSD we use a rebase workflow. In the case of having local commits not yet upstream the steps are:
-
-* Acquire latest changes from upstream
-* Rebase local changes on upstream
-* Push to upstream
-
-Examples of these cases are presented in this primer.
-
-XXX describe git index
-
-== Installing Git
-
-Git can be installed from the FreeBSD package collection by issuing this command:
-
-[source,bash]
-....
-# pkg install git
-....
-
-or from the ports tree:
-
-[source,bash]
-....
-# cd /usr/ports/devel/git
-# make all install clean
-....
-
-== Initial Configuration
-
-There are a number of global git configuration options that should be set:
-
-[source,bash]
-....
-% git config --global user.name "Inigo Montoya" # You killed my father
-% git config --global user.email "imontoya@FreeBSD.org"
-....
-
-== Getting Started
-
-There are a few ways to obtain a working copy of the tree from Git. This section will explain them.
-
-=== Direct Checkout
-
-The first is to check out directly from the main repository. For the src tree, use:
-
-[source,bash]
-....
-% git clone -o upstream git@cgit-beta.freebsd.org/src.git /usr/src
-....
-
-For the doc tree, use:
-
-[source,bash]
-....
-% git clone -o upstream git@cgit-beta.freebsd.org/doc.git /usr/doc
-....
-
-For the ports tree, use:
-
-[source,bash]
-....
-% git clone -o upstream git@cgit-beta.freebsd.org/ports.git /usr/ports
-....
-
-[NOTE]
-====
-Though the remaining examples in this document are written with the workflow of working with the src tree in mind, the underlying concepts are the same for working with the doc and the ports tree. Ports related Git operations are listed in Section XXX, “Ports Specific FAQ”.
-====
-
-The above command will check out a CURRENT source tree as /usr/src/, which can be any target directory on the local filesystem. Omitting the final argument of that command causes the working copy, in this case, to be named “src”, but that can be renamed safely.
-
-git@ means the git protocol tunnelled over SSH. The name of the server is *cgit-beta.freebsd.org* and *src* is the repository.
-
-XXX
-If your FreeBSD login name is different from the login name used on the local machine, either include it in the URL (for example jarjar@cgit-beta.freebsd.org/src.git), or add an entry to ~/.ssh/config in the form:
-
-[source,bash]
-....
-Host cgit-beta.freebsd.org
-	User jarjar
-....
-
-**Note**: The git diff command does not require access to the server, as git stores the entire repository history locally.
-
-=== RELENG_* Branches and General Layout
-
-In *git@cgit-beta.freebsd.org/src.git*, *src* refers to the source tree. Similarly, *ports* refers to the ports tree, and so on. These are separate repositories with their own revision hashes, access controls and commit mail.
-
-For the base repository, the main branch refers to the -CURRENT tree. For example, *bin/ls* is what would go into */usr/src/bin/ls* in a release. Some key branches:
-
-XXX
-* *main* which corresponds to HEAD, also known as -CURRENT.
-* *stable/n* which corresponds to RELENG_n.
-* *releng/n.n* which corresponds to RELENG_n_n.
-* *release/n.n.n* which corresponds to RELENG_n_n_n_RELEASE.
-
-=== FreeBSD Documentation Project Branches and Layout
-
-In *git@cgit-beta.freebsd.org/doc.git*, *doc* refers to the repository root of the documentation tree.
-
-In general, most FreeBSD Documentation Project work will be done within the main branch of the documentation source tree.
-
-FreeBSD documentation is written and/or translated to various languages, each in a separate directory in the main branch.
-
-Each translation set contains several subdirectories for the various parts of the FreeBSD Documentation Project. A few noteworthy directories are:
-
-* */articles/* contains the source code for articles written by various FreeBSD contributors.
-* */books/* contains the source code for the different books, such as the FreeBSD Handbook.
-* */htdocs/* contains the source code for the FreeBSD website.
-
-=== FreeBSD Ports Tree Branches and Layout
-
-In *git@cgit-beta.freebsd.org/ports.git*, *ports* refers to the repository root of the ports tree.
-
-In general, most FreeBSD port work will be done within the main/ branch of the ports tree which is the actual ports tree used to install software. Some other key branches:
-
-* RELENG_n_n_n which corresponds to RELENG_n_n_n is used to merge back security updates in preparation for a release.
-* RELEASE_n_n_n which corresponds to RELEASE_n_n_n represents a release tag of the ports tree.
-* /tags/RELEASE_n_EOL represents the end of life tag of a specific FreeBSD branch.
-
-== Daily Use
-
-While git has a lot of flexibility in how it can be used, we will concentrate on how we expect it to be used by FreeBSD Developers in this section, by which we mean people who are planning to commit changes to one of the three FreeBSD repositories: `doc, ports, src.`
-
-One concept to keep fixed in your mind as you begin working with git on FreeBSD is that our git repository is only meant for commits to the `main` branch, or merges from the `main` branch to one of our subsidiary branches, such as `STABLE`. The FreeBSD repos are not meant for, nor do they support, developer branches. If you wish to have a long lived, shared, branch for collaboration, that will be covered in the Collaboration Workflow section.
-
-=== Help
-
-git has built in help documentation. It can be accessed by typing:
-
-[source,bash]
-....
-% git help
-% git help <subcommand>
-....
-
-Additional information can be found in the link:https://git-scm.com/book/en/v2[Git Book].
-
-=== Checkout
-
-As seen earlier, to check out the FreeBSD head branch:
-
-=== Anonymous Checkout
-
-XXX
-It is possible to anonymously check out the FreeBSD repository with Git. This will give access to a read-only tree that can be updated, but not committed back to the main repository. To do this, use:
-
-=== Status
-
-To view the local changes that have been made to the working copy:
-
-[source,bash]
-....
-% git status
-....
-
-Git reports files in three different categories:
-- Untracked (i.e., new files not yet added to the tree)
-- Unstaged (modified, but not added to the index)
-- Staged (modified and added to the index, for the next commit)
-
-=== Editing, Staging,  and Committing
-
-To add a new file or stage all changes to a previously added file to the index:
-
-[source,bash]
-....
-% git add path/to/file
-....
-
-Likewise, you can stage files for removal (and remove them from the current checkout) with
-
-[source,bash]
-....
-% git rm path/to/file
-....
-
-Files can be moved with
-
-[source,bash]
-....
-% git mv foo.c bar.c
-....
-
-To review changes to previously added files and add some or all of those changes to the index:
-
-[source,bash]
-....
-% git add -p
-....
-
-To review changes staged for commit:
-
-[source,bash]
-....
-% git diff --staged
-....
-
-To commit staged changes (ones that have already been added to the index):
-
-[source,bash]
-....
-% git commit
-....
-
-=== XXX: git push here or cover rebase first?
-EM: suggest rebase first, we should discourage `git commit -a && git push`-style approach.
-
-=== Rebasing
-
-=== Pushing commits to the canonical repository
-
-=== Log and Annotate
-
-`git log` shows revisions and commit messages, most recent first, for files or directories. When used on a directory, all revisions that affected the directory and files within that directory are shown.
-
-[source,bash]
-....
-% git log sys/kern
-....
-
-To show the log for a single commit:
-
-[source,bash]
-....
-% git log -1 hash
-....
-
-To show the log for a single commit with the diff:
-
-[source,bash]
-....
-% git log -1 hash -p
-....
-
-A one-line summary of each commit alongside a short hash fits more information on one screen. This can also be configured as an alias for convenience:
-
-[source,bash]
-....
-% git log --oneline
-% git config --global alias.lol "log --oneline --graph --decorate"
-% git lol       # "log --oneline" short logs for working branch
-% git lol --all # for all branches, with fork/merge points visualized
-....
-
-`git annotate`, or equally `git blame`, shows the most recent commit hash and who committed that change for each line of a file.
-
-=== Diffs
-
-git diff displays changes in the working tree, or changes between specified version hashes. By default staged changes (i.e., in the index) are *not* shown by `git diff`.
-
-Diffs generated by git are unified and include new files by default in the diff output.
-
-To show differences between the working tree and the index:
-
-[source,bash]
-....
-% git diff
-....
-
-To show differences between the index and HEAD (the most recent commit on the branch):
-
-[source,bash]
-....
-% git diff --cached
-....
-
-To show differences between the working tree and HEAD, including changes already staged in the index:
-
-[source,bash]
-....
-% git diff HEAD
-....
-
-To show the commit message and diff for a particular commit:
-
-[source,bash]
-....
-% git show hash
-....
-
-git diff can show the changes between two revisions of the same file:
-
-[source,bash]
-....
-% git diff hash_1..hash_2 -- file
-....
-
-The paths generated by git diff start with a/ for the original and b/ for the modified files. They could be applied to the original tree with:
-
-[source,bash]
-....
-% patch -p1 file
-....
-
-=== Unstaging
-
-Remove the changes in a file from the index:
-
-[source,bash]
-....
-% git reset file
-....
-
-This works for both changes to an existing file and for new files.  In either case, the contents of the files are unchanged.
-
-=== Reverting
-
-To revert unstaged changes to a file:
-
-[source,bash]
-....
-% git checkout file
-....
-
-To review and revert some changes to a file:
-
-[source,bash]
-....
-% git checkout -p file
-....
-
-The above commands can also take a directory and will act on all files under that path. This can include the whole repository if `.` is given from the root of the clone. **These commands result in permantent lost of work.** Confusingly, `git checkout` is also used to switch between branches where it does not risk dataloss.
-
-=== Branches
-
-To switch between local branches use:
-
-[source,bash]
-....
-% git checkout branch
-....
-
-If `branch` does not exist but a remote branch you have cloned of the same name exists a local branch will be created tracking that branch.
-
-To create a new branch from your currently checked out branch's state:
-
-[source,bash]
-....
-% git checkout -b newbranch
-....
-
-=== XXX: something about merging and rebasing for our no-merge-commits main branch
-see above
-
-=== Conflicts
-
-If a git command resulted in a merge conflict, Git will remember which files have conflicts and refuse to commit any changes to those files until explicitly told that the conflicts have been resolved.
-
-Conflicts are indicated with ``<<<<<<<`, `=======`, and `>>>>>>>`` markers in the conflicting file(s). These can be resolved by editing the file:
-
-[source,bash]
-....
-% vim path/to/conflicting/file
-% git add path/to/conflicting/file
-% git commit
-....
-
-The link:https://git-scm.com/docs/git-mergetool[`git mergetool`] command can be used to manage the conflict resolution process, relying on a third-party 3-way merge tool such as kdiff3, vimdiff3, or p4merge.
-
-== Advanced Use
-
-=== Sparse Checkouts
-
-XXX to be written - see the link:https://git-scm.com/docs/git-sparse-checkout[git-sparse-checkout]  documentation.
-
-=== Direct Operation
-
-Certain operations can be performed directly on the repository without touching the working copy. Specifically, this applies to any operation that does not require editing a file, including:
-
-=== Merging with git
-
-This section deals with merging code from one branch to another (typically, from head to a stable branch).
-
-=== Vendor Imports with git
-
-XXX TODO
-
-Important:
-
-Please read this entire section before starting a vendor import.
-
-Note:
-
-Patches to vendor code fall into two categories:
-
-* Vendor patches: these are patches that have been issued by the vendor, or that have been extracted from the vendor's version control system, which address issues which cannot wait until the next vendor release.
-* FreeBSD patches: these are patches that modify the vendor code to address FreeBSD-specific issues.
-
-The nature of a patch dictates where it should be committed:
-
-* Vendor patches must be committed to the vendor branch, and merged from there to head. If the patch addresses an issue in a new release that is currently being imported, it must not be committed along with the new release: the release must be imported and tagged first, then the patch can be applied and committed. There is no need to re-tag the vendor sources after committing the patch.
-* FreeBSD patches are committed directly to head.
-
-==== Preparing the Tree
-
-If importing for the first time after the switch to Git, bootstrapping the merge history in the main tree is necessary.
-
-===== Bootstrapping Merge History
-
-If importing for the first time after the switch to Git, bootstrap svn:mergeinfo on the target directory in the main tree to the revision that corresponds to the last related change to the vendor tree, prior to importing new sources:
-
-==== Importing New Sources
-
-==== Merging to Head
-
-[source,bash]
-....
-% cd head/contrib/pf
-% svn up
-% svn merge --accept=postpone svn+ssh://repo.freebsd.org/base/vendor/pf/dist .
-....
-
-==== Committing the Vendor Import
-
-Committing is now possible! Everything must be committed in one go. If done properly, the tree will move from a consistent state with old code, to a consistent state with new code.
-
-=== Using a Git Mirror
-
-=== Committing High-ASCII Data
-
-== Some Tips
-
-When referring to other commits in prose (commit messages and such), specify the first 12 characters of the associated Git hash (e.g. “f3c8503082ea”).
-
-=== Collaboration Workflow
-
-Now that we've covered how to work with, and commit, directly to the FreeBSD repositories we can address the concept of a collaboration workflow. When working directly on the repository your changes are only visible once they are committed to the ```main``` branch, but what if you want to work on some feature for a long period, and share it with others inside and outside the FreeBSD community? A collaboration workflow allows you to have your own, publicly hosted, long lived, development branches that others can share in.
-
-To set up a collaboration branch you will need to work with two different repositories in parallel, the canonical FreeBSD repos that we've been describing thus far, and your own, hosted repository, which is where your development branches will live. The following examples use github for the hosted repository, but the same effect can be achieved with a GitLab instance, or your own, personally hosted, git.
-
-The steps required to set up a collaboration workflow are the following:
-
-* Clone the FreeBSD repository
-* Create a publicly visible repository
-* Push your cloned FreeBSD repo into your public repo.
-* Create branches locally
-* Push shared branches to your public repo.
-
-Note that pushing new branches to the FreeBSD repo is forbidden, and attempts to push a developer branch will result in an error.
-
-When we clone the FreeBSD repo we have a copy of the repo on our local system. The clone has a single ```remote``` which is where all updates come from:
-
-[source,bash]
-....
-> git remote -v
-origin	https://cgit-beta.freebsd.org/src.git (fetch)
-origin	https://cgit-beta.freebsd.org/src.git (push)
-....
-
-The ```origin``` remote is set by git when you clone the repo.
-
-Now you have to create your collaboration space, which can be done by creating a new, empty, repository on github. For this example I have created:
-
-[source,bash]
-....
-git@github.com:gvnn3/FreeBSD.src-gnn.git
-....
-
-using the standard github web UI.
-
-For convenience we rename origin to ```freebsd```:
-
-[source,bash]
-....
-> git remote rename origin freebsd
-> git remote -v
-freebsd	https://cgit-beta.freebsd.org/src.git (fetch)
-freebsd	https://cgit-beta.freebsd.org/src.git (push)
-....
-
-Next we'll add our collaboration repo as a secondary remote:
-
-[source,bash]
-....
-> git remote add public git@github.com:gvnn3/FreeBSD.src-gnn.git
-
-> git remote -v
-freebsd	https://cgit-beta.freebsd.org/src.git (fetch)
-freebsd	https://cgit-beta.freebsd.org/src.git (push)
-public	git@github.com:gvnn3/FreeBSD.src-gnn.git (fetch)
-public	git@github.com:gvnn3/FreeBSD.src-gnn.git (push)
-....
-
-Now we have a ```freebsd``` remote from which we mostly receive updates, and where we ONLY commit changes to ```main``` or bring changes from ```main``` to one of the ```STABLE``` branches.
-
-Finally we push the FreeBSD repo into our empty, public, repository.
-
-[source,bash]
-....
-> git push public
-....
-
-Now that you have a public collaboration space you can create and push branches to it for others to see and enjoy.  First we create our local branch to work in:
-
-[source,bash]
-....
-> git branch gnn-test
-> git checkout gnn-test
-Switched to branch 'gnn-test'
-....
-
-and then we push that branch into our `public` space:
-
-[source,bash]
-....
-> git push --set-upstream public gnn-test
-Warning: No xauth data; using fake authentication data for X11 forwarding.
-X11 forwarding request failed on channel 0
-Total 0 (delta 0), reused 0 (delta 0)
-remote:
-remote: Create a pull request for 'gnn-test' on GitHub by visiting:
-remote:      https://github.com/gvnn3/FreeBSD.src-gnn/pull/new/gnn-test
-remote:
-To github.com:gvnn3/FreeBSD.src-gnn.git
- * [new branch]              gnn-test -> gnn-test
-Branch 'gnn-test' set up to track remote branch 'gnn-test' from 'public'.
-....
-
-Updating your working branch requires that you rebase from the `freebsd` repo.  First we'll fetch all the changes from the repo but NOT apply them:
-
-[source,bash]
-....
-> git fetch freebsd
-....
-
-and then we will apply the changes to the main branch via a rebase:
-
-[source,bash]
-....
-> git checkout master
-git rebase freebsd/master
-First, rewinding head to replay your work on top of it...
-....
-
-== XXX TODO
-(Notes here for updates we need)
-=== mention worktrees
-
-create a worktree for a project branch
-
-[source,bash]
-....
-% git worktree add -b pkgbase ../pkgbase upstream/main
-....
-
-example for a stable/12 worktree
-
-[source,bash]
-....
-% git worktree add -b stable/12 ../stable-12 upstream/stable/12
-....
-
-== Useful links
-* https://stackoverflow.com/questions/1587846/how-do-i-show-the-changes-which-have-been-staged

From owner-dev-commits-doc-all@freebsd.org  Thu Feb  4 00:40:49 2021
Return-Path: <owner-dev-commits-doc-all@freebsd.org>
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 C8215531A6A
 for <dev-commits-doc-all@mailman.nyi.freebsd.org>;
 Thu,  4 Feb 2021 00:40:49 +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 4DWKTs5MRFz4Xdl;
 Thu,  4 Feb 2021 00:40:49 +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 AB49A2A6B9;
 Thu,  4 Feb 2021 00:40:49 +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 1140en6B092549;
 Thu, 4 Feb 2021 00:40:49 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
 by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1140eniM092548;
 Thu, 4 Feb 2021 00:40:49 GMT (envelope-from git)
Date: Thu, 4 Feb 2021 00:40:49 GMT
Message-Id: <202102040040.1140eniM092548@gitrepo.freebsd.org>
To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org
From: Warner Losh <imp@FreeBSD.org>
Subject: git: 4fc73e884c - main - Convert vendor imports to git instructions
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: imp
X-Git-Repository: doc
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 4fc73e884c9d5e249e8510f7fd6f0269d19256c0
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
 <dev-commits-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-doc-all/>
List-Post: <mailto:dev-commits-doc-all@freebsd.org>
List-Help: <mailto:dev-commits-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Feb 2021 00:40:49 -0000

The branch main has been updated by imp:

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

commit 4fc73e884c9d5e249e8510f7fd6f0269d19256c0
Author:     Warner Losh <imp@FreeBSD.org>
AuthorDate: 2021-02-04 00:38:52 +0000
Commit:     Warner Losh <imp@FreeBSD.org>
CommitDate: 2021-02-04 00:40:30 +0000

    Convert vendor imports to git instructions
---
 .../developers-handbook/policies/chapter.adoc      | 257 +++++++++++++--------
 1 file changed, 158 insertions(+), 99 deletions(-)

diff --git a/documentation/content/en/books/developers-handbook/policies/chapter.adoc b/documentation/content/en/books/developers-handbook/policies/chapter.adoc
index 0f437fd48c..bd3eec64bb 100644
--- a/documentation/content/en/books/developers-handbook/policies/chapter.adoc
+++ b/documentation/content/en/books/developers-handbook/policies/chapter.adoc
@@ -77,154 +77,213 @@ Ultimately, however, it comes down to the people actually doing the work. If usi
 Because it makes it harder to import future versions minor, trivial and/or cosmetic changes are _strongly discouraged_ on files that are still tracking the vendor branch.
 ====
 
-[[vendor-import-svn]]
-=== Vendor Imports with SVN
+[[vendor-import-git]]
+=== Vendor Imports with Git
 
-This section describes the vendor import procedure with Subversion in details.
+This section describes the vendor import procedure with git in detail.
+
+[.conventions]
+. *Branch naming convention*
+All vendor branches and tags start with `vendor/` and are branches and
+tags visible by default. Prior drafts of this document had them directly under
+`refs/vendor` rather than `refs/heads/vendor` and `refs/tags/vendor` (the git
+defaults) so early adopters that have the older refs may need to clean them up.
+
+[NOTE]
+====
+This chapter follows the convention that the `freebsd` origin is the source of truth. If you use a different convention, replace `freebsd` with your name as appopriate.
+====
+
+
+We'll explore an example for updating NetBSD's mtree that's in our
+tree. The vendor branch for this is `vendor/NetBSD/mtree`.
 
 [.procedure]
-. *Preparing the Tree*
-+ 
-If this is your first import after the switch to SVN, you will have to flatten and clean up the vendor tree, and bootstrap merge history in the main tree. If not, you can safely omit this step.
+. *Updating an old vendor import*
+Since the trees we have in vendor branches are usually a tiny subset of
+the FreeBSD, it's best to do them with work trees since the process is
+quite fast. Make sure that whatever directory you choose (the
+`../mtree`) argument is empty and doesn't conflict.
+[source,bash]
+....
+% git worktree add ../mtree vendor/NetBSD/mtree
+....
+. *Update the Sources in the Vendor Branch*
 + 
-During the conversion from CVS to SVN, vendor branches were imported with the same layout as the main tree. For example, the foo vendor sources ended up in [.filename]#vendor/foo/dist/contrib/foo#, but it is pointless and rather inconvenient. What we really want is to have the vendor source directly in [.filename]#vendor/foo/dist#, like this:
+Prepare a full, clean tree of the vendor sources. Import everything but merge only what is needed.
 +
+I have my copy of NetBSD checked out from their GitHub mirror in
+`~/git/NetBSD`, so I'll update from there: Note that "upstream" might
+have added or removed files, so we want to make sure deletions are
+propagated as well. rsync(1) is commonly installed, so I'll use that.
 [source,bash]
 ....
-% cd vendor/foo/dist/contrib/foo
-% svn move $(svn list) ../..
-% cd ../..
-% svn remove contrib
-% svn propdel -R svn:mergeinfo
-% svn commit
+% cd ../mtree
+% rsync -va --del --exclude=".git" ~/git/NetBSD/usr.sbin/mtree/ .
+% git add -A
+% git status
+...
+% git diff --staged
+...
+% git commit -m"Vendor import of NetBSD's mtree at 2020-12-11"
+[vendor/NetBSD/mtree 8e7aa25fcf1] Vendor import of NetBSD's mtree at 2020-12-11
+ 7 files changed, 114 insertions(+), 82 deletions(-)
+% git tag -a vendor/NetBSD/mtree/20201211
 ....
-+ 
-Note that, the `propdel` bit is necessary because starting with 1.5, Subversion will automatically add `svn:mergeinfo` to any directory you copy or move. In this case, you will not need this information, since you are not going to merge anything from the tree you deleted.
 +
-[NOTE]
-====
-You may want to flatten the tags as well. The procedure is exactly the same. If you do this, put off the commit until the end.
-====
-+ 
-Check the [.filename]#dist# tree and perform any cleanup that is deemed to be necessary. You may want to disable keyword expansion, as it makes no sense on unmodified vendor code. In some cases, it can be even be harmful.
+Note: I run the `git diff` and `git status` commands to make sure nothing weird
+was present. Also I used `-m` to illustrate, but you should compose a proper
+message in an editor (using a commit message template).
 +
+It's also important to create an annotated tag, otherwise the push
+will be rejected. Only annotated tags are allowed to be pushed.
+. *Updating the FreeBSD Copy*
+At this point you can push the import to vendor into our repo.
 [source,bash]
 ....
-% svn propdel svn:keywords -R .
-% svn commit
+% git push --follow-tags freebsd vendor/NetBSD/mtree
 ....
-+ 
-Bootstrapping of `svn:mergeinfo` on the target directory (in the main tree) to the revision that corresponds to the last change was made to the vendor tree prior to importing new sources is also needed:
-+
+
+`--follow-tags` tells `git push` to also push tags associated with the locally committed revision.
+. *Updating the FreeBSD source tree*
+Now you need to update the mtree in FreeBSD. The sources live in
+`contrib/mtree` since it is upstream software.
 [source,bash]
 ....
-% cd head/contrib/foo
-% svn merge --record-only ^/vendor/foo/dist@12345678 .
-% svn commit
+% cd ../src
+% git subtree merge -P contrib/mtree vendor/NetBSD/mtree
 ....
-+ 
-With some shells, the `^` in the above command may need to be escaped with a backslash.
-. *Importing New Sources*
-+ 
-Prepare a full, clean tree of the vendor sources. With SVN, we can keep a full distribution in the vendor tree without bloating the main tree. Import everything but merge only what is needed.
-+ 
-Note that you will need to add any files that were added since the last vendor import, and remove any that were removed. To facilitate this, you should prepare sorted lists of the contents of the vendor tree and of the sources you are about to import:
+This would generate a subtree merge commit of `contrib/mtree` against the local `vendor/NetBSD/mtree` branch. If there were conflicts, you would need to fix them before committing.
++
+. *Rebasing your change against latest FreeBSD source tree*
+Because the current policy recommends against using merges, if the upstream FreeBSD `main` moved forward
+before you get a chance to push, you would have to redo the merge.
++
+Regular `git rebase` or `git pull --rebase` doesn't know how to rebase a merge commit **as a merge commit**,
+so instead of that you would have to recreate the commit.
++
+The easiest way to do this would be to create a side branch with the **contents** of the merged tree:
 +
 [source,bash]
 ....
-% cd vendor/foo/dist
-% svn list -R | grep -v '/$' | sort > ../old
-% cd ../foo-9.9
-% find . -type f | cut -c 3- | sort > ../new
+% cd ../src
+% git fetch freebsd
+% git checkout -b merge_result
+% git merge freebsd/main
 ....
-+ 
-With these two files, the following command will list removed files (files only in [.filename]#old#):
 +
+Typically, there would be no merge conflicts here (because developers tends to work on different components).
+In the worst case scenario, you would still have to resolve merge conflicts, if there was any, but this
+should be really rare.
++
+Now, checkout `freebsd/main` again as `new_merge`, and redo the merge:
 [source,bash]
 ....
-% comm -23 ../old ../new
+% git checkout -b new_merge freebsd/main
+% git subtree merge -P contrib/mtree vendor/NetBSD/mtree
 ....
-+ 
-While the command below will list added files (files only in [.filename]#new#):
+Instead of resolving the conflicts, perform this instead:
+[source,bash]
+....
+% git checkout merge_result .
+....
+Which will overwrite the files with conflicts with the version found in `merge_result`.
 +
+Examine the tree against `merge_result` to make sure that you haven't missed deleted files:
 [source,bash]
 ....
-% comm -13 ../old ../new
+% git diff merge_result
 ....
-+ 
-Let us put this together:
+. *Creating a new vendor branch*
+There's a number of ways to create a new vendor branch. The easiest is
+to create a new repository and then merge that with FreeBSD. Let's say
+we're importing `glorbnitz` into the FreeBSD tree, release 3.1415. For
+the sake of simplicity, we'll not trim this release. It's a user
+command that puts the nitz device into different magical glorb states.
 +
+. *Create the repo*
 [source,bash]
 ....
-% cd vendor/foo/foo-9.9
-% tar cf - . | tar xf - -C ../dist
-% cd ../dist
-% comm -23 ../old ../new | xargs svn remove
-% comm -13 ../old ../new | xargs svn add
+% cd /some/where
+% mkdir glorbnitz
+% cd glorbnitz
+% git init
+% git checkout -b vendor/glorbnitz
 ....
+At this point, you have a new repo, where all new commits will go on
+the `vendor/glorbnitz` branch.
 +
-[WARNING]
-====
-
-If there are new directories in the new distribution, the last command will fail. You will have to add the directories, and run it again. Conversely, if any directories were removed, you will have to remove them manually.
-====
-+ 
-Check properties on any new files:
-
-** All text files should have `svn:eol-style` set to `native`.
-** All binary files should have `svn:mime-type` set to `application/octet-stream`, unless there is a more appropriate media type.
-** Executable files should have `svn:executable` set to `*`.
-** There should be no other properties on any file in the tree.
+(Git professionals can also do this right in their FreeBSD clone, if they know
+how to create a new root commit that's not attached to anything, e.g.
+`git checkout --orphan vendor/glorbnitz`)
 +
-[NOTE]
-====
-You are ready to commit, but you should first check the output of `svn stat` and `svn diff` to make sure everything is in order.
-====
-+ 
-Once you have committed the new vendor release, you should tag it for future reference. The best and quickest way is to do it directly in the repository:
+. *Copy the sources in*
+Since this is a new import, you can just cp the sources in, or use tar or
+even rsync as shown above. And we'll add everything, assuming no dot files.
+[source,bash]
+....
+% cp -r ~/glorbnitz/* .
+% git add *
+....
++
+At this point, you should have a pristine copy of glorbnitz ready to commit.
 +
 [source,bash]
 ....
-% svn copy ^/vendor/foo/dist svn_base/vendor/foo/9.9
+% git commit -m"Import GlorbNitz frobnosticator revision 3.1415"
 ....
-+ 
-To get the new tag, you can update your working copy of [.filename]#vendor/foo#.
+As above, I used `-m` for simplicity, but you should likely create a
+commit message that explains what a Glorb is and why you'd use a Nitz
+to get it. Not everybody will know.
 +
-[NOTE]
-====
-If you choose to do the copy in the checkout instead, do not forget to remove the generated `svn:mergeinfo` as described above.
-====
-
-. *Merging to __-HEAD__*
-+ 
-After you have prepared your import, it is time to merge. Option `--accept=postpone` tells SVN not to handle merge conflicts yet, because they will be taken care of manually:
+. *Now import it into our repository*
+Now you need to import the branch into our repository.
+[source,bash]
+....
+% cd /path/to/freebsd/repo/src
+% git remote add glorbnitz /some/where/glorbnitz
+% git fetch glorbnitz vendor/glorbnitz
+....
+Note the vendor/glorbnitz branch is in the repo. At this point the
+`/some/where/glorbnitz` can be deleted, if you like. It was only a means
+to an end.
 +
+. *Tag and push*
+Steps from here on out are much the same as they are in the case of
+updating a vendor branch, though w/o the updating the vendor
+branch step.
 [source,bash]
 ....
-% cd head/contrib/foo
-% svn update
-% svn merge --accept=postpone ^/vendor/foo/dist
+% git worktree add ../glorbnitz vendor/glorbnitz
+% cd ../glorbnitz
+% git tag --annotate vendor/glorbnitz/3.1415
+# Make sure it's good
+% git push --follow-tags freebsd vendor/glorbnitz
 ....
-+ 
-Resolve any conflicts, and make sure that any files that were added or removed in the vendor tree have been properly added or removed in the main tree. It is always a good idea to check differences against the vendor branch:
+By 'good' we mean:
+1. All the right files are present
+2. None of the wrong files are present
+3. The vendor branch points at something sensible
+4. The tag looks good, and is annotated.
 +
+. *Time to finally merge it into the base tree*
 [source,bash]
 ....
-% svn diff --no-diff-deleted --old=^/vendor/foo/dist --new=.
+% cd ../src
+% git subtree add -P contrib/glorbnitz vendor/glorbnitz
+# Make sure it's good
+% git push freebsd
 ....
-+ 
-`--no-diff-deleted` tells SVN not to check files that are in the vendor tree but not in the main tree.
+Here 'good' means:
+1. All the right files, and none of the wrong ones, were merged into contrib/glorbnitz.
+2. No other changes are in the tree
+3. The commit messages look good.
 +
 [NOTE]
-====
-With SVN, there is no concept of on or off the vendor branch. If a file that previously had local modifications no longer does, just remove any left-over cruft, such as FreeBSD version tags, so it no longer shows up in diffs against the vendor tree.
-====
-+ 
-If any changes are required for the world to build with the new sources, make them now - and test until you are satisfied that everything build and runs correctly.
-. *Commit*
-+ 
-Now, you are ready to commit. Make sure you get everything in one go. Ideally, you would have done all steps in a clean tree, in which case you can just commit from the top of that tree. That is the best way to avoid surprises. If you do it properly, the tree will move atomically from a consistent state with the old code to a consistent state with the new code.
-
+===
+This hasn't connected `glorbnitz` to the build yet. How to do
+that hasn't changed and is beyond the scope of this article.
+===
 [[policies-encumbered]]
 == Encumbered Files
 

From owner-dev-commits-doc-all@freebsd.org  Thu Feb  4 00:44:53 2021
Return-Path: <owner-dev-commits-doc-all@freebsd.org>
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 0BF15531E2D
 for <dev-commits-doc-all@mailman.nyi.freebsd.org>;
 Thu,  4 Feb 2021 00:44:53 +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 4DWKZX6Z7dz4Y9P;
 Thu,  4 Feb 2021 00:44:52 +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 D01C62AA33;
 Thu,  4 Feb 2021 00:44:52 +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 1140iqwD097254;
 Thu, 4 Feb 2021 00:44:52 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
 by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1140iqVa097251;
 Thu, 4 Feb 2021 00:44:52 GMT (envelope-from git)
Date: Thu, 4 Feb 2021 00:44:52 GMT
Message-Id: <202102040044.1140iqVa097251@gitrepo.freebsd.org>
To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org
From: Warner Losh <imp@FreeBSD.org>
Subject: git: e11aaf5a76 - main - Revert "Convert vendor imports to git
 instructions"
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: imp
X-Git-Repository: doc
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: e11aaf5a76d696458092bbde8f3e8f88cfbb3e96
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
 <dev-commits-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-doc-all/>
List-Post: <mailto:dev-commits-doc-all@freebsd.org>
List-Help: <mailto:dev-commits-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Feb 2021 00:44:53 -0000

The branch main has been updated by imp:

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

commit e11aaf5a76d696458092bbde8f3e8f88cfbb3e96
Author:     Warner Losh <imp@FreeBSD.org>
AuthorDate: 2021-02-04 00:43:45 +0000
Commit:     Warner Losh <imp@FreeBSD.org>
CommitDate: 2021-02-04 00:43:45 +0000

    Revert "Convert vendor imports to git instructions"
    
    This reverts commit 4fc73e884c9d5e249e8510f7fd6f0269d19256c0.
    
    4fc73e884c9d was pushed w/o review by mistake.
---
 .../developers-handbook/policies/chapter.adoc      | 257 ++++++++-------------
 1 file changed, 99 insertions(+), 158 deletions(-)

diff --git a/documentation/content/en/books/developers-handbook/policies/chapter.adoc b/documentation/content/en/books/developers-handbook/policies/chapter.adoc
index bd3eec64bb..0f437fd48c 100644
--- a/documentation/content/en/books/developers-handbook/policies/chapter.adoc
+++ b/documentation/content/en/books/developers-handbook/policies/chapter.adoc
@@ -77,213 +77,154 @@ Ultimately, however, it comes down to the people actually doing the work. If usi
 Because it makes it harder to import future versions minor, trivial and/or cosmetic changes are _strongly discouraged_ on files that are still tracking the vendor branch.
 ====
 
-[[vendor-import-git]]
-=== Vendor Imports with Git
+[[vendor-import-svn]]
+=== Vendor Imports with SVN
 
-This section describes the vendor import procedure with git in detail.
-
-[.conventions]
-. *Branch naming convention*
-All vendor branches and tags start with `vendor/` and are branches and
-tags visible by default. Prior drafts of this document had them directly under
-`refs/vendor` rather than `refs/heads/vendor` and `refs/tags/vendor` (the git
-defaults) so early adopters that have the older refs may need to clean them up.
-
-[NOTE]
-====
-This chapter follows the convention that the `freebsd` origin is the source of truth. If you use a different convention, replace `freebsd` with your name as appopriate.
-====
-
-
-We'll explore an example for updating NetBSD's mtree that's in our
-tree. The vendor branch for this is `vendor/NetBSD/mtree`.
+This section describes the vendor import procedure with Subversion in details.
 
 [.procedure]
-. *Updating an old vendor import*
-Since the trees we have in vendor branches are usually a tiny subset of
-the FreeBSD, it's best to do them with work trees since the process is
-quite fast. Make sure that whatever directory you choose (the
-`../mtree`) argument is empty and doesn't conflict.
-[source,bash]
-....
-% git worktree add ../mtree vendor/NetBSD/mtree
-....
-. *Update the Sources in the Vendor Branch*
+. *Preparing the Tree*
 + 
-Prepare a full, clean tree of the vendor sources. Import everything but merge only what is needed.
+If this is your first import after the switch to SVN, you will have to flatten and clean up the vendor tree, and bootstrap merge history in the main tree. If not, you can safely omit this step.
++ 
+During the conversion from CVS to SVN, vendor branches were imported with the same layout as the main tree. For example, the foo vendor sources ended up in [.filename]#vendor/foo/dist/contrib/foo#, but it is pointless and rather inconvenient. What we really want is to have the vendor source directly in [.filename]#vendor/foo/dist#, like this:
 +
-I have my copy of NetBSD checked out from their GitHub mirror in
-`~/git/NetBSD`, so I'll update from there: Note that "upstream" might
-have added or removed files, so we want to make sure deletions are
-propagated as well. rsync(1) is commonly installed, so I'll use that.
 [source,bash]
 ....
-% cd ../mtree
-% rsync -va --del --exclude=".git" ~/git/NetBSD/usr.sbin/mtree/ .
-% git add -A
-% git status
-...
-% git diff --staged
-...
-% git commit -m"Vendor import of NetBSD's mtree at 2020-12-11"
-[vendor/NetBSD/mtree 8e7aa25fcf1] Vendor import of NetBSD's mtree at 2020-12-11
- 7 files changed, 114 insertions(+), 82 deletions(-)
-% git tag -a vendor/NetBSD/mtree/20201211
+% cd vendor/foo/dist/contrib/foo
+% svn move $(svn list) ../..
+% cd ../..
+% svn remove contrib
+% svn propdel -R svn:mergeinfo
+% svn commit
 ....
++ 
+Note that, the `propdel` bit is necessary because starting with 1.5, Subversion will automatically add `svn:mergeinfo` to any directory you copy or move. In this case, you will not need this information, since you are not going to merge anything from the tree you deleted.
 +
-Note: I run the `git diff` and `git status` commands to make sure nothing weird
-was present. Also I used `-m` to illustrate, but you should compose a proper
-message in an editor (using a commit message template).
+[NOTE]
+====
+You may want to flatten the tags as well. The procedure is exactly the same. If you do this, put off the commit until the end.
+====
++ 
+Check the [.filename]#dist# tree and perform any cleanup that is deemed to be necessary. You may want to disable keyword expansion, as it makes no sense on unmodified vendor code. In some cases, it can be even be harmful.
 +
-It's also important to create an annotated tag, otherwise the push
-will be rejected. Only annotated tags are allowed to be pushed.
-. *Updating the FreeBSD Copy*
-At this point you can push the import to vendor into our repo.
 [source,bash]
 ....
-% git push --follow-tags freebsd vendor/NetBSD/mtree
+% svn propdel svn:keywords -R .
+% svn commit
 ....
-
-`--follow-tags` tells `git push` to also push tags associated with the locally committed revision.
-. *Updating the FreeBSD source tree*
-Now you need to update the mtree in FreeBSD. The sources live in
-`contrib/mtree` since it is upstream software.
-[source,bash]
-....
-% cd ../src
-% git subtree merge -P contrib/mtree vendor/NetBSD/mtree
-....
-This would generate a subtree merge commit of `contrib/mtree` against the local `vendor/NetBSD/mtree` branch. If there were conflicts, you would need to fix them before committing.
-+
-. *Rebasing your change against latest FreeBSD source tree*
-Because the current policy recommends against using merges, if the upstream FreeBSD `main` moved forward
-before you get a chance to push, you would have to redo the merge.
-+
-Regular `git rebase` or `git pull --rebase` doesn't know how to rebase a merge commit **as a merge commit**,
-so instead of that you would have to recreate the commit.
-+
-The easiest way to do this would be to create a side branch with the **contents** of the merged tree:
++ 
+Bootstrapping of `svn:mergeinfo` on the target directory (in the main tree) to the revision that corresponds to the last change was made to the vendor tree prior to importing new sources is also needed:
 +
 [source,bash]
 ....
-% cd ../src
-% git fetch freebsd
-% git checkout -b merge_result
-% git merge freebsd/main
+% cd head/contrib/foo
+% svn merge --record-only ^/vendor/foo/dist@12345678 .
+% svn commit
 ....
++ 
+With some shells, the `^` in the above command may need to be escaped with a backslash.
+. *Importing New Sources*
++ 
+Prepare a full, clean tree of the vendor sources. With SVN, we can keep a full distribution in the vendor tree without bloating the main tree. Import everything but merge only what is needed.
++ 
+Note that you will need to add any files that were added since the last vendor import, and remove any that were removed. To facilitate this, you should prepare sorted lists of the contents of the vendor tree and of the sources you are about to import:
 +
-Typically, there would be no merge conflicts here (because developers tends to work on different components).
-In the worst case scenario, you would still have to resolve merge conflicts, if there was any, but this
-should be really rare.
-+
-Now, checkout `freebsd/main` again as `new_merge`, and redo the merge:
-[source,bash]
-....
-% git checkout -b new_merge freebsd/main
-% git subtree merge -P contrib/mtree vendor/NetBSD/mtree
-....
-Instead of resolving the conflicts, perform this instead:
 [source,bash]
 ....
-% git checkout merge_result .
+% cd vendor/foo/dist
+% svn list -R | grep -v '/$' | sort > ../old
+% cd ../foo-9.9
+% find . -type f | cut -c 3- | sort > ../new
 ....
-Which will overwrite the files with conflicts with the version found in `merge_result`.
++ 
+With these two files, the following command will list removed files (files only in [.filename]#old#):
 +
-Examine the tree against `merge_result` to make sure that you haven't missed deleted files:
 [source,bash]
 ....
-% git diff merge_result
+% comm -23 ../old ../new
 ....
-. *Creating a new vendor branch*
-There's a number of ways to create a new vendor branch. The easiest is
-to create a new repository and then merge that with FreeBSD. Let's say
-we're importing `glorbnitz` into the FreeBSD tree, release 3.1415. For
-the sake of simplicity, we'll not trim this release. It's a user
-command that puts the nitz device into different magical glorb states.
++ 
+While the command below will list added files (files only in [.filename]#new#):
 +
-. *Create the repo*
 [source,bash]
 ....
-% cd /some/where
-% mkdir glorbnitz
-% cd glorbnitz
-% git init
-% git checkout -b vendor/glorbnitz
+% comm -13 ../old ../new
 ....
-At this point, you have a new repo, where all new commits will go on
-the `vendor/glorbnitz` branch.
-+
-(Git professionals can also do this right in their FreeBSD clone, if they know
-how to create a new root commit that's not attached to anything, e.g.
-`git checkout --orphan vendor/glorbnitz`)
++ 
+Let us put this together:
 +
-. *Copy the sources in*
-Since this is a new import, you can just cp the sources in, or use tar or
-even rsync as shown above. And we'll add everything, assuming no dot files.
 [source,bash]
 ....
-% cp -r ~/glorbnitz/* .
-% git add *
+% cd vendor/foo/foo-9.9
+% tar cf - . | tar xf - -C ../dist
+% cd ../dist
+% comm -23 ../old ../new | xargs svn remove
+% comm -13 ../old ../new | xargs svn add
 ....
 +
-At this point, you should have a pristine copy of glorbnitz ready to commit.
+[WARNING]
+====
+
+If there are new directories in the new distribution, the last command will fail. You will have to add the directories, and run it again. Conversely, if any directories were removed, you will have to remove them manually.
+====
++ 
+Check properties on any new files:
+
+** All text files should have `svn:eol-style` set to `native`.
+** All binary files should have `svn:mime-type` set to `application/octet-stream`, unless there is a more appropriate media type.
+** Executable files should have `svn:executable` set to `*`.
+** There should be no other properties on any file in the tree.
 +
-[source,bash]
-....
-% git commit -m"Import GlorbNitz frobnosticator revision 3.1415"
-....
-As above, I used `-m` for simplicity, but you should likely create a
-commit message that explains what a Glorb is and why you'd use a Nitz
-to get it. Not everybody will know.
+[NOTE]
+====
+You are ready to commit, but you should first check the output of `svn stat` and `svn diff` to make sure everything is in order.
+====
++ 
+Once you have committed the new vendor release, you should tag it for future reference. The best and quickest way is to do it directly in the repository:
 +
-. *Now import it into our repository*
-Now you need to import the branch into our repository.
 [source,bash]
 ....
-% cd /path/to/freebsd/repo/src
-% git remote add glorbnitz /some/where/glorbnitz
-% git fetch glorbnitz vendor/glorbnitz
+% svn copy ^/vendor/foo/dist svn_base/vendor/foo/9.9
 ....
-Note the vendor/glorbnitz branch is in the repo. At this point the
-`/some/where/glorbnitz` can be deleted, if you like. It was only a means
-to an end.
++ 
+To get the new tag, you can update your working copy of [.filename]#vendor/foo#.
++
+[NOTE]
+====
+If you choose to do the copy in the checkout instead, do not forget to remove the generated `svn:mergeinfo` as described above.
+====
+
+. *Merging to __-HEAD__*
++ 
+After you have prepared your import, it is time to merge. Option `--accept=postpone` tells SVN not to handle merge conflicts yet, because they will be taken care of manually:
 +
-. *Tag and push*
-Steps from here on out are much the same as they are in the case of
-updating a vendor branch, though w/o the updating the vendor
-branch step.
 [source,bash]
 ....
-% git worktree add ../glorbnitz vendor/glorbnitz
-% cd ../glorbnitz
-% git tag --annotate vendor/glorbnitz/3.1415
-# Make sure it's good
-% git push --follow-tags freebsd vendor/glorbnitz
+% cd head/contrib/foo
+% svn update
+% svn merge --accept=postpone ^/vendor/foo/dist
 ....
-By 'good' we mean:
-1. All the right files are present
-2. None of the wrong files are present
-3. The vendor branch points at something sensible
-4. The tag looks good, and is annotated.
++ 
+Resolve any conflicts, and make sure that any files that were added or removed in the vendor tree have been properly added or removed in the main tree. It is always a good idea to check differences against the vendor branch:
 +
-. *Time to finally merge it into the base tree*
 [source,bash]
 ....
-% cd ../src
-% git subtree add -P contrib/glorbnitz vendor/glorbnitz
-# Make sure it's good
-% git push freebsd
+% svn diff --no-diff-deleted --old=^/vendor/foo/dist --new=.
 ....
-Here 'good' means:
-1. All the right files, and none of the wrong ones, were merged into contrib/glorbnitz.
-2. No other changes are in the tree
-3. The commit messages look good.
++ 
+`--no-diff-deleted` tells SVN not to check files that are in the vendor tree but not in the main tree.
 +
 [NOTE]
-===
-This hasn't connected `glorbnitz` to the build yet. How to do
-that hasn't changed and is beyond the scope of this article.
-===
+====
+With SVN, there is no concept of on or off the vendor branch. If a file that previously had local modifications no longer does, just remove any left-over cruft, such as FreeBSD version tags, so it no longer shows up in diffs against the vendor tree.
+====
++ 
+If any changes are required for the world to build with the new sources, make them now - and test until you are satisfied that everything build and runs correctly.
+. *Commit*
++ 
+Now, you are ready to commit. Make sure you get everything in one go. Ideally, you would have done all steps in a clean tree, in which case you can just commit from the top of that tree. That is the best way to avoid surprises. If you do it properly, the tree will move atomically from a consistent state with the old code to a consistent state with the new code.
+
 [[policies-encumbered]]
 == Encumbered Files
 

From owner-dev-commits-doc-all@freebsd.org  Thu Feb  4 14:42:09 2021
Return-Path: <owner-dev-commits-doc-all@freebsd.org>
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 A1E6954589A
 for <dev-commits-doc-all@mailman.nyi.freebsd.org>;
 Thu,  4 Feb 2021 14:42:09 +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 4DWh8d3vMXz4S3J;
 Thu,  4 Feb 2021 14:42:09 +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 6E3E858C9;
 Thu,  4 Feb 2021 14:42:09 +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 114Eg9mi092159;
 Thu, 4 Feb 2021 14:42:09 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
 by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 114Eg9Z8092158;
 Thu, 4 Feb 2021 14:42:09 GMT (envelope-from git)
Date: Thu, 4 Feb 2021 14:42:09 GMT
Message-Id: <202102041442.114Eg9Z8092158@gitrepo.freebsd.org>
To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org
From: Ed Maste <emaste@FreeBSD.org>
Subject: git: fbc1409c73 - main - Use @generated in generated files
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: emaste
X-Git-Repository: doc
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: fbc1409c73012ea3d33c1bad851530ed29eb80da
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
 <dev-commits-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-doc-all/>
List-Post: <mailto:dev-commits-doc-all@freebsd.org>
List-Help: <mailto:dev-commits-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Feb 2021 14:42:09 -0000

The branch main has been updated by emaste (src committer):

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

commit fbc1409c73012ea3d33c1bad851530ed29eb80da
Author:     Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2021-02-01 17:55:05 +0000
Commit:     Ed Maste <emaste@FreeBSD.org>
CommitDate: 2021-02-04 14:39:06 +0000

    Use @generated in generated files
    
    @generated is used by various tools to identify generated files.
    For example, Phabricator will not display diffs in generated files
    by default.
    
    Reviewed by:    gjb
    Sponsored by:   The FreeBSD Foundation
    Differential Revision:  https://reviews.freebsd.org/D28446
---
 documentation/tools/books-toc-creator.py          | 2 +-
 documentation/tools/books-toc-examples-creator.py | 2 +-
 documentation/tools/books-toc-figures-creator.py  | 2 +-
 documentation/tools/books-toc-parts-creator.py    | 2 +-
 documentation/tools/books-toc-tables-creator.py   | 2 +-
 website/tools/releases-toml.py                    | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/documentation/tools/books-toc-creator.py b/documentation/tools/books-toc-creator.py
index 5d05448801..f5b4721a69 100644
--- a/documentation/tools/books-toc-creator.py
+++ b/documentation/tools/books-toc-creator.py
@@ -143,7 +143,7 @@ def main(argv):
     with open('./content/{0}/books/handbook/chapters-order.adoc'.format(language), 'r', encoding = 'utf-8') as chaptersFile:
       chapters = [line.strip() for line in chaptersFile]
 
-    toc =  "// Code generated by the FreeBSD Documentation toolchain. DO NOT EDIT.\n"
+    toc =  "// Code @" + "generated by the FreeBSD Documentation toolchain. DO NOT EDIT.\n"
     toc += "// Please don't change this file manually but run `make` to update it.\n"
     toc += "// For more information, please read the FreeBSD Documentation Project Primer\n\n"
     toc += "[.toc]\n"
diff --git a/documentation/tools/books-toc-examples-creator.py b/documentation/tools/books-toc-examples-creator.py
index 1040b3cdfb..f72ffa945e 100644
--- a/documentation/tools/books-toc-examples-creator.py
+++ b/documentation/tools/books-toc-examples-creator.py
@@ -75,7 +75,7 @@ def main(argv):
         with open('./content/{0}/books/{1}/chapters-order.adoc'.format(language, book), 'r', encoding = 'utf-8') as chaptersFile:
           chapters = [line.strip() for line in chaptersFile]
 
-        toc =  "// Code generated by the FreeBSD Documentation toolchain. DO NOT EDIT.\n"
+        toc =  "// Code @" + "generated by the FreeBSD Documentation toolchain. DO NOT EDIT.\n"
         toc += "// Please don't change this file manually but run `make` to update it.\n"
         toc += "// For more information, please read the FreeBSD Documentation Project Primer\n\n"
         toc += "[.toc]\n"
diff --git a/documentation/tools/books-toc-figures-creator.py b/documentation/tools/books-toc-figures-creator.py
index 05139ffa80..46bea6226b 100644
--- a/documentation/tools/books-toc-figures-creator.py
+++ b/documentation/tools/books-toc-figures-creator.py
@@ -75,7 +75,7 @@ def main(argv):
         with open('./content/{0}/books/{1}/chapters-order.adoc'.format(language, book), 'r', encoding = 'utf-8') as chaptersFile:
           chapters = [line.strip() for line in chaptersFile]
 
-        toc =  "// Code generated by the FreeBSD Documentation toolchain. DO NOT EDIT.\n"
+        toc =  "// Code @" + "generated by the FreeBSD Documentation toolchain. DO NOT EDIT.\n"
         toc += "// Please don't change this file manually but run `make` to update it.\n"
         toc += "// For more information, please read the FreeBSD Documentation Project Primer\n\n"
         toc += "[.toc]\n"
diff --git a/documentation/tools/books-toc-parts-creator.py b/documentation/tools/books-toc-parts-creator.py
index d36e8a3dde..86ed31fbd1 100644
--- a/documentation/tools/books-toc-parts-creator.py
+++ b/documentation/tools/books-toc-parts-creator.py
@@ -20,7 +20,7 @@ def cleanTocFile(language, tocCounter):
         tocFile.truncate(0)
 
 def appendCommendAndTitle(language, tocCounter, tocContent):
-  toc =  "// Code generated by the FreeBSD Documentation toolchain. DO NOT EDIT.\n"
+  toc =  "// Code @" + "generated by the FreeBSD Documentation toolchain. DO NOT EDIT.\n"
   toc += "// Please don't change this file manually but run `make` to update it.\n"
   toc += "// For more information, please read the FreeBSD Documentation Project Primer\n\n"
   toc += "[.toc]\n"
diff --git a/documentation/tools/books-toc-tables-creator.py b/documentation/tools/books-toc-tables-creator.py
index 7ebd7acdec..592330b7a4 100644
--- a/documentation/tools/books-toc-tables-creator.py
+++ b/documentation/tools/books-toc-tables-creator.py
@@ -75,7 +75,7 @@ def main(argv):
         with open('./content/{0}/books/{1}/chapters-order.adoc'.format(language, book), 'r', encoding = 'utf-8') as chaptersFile:
           chapters = [line.strip() for line in chaptersFile]
 
-        toc =  "// Code generated by the FreeBSD Documentation toolchain. DO NOT EDIT.\n"
+        toc =  "// Code @" + "generated by the FreeBSD Documentation toolchain. DO NOT EDIT.\n"
         toc += "// Please don't change this file manually but run `make` to update it.\n"
         toc += "// For more information, please read the FreeBSD Documentation Project Primer\n\n"
         toc += "[.toc]\n"
diff --git a/website/tools/releases-toml.py b/website/tools/releases-toml.py
index 2e0b72b688..2dc96d310f 100644
--- a/website/tools/releases-toml.py
+++ b/website/tools/releases-toml.py
@@ -49,7 +49,7 @@ def main(argv):
     elif opt in ("-p", "--path"):
       path = arg
 
-  releasesTOML =  "# Code generated by the FreeBSD Documentation toolchain. DO NOT EDIT.\n"
+  releasesTOML =  "# Code @" + "generated by the FreeBSD Documentation toolchain. DO NOT EDIT.\n"
   releasesTOML += "# Please don't change this file manually but run `make` to update it.\n"
   releasesTOML += "# For more information, please read the FreeBSD Documentation Project Primer\n"
   releasesTOML += '\n'

From owner-dev-commits-doc-all@freebsd.org  Thu Feb  4 14:42:10 2021
Return-Path: <owner-dev-commits-doc-all@freebsd.org>
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 CB6A454589B
 for <dev-commits-doc-all@mailman.nyi.freebsd.org>;
 Thu,  4 Feb 2021 14:42:10 +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 4DWh8f4rcrz4S12;
 Thu,  4 Feb 2021 14:42:10 +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 991835B83;
 Thu,  4 Feb 2021 14:42:10 +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 114EgAp7092182;
 Thu, 4 Feb 2021 14:42:10 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
 by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 114EgAhE092181;
 Thu, 4 Feb 2021 14:42:10 GMT (envelope-from git)
Date: Thu, 4 Feb 2021 14:42:10 GMT
Message-Id: <202102041442.114EgAhE092181@gitrepo.freebsd.org>
To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org
From: Ed Maste <emaste@FreeBSD.org>
Subject: git: 985dccbda6 - main - FreeBSD 12.1 (and 11.3) are EOL
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: emaste
X-Git-Repository: doc
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 985dccbda6f1a272bbe052c40c76aebd554edaaa
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
 <dev-commits-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-doc-all/>
List-Post: <mailto:dev-commits-doc-all@freebsd.org>
List-Help: <mailto:dev-commits-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Feb 2021 14:42:10 -0000

The branch main has been updated by emaste (src committer):

URL: https://cgit.FreeBSD.org/doc/commit/?id=985dccbda6f1a272bbe052c40c76aebd554edaaa

commit 985dccbda6f1a272bbe052c40c76aebd554edaaa
Author:     Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2021-02-04 14:38:42 +0000
Commit:     Ed Maste <emaste@FreeBSD.org>
CommitDate: 2021-02-04 14:39:06 +0000

    FreeBSD 12.1 (and 11.3) are EOL
---
 website/content/en/releases/_index.adoc   | 3 +--
 website/content/en/releng/_index.adoc     | 4 ++--
 website/content/en/security/_index.adoc   | 1 -
 website/themes/beastie/layouts/index.html | 1 -
 4 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/website/content/en/releases/_index.adoc b/website/content/en/releases/_index.adoc
index 59527f8b31..074ae136af 100644
--- a/website/content/en/releases/_index.adoc
+++ b/website/content/en/releases/_index.adoc
@@ -27,8 +27,6 @@ Complete information about the release date and the estimated End-Of-Life (EOL)
 
 *Release {rel122-current}* ({rel122-current-date}) _link:{u-rel122-announce}[Announcement] : link:{u-rel122-notes}[Release Notes] : link:{u-rel122-installation}[Installation Instructions] : link:{u-rel122-hardware}[Hardware Compatibility List] : link:{u-rel122-readme}[Readme] : link:{u-rel122-errata}[Errata] : link:{u-rel122-signatures}[Signed Checksums]_
 
-*Release {rel121-current}* ({rel121-current-date}) _link:{u-rel121-announce}[Announcement] : link:{u-rel121-notes}[Release Notes] : link:{u-rel121-installation}[Installation Instructions] : link:{u-rel121-hardware}[Hardware Compatibility List] : link:{u-rel121-readme}[Readme] : link:{u-rel121-errata}[Errata] : link:{u-rel121-signatures}[Signed Checksums]_
-
 *Release {rel114-current}* ({rel114-current-date}) _link:{u-rel114-announce}[Announcement] : link:{u-rel114-notes}[Release Notes] : link:{u-rel114-installation}[Installation Instructions] : link:{u-rel114-hardware}[Hardware Notes] : link:{u-rel114-readme}[Readme] : link:{u-rel114-errata}[Errata] : link:{u-rel114-signatures}[Checksums]_
 
 ////
@@ -49,6 +47,7 @@ The latest snapshots from our link:{handbook}#stable[FreeBSD-STABLE] and link:{h
 
 Complete historical information about the release date, the classification type, and the effective End-Of-Life (EOL) for these releases can be found on the link:../security/unsupported/[Unsupported Releases] section of the link:../security/[FreeBSD Security Information] page.
 
+* *{rel121-current}* ({rel121-current-date}) _link:{u-rel121-announce}[Announcement] : link:{u-rel121-notes}[Release Notes] : link:{u-rel121-installation}[Installation Instructions] : link:{u-rel121-hardware}[Hardware Compatibility List] : link:{u-rel121-readme}[Readme] : link:{u-rel121-errata}[Errata] : link:{u-rel121-signatures}[Signed Checksums]_
 * *12.0* (December, 2018) _link:12.0R/announce/[Announcement]: link:12.0R/relnotes/[Release Notes]: link:12.0R/installation/[Installation Instructions]: link:12.0R/hardware/[Hardware Notes]: link:12.0R/readme/[Readme]: link:12.0R/errata/[Errata]: link:12.0R/signatures/[Checksums]_
 * *11.3* (July, 2019) _link:11.3R/announce/[Announcement]: link:11.3R/relnotes/[Release Notes]: link:11.3R/installation/[Installation Instructions]: link:11.3R/hardware/[Hardware Notes]: link:11.3R/readme/[Readme]: link:11.3R/errata/[Errata]: link:11.3R/signatures/[Checksums]_
 * *11.2* (June, 2018) _link:11.2R/announce/[Announcement]: link:11.2R/relnotes/[Release Notes]: link:11.2R/installation/[Installation Instructions]: link:11.2R/hardware/[Hardware Notes]: link:11.2R/readme/[Readme]: link:11.2R/errata/[Errata]: link:11.2R/signatures/[Checksums]_
diff --git a/website/content/en/releng/_index.adoc b/website/content/en/releng/_index.adoc
index f0c3d1e5ce..cd1b5323a3 100644
--- a/website/content/en/releng/_index.adoc
+++ b/website/content/en/releng/_index.adoc
@@ -51,11 +51,11 @@ This table lists the code freeze status for major branches of the `src/` subtree
 //|`releng/13.0` |Frozen |re@FreeBSD.org |FreeBSD 13.0 supported errata fix branch.
 |`stable/12` |Open |committers |Development branch for FreeBSD 12-STABLE.
 |`releng/12.2`|Frozen|security-officer@FreeBSD.org|FreeBSD 12.2 supported errata fix branch.
-|`releng/12.1` |Frozen |security-officer@FreeBSD.org |FreeBSD 12.1 supported errata fix branch.
+|`releng/12.1` |Frozen |security-officer@FreeBSD.org |FreeBSD 12.1 errata fix branch (not officially supported)..
 |`releng/12.0` |Frozen |security-officer@FreeBSD.org |FreeBSD 12.0 errata fix branch (not officially supported).
 |`stable/11` |Open |committers |Development branch for FreeBSD 11-STABLE.
 |`releng/11.4` |Frozen |security-officer@FreeBSD.org |FreeBSD 11.4 supported errata fix branch.
-|`releng/11.3` |Frozen |security-officer@FreeBSD.org |FreeBSD 11.3 supported errata fix branch.
+|`releng/11.3` |Frozen |security-officer@FreeBSD.org |FreeBSD 11.3 errata fix branch (not officially supported).
 |`releng/11.2` |Frozen |security-officer@FreeBSD.org |FreeBSD 11.2 errata fix branch (not officially supported).
 |`releng/11.1` |Frozen |security-officer@FreeBSD.org |FreeBSD 11.1 errata fix branch (not officially supported).
 |`releng/11.0` |Frozen |security-officer@FreeBSD.org |FreeBSD 11.0 errata fix branch (not officially supported).
diff --git a/website/content/en/security/_index.adoc b/website/content/en/security/_index.adoc
index 49cba23dfd..2ce2eb63ff 100644
--- a/website/content/en/security/_index.adoc
+++ b/website/content/en/security/_index.adoc
@@ -98,7 +98,6 @@ link:unsupported[Older releases] are not supported and users are strongly encour
 |Branch |Release |Release Date |Expected EoL
 |stable/12 |n/a |n/a |June 30, 2024
 |releng/12.2 |12.2-RELEASE |October 27, 2020 |12.3-RELEASE + 3 months
-|releng/12.1 |12.1-RELEASE |November 4, 2019 |January 31, 2021
 |stable/11 |n/a |n/a |September 30, 2021
 |releng/11.4 |11.4-RELEASE |June 16, 2020 |September 30, 2021
 |===
diff --git a/website/themes/beastie/layouts/index.html b/website/themes/beastie/layouts/index.html
index 85a21c8e8c..f98f93cb08 100755
--- a/website/themes/beastie/layouts/index.html
+++ b/website/themes/beastie/layouts/index.html
@@ -49,7 +49,6 @@
               <li>
                 {{ i18n "production" }}:
                 <a href={{ index $.Site.Data.releases "u-rel122-announce" }}>{{ index $.Site.Data.releases "rel122-current" }}</a>,
-                <a href={{ index $.Site.Data.releases "u-rel121-announce" }}>{{ index $.Site.Data.releases "rel121-current" }}</a>,
                 <a href={{ index $.Site.Data.releases "u-rel114-announce" }}>{{ index $.Site.Data.releases "rel114-current" }}</a>
               </li>
               {{ $betaUpcoming := index $.Site.Data.releases "beta-upcoming" }}

From owner-dev-commits-doc-all@freebsd.org  Thu Feb  4 14:48:40 2021
Return-Path: <owner-dev-commits-doc-all@freebsd.org>
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 26E69545BD1
 for <dev-commits-doc-all@mailman.nyi.freebsd.org>;
 Thu,  4 Feb 2021 14:48:40 +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 4DWhJ80hdQz4SD4;
 Thu,  4 Feb 2021 14:48:40 +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 0A8FC59AC;
 Thu,  4 Feb 2021 14:48:40 +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 114Emdmq093452;
 Thu, 4 Feb 2021 14:48:39 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
 by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 114EmdtO093451;
 Thu, 4 Feb 2021 14:48:39 GMT (envelope-from git)
Date: Thu, 4 Feb 2021 14:48:39 GMT
Message-Id: <202102041448.114EmdtO093451@gitrepo.freebsd.org>
To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org
From: Ed Maste <emaste@FreeBSD.org>
Subject: git: 4fce6f3e90 - main - Remove accidental doubled . in 985dccbda6f1
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: emaste
X-Git-Repository: doc
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 4fce6f3e901150972a94842ffce5ec98d04f520a
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
 <dev-commits-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-doc-all/>
List-Post: <mailto:dev-commits-doc-all@freebsd.org>
List-Help: <mailto:dev-commits-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Feb 2021 14:48:40 -0000

The branch main has been updated by emaste (src committer):

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

commit 4fce6f3e901150972a94842ffce5ec98d04f520a
Author:     Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2021-02-04 14:47:03 +0000
Commit:     Ed Maste <emaste@FreeBSD.org>
CommitDate: 2021-02-04 14:47:26 +0000

    Remove accidental doubled . in 985dccbda6f1
---
 website/content/en/releng/_index.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website/content/en/releng/_index.adoc b/website/content/en/releng/_index.adoc
index cd1b5323a3..7681e2f15d 100644
--- a/website/content/en/releng/_index.adoc
+++ b/website/content/en/releng/_index.adoc
@@ -51,7 +51,7 @@ This table lists the code freeze status for major branches of the `src/` subtree
 //|`releng/13.0` |Frozen |re@FreeBSD.org |FreeBSD 13.0 supported errata fix branch.
 |`stable/12` |Open |committers |Development branch for FreeBSD 12-STABLE.
 |`releng/12.2`|Frozen|security-officer@FreeBSD.org|FreeBSD 12.2 supported errata fix branch.
-|`releng/12.1` |Frozen |security-officer@FreeBSD.org |FreeBSD 12.1 errata fix branch (not officially supported)..
+|`releng/12.1` |Frozen |security-officer@FreeBSD.org |FreeBSD 12.1 errata fix branch (not officially supported).
 |`releng/12.0` |Frozen |security-officer@FreeBSD.org |FreeBSD 12.0 errata fix branch (not officially supported).
 |`stable/11` |Open |committers |Development branch for FreeBSD 11-STABLE.
 |`releng/11.4` |Frozen |security-officer@FreeBSD.org |FreeBSD 11.4 supported errata fix branch.

From owner-dev-commits-doc-all@freebsd.org  Thu Feb  4 17:11:14 2021
Return-Path: <owner-dev-commits-doc-all@freebsd.org>
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 <dev-commits-doc-all@mailman.nyi.freebsd.org>;
 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 <lwhsu@FreeBSD.org>
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
 <dev-commits-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-doc-all/>
List-Post: <mailto:dev-commits-doc-all@freebsd.org>
List-Help: <mailto:dev-commits-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=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 <lwhsu@FreeBSD.org>
AuthorDate: 2021-02-04 17:11:01 +0000
Commit:     Li-Wen Hsu <lwhsu@FreeBSD.org>
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

From owner-dev-commits-doc-all@freebsd.org  Thu Feb  4 17:40:03 2021
Return-Path: <owner-dev-commits-doc-all@freebsd.org>
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 D7500529F16
 for <dev-commits-doc-all@mailman.nyi.freebsd.org>;
 Thu,  4 Feb 2021 17:40:03 +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 4DWm5v5nPtz4fdl;
 Thu,  4 Feb 2021 17:40:03 +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 B982A7D43;
 Thu,  4 Feb 2021 17:40:03 +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 114He3N1017189;
 Thu, 4 Feb 2021 17:40:03 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
 by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 114He3tt017186;
 Thu, 4 Feb 2021 17:40:03 GMT (envelope-from git)
Date: Thu, 4 Feb 2021 17:40:03 GMT
Message-Id: <202102041740.114He3tt017186@gitrepo.freebsd.org>
To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org
From: Warner Losh <imp@FreeBSD.org>
Subject: git: e73763e350 - main - Convert vendor imports to git instructions
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: imp
X-Git-Repository: doc
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: e73763e35024b57e1a172735f3467056a43e8de6
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
 <dev-commits-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-doc-all/>
List-Post: <mailto:dev-commits-doc-all@freebsd.org>
List-Help: <mailto:dev-commits-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Feb 2021 17:40:03 -0000

The branch main has been updated by imp:

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

commit e73763e35024b57e1a172735f3467056a43e8de6
Author:     Warner Losh <imp@FreeBSD.org>
AuthorDate: 2021-02-04 00:38:52 +0000
Commit:     Warner Losh <imp@FreeBSD.org>
CommitDate: 2021-02-04 17:36:08 +0000

    Convert vendor imports to git instructions
    
    Now that subversion is gone, replace the subversion info with git info.
    
    Note: This was pulled in from my github repo. Fixes contributed
    by jrm@, uqs@, woodsb02@, delphij@, rpokala@ and ceri@
    
    Reviewed by: emaste@ (earlier version, conditional), gjb@
    Differential Revision: https://reviews.freebsd.org/D28474
---
 .../developers-handbook/policies/chapter.adoc      | 289 +++++++++++++--------
 1 file changed, 180 insertions(+), 109 deletions(-)

diff --git a/documentation/content/en/books/developers-handbook/policies/chapter.adoc b/documentation/content/en/books/developers-handbook/policies/chapter.adoc
index 0f437fd48c..925fb10fee 100644
--- a/documentation/content/en/books/developers-handbook/policies/chapter.adoc
+++ b/documentation/content/en/books/developers-handbook/policies/chapter.adoc
@@ -77,154 +77,225 @@ Ultimately, however, it comes down to the people actually doing the work. If usi
 Because it makes it harder to import future versions minor, trivial and/or cosmetic changes are _strongly discouraged_ on files that are still tracking the vendor branch.
 ====
 
-[[vendor-import-svn]]
-=== Vendor Imports with SVN
+[[vendor-import-git]]
+=== Vendor Imports with Git
 
-This section describes the vendor import procedure with Subversion in details.
+This section describes the vendor import procedure with Git in detail.
+
+[.conventions]
+==== Branch naming convention
+All vendor branches and tags start with `vendor/`. These branches and
+tags are visible by default.
+
+[NOTE]
+====
+This chapter follows the convention that the `freebsd` origin is the source of truth. If you use a different convention, replace `freebsd` with your name as appopriate.
+====
+
+
+We'll explore an example for updating NetBSD's mtree that's in our
+tree. The vendor branch for this is `vendor/NetBSD/mtree`.
 
 [.procedure]
-. *Preparing the Tree*
-+ 
-If this is your first import after the switch to SVN, you will have to flatten and clean up the vendor tree, and bootstrap merge history in the main tree. If not, you can safely omit this step.
-+ 
-During the conversion from CVS to SVN, vendor branches were imported with the same layout as the main tree. For example, the foo vendor sources ended up in [.filename]#vendor/foo/dist/contrib/foo#, but it is pointless and rather inconvenient. What we really want is to have the vendor source directly in [.filename]#vendor/foo/dist#, like this:
-+
+==== Updating an old vendor import
+Since the trees we have in vendor branches are usually a tiny subset of
+the FreeBSD, it's best to do them with work trees since the process is
+quite fast. Make sure that whatever directory you choose (the
+`../mtree`) argument is empty and doesn't conflict.
 [source,bash]
 ....
-% cd vendor/foo/dist/contrib/foo
-% svn move $(svn list) ../..
-% cd ../..
-% svn remove contrib
-% svn propdel -R svn:mergeinfo
-% svn commit
+% git worktree add ../mtree vendor/NetBSD/mtree
 ....
-+ 
-Note that, the `propdel` bit is necessary because starting with 1.5, Subversion will automatically add `svn:mergeinfo` to any directory you copy or move. In this case, you will not need this information, since you are not going to merge anything from the tree you deleted.
-+
-[NOTE]
-====
-You may want to flatten the tags as well. The procedure is exactly the same. If you do this, put off the commit until the end.
-====
-+ 
-Check the [.filename]#dist# tree and perform any cleanup that is deemed to be necessary. You may want to disable keyword expansion, as it makes no sense on unmodified vendor code. In some cases, it can be even be harmful.
-+
+==== Update the Sources in the Vendor Branch
+
+Prepare a full, clean tree of the vendor sources. Import everything but merge only what is needed.
+
+I have my copy of NetBSD checked out from their GitHub mirror in
+`~/git/NetBSD`, so I'll update from there: Note that "upstream" might
+have added or removed files, so we want to make sure deletions are
+propagated as well. rsync(1) is commonly installed, so I'll use that.
 [source,bash]
 ....
-% svn propdel svn:keywords -R .
-% svn commit
+% cd ../mtree
+% rsync -va --del --exclude=".git" ~/git/NetBSD/usr.sbin/mtree/ .
+% git add -A
+% git status
+...
+% git diff --staged
+...
+% git commit -m"Vendor import of NetBSD's mtree at 2020-12-11"
+[vendor/NetBSD/mtree 8e7aa25fcf1] Vendor import of NetBSD's mtree at 2020-12-11
+ 7 files changed, 114 insertions(+), 82 deletions(-)
+% git tag -a vendor/NetBSD/mtree/20201211
 ....
-+ 
-Bootstrapping of `svn:mergeinfo` on the target directory (in the main tree) to the revision that corresponds to the last change was made to the vendor tree prior to importing new sources is also needed:
-+
+
+Note: I run the `git diff` and `git status` commands to make sure nothing weird
+was present. Also I used `-m` to illustrate, but you should compose a proper
+message in an editor (using a commit message template).
+
+It's also important to create an annotated tag, otherwise the push
+will be rejected. Only annotated tags are allowed to be pushed. The
+annoated tag gives you a chance to enter a commit message. Enter
+the version you are importing, along with any salient new features
+or fixes in that version.
+==== Updating the FreeBSD Copy
+At this point you can push the import to vendor into our repo.
 [source,bash]
 ....
-% cd head/contrib/foo
-% svn merge --record-only ^/vendor/foo/dist@12345678 .
-% svn commit
-....
-+ 
-With some shells, the `^` in the above command may need to be escaped with a backslash.
-. *Importing New Sources*
-+ 
-Prepare a full, clean tree of the vendor sources. With SVN, we can keep a full distribution in the vendor tree without bloating the main tree. Import everything but merge only what is needed.
-+ 
-Note that you will need to add any files that were added since the last vendor import, and remove any that were removed. To facilitate this, you should prepare sorted lists of the contents of the vendor tree and of the sources you are about to import:
-+
+% git push --follow-tags freebsd vendor/NetBSD/mtree
+....
+
+`--follow-tags` tells `git push` to also push tags associated with the locally committed revision.
+==== Updating the FreeBSD source tree
+Now you need to update the mtree in FreeBSD. The sources live in
+`contrib/mtree` since it is upstream software.
 [source,bash]
 ....
-% cd vendor/foo/dist
-% svn list -R | grep -v '/$' | sort > ../old
-% cd ../foo-9.9
-% find . -type f | cut -c 3- | sort > ../new
+% cd ../src
+% git subtree merge -P contrib/mtree vendor/NetBSD/mtree
 ....
-+ 
-With these two files, the following command will list removed files (files only in [.filename]#old#):
-+
+This would generate a subtree merge commit of `contrib/mtree` against the local `vendor/NetBSD/mtree` branch. If there were conflicts, you would need to fix them before committing.
+
+==== Rebasing your change against latest FreeBSD source tree
+Because the current policy recommends against using merges, if the upstream FreeBSD `main` moved forward
+before you get a chance to push, you would have to redo the merge.
+
+Regular `git rebase` or `git pull --rebase` doesn't know how to rebase a merge commit **as a merge commit**,
+so instead of that you would have to recreate the commit.
+
+The easiest way to do this would be to create a side branch with the **contents** of the merged tree:
+
 [source,bash]
 ....
-% comm -23 ../old ../new
+% cd ../src
+% git fetch freebsd
+% git checkout -b merge_result
+% git merge freebsd/main
 ....
-+ 
-While the command below will list added files (files only in [.filename]#new#):
-+
+
+Typically, there would be no merge conflicts here (because developers tends to work on different components).
+In the worst case scenario, you would still have to resolve merge conflicts, if there was any, but this
+should be really rare.
+
+Now, checkout `freebsd/main` again as `new_merge`, and redo the merge:
 [source,bash]
 ....
-% comm -13 ../old ../new
+% git checkout -b new_merge freebsd/main
+% git subtree merge -P contrib/mtree vendor/NetBSD/mtree
 ....
-+ 
-Let us put this together:
-+
+Instead of resolving the conflicts, perform this instead:
 [source,bash]
 ....
-% cd vendor/foo/foo-9.9
-% tar cf - . | tar xf - -C ../dist
-% cd ../dist
-% comm -23 ../old ../new | xargs svn remove
-% comm -13 ../old ../new | xargs svn add
+% git checkout merge_result .
 ....
-+
-[WARNING]
-====
+Which will overwrite the files with conflicts with the version found in `merge_result`.
 
-If there are new directories in the new distribution, the last command will fail. You will have to add the directories, and run it again. Conversely, if any directories were removed, you will have to remove them manually.
-====
-+ 
-Check properties on any new files:
+Examine the tree against `merge_result` to make sure that you haven't missed deleted files:
+[source,bash]
+....
+% git diff merge_result
+....
+==== Pushing the changes
+Once you are sure that you have a set of deltas you think is good, you can push it to
+a fork off github or gitlab for others to review. Once nice thin about Git is that it
+allows you to publish rough drafts of your work for others to review.
 
-** All text files should have `svn:eol-style` set to `native`.
-** All binary files should have `svn:mime-type` set to `application/octet-stream`, unless there is a more appropriate media type.
-** Executable files should have `svn:executable` set to `*`.
-** There should be no other properties on any file in the tree.
-+
-[NOTE]
-====
-You are ready to commit, but you should first check the output of `svn stat` and `svn diff` to make sure everything is in order.
-====
-+ 
-Once you have committed the new vendor release, you should tag it for future reference. The best and quickest way is to do it directly in the repository:
-+
+After review, when you are sure it is a good change, you can push it to the FreeBSD repo:
 [source,bash]
 ....
-% svn copy ^/vendor/foo/dist svn_base/vendor/foo/9.9
+% git push freebsd main
 ....
-+ 
-To get the new tag, you can update your working copy of [.filename]#vendor/foo#.
-+
-[NOTE]
-====
-If you choose to do the copy in the checkout instead, do not forget to remove the generated `svn:mergeinfo` as described above.
-====
 
-. *Merging to __-HEAD__*
-+ 
-After you have prepared your import, it is time to merge. Option `--accept=postpone` tells SVN not to handle merge conflicts yet, because they will be taken care of manually:
-+
+=== Creating a new vendor branch
+There's a number of ways to create a new vendor branch. The recommended way is
+to create a new repository and then merge that with FreeBSD. Let's say
+we're importing `glorbnitz` into the FreeBSD tree, release 3.1415. For
+the sake of simplicity, we'll not trim this release. It's a user
+command that puts the nitz device into different magical glorb states.
+
+==== Create the repo
 [source,bash]
 ....
-% cd head/contrib/foo
-% svn update
-% svn merge --accept=postpone ^/vendor/foo/dist
+% cd /some/where
+% mkdir glorbnitz
+% cd glorbnitz
+% git init
+% git checkout -b vendor/glorbnitz
 ....
-+ 
-Resolve any conflicts, and make sure that any files that were added or removed in the vendor tree have been properly added or removed in the main tree. It is always a good idea to check differences against the vendor branch:
-+
+At this point, you have a new repo, where all new commits will go on
+the `vendor/glorbnitz` branch.
+
+(Git professionals can also do this right in their FreeBSD clone, if they know
+how to create a new root commit that's not attached to anything, e.g.
+`git checkout --orphan vendor/glorbnitz`)
+
+==== Copy the sources in
+Since this is a new import, you can just cp the sources in, or use tar or
+even rsync as shown above. And we'll add everything, assuming no dot files.
 [source,bash]
 ....
-% svn diff --no-diff-deleted --old=^/vendor/foo/dist --new=.
+% cp -r ~/glorbnitz/* .
+% git add *
 ....
-+ 
-`--no-diff-deleted` tells SVN not to check files that are in the vendor tree but not in the main tree.
+
+At this point, you should have a pristine copy of glorbnitz ready to commit.
+
+[source,bash]
+....
+% git commit -m"Import GlorbNitz frobnosticator revision 3.1415"
+....
+As above, I used `-m` for simplicity, but you should likely create a
+commit message that explains what a Glorb is and why you'd use a Nitz
+to get it. Not everybody will know.
+
+==== Now import it into our repository
+Now you need to import the branch into our repository.
+[source,bash]
+....
+% cd /path/to/freebsd/repo/src
+% git remote add glorbnitz /some/where/glorbnitz
+% git fetch glorbnitz vendor/glorbnitz
+....
+Note the vendor/glorbnitz branch is in the repo. At this point the
+`/some/where/glorbnitz` can be deleted, if you like. It was only a means
+to an end.
+
+==== Tag and push
+Steps from here on out are much the same as they are in the case of
+updating a vendor branch, though w/o the updating the vendor
+branch step.
+[source,bash]
+....
+% git worktree add ../glorbnitz vendor/glorbnitz
+% cd ../glorbnitz
+% git tag --annotate vendor/glorbnitz/3.1415
+# Make sure it's good
+% git push --follow-tags freebsd vendor/glorbnitz
+....
+By 'good' we mean:
+1. All the right files are present
+2. None of the wrong files are present
+3. The vendor branch points at something sensible
+4. The tag looks good, and is annotated.
+
+==== Time to finally merge it into the base tree*
+[source,bash]
+....
+% cd ../src
+% git subtree add -P contrib/glorbnitz vendor/glorbnitz
+# Make sure it's good
+% git push freebsd
+....
+Here 'good' means:
+1. All the right files, and none of the wrong ones, were merged into contrib/glorbnitz.
+2. No other changes are in the tree
+3. The commit messages look good.
 +
 [NOTE]
 ====
-With SVN, there is no concept of on or off the vendor branch. If a file that previously had local modifications no longer does, just remove any left-over cruft, such as FreeBSD version tags, so it no longer shows up in diffs against the vendor tree.
+This hasn't connected `glorbnitz` to the build yet. How to do
+that hasn't changed and is beyond the scope of this article.
 ====
-+ 
-If any changes are required for the world to build with the new sources, make them now - and test until you are satisfied that everything build and runs correctly.
-. *Commit*
-+ 
-Now, you are ready to commit. Make sure you get everything in one go. Ideally, you would have done all steps in a clean tree, in which case you can just commit from the top of that tree. That is the best way to avoid surprises. If you do it properly, the tree will move atomically from a consistent state with the old code to a consistent state with the new code.
-
 [[policies-encumbered]]
 == Encumbered Files
 

From owner-dev-commits-doc-all@freebsd.org  Thu Feb  4 17:40:05 2021
Return-Path: <owner-dev-commits-doc-all@freebsd.org>
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 18F61529E20
 for <dev-commits-doc-all@mailman.nyi.freebsd.org>;
 Thu,  4 Feb 2021 17:40:05 +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 4DWm5w6Hz5z4fbB;
 Thu,  4 Feb 2021 17:40:04 +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 CB6407E32;
 Thu,  4 Feb 2021 17:40:04 +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 114He4V2017392;
 Thu, 4 Feb 2021 17:40:04 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
 by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 114He4Ev017389;
 Thu, 4 Feb 2021 17:40:04 GMT (envelope-from git)
Date: Thu, 4 Feb 2021 17:40:04 GMT
Message-Id: <202102041740.114He4Ev017389@gitrepo.freebsd.org>
To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org
From: Warner Losh <imp@FreeBSD.org>
Subject: git: b3f6ba6ff5 - main - Start to update the committer's guide with
 git information
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: imp
X-Git-Repository: doc
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: b3f6ba6ff5d66c387e2af7aa58810fa9e66d1190
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
 <dev-commits-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-doc-all/>
List-Post: <mailto:dev-commits-doc-all@freebsd.org>
List-Help: <mailto:dev-commits-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Feb 2021 17:40:05 -0000

The branch main has been updated by imp:

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

commit b3f6ba6ff5d66c387e2af7aa58810fa9e66d1190
Author:     Warner Losh <imp@FreeBSD.org>
AuthorDate: 2021-02-04 17:21:04 +0000
Commit:     Warner Losh <imp@FreeBSD.org>
CommitDate: 2021-02-04 17:36:16 +0000

    Start to update the committer's guide with git information
    
    Do the easy git updates for URLs and branch names. Note svn guide
    is just for ports (but don't edit out the src specific bits
    since we'll dump it wholesale in 2 months). Add pointer to my
    draft docs until they can all be integrated.
---
 .../en/articles/committers-guide/_index.adoc       | 48 ++++++++++++----------
 1 file changed, 26 insertions(+), 22 deletions(-)

diff --git a/documentation/content/en/articles/committers-guide/_index.adoc b/documentation/content/en/articles/committers-guide/_index.adoc
index 8ddacc53b9..b4ee7b75a2 100644
--- a/documentation/content/en/articles/committers-guide/_index.adoc
+++ b/documentation/content/en/articles/committers-guide/_index.adoc
@@ -51,11 +51,11 @@ toc::[]
 |_SMTP Host_
 |`smtp.FreeBSD.org:587` (see also <<smtp-setup>>).
 
-|`_src/_` Subversion Root
-|`svn+ssh://repo.FreeBSD.org/base` (see also <<svn-getting-started-base-layout>>).
+|`_src/_` Git Repository
+|`ssh://git@gitrepo.FreeBSD.org/src.git` (see also <<git-getting-started-base-layout>>).
 
-|`_doc/_` Subversion Root
-|`svn+ssh://repo.FreeBSD.org/doc` (see also <<svn-getting-started-doc-layout>>).
+|`_doc/_` Git Repository
+|`ssh://git@gitrepo.FreeBSD.org/doc.git` (see also <<git-getting-started-doc-layout>>).
 
 |`_ports/_` Subversion Root
 |`svn+ssh://repo.FreeBSD.org/ports` (see also <<svn-getting-started-ports-layout>>).
@@ -238,12 +238,14 @@ Committers are encouraged to seek review for their work as part of the normal de
 
 New committers are assumed to already be familiar with the basic operation of Subversion. If not, start by reading the http://svnbook.red-bean.com/[Subversion Book].
 
+This section is relevant only for the ports tree. Information on Git is being worked into the handbook and other documents. A draft version can be found at https://github.com/bsdimp/freebsd-git-docs/blob/main/SUMMARY.adoc
+
 [[svn-intro]]
 === Introduction
 
-The FreeBSD source repository switched from CVS to Subversion on May 31st, 2008. The first real SVN commit is __r179447__.
+The FreeBSD source repository switched from CVS to Subversion on May 31st, 2008. The first real SVN commit is __r179447__. The source repository switched from Subversion to Git on December 23rd, 2020. The last real svn commit is __r368820__. The first real git commit hash is __5ef5f51d2bef80b0ede9b10ad5b0e9440b60518c__
 
-The FreeBSD `doc/www` repository switched from CVS to Subversion on May 19th, 2012. The first real SVN commit is __r38821__.
+The FreeBSD `doc/www` repository switched from CVS to Subversion on May 19th, 2012. The first real SVN commit is __r38821__. The documentation repository switched from Subversion to Git on December 8th, 2020. The last SVN commit is __r54737__. The first real git commit hash is __3be01a475855e7511ad755b2defd2e0da5d58bbe__.
 
 The FreeBSD `ports` repository switched from CVS to Subversion on July 14th, 2012. The first real SVN commit is __r300894__.
 
@@ -307,34 +309,36 @@ This is the simplest method, but it is hard to tell just yet how much load it wi
 The `svn diff` does not require access to the server as SVN stores a reference copy of every file in the working copy. This, however, means that Subversion working copies are very large in size.
 ====
 
-[[svn-getting-started-base-layout]]
+[[git-getting-started-base-layout]]
 ==== `RELENG_*` Branches and General Layout
 
-In `svn+ssh://repo.freebsd.org/base`, _base_ refers to the source tree. Similarly, _ports_ refers to the ports tree, and so on. These are separate repositories with their own change number sequences, access controls and commit mail.
+In `ssh://gitrepo.freebsd.org/src.git`, _src_ refers to the source tree. Similarly, _ports_ refers to the ports tree, and so on. These are separate repositories with their own change number sequences, access controls and commit mail.
 
-For the base repository, HEAD refers to the -CURRENT tree. For example, [.filename]#head/bin/ls# is what would go into [.filename]#/usr/src/bin/ls# in a release. Some key locations are:
+For the src repository, `main` refers to the -CURRENT tree. For example, [.filename]#head/bin/ls# is what would go into [.filename]#/usr/src/bin/ls# in a release. Some key branches are:
 
-* _/head/_ which corresponds to `HEAD`, also known as `-CURRENT`.
-* _/stable/n_ which corresponds to `RELENG_n`.
-* _/releng/n.n_ which corresponds to `RELENG_n_n`.
-* _/release/n.n.n_ which corresponds to `RELENG_n_n_n_RELEASE`.
-* _/vendor*_ is the vendor branch import work area. This directory itself does not contain branches, however its subdirectories do. This contrasts with the __stable__, _releng_ and _release_ directories.
-* _/projects_ and _/user_ feature a branch work area. As above, the _/user_ directory does not contain branches itself.
+* _main_ which corresponds to `HEAD`, also known as `-CURRENT`.
+* _stable/n_ which corresponds to `RELENG_n`.
+* _releng/n.n_ which corresponds to `RELENG_n_n`.
+* _release/n.n.n_ which corresponds to `RELENG_n_n_n_RELEASE`.
+* _vendor*_ is the vendor branch import work area.
 
-[[svn-getting-started-doc-layout]]
+[[git-getting-started-doc-layout]]
 ==== FreeBSD Documentation Project Branches and Layout
 
-In `svn+ssh://repo.freebsd.org/doc`, _doc_ refers to the repository root of the source tree.
+In `ssh://gitrepo.freebsd.org/doc.git`, _doc_ refers to the repository of the documentation tree.
 
-In general, most FreeBSD Documentation Project work will be done within the [.filename]#head/# branch of the documentation source tree.
+In general, most FreeBSD Documentation Project work will be done within the `main` branch of the documentation source tree.
 
-FreeBSD documentation is written and/or translated to various languages, each in a separate directory in the [.filename]#head/# branch.
+FreeBSD documentation is written and/or translated to various languages, each in a separate directory in the `main` branch.
 
 Each translation set contains several subdirectories for the various parts of the FreeBSD Documentation Project. A few noteworthy directories are:
 
-* _/articles/_ contains the source code for articles written by various FreeBSD contributors.
-* _/books/_ contains the source code for the different books, such as the FreeBSD Handbook.
-* _/htdocs/_ contains the source code for the FreeBSD website.
+* _documentation/_ contains all the source code for the documentation part of the tree.
+* _documentation/content/LANG/articles/_ contains the source code for articles written by various FreeBSD contributors.
+* _documentation/content/LANG/books/_ contains the source code for the different books, such as the FreeBSD Handbook.
+* _website/_ contains the source code for the FreeBSD website.
+
+LANG above is the two character language code. All document source is encoded using Unicode.
 
 [[svn-getting-started-ports-layout]]
 ==== FreeBSD Ports Tree Branches and Layout

From owner-dev-commits-doc-all@freebsd.org  Thu Feb  4 17:49:51 2021
Return-Path: <owner-dev-commits-doc-all@freebsd.org>
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 657D252A231
 for <dev-commits-doc-all@mailman.nyi.freebsd.org>;
 Thu,  4 Feb 2021 17:49:51 +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 4DWmKC2SHyz4gYB;
 Thu,  4 Feb 2021 17:49:51 +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 4754A7CD7;
 Thu,  4 Feb 2021 17:49:51 +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 114HnpPZ028978;
 Thu, 4 Feb 2021 17:49:51 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
 by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 114HnpbB028977;
 Thu, 4 Feb 2021 17:49:51 GMT (envelope-from git)
Date: Thu, 4 Feb 2021 17:49:51 GMT
Message-Id: <202102041749.114HnpbB028977@gitrepo.freebsd.org>
To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org
From: Warner Losh <imp@FreeBSD.org>
Subject: git: 4830802786 - main - Fix minor markup issues with updating vendor
 import section
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: imp
X-Git-Repository: doc
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 4830802786572b6e9f2e4ab65f7bd9444f36c3ac
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
 <dev-commits-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-doc-all/>
List-Post: <mailto:dev-commits-doc-all@freebsd.org>
List-Help: <mailto:dev-commits-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Feb 2021 17:49:51 -0000

The branch main has been updated by imp:

URL: https://cgit.FreeBSD.org/doc/commit/?id=4830802786572b6e9f2e4ab65f7bd9444f36c3ac

commit 4830802786572b6e9f2e4ab65f7bd9444f36c3ac
Author:     Warner Losh <imp@FreeBSD.org>
AuthorDate: 2021-02-04 17:49:28 +0000
Commit:     Warner Losh <imp@FreeBSD.org>
CommitDate: 2021-02-04 17:49:28 +0000

    Fix minor markup issues with updating vendor import section
---
 .../content/en/books/developers-handbook/policies/chapter.adoc          | 2 --
 1 file changed, 2 deletions(-)

diff --git a/documentation/content/en/books/developers-handbook/policies/chapter.adoc b/documentation/content/en/books/developers-handbook/policies/chapter.adoc
index 925fb10fee..51f914d18a 100644
--- a/documentation/content/en/books/developers-handbook/policies/chapter.adoc
+++ b/documentation/content/en/books/developers-handbook/policies/chapter.adoc
@@ -82,7 +82,6 @@ Because it makes it harder to import future versions minor, trivial and/or cosme
 
 This section describes the vendor import procedure with Git in detail.
 
-[.conventions]
 ==== Branch naming convention
 All vendor branches and tags start with `vendor/`. These branches and
 tags are visible by default.
@@ -96,7 +95,6 @@ This chapter follows the convention that the `freebsd` origin is the source of t
 We'll explore an example for updating NetBSD's mtree that's in our
 tree. The vendor branch for this is `vendor/NetBSD/mtree`.
 
-[.procedure]
 ==== Updating an old vendor import
 Since the trees we have in vendor branches are usually a tiny subset of
 the FreeBSD, it's best to do them with work trees since the process is

From owner-dev-commits-doc-all@freebsd.org  Thu Feb  4 18:03:51 2021
Return-Path: <owner-dev-commits-doc-all@freebsd.org>
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 09FAB52AADA
 for <dev-commits-doc-all@mailman.nyi.freebsd.org>;
 Thu,  4 Feb 2021 18:03:51 +0000 (UTC)
 (envelope-from carpeddiem@gmail.com)
Received: from mail-il1-f176.google.com (mail-il1-f176.google.com
 [209.85.166.176])
 (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)
 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
 client-signature RSA-PSS (2048 bits) client-digest SHA256)
 (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 4DWmdL0ywVz4jJt;
 Thu,  4 Feb 2021 18:03:49 +0000 (UTC)
 (envelope-from carpeddiem@gmail.com)
Received: by mail-il1-f176.google.com with SMTP id y5so3429009ilg.4;
 Thu, 04 Feb 2021 10:03:49 -0800 (PST)
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20161025;
 h=x-gm-message-state:mime-version:references:in-reply-to:from:date
 :message-id:subject:to:content-transfer-encoding;
 bh=GA9tCEHLVmli2hGsdclo/mXXV1zbw7DMxcr1tNln1XU=;
 b=VNE2ijITQ7c42pIGbovYgveKUFWPO94NcLR8aOIJICx85BUVgCib+QGHhTlwIH+JuB
 bSxAP5yljv7mn9DuyPVs8kl9xQn3y4M+0Ha/2EFb/yYsxkwICDBs9IumgAJTvXeDpL1+
 x6sAfiHrgSdmZTrzZj/jfb7/RFHaGcA/rMjt7pQFNFpad6lS/9tgKlkq4pG8oOL/mn/7
 hksRZceAtb/O4rHsVijjBclS3fA9dYOCclfq7DlToDellQDNcqBt0t8FfIQ3qLJLjOF2
 P4jbMqWYn95QFdPPS3N6OMxW5YQLzckxsQERLQux5eU4dhb+ewQb/YcfJ/pRv2tEz5CZ
 P7gQ==
X-Gm-Message-State: AOAM531IebGShnLDlRwwQniJcDJ5ZmRNmV1EeI3+vzvGeqGaNB7l7ARL
 Kz7M6CtulNaCNWv/+9qEoVvNdJehxhvJUEaEhDjtOnJumeqemA==
X-Google-Smtp-Source: ABdhPJw4qZU32g6I5149A5hm1F1JMjmU8CAYVuQFlXlT+x2/Rh0PwudAzcF+KevTOn3dhNuMo/ZiUUOb5+5OSuw4X3E=
X-Received: by 2002:a05:6e02:1845:: with SMTP id
 b5mr293973ilv.11.1612461827812; 
 Thu, 04 Feb 2021 10:03:47 -0800 (PST)
MIME-Version: 1.0
References: <202102041442.114EgAhE092181@gitrepo.freebsd.org>
In-Reply-To: <202102041442.114EgAhE092181@gitrepo.freebsd.org>
From: Ed Maste <emaste@freebsd.org>
Date: Thu, 4 Feb 2021 13:02:54 -0500
Message-ID: <CAPyFy2A51NF+=wWAe4Jn_fL3+XFgVk8m2nhvTPk5OAi7w7AcJA@mail.gmail.com>
Subject: Re: git: 985dccbda6 - main - FreeBSD 12.1 (and 11.3) are EOL
To: doc-committers@freebsd.org, dev-commits-doc-all@freebsd.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
X-Rspamd-Queue-Id: 4DWmdL0ywVz4jJt
X-Spamd-Bar: --
Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none;
 spf=pass (mx1.freebsd.org: domain of carpeddiem@gmail.com designates
 209.85.166.176 as permitted sender) smtp.mailfrom=carpeddiem@gmail.com
X-Spamd-Result: default: False [-3.00 / 15.00]; ARC_NA(0.00)[];
 FREEMAIL_ENVFROM(0.00)[gmail.com];
 FREEFALL_USER(0.00)[carpeddiem]; FROM_HAS_DN(0.00)[];
 RBL_DBL_DONT_QUERY_IPS(0.00)[209.85.166.176:from];
 R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17:c];
 TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain];
 TO_DN_NONE(0.00)[]; DMARC_NA(0.00)[freebsd.org];
 RCVD_TLS_ALL(0.00)[];
 SPAMHAUS_ZRD(0.00)[209.85.166.176:from:127.0.2.255];
 NEURAL_HAM_MEDIUM(-1.00)[-1.000];
 NEURAL_HAM_LONG(-1.00)[-1.000]; RCPT_COUNT_TWO(0.00)[2];
 RCVD_IN_DNSWL_NONE(0.00)[209.85.166.176:from];
 NEURAL_HAM_SHORT(-1.00)[-1.000];
 FORGED_SENDER(0.30)[emaste@freebsd.org,carpeddiem@gmail.com];
 RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.166.176:from];
 R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+];
 ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US];
 FROM_NEQ_ENVFROM(0.00)[emaste@freebsd.org,carpeddiem@gmail.com];
 MAILMAN_DEST(0.00)[dev-commits-doc-all];
 RCVD_COUNT_TWO(0.00)[2]
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
 <dev-commits-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-doc-all/>
List-Post: <mailto:dev-commits-doc-all@freebsd.org>
List-Help: <mailto:dev-commits-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Feb 2021 18:03:51 -0000

On Thu, 4 Feb 2021 at 09:42, Ed Maste <emaste@freebsd.org> wrote:
>
> -*Release {rel121-current}* ({rel121-current-date}) _link:{u-rel121-annou=
nce}[Announcement] : link:{u-rel121-notes}[Release Notes] : link:{u-rel121-=
installation}[Installation Instructions] : link:{u-rel121-hardware}[Hardwar=
e Compatibility List] : link:{u-rel121-readme}[Readme] : link:{u-rel121-err=
ata}[Errata] : link:{u-rel121-signatures}[Signed Checksums]_
...
> +* *{rel121-current}* ({rel121-current-date}) _link:{u-rel121-announce}[A=
nnouncement] : link:{u-rel121-notes}[Release Notes] : link:{u-rel121-instal=
lation}[Installation Instructions] : link:{u-rel121-hardware}[Hardware Comp=
atibility List] : link:{u-rel121-readme}[Readme] : link:{u-rel121-errata}[E=
rrata] : link:{u-rel121-signatures}[Signed Checksums]_
>  * *12.0* (December, 2018) _link:12.0R/announce/[Announcement]: link:12.0=
R/relnotes/[Release Notes]: link:12.0R/installation/[Installation Instructi=
ons]: link:12.0R/hardware/[Hardware Notes]: link:12.0R/readme/[Readme]: lin=
k:12.0R/errata/[Errata]: link:12.0R/signatures/[Checksums]_

Existing EOL branches use explicit strings (December, 2018) rather
than substitutions {rel121-current-date}, but I just made the
straightforward change of moving 12.1 to the "Prior Releases "section
as we're already a few days after 12.1's EOL. Presumably we will want
to change {rel121-current-date} to (November, 2019) and avoid having
shared/releases.adoc grow indefinitely.

From owner-dev-commits-doc-all@freebsd.org  Thu Feb  4 18:23:35 2021
Return-Path: <owner-dev-commits-doc-all@freebsd.org>
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 48C4B52B74A
 for <dev-commits-doc-all@mailman.nyi.freebsd.org>;
 Thu,  4 Feb 2021 18:23:35 +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 4DWn471byYz4kZd;
 Thu,  4 Feb 2021 18:23:35 +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 29F13109B5;
 Thu,  4 Feb 2021 18:23:35 +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 114INZEV080599;
 Thu, 4 Feb 2021 18:23:35 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
 by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 114INZUv080598;
 Thu, 4 Feb 2021 18:23:35 GMT (envelope-from git)
Date: Thu, 4 Feb 2021 18:23:35 GMT
Message-Id: <202102041823.114INZUv080598@gitrepo.freebsd.org>
To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org
From: Warner Losh <imp@FreeBSD.org>
Subject: git: 612d995019 - main - More markup fixes
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: imp
X-Git-Repository: doc
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 612d995019ef809cd91c23e902609260dbf8d182
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
 <dev-commits-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-doc-all/>
List-Post: <mailto:dev-commits-doc-all@freebsd.org>
List-Help: <mailto:dev-commits-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Feb 2021 18:23:35 -0000

The branch main has been updated by imp:

URL: https://cgit.FreeBSD.org/doc/commit/?id=612d995019ef809cd91c23e902609260dbf8d182

commit 612d995019ef809cd91c23e902609260dbf8d182
Author:     Warner Losh <imp@FreeBSD.org>
AuthorDate: 2021-02-04 17:55:56 +0000
Commit:     Warner Losh <imp@FreeBSD.org>
CommitDate: 2021-02-04 18:21:34 +0000

    More markup fixes
    
    Get the sections rendering correctly in hugo
    Convert markdown enumerated list convention to asciidoc
    Remove stray '+' lines
    Small tweak in wording missed in review for this content's new context
---
 .../developers-handbook/policies/chapter.adoc      | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/documentation/content/en/books/developers-handbook/policies/chapter.adoc b/documentation/content/en/books/developers-handbook/policies/chapter.adoc
index 51f914d18a..5fdb150609 100644
--- a/documentation/content/en/books/developers-handbook/policies/chapter.adoc
+++ b/documentation/content/en/books/developers-handbook/policies/chapter.adoc
@@ -136,6 +136,7 @@ will be rejected. Only annotated tags are allowed to be pushed. The
 annoated tag gives you a chance to enter a commit message. Enter
 the version you are importing, along with any salient new features
 or fixes in that version.
+
 ==== Updating the FreeBSD Copy
 At this point you can push the import to vendor into our repo.
 [source,bash]
@@ -271,10 +272,11 @@ branch step.
 % git push --follow-tags freebsd vendor/glorbnitz
 ....
 By 'good' we mean:
-1. All the right files are present
-2. None of the wrong files are present
-3. The vendor branch points at something sensible
-4. The tag looks good, and is annotated.
+
+. All the right files are present
+. None of the wrong files are present
+. The vendor branch points at something sensible
+. The tag looks good, and is annotated.
 
 ==== Time to finally merge it into the base tree*
 [source,bash]
@@ -285,14 +287,14 @@ By 'good' we mean:
 % git push freebsd
 ....
 Here 'good' means:
-1. All the right files, and none of the wrong ones, were merged into contrib/glorbnitz.
-2. No other changes are in the tree
-3. The commit messages look good.
-+
+
+. All the right files, and none of the wrong ones, were merged into contrib/glorbnitz.
+. No other changes are in the tree
+. The commit messages look good.
+
 [NOTE]
 ====
-This hasn't connected `glorbnitz` to the build yet. How to do
-that hasn't changed and is beyond the scope of this article.
+This hasn't connected `glorbnitz` to the build yet. How so do that is specific to the software being imported.
 ====
 [[policies-encumbered]]
 == Encumbered Files

From owner-dev-commits-doc-all@freebsd.org  Thu Feb  4 18:46:05 2021
Return-Path: <owner-dev-commits-doc-all@freebsd.org>
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 1292152BE80
 for <dev-commits-doc-all@mailman.nyi.freebsd.org>;
 Thu,  4 Feb 2021 18:46:05 +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 4DWnZ46v4Tz4lYr;
 Thu,  4 Feb 2021 18:46:04 +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 DFF1910EF0;
 Thu,  4 Feb 2021 18:46:04 +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 114Ik4PG007574;
 Thu, 4 Feb 2021 18:46:04 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
 by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 114Ik466007573;
 Thu, 4 Feb 2021 18:46:04 GMT (envelope-from git)
Date: Thu, 4 Feb 2021 18:46:04 GMT
Message-Id: <202102041846.114Ik466007573@gitrepo.freebsd.org>
To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org
From: Warner Losh <imp@FreeBSD.org>
Subject: git: e2223b82bd - main - Minor wordsmithing to reflect current
 practice
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: imp
X-Git-Repository: doc
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: e2223b82bd2d8c4f56d4737e7c241ee5ef76350c
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
 <dev-commits-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-doc-all/>
List-Post: <mailto:dev-commits-doc-all@freebsd.org>
List-Help: <mailto:dev-commits-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Feb 2021 18:46:05 -0000

The branch main has been updated by imp:

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

commit e2223b82bd2d8c4f56d4737e7c241ee5ef76350c
Author:     Warner Losh <imp@FreeBSD.org>
AuthorDate: 2021-02-04 18:34:25 +0000
Commit:     Warner Losh <imp@FreeBSD.org>
CommitDate: 2021-02-04 18:43:50 +0000

    Minor wordsmithing to reflect current practice
    
    Generally things are done by consensus, with the core team stepping in when
    there's a dispute. Update the documented encumbered software policy to reflect
    what's actually done and is considered to be working. This harmonizes the wording
    for contributed software and encumbered software. Also wordsmith how Release
    Engineering is referenced. Also removes stray > marks on object files. Also
    document the fw files.
    
    Note: the ascii file requierment dates from CVS days and should change. But
    I've not pushed things that far in this commit.
---
 .../en/books/developers-handbook/policies/chapter.adoc      | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/documentation/content/en/books/developers-handbook/policies/chapter.adoc b/documentation/content/en/books/developers-handbook/policies/chapter.adoc
index 5fdb150609..665a31da85 100644
--- a/documentation/content/en/books/developers-handbook/policies/chapter.adoc
+++ b/documentation/content/en/books/developers-handbook/policies/chapter.adoc
@@ -70,7 +70,7 @@ Over the last couple of years, various methods have been used in dealing with th
 
 Since this is the case, after some debate one of these methods has been selected as the "official" method and will be required for future imports of software of this kind. Furthermore, it is strongly suggested that existing contributed software converge on this model over time, as it has significant advantages over the old method, including the ability to easily obtain diffs relative to the "official" versions of the source by everyone (even without direct repository access). This will make it significantly easier to return changes to the primary developers of the contributed software.
 
-Ultimately, however, it comes down to the people actually doing the work. If using this model is particularly unsuited to the package being dealt with, exceptions to these rules may be granted only with the approval of the core team and with the general consensus of the other developers. The ability to maintain the package in the future will be a key issue in the decisions.
+Ultimately, however, it comes down to the people actually doing the work. If using this model is particularly unsuited to the package being dealt with, exceptions to these rules may be granted only with the approval of the link:https://www.FreeBSD.org/administration/#t-core[Core Team] and with the general consensus of the other developers. The ability to maintain the package in the future will be a key issue in the decisions.
 
 [NOTE]
 ====
@@ -307,15 +307,16 @@ It might occasionally be necessary to include an encumbered file in the FreeBSD
 . Any encumbered file requires specific approval from the link:https://www.FreeBSD.org/administration/#t-core[Core Team] before it is added to the repository.
 . Encumbered files go in [.filename]#src/contrib# or [.filename]#src/sys/contrib#.
 . The entire module should be kept together. There is no point in splitting it, unless there is code-sharing with non-encumbered code.
-. Object files are named [.filename]#arch/filename.o.uu>#.
+. Object files are named [.filename]#arch/filename.o.uu#.
+. Firmware files are named [.filename]#filename.fw.uu#.
 . Kernel files:
 .. Should always be referenced in [.filename]#conf/files.*# (for build simplicity).
-.. Should always be in [.filename]#LINT#, but the link:https://www.FreeBSD.org/administration/#t-core[Core Team] decides per case if it should be commented out or not. The link:https://www.FreeBSD.org/administration/#t-core[Core Team] can, of course, change their minds later on.
-.. The _Release Engineer_ decides whether or not it goes into the release.
+.. Should always be in [.filename]#LINT#, but when the consensus isn't clear the link:https://www.FreeBSD.org/administration/#t-core[Core Team] decides if it should be commented out or not.
+.. The link:https://www.FreeBSD.org/administration/#t-re[Release Engineering] team decides whether or not it goes into the release.
 
 . User-land files:
-.. The link:https://www.FreeBSD.org/administration/#t-core[Core team] decides if the code should be part of `make world`.
-.. The link:https://www.FreeBSD.org/administration/#t-re[Release Engineering] decides if it goes into the release.
+.. The link:https://www.FreeBSD.org/administration/#t-core[Core team] decides if the code should be part of `make world` by default if there is no clear consensus.
+.. The link:https://www.FreeBSD.org/administration/#t-re[Release Engineering] team decides if it goes into the release.
 
 [[policies-shlib]]
 == Shared Libraries

From owner-dev-commits-doc-all@freebsd.org  Thu Feb  4 21:12:59 2021
Return-Path: <owner-dev-commits-doc-all@freebsd.org>
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 D9D6352F2D6
 for <dev-commits-doc-all@mailman.nyi.freebsd.org>;
 Thu,  4 Feb 2021 21:12:59 +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 4DWrqb5rsLz4vjK;
 Thu,  4 Feb 2021 21:12:59 +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 BB99512BB0;
 Thu,  4 Feb 2021 21:12:59 +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 114LCxWs002641;
 Thu, 4 Feb 2021 21:12:59 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
 by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 114LCxTV002640;
 Thu, 4 Feb 2021 21:12:59 GMT (envelope-from git)
Date: Thu, 4 Feb 2021 21:12:59 GMT
Message-Id: <202102042112.114LCxTV002640@gitrepo.freebsd.org>
To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org
From: Ed Maste <emaste@FreeBSD.org>
Subject: git: ce6b2d1570 - main - Remove download links for EOL'd FreeBSD 12.1
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: emaste
X-Git-Repository: doc
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: ce6b2d15707620291018a243654e3a9fd888d47d
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
 <dev-commits-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-doc-all/>
List-Post: <mailto:dev-commits-doc-all@freebsd.org>
List-Help: <mailto:dev-commits-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Feb 2021 21:12:59 -0000

The branch main has been updated by emaste (src committer):

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

commit ce6b2d15707620291018a243654e3a9fd888d47d
Author:     Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2021-02-04 21:09:32 +0000
Commit:     Ed Maste <emaste@FreeBSD.org>
CommitDate: 2021-02-04 21:10:54 +0000

    Remove download links for EOL'd FreeBSD 12.1
    
    Reported by:    debdrup
    Sponsored by:   The FreeBSD Foundation
---
 website/content/en/where.adoc | 49 -------------------------------------------
 1 file changed, 49 deletions(-)

diff --git a/website/content/en/where.adoc b/website/content/en/where.adoc
index 6666c79c43..4ee9c4d758 100644
--- a/website/content/en/where.adoc
+++ b/website/content/en/where.adoc
@@ -80,55 +80,6 @@ a|
 
 |===
 
-[[download-rel121]]
-== FreeBSD {rel121-current}-RELEASE
-
-[.tblbasic]
-[.tblDownload]
-[width="100%",cols="25%,25%,25%,25%",options="header",]
-|===
-|Installer Images |Virtual Machine Images |SD Card Images |Documentation
-a|
-* link:{url-rel}/amd64/amd64/ISO-IMAGES/{rel121-current}/[amd64]
-* link:{url-rel}/i386/i386/ISO-IMAGES/{rel121-current}/[i386]
-* link:{url-rel}/powerpc/powerpc/ISO-IMAGES/{rel121-current}/[powerpc]
-* link:{url-rel}/powerpc/powerpc64/ISO-IMAGES/{rel121-current}/[powerpc64]
-* link:{url-rel}/powerpc/powerpcspe/ISO-IMAGES/{rel121-current}/[powerpcspe]
-* link:{url-rel}/sparc64/sparc64/ISO-IMAGES/{rel121-current}/[sparc64]
-* link:{url-rel}/arm64/aarch64/ISO-IMAGES/{rel121-current}/[aarch64]
-
-a|
-* link:{url-rel}/VM-IMAGES/README.txt[README]
-* link:{url-rel}/VM-IMAGES/{rel121-current}-RELEASE/amd64/Latest/[amd64]
-* link:{url-rel}/VM-IMAGES/{rel121-current}-RELEASE/i386/Latest/[i386]
-* link:{url-rel}/VM-IMAGES/{rel121-current}-RELEASE/aarch64/Latest/[aarch64]
-
-a|
-* link:{url-rel}/arm/armv6/ISO-IMAGES/{rel121-current}/FreeBSD-{rel121-current}-RELEASE-arm-armv6-RPI-B.img.xz[RPI-B]
-* link:{url-rel}/arm/armv7/ISO-IMAGES/{rel121-current}/FreeBSD-{rel121-current}-RELEASE-arm-armv7-BANANAPI.img.xz[BANANAPI]
-* link:{url-rel}/arm/armv7/ISO-IMAGES/{rel121-current}/FreeBSD-{rel121-current}-RELEASE-arm-armv7-BEAGLEBONE.img.xz[BEAGLEBONE]
-* link:{url-rel}/arm/armv7/ISO-IMAGES/{rel121-current}/FreeBSD-{rel121-current}-RELEASE-arm-armv7-CUBIEBOARD.img.xz[CUBIEBOARD]
-* link:{url-rel}/arm/armv7/ISO-IMAGES/{rel121-current}/FreeBSD-{rel121-current}-RELEASE-arm-armv7-CUBIEBOARD2.img.xz[CUBIEBOARD2]
-* link:{url-rel}/arm/armv7/ISO-IMAGES/{rel121-current}/FreeBSD-{rel121-current}-RELEASE-arm-armv7-CUBOX-HUMMINGBOARD.img.xz[CUBOX-HUMMINGBOARD]
-* link:{url-rel}/arm/armv7/ISO-IMAGES/{rel121-current}/FreeBSD-{rel121-current}-RELEASE-arm-armv7-GENERICSD.img.xz[GENERICSD]
-* link:{url-rel}/arm/armv7/ISO-IMAGES/{rel121-current}/FreeBSD-{rel121-current}-RELEASE-arm-armv7-RPI2.img.xz[RPI2]
-* link:{url-rel}/arm/armv7/ISO-IMAGES/{rel121-current}/FreeBSD-{rel121-current}-RELEASE-arm-armv7-PANDABOARD.img.xz[PANDABOARD]
-* link:{url-rel}/arm/armv7/ISO-IMAGES/{rel121-current}/FreeBSD-{rel121-current}-RELEASE-arm-armv7-WANDBOARD.img.xz[WANDBOARD]
-* link:{url-rel}/arm64/aarch64/ISO-IMAGES/{rel121-current}/FreeBSD-{rel121-current}-RELEASE-arm64-aarch64-PINE64.img.xz[PINE64]
-* link:{url-rel}/arm64/aarch64/ISO-IMAGES/{rel121-current}/FreeBSD-{rel121-current}-RELEASE-arm64-aarch64-PINE64-LTS.img.xz[PINE64-LTS]
-* link:{url-rel}/arm64/aarch64/ISO-IMAGES/{rel121-current}/FreeBSD-{rel121-current}-RELEASE-arm64-aarch64-RPI3.img.xz[RPI3]
-
-a|
-* link:../releases/#current[Released]: {rel121-current-date}
-* link:{u-rel121-notes}[Release Notes]
-* link:{u-rel121-readme}[Readme]
-* link:{u-rel121-hardware}[Hardware Compatibility List]
-* link:{u-rel121-installation}[Installation Instructions]
-* link:{u-rel121-errata}[Errata]
-* link:{u-rel121-signatures}[Signed Checksums]
-
-|===
-
 [[download-rel114]]
 == FreeBSD {rel114-current}-RELEASE
 

From owner-dev-commits-doc-all@freebsd.org  Thu Feb  4 21:33:08 2021
Return-Path: <owner-dev-commits-doc-all@freebsd.org>
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 0A46A52FB5D
 for <dev-commits-doc-all@mailman.nyi.freebsd.org>;
 Thu,  4 Feb 2021 21:33:08 +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 4DWsGq6tQLz3CHt;
 Thu,  4 Feb 2021 21:33:07 +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 DF3101333A;
 Thu,  4 Feb 2021 21:33:07 +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 114LX7gr029229;
 Thu, 4 Feb 2021 21:33:07 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
 by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 114LX7YM029228;
 Thu, 4 Feb 2021 21:33:07 GMT (envelope-from git)
Date: Thu, 4 Feb 2021 21:33:07 GMT
Message-Id: <202102042133.114LX7YM029228@gitrepo.freebsd.org>
To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org
From: Ed Maste <emaste@FreeBSD.org>
Subject: git: ee257dd13c - main - Add header option to 12.2 table
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: emaste
X-Git-Repository: doc
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: ee257dd13c2828d1a8faebc7ad1f7bc00698b955
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
 <dev-commits-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-doc-all/>
List-Post: <mailto:dev-commits-doc-all@freebsd.org>
List-Help: <mailto:dev-commits-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Feb 2021 21:33:08 -0000

The branch main has been updated by emaste (src committer):

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

commit ee257dd13c2828d1a8faebc7ad1f7bc00698b955
Author:     Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2021-02-04 21:30:14 +0000
Commit:     Ed Maste <emaste@FreeBSD.org>
CommitDate: 2021-02-04 21:30:14 +0000

    Add header option to 12.2 table
    
    12.2 "Installer Images" etc. headings should be bold, as they are with
    11.4 and were with the now-removed 12.1.
    
    Sponsored by:   The FreeBSD Foundation
---
 website/content/en/where.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website/content/en/where.adoc b/website/content/en/where.adoc
index 4ee9c4d758..acee6cb1d0 100644
--- a/website/content/en/where.adoc
+++ b/website/content/en/where.adoc
@@ -37,7 +37,7 @@ While FreeBSD does not gather deployment statistics, having statistical informat
 
 [.tblbasic]
 [.tblDownload]
-[width="100%",cols="25%,25%,25%,25%",]
+[width="100%",cols="25%,25%,25%,25%",options="header",]
 |===
 |Installer Images |Virtual Machine Images |SD Card Images |Documentation
 a|

From owner-dev-commits-doc-all@freebsd.org  Fri Feb  5 00:06:35 2021
Return-Path: <owner-dev-commits-doc-all@freebsd.org>
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 5E147534C20
 for <dev-commits-doc-all@mailman.nyi.freebsd.org>;
 Fri,  5 Feb 2021 00:06:35 +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 4DWwgv1rmBz3R3b;
 Fri,  5 Feb 2021 00:06:35 +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 304B814E4B;
 Fri,  5 Feb 2021 00:06:35 +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 11506Zn5027358;
 Fri, 5 Feb 2021 00:06:35 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
 by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 11506ZsQ027357;
 Fri, 5 Feb 2021 00:06:35 GMT (envelope-from git)
Date: Fri, 5 Feb 2021 00:06:35 GMT
Message-Id: <202102050006.11506ZsQ027357@gitrepo.freebsd.org>
To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org
From: Glen Barber <gjb@FreeBSD.org>
Subject: git: b776d2274b - main - Document __FreeBSD_version 1305000
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: gjb
X-Git-Repository: doc
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: b776d2274bde3b1f96ef0330fd632232c111b1aa
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
 <dev-commits-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-doc-all/>
List-Post: <mailto:dev-commits-doc-all@freebsd.org>
List-Help: <mailto:dev-commits-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Feb 2021 00:06:35 -0000

The branch main has been updated by gjb:

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

commit b776d2274bde3b1f96ef0330fd632232c111b1aa
Author:     Glen Barber <gjb@FreeBSD.org>
AuthorDate: 2021-02-05 00:06:04 +0000
Commit:     Glen Barber <gjb@FreeBSD.org>
CommitDate: 2021-02-05 00:06:26 +0000

    Document __FreeBSD_version 1305000
    
    Approved by:    re (implicit)
    Sponsored by:   Rubicon Communications, LLC ("Netgate")
---
 .../content/en/books/porters-handbook/versions/chapter.adoc          | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/documentation/content/en/books/porters-handbook/versions/chapter.adoc b/documentation/content/en/books/porters-handbook/versions/chapter.adoc
index d89a32f386..eb7c76ef9e 100644
--- a/documentation/content/en/books/porters-handbook/versions/chapter.adoc
+++ b/documentation/content/en/books/porters-handbook/versions/chapter.adoc
@@ -789,6 +789,11 @@ Here is a convenient list of `__FreeBSD_version` values as defined in https://cg
 |link:https://cgit.freebsd.org/src/commit/?id=91a07ed50ffca4dfada3e7f1f050ea746c1bac66[91a07ed50ffc]
 |February 2, 2021
 |13.0-ALPHA3 after adding various LinuxKPI bits conflicting with drm-kmod.
+
+|1305000
+|link:https://cgit.freebsd.org/src/commit/?id=XXXX[XXXX]
+|February 5, 2021
+|13.0-STABLE after releng/13.0 was branched.
 |===
 
 [[versions-12]]

From owner-dev-commits-doc-all@freebsd.org  Fri Feb  5 00:07:50 2021
Return-Path: <owner-dev-commits-doc-all@freebsd.org>
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 5380C534BA8
 for <dev-commits-doc-all@mailman.nyi.freebsd.org>;
 Fri,  5 Feb 2021 00:07:50 +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 4DWwjL1ttPz3RGP;
 Fri,  5 Feb 2021 00:07:50 +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 33C5315288;
 Fri,  5 Feb 2021 00:07:50 +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 11507oUS027631;
 Fri, 5 Feb 2021 00:07:50 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
 by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 11507oMI027630;
 Fri, 5 Feb 2021 00:07:50 GMT (envelope-from git)
Date: Fri, 5 Feb 2021 00:07:50 GMT
Message-Id: <202102050007.11507oMI027630@gitrepo.freebsd.org>
To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org
From: Glen Barber <gjb@FreeBSD.org>
Subject: git: 6aab51c6e8 - main - releng: document releng/13.0 branch and
 13.0-BETA1 builds
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: gjb
X-Git-Repository: doc
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 6aab51c6e8d5969ccb28836b6b98e6219961ab11
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
 <dev-commits-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-doc-all/>
List-Post: <mailto:dev-commits-doc-all@freebsd.org>
List-Help: <mailto:dev-commits-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Feb 2021 00:07:50 -0000

The branch main has been updated by gjb:

URL: https://cgit.FreeBSD.org/doc/commit/?id=6aab51c6e8d5969ccb28836b6b98e6219961ab11

commit 6aab51c6e8d5969ccb28836b6b98e6219961ab11
Author:     Glen Barber <gjb@FreeBSD.org>
AuthorDate: 2021-02-05 00:07:26 +0000
Commit:     Glen Barber <gjb@FreeBSD.org>
CommitDate: 2021-02-05 00:07:26 +0000

    releng: document releng/13.0 branch and 13.0-BETA1 builds
    
    Sponsored by:   Rubicon Communications, LLC ("Netgate")
---
 website/content/en/releases/13.0R/schedule.adoc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/website/content/en/releases/13.0R/schedule.adoc b/website/content/en/releases/13.0R/schedule.adoc
index 0dd49b13d3..d3ce81b485 100644
--- a/website/content/en/releases/13.0R/schedule.adoc
+++ b/website/content/en/releases/13.0R/schedule.adoc
@@ -36,8 +36,8 @@ Announcements regarding the availability of the ALPHA snapshots will be sent to
 |Release schedule reminder |3 December 2020 |3 December 2020 |Release Engineers send reminder announcement e-mail to developers with updated schedule.
 |Code slush begins |8 January 2021 |8 January 2021 |Release Engineers announce that all further commits to the {localBranchHead} branch will not require explicit approval, however new features should be avoided. Additionally, there can be no changes to the KBI until {localBranchHead} is branched to {localBranchStable}.
 |{localBranchStable} branch |22 January 2021 |22 January 2021 |{localBranchStable} branch created; release engineering continues on this branch.
-|{localBranchReleng} branch |5 February 2021 |- |{localBranchReleng} branch created; future release engineering proceeds on this branch. Commits to this branch require explicit approval from the Release Engineers.
-|BETA1 builds begin |5 February 2021 |- |First beta test snapshot.
+|{localBranchReleng} branch |5 February 2021 |5 February 2021 |{localBranchReleng} branch created; future release engineering proceeds on this branch. Commits to this branch require explicit approval from the Release Engineers.
+|BETA1 builds begin |5 February 2021 |5 February 2021 |First beta test snapshot.
 |BETA2 builds begin |12 February 2021 |- |Second beta test snapshot.
 |BETA3 builds begin * |19 February 2021 |- |Third beta test snapshot.
 |RC1 builds begin |26 February 2021 |- |First release candidate.

From owner-dev-commits-doc-all@freebsd.org  Fri Feb  5 00:12:25 2021
Return-Path: <owner-dev-commits-doc-all@freebsd.org>
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 3853A534D8F
 for <dev-commits-doc-all@mailman.nyi.freebsd.org>;
 Fri,  5 Feb 2021 00:12:25 +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 4DWwpd1Bbdz3h6j;
 Fri,  5 Feb 2021 00:12:25 +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 1BF8C15482;
 Fri,  5 Feb 2021 00:12:25 +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 1150CPbP039663;
 Fri, 5 Feb 2021 00:12:25 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
 by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1150CPnX039662;
 Fri, 5 Feb 2021 00:12:25 GMT (envelope-from git)
Date: Fri, 5 Feb 2021 00:12:25 GMT
Message-Id: <202102050012.1150CPnX039662@gitrepo.freebsd.org>
To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org
From: Glen Barber <gjb@FreeBSD.org>
Subject: git: 118a5fec79 - main - fix __FreeBSD_version 1305000 entry.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: gjb
X-Git-Repository: doc
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 118a5fec79dc05a8583a7462cd17a46287aafa3b
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
 <dev-commits-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-doc-all/>
List-Post: <mailto:dev-commits-doc-all@freebsd.org>
List-Help: <mailto:dev-commits-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Feb 2021 00:12:25 -0000

The branch main has been updated by gjb:

URL: https://cgit.FreeBSD.org/doc/commit/?id=118a5fec79dc05a8583a7462cd17a46287aafa3b

commit 118a5fec79dc05a8583a7462cd17a46287aafa3b
Author:     Glen Barber <gjb@FreeBSD.org>
AuthorDate: 2021-02-05 00:12:06 +0000
Commit:     Glen Barber <gjb@FreeBSD.org>
CommitDate: 2021-02-05 00:12:06 +0000

    fix __FreeBSD_version 1305000 entry.
    
    Pointyhat:      gjb (myself)
    Sponsored by:   Rubicon Communications, LLC ("Netgate")
---
 documentation/content/en/books/porters-handbook/versions/chapter.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/documentation/content/en/books/porters-handbook/versions/chapter.adoc b/documentation/content/en/books/porters-handbook/versions/chapter.adoc
index eb7c76ef9e..8c46f8d4da 100644
--- a/documentation/content/en/books/porters-handbook/versions/chapter.adoc
+++ b/documentation/content/en/books/porters-handbook/versions/chapter.adoc
@@ -791,7 +791,7 @@ Here is a convenient list of `__FreeBSD_version` values as defined in https://cg
 |13.0-ALPHA3 after adding various LinuxKPI bits conflicting with drm-kmod.
 
 |1305000
-|link:https://cgit.freebsd.org/src/commit/?id=XXXX[XXXX]
+|link:https://cgit.freebsd.org/src/commit/?id=3d544e6b0bc4000c0a485d84c95ed2b699916f3a[3d544e6b0bc4]
 |February 5, 2021
 |13.0-STABLE after releng/13.0 was branched.
 |===

From owner-dev-commits-doc-all@freebsd.org  Fri Feb  5 00:14:17 2021
Return-Path: <owner-dev-commits-doc-all@freebsd.org>
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 D6CAC534B53
 for <dev-commits-doc-all@mailman.nyi.freebsd.org>;
 Fri,  5 Feb 2021 00:14:17 +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 4DWwrn5nCxz3h0P;
 Fri,  5 Feb 2021 00:14:17 +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 B4A96150E7;
 Fri,  5 Feb 2021 00:14:17 +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 1150EHtQ040056;
 Fri, 5 Feb 2021 00:14:17 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
 by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1150EHfZ040055;
 Fri, 5 Feb 2021 00:14:17 GMT (envelope-from git)
Date: Fri, 5 Feb 2021 00:14:17 GMT
Message-Id: <202102050014.1150EHfZ040055@gitrepo.freebsd.org>
To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org
From: Glen Barber <gjb@FreeBSD.org>
Subject: git: 9ed79c4264 - main - releng: document releng/13.0 as frozen
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: gjb
X-Git-Repository: doc
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 9ed79c4264e87927cddf8fac2ddaa2cb4a76e8b8
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
 <dev-commits-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-doc-all/>
List-Post: <mailto:dev-commits-doc-all@freebsd.org>
List-Help: <mailto:dev-commits-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Feb 2021 00:14:17 -0000

The branch main has been updated by gjb:

URL: https://cgit.FreeBSD.org/doc/commit/?id=9ed79c4264e87927cddf8fac2ddaa2cb4a76e8b8

commit 9ed79c4264e87927cddf8fac2ddaa2cb4a76e8b8
Author:     Glen Barber <gjb@FreeBSD.org>
AuthorDate: 2021-02-05 00:14:04 +0000
Commit:     Glen Barber <gjb@FreeBSD.org>
CommitDate: 2021-02-05 00:14:04 +0000

    releng: document releng/13.0 as frozen
    
    Sponsored by:   Rubicon Communications, LLC ("Netgate")
---
 website/content/en/releng/_index.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website/content/en/releng/_index.adoc b/website/content/en/releng/_index.adoc
index 7681e2f15d..5368e01488 100644
--- a/website/content/en/releng/_index.adoc
+++ b/website/content/en/releng/_index.adoc
@@ -48,7 +48,7 @@ This table lists the code freeze status for major branches of the `src/` subtree
 |Branch |Status |Contact |Notes
 |`head` |Open |committers |Active development branch for 14.0-CURRENT.
 |`stable/13` |Open |committers |Development branch for FreeBSD 13-STABLE.
-//|`releng/13.0` |Frozen |re@FreeBSD.org |FreeBSD 13.0 supported errata fix branch.
+|`releng/13.0` |Frozen |re@FreeBSD.org |FreeBSD 13.0 supported errata fix branch.
 |`stable/12` |Open |committers |Development branch for FreeBSD 12-STABLE.
 |`releng/12.2`|Frozen|security-officer@FreeBSD.org|FreeBSD 12.2 supported errata fix branch.
 |`releng/12.1` |Frozen |security-officer@FreeBSD.org |FreeBSD 12.1 errata fix branch (not officially supported).

From owner-dev-commits-doc-all@freebsd.org  Fri Feb  5 16:42:12 2021
Return-Path: <owner-dev-commits-doc-all@freebsd.org>
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 CD27A54C222
 for <dev-commits-doc-all@mailman.nyi.freebsd.org>;
 Fri,  5 Feb 2021 16:42:12 +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 4DXLmh5S9Xz3kJ1;
 Fri,  5 Feb 2021 16:42:12 +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 AE4E921DC1;
 Fri,  5 Feb 2021 16:42:12 +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 115GgC5v035136;
 Fri, 5 Feb 2021 16:42:12 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
 by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 115GgCru035135;
 Fri, 5 Feb 2021 16:42:12 GMT (envelope-from git)
Date: Fri, 5 Feb 2021 16:42:12 GMT
Message-Id: <202102051642.115GgCru035135@gitrepo.freebsd.org>
To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org
From: Glen Barber <gjb@FreeBSD.org>
Subject: git: 16e7cfb746 - main - fix __FreeBSD_version after 3c6a89748a01
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: gjb
X-Git-Repository: doc
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 16e7cfb74648106fd48005b8b63c6492555a51f2
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
 <dev-commits-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-doc-all/>
List-Post: <mailto:dev-commits-doc-all@freebsd.org>
List-Help: <mailto:dev-commits-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Feb 2021 16:42:12 -0000

The branch main has been updated by gjb:

URL: https://cgit.FreeBSD.org/doc/commit/?id=16e7cfb74648106fd48005b8b63c6492555a51f2

commit 16e7cfb74648106fd48005b8b63c6492555a51f2
Author:     Glen Barber <gjb@FreeBSD.org>
AuthorDate: 2021-02-05 16:41:57 +0000
Commit:     Glen Barber <gjb@FreeBSD.org>
CommitDate: 2021-02-05 16:41:57 +0000

    fix __FreeBSD_version after 3c6a89748a01
    
    Sponsored by:   Rubicon Communications, LLC ("Netgate")
---
 documentation/content/en/books/porters-handbook/versions/chapter.adoc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/documentation/content/en/books/porters-handbook/versions/chapter.adoc b/documentation/content/en/books/porters-handbook/versions/chapter.adoc
index 8c46f8d4da..cc3ab873b3 100644
--- a/documentation/content/en/books/porters-handbook/versions/chapter.adoc
+++ b/documentation/content/en/books/porters-handbook/versions/chapter.adoc
@@ -790,8 +790,8 @@ Here is a convenient list of `__FreeBSD_version` values as defined in https://cg
 |February 2, 2021
 |13.0-ALPHA3 after adding various LinuxKPI bits conflicting with drm-kmod.
 
-|1305000
-|link:https://cgit.freebsd.org/src/commit/?id=3d544e6b0bc4000c0a485d84c95ed2b699916f3a[3d544e6b0bc4]
+|1300500
+|link:https://cgit.freebsd.org/src/commit/?id=3c6a89748a01869c18955d5e3bfcdf35f6705d26[3c6a89748a01]
 |February 5, 2021
 |13.0-STABLE after releng/13.0 was branched.
 |===

From owner-dev-commits-doc-all@freebsd.org  Fri Feb  5 16:51:47 2021
Return-Path: <owner-dev-commits-doc-all@freebsd.org>
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 61C6C54C668
 for <dev-commits-doc-all@mailman.nyi.freebsd.org>;
 Fri,  5 Feb 2021 16:51:47 +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 4DXLzk6h0nz3lKP;
 Fri,  5 Feb 2021 16:51:46 +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 89F282227A;
 Fri,  5 Feb 2021 16:51:46 +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 115GpkCa045026;
 Fri, 5 Feb 2021 16:51:46 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
 by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 115Gpk4c045025;
 Fri, 5 Feb 2021 16:51:46 GMT (envelope-from git)
Date: Fri, 5 Feb 2021 16:51:46 GMT
Message-Id: <202102051651.115Gpk4c045025@gitrepo.freebsd.org>
To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org
From: Li-Wen Hsu <lwhsu@FreeBSD.org>
Subject: git: 08736ad635 - main - Fix 12.2 upgrading instruction
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: 08736ad6356c538afbf27b904c4b5494ec843c0f
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
 <dev-commits-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-doc-all/>
List-Post: <mailto:dev-commits-doc-all@freebsd.org>
List-Help: <mailto:dev-commits-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Feb 2021 16:51:48 -0000

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

URL: https://cgit.FreeBSD.org/doc/commit/?id=08736ad6356c538afbf27b904c4b5494ec843c0f

commit 08736ad6356c538afbf27b904c4b5494ec843c0f
Author:     Li-Wen Hsu <lwhsu@FreeBSD.org>
AuthorDate: 2021-02-05 16:51:36 +0000
Commit:     Li-Wen Hsu <lwhsu@FreeBSD.org>
CommitDate: 2021-02-05 16:51:36 +0000

    Fix 12.2 upgrading instruction
    
    Approved by:    carlavilla (implicitly)
---
 website/content/en/releases/12.2R/installation.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website/content/en/releases/12.2R/installation.adoc b/website/content/en/releases/12.2R/installation.adoc
index 0f13ce11a1..0b3b10aa39 100644
--- a/website/content/en/releases/12.2R/installation.adoc
+++ b/website/content/en/releases/12.2R/installation.adoc
@@ -51,7 +51,7 @@ Now the {{< manpage "freebsd-update" "8">}} utility can fetch bits belonging to
 
 [.screen]
 ----
-# freebsd-update upgrade -r 12.1-RELEASE
+# freebsd-update upgrade -r 12.2-RELEASE
 # freebsd-update install
 ----
 

From owner-dev-commits-doc-all@freebsd.org  Fri Feb  5 17:28:03 2021
Return-Path: <owner-dev-commits-doc-all@freebsd.org>
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 3954554D652
 for <dev-commits-doc-all@mailman.nyi.freebsd.org>;
 Fri,  5 Feb 2021 17:28:03 +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 4DXMnb19vpz3pBW;
 Fri,  5 Feb 2021 17:28:03 +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 1AF772291D;
 Fri,  5 Feb 2021 17:28:03 +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 115HS3Kq089330;
 Fri, 5 Feb 2021 17:28:03 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
 by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 115HS3D2089329;
 Fri, 5 Feb 2021 17:28:03 GMT (envelope-from git)
Date: Fri, 5 Feb 2021 17:28:03 GMT
Message-Id: <202102051728.115HS3D2089329@gitrepo.freebsd.org>
To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org
From: Li-Wen Hsu <lwhsu@FreeBSD.org>
Subject: git: 4d36b9edf3 - main - Fix 11.4 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: 4d36b9edf37c0b706e5ea4ae9ace8c2572c50fbb
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
 <dev-commits-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-doc-all/>
List-Post: <mailto:dev-commits-doc-all@freebsd.org>
List-Help: <mailto:dev-commits-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Feb 2021 17:28:03 -0000

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@FreeBSD.org>
AuthorDate: 2021-02-05 17:27:43 +0000
Commit:     Li-Wen Hsu <lwhsu@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@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@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@FreeBSD.org[freebsd-current] and mailto:freebsd-snapshots@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]
 |===

From owner-dev-commits-doc-all@freebsd.org  Fri Feb  5 18:55:16 2021
Return-Path: <owner-dev-commits-doc-all@freebsd.org>
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 2769254F6B3
 for <dev-commits-doc-all@mailman.nyi.freebsd.org>;
 Fri,  5 Feb 2021 18:55:16 +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 4DXPkD0ZHcz3vGG;
 Fri,  5 Feb 2021 18:55:16 +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 067E223C9D;
 Fri,  5 Feb 2021 18:55:16 +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 115ItFsx006746;
 Fri, 5 Feb 2021 18:55:15 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
 by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 115ItF6g006745;
 Fri, 5 Feb 2021 18:55:15 GMT (envelope-from git)
Date: Fri, 5 Feb 2021 18:55:15 GMT
Message-Id: <202102051855.115ItF6g006745@gitrepo.freebsd.org>
To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org
From: John Baldwin <jhb@FreeBSD.org>
Subject: git: 77822d511c - main - Drop "Projected" from the 13.x Tiers column.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: jhb
X-Git-Repository: doc
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 77822d511cac7c2079e2a41794d3c533138b449b
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
 <dev-commits-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-doc-all/>
List-Post: <mailto:dev-commits-doc-all@freebsd.org>
List-Help: <mailto:dev-commits-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Feb 2021 18:55:16 -0000

The branch main has been updated by jhb:

URL: https://cgit.FreeBSD.org/doc/commit/?id=77822d511cac7c2079e2a41794d3c533138b449b

commit 77822d511cac7c2079e2a41794d3c533138b449b
Author:     John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2021-02-05 18:54:08 +0000
Commit:     John Baldwin <jhb@FreeBSD.org>
CommitDate: 2021-02-05 18:54:08 +0000

    Drop "Projected" from the 13.x Tiers column.
    
    Reviewed by:    emaste
    Differential Revision:  https://reviews.freebsd.org/D28507
---
 website/content/en/platforms/_index.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website/content/en/platforms/_index.adoc b/website/content/en/platforms/_index.adoc
index 033c255d1b..092ca0de84 100644
--- a/website/content/en/platforms/_index.adoc
+++ b/website/content/en/platforms/_index.adoc
@@ -14,7 +14,7 @@ Here is a list of platforms supported by FreeBSD.
 [.tblbasic]
 [cols=",,,,",options="header",]
 |===
-|Platform Name |TARGET_ARCH |11.x link:{committers-guide}#archs[Support Tier] |12.x link:{committers-guide}#archs[Support Tier] |Projected 13.x link:{committers-guide}#archs[Support Tier]
+|Platform Name |TARGET_ARCH |11.x link:{committers-guide}#archs[Support Tier] |12.x link:{committers-guide}#archs[Support Tier] |13.x link:{committers-guide}#archs[Support Tier]
 |64-bit x86 |link:amd64[amd64] |Tier 1 |Tier 1 |Tier 1
 |32-bit x86 |link:i386[i386] |Tier 1 |Tier 1 |Tier 2
 |PC98 |link:pc98[pc98] |Tier 2 |Tier 4 |Tier 4

From owner-dev-commits-doc-all@freebsd.org  Fri Feb  5 21:40:42 2021
Return-Path: <owner-dev-commits-doc-all@freebsd.org>
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 1ADDD52AE09
 for <dev-commits-doc-all@mailman.nyi.freebsd.org>;
 Fri,  5 Feb 2021 21:40:42 +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 4DXTP56C2rz4bK0;
 Fri,  5 Feb 2021 21:40:41 +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 C7EF925D3B;
 Fri,  5 Feb 2021 21:40:41 +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 115Lef3M023353;
 Fri, 5 Feb 2021 21:40:41 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
 by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 115LefD0023352;
 Fri, 5 Feb 2021 21:40:41 GMT (envelope-from git)
Date: Fri, 5 Feb 2021 21:40:41 GMT
Message-Id: <202102052140.115LefD0023352@gitrepo.freebsd.org>
To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org
From: Daniel Ebdrup Jensen <debdrup@FreeBSD.org>
Subject: git: b45a44fa61 - main - report-2020-04-2020-06: Fix missing
 stylesheet
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: debdrup
X-Git-Repository: doc
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: b45a44fa61cac61123299e9b5aff58443ca356df
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
 <dev-commits-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-doc-all/>
List-Post: <mailto:dev-commits-doc-all@freebsd.org>
List-Help: <mailto:dev-commits-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Feb 2021 21:40:42 -0000

The branch main has been updated by debdrup:

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

commit b45a44fa61cac61123299e9b5aff58443ca356df
Author:     Daniel Ebdrup Jensen <debdrup@FreeBSD.org>
AuthorDate: 2021-02-05 21:35:04 +0000
Commit:     Daniel Ebdrup Jensen <debdrup@FreeBSD.org>
CommitDate: 2021-02-05 21:35:04 +0000

    report-2020-04-2020-06: Fix missing stylesheet
---
 website/content/en/status/report-2020-04-2020-06.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website/content/en/status/report-2020-04-2020-06.html b/website/content/en/status/report-2020-04-2020-06.html
index 66bfc60e7f..0f510cf78d 100644
--- a/website/content/en/status/report-2020-04-2020-06.html
+++ b/website/content/en/status/report-2020-04-2020-06.html
@@ -5,7 +5,7 @@
     <title>FreeBSD Quarterly Status Report</title>
     <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
     <link rel="shortcut icon" href="../../favicon.ico" type="image/x-icon" />
-    <link rel="stylesheet" media="screen,print" href="../../layout/css/fixed.css?20130112" type="text/css" />
+    <link rel="stylesheet" media="screen,print" href="../layout/css/fixed.css?20130112" type="text/css" />
     <script type="text/javascript" src="../../layout/js/google.js"></script>
   </head>
   <body>

From owner-dev-commits-doc-all@freebsd.org  Sat Feb  6 01:59:23 2021
Return-Path: <owner-dev-commits-doc-all@freebsd.org>
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 5829C5302B8
 for <dev-commits-doc-all@mailman.nyi.freebsd.org>;
 Sat,  6 Feb 2021 01:59:23 +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 4DXb7Z2zmKz4s07;
 Sat,  6 Feb 2021 01:59:21 +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 054F61138;
 Sat,  6 Feb 2021 01:59:19 +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 1161xIcu054342;
 Sat, 6 Feb 2021 01:59:18 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
 by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1161xIFT054341;
 Sat, 6 Feb 2021 01:59:18 GMT (envelope-from git)
Date: Sat, 6 Feb 2021 01:59:18 GMT
Message-Id: <202102060159.1161xIFT054341@gitrepo.freebsd.org>
To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org
From: Daniel Ebdrup Jensen <debdrup@FreeBSD.org>
Subject: git: 4ace6ff83e - main - handbook/virtualization: Suggest using
 supported RELEASE for bhyve
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: debdrup
X-Git-Repository: doc
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 4ace6ff83ed4fbe5eb22d4a83f2e42dcd420a315
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
 <dev-commits-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-doc-all/>
List-Post: <mailto:dev-commits-doc-all@freebsd.org>
List-Help: <mailto:dev-commits-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 06 Feb 2021 01:59:23 -0000

The branch main has been updated by debdrup:

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

commit 4ace6ff83ed4fbe5eb22d4a83f2e42dcd420a315
Author:     Daniel Ebdrup Jensen <debdrup@FreeBSD.org>
AuthorDate: 2021-02-06 01:55:08 +0000
Commit:     Daniel Ebdrup Jensen <debdrup@FreeBSD.org>
CommitDate: 2021-02-06 01:55:08 +0000

    handbook/virtualization: Suggest using supported RELEASE for bhyve
    
    Since 10.3-RELEASE has gone EOL a while ago, update instructions to
    match the newest -RELEASE on the newest releng branch as of writing.
    
    While here, also correct at typo that instructed people to look in
    /usr/shared which doesn't exist in hier(7).
---
 .../content/en/books/handbook/virtualization/_index.adoc          | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/documentation/content/en/books/handbook/virtualization/_index.adoc b/documentation/content/en/books/handbook/virtualization/_index.adoc
index 4ac0b4c85a..afab7bf02c 100644
--- a/documentation/content/en/books/handbook/virtualization/_index.adoc
+++ b/documentation/content/en/books/handbook/virtualization/_index.adoc
@@ -590,15 +590,15 @@ Download an installation image of FreeBSD to install:
 
 [source,bash]
 ....
-# fetch ftp://ftp.freebsd.org/pub/FreeBSD/releases/ISO-IMAGES/10.3/FreeBSD-10.3-RELEASE-amd64-bootonly.iso
-FreeBSD-10.3-RELEASE-amd64-bootonly.iso       100% of  230 MB  570 kBps 06m17s
+# fetch ftp://ftp.freebsd.org/pub/FreeBSD/releases/ISO-IMAGES/12.2/FreeBSD-12.2-RELEASE-amd64-bootonly.iso
+FreeBSD-12.2-RELEASE-amd64-bootonly.iso       100% of  230 MB  570 kBps 06m17s
 ....
 
 FreeBSD comes with an example script for running a virtual machine in bhyve. The script will start the virtual machine and run it in a loop, so it will automatically restart if it crashes. The script takes a number of options to control the configuration of the machine: `-c` controls the number of virtual CPUs, `-m` limits the amount of memory available to the guest, `-t` defines which [.filename]#tap# device to use, `-d` indicates which disk image to use, `-i` tells bhyve to boot from the CD image instead of the disk, and `-I` defines which CD image to use. The last parameter is the name of the virtual machine, used to track the running machines. This example starts the virtual machine in installation mode:
 
 [source,bash]
 ....
-# sh /usr/shared/examples/bhyve/vmrun.sh -c 1 -m 1024M -t tap0 -d guest.img -i -I FreeBSD-10.3-RELEASE-amd64-bootonly.iso guestname
+# sh /usr/share/examples/bhyve/vmrun.sh -c 1 -m 1024M -t tap0 -d guest.img -i -I FreeBSD-12.2-RELEASE-amd64-bootonly.iso guestname
 ....
 
 The virtual machine will boot and start the installer. After installing a system in the virtual machine, when the system asks about dropping in to a shell at the end of the installation, choose btn:[Yes].
@@ -607,7 +607,7 @@ Reboot the virtual machine. While rebooting the virtual machine causes bhyve to
 
 [source,bash]
 ....
-# sh /usr/shared/examples/bhyve/vmrun.sh -c 4 -m 1024M -t tap0 -d guest.img guestname
+# sh /usr/share/examples/bhyve/vmrun.sh -c 4 -m 1024M -t tap0 -d guest.img guestname
 ....
 
 [[virtualization-bhyve-linux]]

From owner-dev-commits-doc-all@freebsd.org  Sat Feb  6 04:29:09 2021
Return-Path: <owner-dev-commits-doc-all@freebsd.org>
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 8F4D8533894
 for <dev-commits-doc-all@mailman.nyi.freebsd.org>;
 Sat,  6 Feb 2021 04:29:09 +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 4DXfSP3PVHz3JHc;
 Sat,  6 Feb 2021 04:29:09 +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 67A1B2E3A;
 Sat,  6 Feb 2021 04:29:09 +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 1164T9AQ052646;
 Sat, 6 Feb 2021 04:29:09 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
 by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1164T9sX052645;
 Sat, 6 Feb 2021 04:29:09 GMT (envelope-from git)
Date: Sat, 6 Feb 2021 04:29:09 GMT
Message-Id: <202102060429.1164T9sX052645@gitrepo.freebsd.org>
To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org
From: Li-Wen Hsu <lwhsu@FreeBSD.org>
Subject: git: 48eff74004 - main - Remove EOL'd FreeBSD 12.1 from "Production
 Release" in side navigator
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: 48eff7400460c4bd2172876260a3d226c37010cf
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
 <dev-commits-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-doc-all/>
List-Post: <mailto:dev-commits-doc-all@freebsd.org>
List-Help: <mailto:dev-commits-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 06 Feb 2021 04:29:09 -0000

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

URL: https://cgit.FreeBSD.org/doc/commit/?id=48eff7400460c4bd2172876260a3d226c37010cf

commit 48eff7400460c4bd2172876260a3d226c37010cf
Author:     Li-Wen Hsu <lwhsu@FreeBSD.org>
AuthorDate: 2021-02-06 04:27:23 +0000
Commit:     Li-Wen Hsu <lwhsu@FreeBSD.org>
CommitDate: 2021-02-06 04:27:23 +0000

    Remove EOL'd FreeBSD 12.1 from "Production Release" in side navigator
    
    Approved by:    carlavilla (implicitly)
---
 documentation/themes/beastie/layouts/partials/sidenav.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/documentation/themes/beastie/layouts/partials/sidenav.html b/documentation/themes/beastie/layouts/partials/sidenav.html
index ce34a895c4..b8be176202 100644
--- a/documentation/themes/beastie/layouts/partials/sidenav.html
+++ b/documentation/themes/beastie/layouts/partials/sidenav.html
@@ -60,7 +60,6 @@
     <a href={{ "releases" | absLangURL }}>{{ i18n "releases" }}</a>
     <ul>
       <li>{{ i18n "productionRelease" }}: <br /><a href={{ index .data.releases "u-rel121-announce" }}>{{ index .data.releases "rel122-current" }}</a></li>
-      <li>{{ i18n "productionRelease" }}: <br /><a href={{ index .data.releases "u-rel121-announce" }}>{{ index .data.releases "rel121-current" }}</a></li>
       <li>{{ i18n "productionRelease" }}: <br /><a href={{ index .data.releases "u-rel114-announce" }}>{{ index .data.releases "rel114-current" }}</a></li>
     </ul>
   </li>

From owner-dev-commits-doc-all@freebsd.org  Sat Feb  6 05:11:02 2021
Return-Path: <owner-dev-commits-doc-all@freebsd.org>
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 88A31534349
 for <dev-commits-doc-all@mailman.nyi.freebsd.org>;
 Sat,  6 Feb 2021 05:11:02 +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 4DXgNk3T14z3KhK;
 Sat,  6 Feb 2021 05:11:02 +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 69F223A93;
 Sat,  6 Feb 2021 05:11:02 +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 1165B2EI013878;
 Sat, 6 Feb 2021 05:11:02 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
 by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1165B2wD013877;
 Sat, 6 Feb 2021 05:11:02 GMT (envelope-from git)
Date: Sat, 6 Feb 2021 05:11:02 GMT
Message-Id: <202102060511.1165B2wD013877@gitrepo.freebsd.org>
To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org
From: Li-Wen Hsu <lwhsu@FreeBSD.org>
Subject: git: 16168ab123 - main - Remove EOL'd FreeBSD 12.1 from "Production
 Release" in side navigator
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: 16168ab123f05af25bc3061e732545a55a988e46
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
 <dev-commits-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-doc-all/>
List-Post: <mailto:dev-commits-doc-all@freebsd.org>
List-Help: <mailto:dev-commits-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 06 Feb 2021 05:11:02 -0000

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

URL: https://cgit.FreeBSD.org/doc/commit/?id=16168ab123f05af25bc3061e732545a55a988e46

commit 16168ab123f05af25bc3061e732545a55a988e46
Author:     Li-Wen Hsu <lwhsu@FreeBSD.org>
AuthorDate: 2021-02-06 05:10:23 +0000
Commit:     Li-Wen Hsu <lwhsu@FreeBSD.org>
CommitDate: 2021-02-06 05:10:23 +0000

    Remove EOL'd FreeBSD 12.1 from "Production Release" in side navigator
    
    In both documentation and website, also fix wrong link.
    
    Approved by:    carlavilla (implicitly)
---
 documentation/themes/beastie/layouts/partials/sidenav.html | 2 +-
 website/themes/beastie/layouts/partials/sidenav.html       | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/documentation/themes/beastie/layouts/partials/sidenav.html b/documentation/themes/beastie/layouts/partials/sidenav.html
index b8be176202..b283da1372 100644
--- a/documentation/themes/beastie/layouts/partials/sidenav.html
+++ b/documentation/themes/beastie/layouts/partials/sidenav.html
@@ -59,7 +59,7 @@
   <li>
     <a href={{ "releases" | absLangURL }}>{{ i18n "releases" }}</a>
     <ul>
-      <li>{{ i18n "productionRelease" }}: <br /><a href={{ index .data.releases "u-rel121-announce" }}>{{ index .data.releases "rel122-current" }}</a></li>
+      <li>{{ i18n "productionRelease" }}: <br /><a href={{ index .data.releases "u-rel122-announce" }}>{{ index .data.releases "rel122-current" }}</a></li>
       <li>{{ i18n "productionRelease" }}: <br /><a href={{ index .data.releases "u-rel114-announce" }}>{{ index .data.releases "rel114-current" }}</a></li>
     </ul>
   </li>
diff --git a/website/themes/beastie/layouts/partials/sidenav.html b/website/themes/beastie/layouts/partials/sidenav.html
index 4dfe07f0ff..f3a1e17530 100644
--- a/website/themes/beastie/layouts/partials/sidenav.html
+++ b/website/themes/beastie/layouts/partials/sidenav.html
@@ -61,7 +61,6 @@
     <a href={{ "releases" | absLangURL }}>{{ i18n "releases" }}</a>
     <ul>
       <li>{{ i18n "productionRelease" }}: <br /><a href={{ index .data.releases "u-rel122-announce" }}>{{ index .data.releases "rel122-current" }}</a></li>
-      <li>{{ i18n "productionRelease" }}: <br /><a href={{ index .data.releases "u-rel121-announce" }}>{{ index .data.releases "rel121-current" }}</a></li>
       <li>{{ i18n "productionRelease" }}: <br /><a href={{ index .data.releases "u-rel114-announce" }}>{{ index .data.releases "rel114-current" }}</a></li>
     </ul>
   </li>

From owner-dev-commits-doc-all@freebsd.org  Sat Feb  6 06:15:33 2021
Return-Path: <owner-dev-commits-doc-all@freebsd.org>
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 5A8C453D4FF
 for <dev-commits-doc-all@mailman.nyi.freebsd.org>;
 Sat,  6 Feb 2021 06:15:33 +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 4DXhq924y8z3QnW;
 Sat,  6 Feb 2021 06:15:33 +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 3AEC24B0F;
 Sat,  6 Feb 2021 06:15:33 +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 1166FX8B096020;
 Sat, 6 Feb 2021 06:15:33 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
 by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1166FXbA096019;
 Sat, 6 Feb 2021 06:15:33 GMT (envelope-from git)
Date: Sat, 6 Feb 2021 06:15:33 GMT
Message-Id: <202102060615.1166FXbA096019@gitrepo.freebsd.org>
To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org
From: Li-Wen Hsu <lwhsu@FreeBSD.org>
Subject: git: 69b9b213e4 - main - Update -CURRENT and -STABLE release
 documentation link
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: 69b9b213e40226b6b0a6b4fde06cf79eb795dead
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
 <dev-commits-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-doc-all/>
List-Post: <mailto:dev-commits-doc-all@freebsd.org>
List-Help: <mailto:dev-commits-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 06 Feb 2021 06:15:33 -0000

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

URL: https://cgit.FreeBSD.org/doc/commit/?id=69b9b213e40226b6b0a6b4fde06cf79eb795dead

commit 69b9b213e40226b6b0a6b4fde06cf79eb795dead
Author:     Li-Wen Hsu <lwhsu@FreeBSD.org>
AuthorDate: 2021-02-06 06:14:54 +0000
Commit:     Li-Wen Hsu <lwhsu@FreeBSD.org>
CommitDate: 2021-02-06 06:14:54 +0000

    Update -CURRENT and -STABLE release documentation link
    
    Approved by:    carlavilla (implicitly)
---
 website/content/en/relnotes.adoc | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/website/content/en/relnotes.adoc b/website/content/en/relnotes.adoc
index 591b306f72..bbce583bc1 100644
--- a/website/content/en/relnotes.adoc
+++ b/website/content/en/relnotes.adoc
@@ -36,9 +36,23 @@ HTML versions of the release documentation for FreeBSD -CURRENT and FreeBSD -STA
 
 === FreeBSD -CURRENT Release Documentation
 
-* link:../releases/12.0r/readme/[README]
-* link:../releases/12.0r/relnotes/[Release Notes]
-* link:../releases/12.0r/hardware/[Hardware Notes]
+* link:../releases/CURRENT/readme/[README]
+* link:../releases/CURRENT/relnotes/[Release Notes]
+* link:../releases/CURRENT/hardware/[Hardware Notes]
+
+=== FreeBSD 13-STABLE Release Documentation
+
+* link:../relnotes/13-STABLE/readme/[README]
+* link:../relnotes/13-STABLE/relnotes/[Release Notes]
+* link:../relnotes/13-STABLE/hardware/[Hardware Notes]
+* link:../relnotes/13-STABLE/errata/[Errata]
+
+=== FreeBSD 12-STABLE Release Documentation
+
+* link:../relnotes/12-STABLE/readme/[README]
+* link:../relnotes/12-STABLE/relnotes/[Release Notes]
+* link:../relnotes/12-STABLE/hardware/[Hardware Notes]
+* link:../relnotes/12-STABLE/errata/[Errata]
 
 === FreeBSD 11-STABLE Release Documentation
 
@@ -46,10 +60,3 @@ HTML versions of the release documentation for FreeBSD -CURRENT and FreeBSD -STA
 * link:../relnotes/11-STABLE/relnotes/[Release Notes]
 * link:../relnotes/11-STABLE/hardware/[Hardware Notes]
 * link:../relnotes/11-STABLE/errata/[Errata]
-
-=== FreeBSD 10-STABLE Release Documentation
-
-* link:../relnotes/10-STABLE/readme/[README]
-* link:../relnotes/10-STABLE/relnotes/[Release Notes]
-* link:../relnotes/10-STABLE/hardware/[Hardware Notes]
-* link:../relnotes/10-STABLE/errata/[Errata]

From owner-dev-commits-doc-all@freebsd.org  Sat Feb  6 06:40:34 2021
Return-Path: <owner-dev-commits-doc-all@freebsd.org>
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 EAD0053D83D
 for <dev-commits-doc-all@mailman.nyi.freebsd.org>;
 Sat,  6 Feb 2021 06:40:34 +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 4DXjN26LJmz3RFM;
 Sat,  6 Feb 2021 06:40:34 +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 CCA7E4B6D;
 Sat,  6 Feb 2021 06:40:34 +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 1166eYBg029988;
 Sat, 6 Feb 2021 06:40:34 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
 by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1166eYbO029987;
 Sat, 6 Feb 2021 06:40:34 GMT (envelope-from git)
Date: Sat, 6 Feb 2021 06:40:34 GMT
Message-Id: <202102060640.1166eYbO029987@gitrepo.freebsd.org>
To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org
From: Li-Wen Hsu <lwhsu@FreeBSD.org>
Subject: git: f15a6bdc83 - main - s/Subversion/Git/
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: f15a6bdc83a767b3ab5064d2f75f6e710a32954b
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
 <dev-commits-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-doc-all/>
List-Post: <mailto:dev-commits-doc-all@freebsd.org>
List-Help: <mailto:dev-commits-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 06 Feb 2021 06:40:35 -0000

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

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

commit f15a6bdc83a767b3ab5064d2f75f6e710a32954b
Author:     Li-Wen Hsu <lwhsu@FreeBSD.org>
AuthorDate: 2021-02-06 06:39:14 +0000
Commit:     Li-Wen Hsu <lwhsu@FreeBSD.org>
CommitDate: 2021-02-06 06:39:14 +0000

    s/Subversion/Git/
    
    While here, update the branch name of the -CURRENT and replace "subtree"
    with "repository".
    
    Approved by:    carlavilla (implicitly)
---
 website/content/en/releng/_index.adoc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/website/content/en/releng/_index.adoc b/website/content/en/releng/_index.adoc
index 5368e01488..d5e385237c 100644
--- a/website/content/en/releng/_index.adoc
+++ b/website/content/en/releng/_index.adoc
@@ -40,13 +40,13 @@ As of 2019-11-04, the next release has not yet been announced.
 [[freeze]]
 == Code-Freeze Status
 
-This table lists the code freeze status for major branches of the `src/` subtree of the FreeBSD Subversion repository. Commits to any branch listed as "frozen" must first be reviewed and approved by the relevant contact party. The status of other subtrees such as `ports/` and `doc/` is also provided below.
+This table lists the code freeze status for major branches of the `src/` repository of the FreeBSD Git repositories. Commits to any branch listed as "frozen" must first be reviewed and approved by the relevant contact party. The status of other repositories such as `ports/` and `doc/` is also provided below.
 
 [.tblbasic]
 [cols=",,,",options="header",]
 |===
 |Branch |Status |Contact |Notes
-|`head` |Open |committers |Active development branch for 14.0-CURRENT.
+|`main` |Open |committers |Active development branch for 14.0-CURRENT.
 |`stable/13` |Open |committers |Development branch for FreeBSD 13-STABLE.
 |`releng/13.0` |Frozen |re@FreeBSD.org |FreeBSD 13.0 supported errata fix branch.
 |`stable/12` |Open |committers |Development branch for FreeBSD 12-STABLE.
@@ -107,7 +107,7 @@ This table lists the code freeze status for major branches of the `src/` subtree
 |`releng/4.3` |Frozen |security-officer@FreeBSD.org |FreeBSD 4.3 security fix branch (not officially supported).
 |`stable/3` |Open |committers |Maintenance branch for 3-STABLE (not officially supported).
 |`stable/2.2` |Open |committers |Maintenance branch for 2.2-STABLE (not officially supported).
-|*Subtree* |*Status* |*Contact* |*Notes*
+|*Repository* |*Status* |*Contact* |*Notes*
 |`ports/` |Open |portmgr@FreeBSD.org |FreeBSD Ports Collection.
 |`doc/` |Open |freebsd-doc@FreeBSD.org |ASCIIDoc-based documentation set.
 |===

From owner-dev-commits-doc-all@freebsd.org  Sat Feb  6 06:56:28 2021
Return-Path: <owner-dev-commits-doc-all@freebsd.org>
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 6E1BB53E19A
 for <dev-commits-doc-all@mailman.nyi.freebsd.org>;
 Sat,  6 Feb 2021 06:56:28 +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 4DXjkN2CHtz3hq0;
 Sat,  6 Feb 2021 06:56:28 +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 3489C4D62;
 Sat,  6 Feb 2021 06:56:28 +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 1166uSUF048288;
 Sat, 6 Feb 2021 06:56:28 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
 by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1166uS17048287;
 Sat, 6 Feb 2021 06:56:28 GMT (envelope-from git)
Date: Sat, 6 Feb 2021 06:56:28 GMT
Message-Id: <202102060656.1166uS17048287@gitrepo.freebsd.org>
To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org
From: Li-Wen Hsu <lwhsu@FreeBSD.org>
Subject: git: baf590ef21 - main - Add header option for the tables
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: baf590ef211fb9d46d8a2edd6162458aa830d561
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
 <dev-commits-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-doc-all/>
List-Post: <mailto:dev-commits-doc-all@freebsd.org>
List-Help: <mailto:dev-commits-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 06 Feb 2021 06:56:28 -0000

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

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

commit baf590ef211fb9d46d8a2edd6162458aa830d561
Author:     Li-Wen Hsu <lwhsu@FreeBSD.org>
AuthorDate: 2021-02-06 06:56:06 +0000
Commit:     Li-Wen Hsu <lwhsu@FreeBSD.org>
CommitDate: 2021-02-06 06:56:06 +0000

    Add header option for the tables
    
    Approved by:    carlavilla (implicitly)
---
 website/content/en/releases/11.4R/schedule.adoc | 2 +-
 website/content/en/releases/12.2R/schedule.adoc | 2 +-
 website/content/en/releases/13.0R/schedule.adoc | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/website/content/en/releases/11.4R/schedule.adoc b/website/content/en/releases/11.4R/schedule.adoc
index 9b9abf733a..7dd879f14b 100644
--- a/website/content/en/releases/11.4R/schedule.adoc
+++ b/website/content/en/releases/11.4R/schedule.adoc
@@ -22,7 +22,7 @@ link:{handbook}#mfc-glossary[MFC] requests are no longer being accepted.
 == Schedule
 
 [.tblbasic]
-[cols=",,,",]
+[cols=",,,",options="header",]
 |===
 |Action |Expected |Actual |Description
 |Initial release schedule announcement |- |3 January 2020 |Release Engineers send announcement email to developers with a rough schedule.
diff --git a/website/content/en/releases/12.2R/schedule.adoc b/website/content/en/releases/12.2R/schedule.adoc
index 33acab49f4..b109771790 100644
--- a/website/content/en/releases/12.2R/schedule.adoc
+++ b/website/content/en/releases/12.2R/schedule.adoc
@@ -23,7 +23,7 @@ General discussions about the pending release and known issues should be sent to
 == Schedule
 
 [.tblbasic]
-[cols=",,,",]
+[cols=",,,",options="header",]
 |===
 |Action |Expected |Actual |Description
 |Initial release schedule announcement |- |3 January 2020 |Release Engineers send announcement email to developers with a rough schedule.
diff --git a/website/content/en/releases/13.0R/schedule.adoc b/website/content/en/releases/13.0R/schedule.adoc
index d3ce81b485..486aa06514 100644
--- a/website/content/en/releases/13.0R/schedule.adoc
+++ b/website/content/en/releases/13.0R/schedule.adoc
@@ -29,7 +29,7 @@ During the {localBranchHead} freeze, the Release Engineering Team may create ALP
 Announcements regarding the availability of the ALPHA snapshots will be sent to the mailto:freebsd-current@FreeBSD.org[freebsd-current] and mailto:freebsd-snapshots@FreeBSD.org[freebsd-snapshots] mailing lists.
 
 [.tblbasic]
-[cols=",,,",]
+[cols=",,,",options="header",]
 |===
 |Action |Expected |Actual |Description
 |Initial release schedule announcement |- |21 July 2020 |Release Engineers send announcement email to developers with a rough schedule.

From owner-dev-commits-doc-all@freebsd.org  Sat Feb  6 07:13:42 2021
Return-Path: <owner-dev-commits-doc-all@freebsd.org>
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 8DA0C53E93F
 for <dev-commits-doc-all@mailman.nyi.freebsd.org>;
 Sat,  6 Feb 2021 07:13:42 +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 4DXk6G3PRwz3kCx;
 Sat,  6 Feb 2021 07:13:42 +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 67BED5446;
 Sat,  6 Feb 2021 07:13:42 +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 1167DgUO074290;
 Sat, 6 Feb 2021 07:13:42 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
 by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1167DgW6074289;
 Sat, 6 Feb 2021 07:13:42 GMT (envelope-from git)
Date: Sat, 6 Feb 2021 07:13:42 GMT
Message-Id: <202102060713.1167DgW6074289@gitrepo.freebsd.org>
To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org
From: Li-Wen Hsu <lwhsu@FreeBSD.org>
Subject: git: d01ef2b3ed - main - Add more options="header" to tables
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: d01ef2b3ed84651caa83bdec5b590a0022dd3ec4
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
 <dev-commits-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-doc-all/>
List-Post: <mailto:dev-commits-doc-all@freebsd.org>
List-Help: <mailto:dev-commits-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 06 Feb 2021 07:13:42 -0000

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

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

commit d01ef2b3ed84651caa83bdec5b590a0022dd3ec4
Author:     Li-Wen Hsu <lwhsu@FreeBSD.org>
AuthorDate: 2021-02-06 07:12:57 +0000
Commit:     Li-Wen Hsu <lwhsu@FreeBSD.org>
CommitDate: 2021-02-06 07:12:57 +0000

    Add more options="header" to tables
    
    Approved by:    carlavilla (implicitly)
---
 website/content/en/where.adoc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/website/content/en/where.adoc b/website/content/en/where.adoc
index acee6cb1d0..53facdf95e 100644
--- a/website/content/en/where.adoc
+++ b/website/content/en/where.adoc
@@ -132,7 +132,7 @@ If you are interested in a purely experimental *snapshot* release of FreeBSD-CUR
 
 [.tblbasic]
 [.tblDownload]
-[width="100%",cols="25%,25%,25%,25%",]
+[width="100%",cols="25%,25%,25%,25%",options="header",]
 |===
 |Installer Images |Virtual Machine Images |SD Card Images |Documentation
 a|
@@ -176,7 +176,7 @@ a|
 
 [.tblbasic]
 [.tblDownload]
-[width="100%",cols="25%,25%,25%,25%",]
+[width="100%",cols="25%,25%,25%,25%",options="header",]
 |===
 |Installer Images |Virtual Machine Images |SD Card Images |Documentation
 a|
@@ -219,7 +219,7 @@ a|
 
 [.tblbasic]
 [.tblDownload]
-[width="100%",cols="25%,25%,25%,25%",]
+[width="100%",cols="25%,25%,25%,25%",options="header",]
 |===
 |Installer Images |Virtual Machine Images |SD Card Images |Documentation
 a|

From owner-dev-commits-doc-all@freebsd.org  Sat Feb  6 07:29:23 2021
Return-Path: <owner-dev-commits-doc-all@freebsd.org>
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 5129553F20C
 for <dev-commits-doc-all@mailman.nyi.freebsd.org>;
 Sat,  6 Feb 2021 07:29:23 +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 4DXkSM1vnVz3lCY;
 Sat,  6 Feb 2021 07:29:23 +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 343A95A44;
 Sat,  6 Feb 2021 07:29:23 +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 1167TNjO087979;
 Sat, 6 Feb 2021 07:29:23 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
 by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1167TNZX087978;
 Sat, 6 Feb 2021 07:29:23 GMT (envelope-from git)
Date: Sat, 6 Feb 2021 07:29:23 GMT
Message-Id: <202102060729.1167TNZX087978@gitrepo.freebsd.org>
To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org
From: Li-Wen Hsu <lwhsu@FreeBSD.org>
Subject: git: 22c571e50b - main - Add table style and options="header"
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: 22c571e50bc9163233cd2422ea2bfebe4b5ee157
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
 <dev-commits-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-doc-all/>
List-Post: <mailto:dev-commits-doc-all@freebsd.org>
List-Help: <mailto:dev-commits-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 06 Feb 2021 07:29:23 -0000

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

URL: https://cgit.FreeBSD.org/doc/commit/?id=22c571e50bc9163233cd2422ea2bfebe4b5ee157

commit 22c571e50bc9163233cd2422ea2bfebe4b5ee157
Author:     Li-Wen Hsu <lwhsu@FreeBSD.org>
AuthorDate: 2021-02-06 07:27:25 +0000
Commit:     Li-Wen Hsu <lwhsu@FreeBSD.org>
CommitDate: 2021-02-06 07:27:25 +0000

    Add table style and options="header"
    
    Approved by:    carlavilla (implicitly)
---
 website/content/en/releases/12.1R/schedule.adoc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/website/content/en/releases/12.1R/schedule.adoc b/website/content/en/releases/12.1R/schedule.adoc
index 2797431aa0..dfc82cdef7 100644
--- a/website/content/en/releases/12.1R/schedule.adoc
+++ b/website/content/en/releases/12.1R/schedule.adoc
@@ -20,7 +20,8 @@ General discussions about the pending release and known issues should be sent to
 
 == Schedule
 
-[cols=",,,",]
+[.tblbasic]
+[cols=",,,",options="header",]
 |===
 |Action |Expected |Actual |Description
 |Initial release schedule announcement |- |14 May 2019 |Release Engineers send announcement email to developers with a rough schedule.

From owner-dev-commits-doc-all@freebsd.org  Sat Feb  6 17:47:13 2021
Return-Path: <owner-dev-commits-doc-all@freebsd.org>
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 7C3B752FFAC
 for <dev-commits-doc-all@mailman.nyi.freebsd.org>;
 Sat,  6 Feb 2021 17:47:13 +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 4DY09F2x9Gz4sr9;
 Sat,  6 Feb 2021 17:47:13 +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 57AC415B86;
 Sat,  6 Feb 2021 17:47:13 +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 116HlDT3095580;
 Sat, 6 Feb 2021 17:47:13 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
 by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 116HlDtQ095579;
 Sat, 6 Feb 2021 17:47:13 GMT (envelope-from git)
Date: Sat, 6 Feb 2021 17:47:13 GMT
Message-Id: <202102061747.116HlDtQ095579@gitrepo.freebsd.org>
To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org
From: "Danilo G. Baio" <dbaio@FreeBSD.org>
Subject: git: d39d87746b - main - website/docs: Fix link to Books and Articles
 Online page
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: dbaio
X-Git-Repository: doc
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: d39d87746b9cf54b722f43e301ee9e77f5e1f019
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
 <dev-commits-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-doc-all/>
List-Post: <mailto:dev-commits-doc-all@freebsd.org>
List-Help: <mailto:dev-commits-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 06 Feb 2021 17:47:13 -0000

The branch main has been updated by dbaio (ports committer):

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

commit d39d87746b9cf54b722f43e301ee9e77f5e1f019
Author:     Danilo G. Baio <dbaio@FreeBSD.org>
AuthorDate: 2021-02-06 17:44:57 +0000
Commit:     Danilo G. Baio <dbaio@FreeBSD.org>
CommitDate: 2021-02-06 17:44:57 +0000

    website/docs: Fix link to Books and Articles Online page
    
    Approved by:   carlavilla (doc)
    Differential Revision:  https://reviews.freebsd.org/D28512
---
 website/content/en/docs/_index.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website/content/en/docs/_index.adoc b/website/content/en/docs/_index.adoc
index ec40f185aa..7f08a7518c 100644
--- a/website/content/en/docs/_index.adoc
+++ b/website/content/en/docs/_index.adoc
@@ -10,4 +10,4 @@ include::shared/en/urls.adoc[]
 [.right]
 image::../gifs/doc.jpg[BSD daemon reading documentation,274,163]
 
-A wide variety of link:{handbook}[documentation] is available for FreeBSD, on this web site, on other web sites, and available over the counter.
+A wide variety of link:../docs/books/[documentation] is available for FreeBSD, on this web site, on other web sites, and available over the counter.

From owner-dev-commits-doc-all@freebsd.org  Sat Feb  6 23:52:21 2021
Return-Path: <owner-dev-commits-doc-all@freebsd.org>
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 D894B53EEC5
 for <dev-commits-doc-all@mailman.nyi.freebsd.org>;
 Sat,  6 Feb 2021 23:52:21 +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 4DY8GY5tQ1z4rLC;
 Sat,  6 Feb 2021 23:52:21 +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 BBF371A8D9;
 Sat,  6 Feb 2021 23:52:21 +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 116NqLlZ072813;
 Sat, 6 Feb 2021 23:52:21 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
 by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 116NqLjw072812;
 Sat, 6 Feb 2021 23:52:21 GMT (envelope-from git)
Date: Sat, 6 Feb 2021 23:52:21 GMT
Message-Id: <202102062352.116NqLjw072812@gitrepo.freebsd.org>
To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org
From: Mateusz Piotrowski <0mp@FreeBSD.org>
Subject: git: b31c217093 - internal/admin - Release Daniel Ebdrup Jensen from
 mentorship
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: 0mp
X-Git-Repository: doc
X-Git-Refname: refs/internal/admin
X-Git-Reftype: branch
X-Git-Commit: b31c21709399b45324d3a1cd6f999fb8483287f1
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
 <dev-commits-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-doc-all/>
List-Post: <mailto:dev-commits-doc-all@freebsd.org>
List-Help: <mailto:dev-commits-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 06 Feb 2021 23:52:21 -0000

The branch internal/admin has been updated by 0mp:

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

commit b31c21709399b45324d3a1cd6f999fb8483287f1
Author:     Mateusz Piotrowski <0mp@FreeBSD.org>
AuthorDate: 2021-02-06 23:52:37 +0000
Commit:     Mateusz Piotrowski <0mp@FreeBSD.org>
CommitDate: 2021-02-06 23:52:37 +0000

    Release Daniel Ebdrup Jensen from mentorship
    
    Congratulations, Daniel! You are ready now to fly on your own.
    
    Approved by:    doceng (implicit)
---
 mentors | 1 -
 1 file changed, 1 deletion(-)

diff --git a/mentors b/mentors
index 27370a0442..e9bc1b0605 100644
--- a/mentors
+++ b/mentors
@@ -10,5 +10,4 @@
 # Sort by mentee login name.
 
 # Mentee	Mentor		Optional comment
-debdrup		0mp		co-mentors: allanjude, bcr
 murray		bcr

From owner-dev-commits-doc-all@freebsd.org  Sun Feb  7 00:02:10 2021
Return-Path: <owner-dev-commits-doc-all@freebsd.org>
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 6171953F57E
 for <dev-commits-doc-all@mailman.nyi.freebsd.org>;
 Sun,  7 Feb 2021 00:02:10 +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 4DY8Tt2MlLz4rxd;
 Sun,  7 Feb 2021 00:02:10 +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 443A11A762;
 Sun,  7 Feb 2021 00:02:10 +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 11702ANW089720;
 Sun, 7 Feb 2021 00:02:10 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
 by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 11702APd089719;
 Sun, 7 Feb 2021 00:02:10 GMT (envelope-from git)
Date: Sun, 7 Feb 2021 00:02:10 GMT
Message-Id: <202102070002.11702APd089719@gitrepo.freebsd.org>
To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org
From: Mateusz Piotrowski <0mp@FreeBSD.org>
Subject: git: 50aa9089fe - internal/admin - Please welcome Fernando Apesteguía to the ranks of doc committers!
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: 0mp
X-Git-Repository: doc
X-Git-Refname: refs/internal/admin
X-Git-Reftype: branch
X-Git-Commit: 50aa9089febc7a489df7156c9aa97958e8c7daae
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
 <dev-commits-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-doc-all/>
List-Post: <mailto:dev-commits-doc-all@freebsd.org>
List-Help: <mailto:dev-commits-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 07 Feb 2021 00:02:10 -0000

The branch internal/admin has been updated by 0mp:

URL: https://cgit.FreeBSD.org/doc/commit/?id=50aa9089febc7a489df7156c9aa97958e8c7daae

commit 50aa9089febc7a489df7156c9aa97958e8c7daae
Author:     Mateusz Piotrowski <0mp@FreeBSD.org>
AuthorDate: 2021-02-06 23:55:13 +0000
Commit:     Mateusz Piotrowski <0mp@FreeBSD.org>
CommitDate: 2021-02-07 00:01:24 +0000

    Please welcome Fernando Apesteguía to the ranks of doc committers!
    
    Fernando is providing us with a constant stream of great documentation
    patches, especially in the area of manual pages.  We are sure that this
    commit bit is well earned.
    
    I will be mentoring Fernando together with Gordon.
    
    Approved by:    doceng
---
 access  | 1 +
 mentors | 1 +
 2 files changed, 2 insertions(+)

diff --git a/access b/access
index d3ac635091..0cbf95272e 100644
--- a/access
+++ b/access
@@ -34,6 +34,7 @@ debdrup
 delphij
 eadler
 ebrandi
+fernape
 gabor			devnull
 ganbold
 gavin
diff --git a/mentors b/mentors
index e9bc1b0605..ccaa57643f 100644
--- a/mentors
+++ b/mentors
@@ -10,4 +10,5 @@
 # Sort by mentee login name.
 
 # Mentee	Mentor		Optional comment
+fernape		0mp		co-mentors: gbe
 murray		bcr

From owner-dev-commits-doc-all@freebsd.org  Sun Feb  7 03:59:09 2021
Return-Path: <owner-dev-commits-doc-all@freebsd.org>
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 B36665464F6
 for <dev-commits-doc-all@mailman.nyi.freebsd.org>;
 Sun,  7 Feb 2021 03:59:09 +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 4DYFlK4RGMz3N3J;
 Sun,  7 Feb 2021 03:59:09 +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 8534D1D84B;
 Sun,  7 Feb 2021 03:59:09 +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 1173x9wR091888;
 Sun, 7 Feb 2021 03:59:09 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
 by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1173x9FG091887;
 Sun, 7 Feb 2021 03:59:09 GMT (envelope-from git)
Date: Sun, 7 Feb 2021 03:59:09 GMT
Message-Id: <202102070359.1173x9FG091887@gitrepo.freebsd.org>
To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org
From: Li-Wen Hsu <lwhsu@FreeBSD.org>
Subject: git: 50c17da354 - main - Use https as possible
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: 50c17da354e0f2a0616cab710d2f7958ad695808
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
 <dev-commits-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-doc-all/>
List-Post: <mailto:dev-commits-doc-all@freebsd.org>
List-Help: <mailto:dev-commits-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 07 Feb 2021 03:59:09 -0000

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

URL: https://cgit.FreeBSD.org/doc/commit/?id=50c17da354e0f2a0616cab710d2f7958ad695808

commit 50c17da354e0f2a0616cab710d2f7958ad695808
Author:     Li-Wen Hsu <lwhsu@FreeBSD.org>
AuthorDate: 2021-02-07 03:58:44 +0000
Commit:     Li-Wen Hsu <lwhsu@FreeBSD.org>
CommitDate: 2021-02-07 03:58:44 +0000

    Use https as possible
    
    Approved by:    carlavilla (implicitly)
---
 website/content/en/internal/developer.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website/content/en/internal/developer.adoc b/website/content/en/internal/developer.adoc
index 4968e6c1a0..421d73c7b2 100644
--- a/website/content/en/internal/developer.adoc
+++ b/website/content/en/internal/developer.adoc
@@ -38,6 +38,6 @@ This document describes how to build and update the FreeBSD Web pages from the S
 * link:../../support/[Bug Reports]
 * link:../../security/[FreeBSD Security Information]
 * link:../../copyright/[Copyright]
-* http://wiki.FreeBSD.org[FreeBSD Wiki]
+* https://wiki.FreeBSD.org[FreeBSD Wiki]
 
 link:..[FreeBSD Internal Home]

From owner-dev-commits-doc-all@freebsd.org  Sun Feb  7 04:11:05 2021
Return-Path: <owner-dev-commits-doc-all@freebsd.org>
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 A8086546B1D
 for <dev-commits-doc-all@mailman.nyi.freebsd.org>;
 Sun,  7 Feb 2021 04:11:05 +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 4DYG154QNhz3NkZ;
 Sun,  7 Feb 2021 04:11:05 +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 8B0AA1D87A;
 Sun,  7 Feb 2021 04:11:05 +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 1174B585013285;
 Sun, 7 Feb 2021 04:11:05 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
 by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1174B57q013284;
 Sun, 7 Feb 2021 04:11:05 GMT (envelope-from git)
Date: Sun, 7 Feb 2021 04:11:05 GMT
Message-Id: <202102070411.1174B57q013284@gitrepo.freebsd.org>
To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org
From: Li-Wen Hsu <lwhsu@FreeBSD.org>
Subject: git: 3dffe35aba - main - Announce ref14-{amd64,
 i386}.freebsd.org are available
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: 3dffe35aba68d725c5d4f5f5b236b15e99248e0b
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
 <dev-commits-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-doc-all/>
List-Post: <mailto:dev-commits-doc-all@freebsd.org>
List-Help: <mailto:dev-commits-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 07 Feb 2021 04:11:05 -0000

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

URL: https://cgit.FreeBSD.org/doc/commit/?id=3dffe35aba68d725c5d4f5f5b236b15e99248e0b

commit 3dffe35aba68d725c5d4f5f5b236b15e99248e0b
Author:     Li-Wen Hsu <lwhsu@FreeBSD.org>
AuthorDate: 2021-02-07 04:10:57 +0000
Commit:     Li-Wen Hsu <lwhsu@FreeBSD.org>
CommitDate: 2021-02-07 04:10:57 +0000

    Announce ref14-{amd64,i386}.freebsd.org are available
    
    While here, fix a typo in ref*-aarch64's hostname.
    
    Approved by:    carlavilla (implicitly)
---
 website/content/en/internal/machines.adoc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/website/content/en/internal/machines.adoc b/website/content/en/internal/machines.adoc
index fd174592b0..a03c682982 100644
--- a/website/content/en/internal/machines.adoc
+++ b/website/content/en/internal/machines.adoc
@@ -18,9 +18,9 @@ These systems are available for FreeBSD developer / committer use. Reference sys
 |===
 |Host |OS |Type |Purpose
 |freefall |13-CURRENT |amd64 |Shell Logins.
-|ref[13\|12\|11]-amd64 |X-STABLE |amd64 |Reference machine for general testing and Ports building.
-|ref[13\|12\|11]-i386 |X-STABLE |i386 |Reference machine for general testing and Ports building.
-|rref[13\|12]-aarch64 |X-STABLE |arm64\|aarch64 |Reference machine for general testing and Ports building.
+|ref[14\|13\|12\|11]-amd64 |X-STABLE |amd64 |Reference machine for general testing and Ports building.
+|ref[14\|13\|12\|11]-i386 |X-STABLE |i386 |Reference machine for general testing and Ports building.
+|ref[13\|12]-aarch64 |X-STABLE |arm64\|aarch64 |Reference machine for general testing and Ports building.
 |ref[13\|12]-ppc64 |X-STABLE |ppc64\|powerpc64 |Reference machine for general testing and Ports building.
 |universe[13\|12\|11][a\|b] |X-STABLE |amd64 |Universe build machine for fast, large scale compiling.
 |===

From owner-dev-commits-doc-all@freebsd.org  Sun Feb  7 04:55:41 2021
Return-Path: <owner-dev-commits-doc-all@freebsd.org>
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 B19A5547D70
 for <dev-commits-doc-all@mailman.nyi.freebsd.org>;
 Sun,  7 Feb 2021 04:55:41 +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 4DYH0Y4cwQz3RCY;
 Sun,  7 Feb 2021 04:55:41 +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 90D781E4BD;
 Sun,  7 Feb 2021 04:55:41 +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 1174tfGj069827;
 Sun, 7 Feb 2021 04:55:41 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
 by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1174tfBE069826;
 Sun, 7 Feb 2021 04:55:41 GMT (envelope-from git)
Date: Sun, 7 Feb 2021 04:55:41 GMT
Message-Id: <202102070455.1174tfBE069826@gitrepo.freebsd.org>
To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org
From: Li-Wen Hsu <lwhsu@FreeBSD.org>
Subject: git: bb61dd6cc9 - main - Fix link to English Mailing lists
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: bb61dd6cc98d5908c9a7e69576af6941d619fc68
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
 <dev-commits-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-doc-all/>
List-Post: <mailto:dev-commits-doc-all@freebsd.org>
List-Help: <mailto:dev-commits-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 07 Feb 2021 04:55:41 -0000

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

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

commit bb61dd6cc98d5908c9a7e69576af6941d619fc68
Author:     Li-Wen Hsu <lwhsu@FreeBSD.org>
AuthorDate: 2021-02-07 04:54:24 +0000
Commit:     Li-Wen Hsu <lwhsu@FreeBSD.org>
CommitDate: 2021-02-07 04:54:24 +0000

    Fix link to English Mailing lists
    
    PR:             253300
    Reported by:    joh.hendriks@gmail.com
    Approved by:    carlavilla (implicitly)
---
 website/content/en/community/mailinglists.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website/content/en/community/mailinglists.adoc b/website/content/en/community/mailinglists.adoc
index 6e38763293..e6a01b253f 100644
--- a/website/content/en/community/mailinglists.adoc
+++ b/website/content/en/community/mailinglists.adoc
@@ -15,7 +15,7 @@ You can link:../../search/#mailinglists[search] or https://www.FreeBSD.org/mail/
 
 == English Mailing lists
 
-The English speaking mailing lists are link:{handbook}#eresources-mail[listed in the FreeBSD Handbook].
+The English speaking mailing lists are link:{handbook}eresources/#eresources-mail[listed in the FreeBSD Handbook].
 
 == Non-English Mailing lists
 

From owner-dev-commits-doc-all@freebsd.org  Sun Feb  7 05:06:31 2021
Return-Path: <owner-dev-commits-doc-all@freebsd.org>
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 9F657547F6F
 for <dev-commits-doc-all@mailman.nyi.freebsd.org>;
 Sun,  7 Feb 2021 05:06:31 +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 4DYHF34C4yz3hgC;
 Sun,  7 Feb 2021 05:06:31 +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 834271E7D9;
 Sun,  7 Feb 2021 05:06:31 +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 11756ViI082891;
 Sun, 7 Feb 2021 05:06:31 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
 by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 11756Vb5082890;
 Sun, 7 Feb 2021 05:06:31 GMT (envelope-from git)
Date: Sun, 7 Feb 2021 05:06:31 GMT
Message-Id: <202102070506.11756Vb5082890@gitrepo.freebsd.org>
To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org
From: Li-Wen Hsu <lwhsu@FreeBSD.org>
Subject: git: ebd47aa134 - main - Use production setting
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: ebd47aa1348a950b3129727a5490c667f3755636
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
 <dev-commits-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-doc-all/>
List-Post: <mailto:dev-commits-doc-all@freebsd.org>
List-Help: <mailto:dev-commits-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 07 Feb 2021 05:06:31 -0000

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

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

commit ebd47aa1348a950b3129727a5490c667f3755636
Author:     Li-Wen Hsu <lwhsu@FreeBSD.org>
AuthorDate: 2021-02-07 05:05:13 +0000
Commit:     Li-Wen Hsu <lwhsu@FreeBSD.org>
CommitDate: 2021-02-07 05:05:13 +0000

    Use production setting
    
    PR:             253134
    Reported by:    wosch
    Approved by:    carlavilla (implicitly)
---
 documentation/config/_default/config.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/documentation/config/_default/config.toml b/documentation/config/_default/config.toml
index 9d0acfa24e..d75e4f5433 100644
--- a/documentation/config/_default/config.toml
+++ b/documentation/config/_default/config.toml
@@ -15,7 +15,7 @@ ignoreFiles = [ "chapters-order.adoc$", "toc.adoc$", "toc-tables.adoc$", "toc-fi
 enableRobotsTXT = true
 
 [params]
-  websiteURL = "https://www-dev.freebsd.org/"
+  websiteURL = "https://www.FreeBSD.org/"
 
 [markup.asciidocExt]
     preserveTOC = true

From owner-dev-commits-doc-all@freebsd.org  Sun Feb  7 05:36:46 2021
Return-Path: <owner-dev-commits-doc-all@freebsd.org>
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 724024F8CC1
 for <dev-commits-doc-all@mailman.nyi.freebsd.org>;
 Sun,  7 Feb 2021 05:36:46 +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 4DYHvy2qFwz3kC7;
 Sun,  7 Feb 2021 05:36:46 +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 5303D1F128;
 Sun,  7 Feb 2021 05:36:46 +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 1175akw9022159;
 Sun, 7 Feb 2021 05:36:46 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
 by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1175akRj022158;
 Sun, 7 Feb 2021 05:36:46 GMT (envelope-from git)
Date: Sun, 7 Feb 2021 05:36:46 GMT
Message-Id: <202102070536.1175akRj022158@gitrepo.freebsd.org>
To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org
From: Li-Wen Hsu <lwhsu@FreeBSD.org>
Subject: git: 913df4a581 - main - Add missing Git Repository label translation
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: 913df4a581c0e19d15367892825695faf3cf2499
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
 <dev-commits-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-doc-all/>
List-Post: <mailto:dev-commits-doc-all@freebsd.org>
List-Help: <mailto:dev-commits-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 07 Feb 2021 05:36:46 -0000

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

URL: https://cgit.FreeBSD.org/doc/commit/?id=913df4a581c0e19d15367892825695faf3cf2499

commit 913df4a581c0e19d15367892825695faf3cf2499
Author:     Li-Wen Hsu <lwhsu@FreeBSD.org>
AuthorDate: 2021-02-07 05:35:56 +0000
Commit:     Li-Wen Hsu <lwhsu@FreeBSD.org>
CommitDate: 2021-02-07 05:35:56 +0000

    Add missing Git Repository label translation
    
    Approved by:    carlavilla (implicitly)
---
 documentation/themes/beastie/i18n/en.toml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/documentation/themes/beastie/i18n/en.toml b/documentation/themes/beastie/i18n/en.toml
index ce4bfcf4a4..c4d1463ea2 100644
--- a/documentation/themes/beastie/i18n/en.toml
+++ b/documentation/themes/beastie/i18n/en.toml
@@ -112,6 +112,9 @@ other = "Project Ideas"
 [subversionRepository]
 other = "Subversion Repository"
 
+[gitRepository]
+other = "Git Repository"
+
 [gitMirror]
 other = "Git Mirror"
 

From owner-dev-commits-doc-all@freebsd.org  Sun Feb  7 05:38:50 2021
Return-Path: <owner-dev-commits-doc-all@freebsd.org>
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 304464F8F95
 for <dev-commits-doc-all@mailman.nyi.freebsd.org>;
 Sun,  7 Feb 2021 05:38:50 +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 4DYHyL0zlxz3k3r;
 Sun,  7 Feb 2021 05:38:50 +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 14F6C1F129;
 Sun,  7 Feb 2021 05:38:50 +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 1175cnq5022554;
 Sun, 7 Feb 2021 05:38:49 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
 by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1175cnx9022553;
 Sun, 7 Feb 2021 05:38:49 GMT (envelope-from git)
Date: Sun, 7 Feb 2021 05:38:49 GMT
Message-Id: <202102070538.1175cnx9022553@gitrepo.freebsd.org>
To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org
From: Li-Wen Hsu <lwhsu@FreeBSD.org>
Subject: git: efb1bb8d4c - main - Sync with www.freebsd.org
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: efb1bb8d4cbb70a5f7723f214f476442d947e3dd
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
 <dev-commits-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-doc-all/>
List-Post: <mailto:dev-commits-doc-all@freebsd.org>
List-Help: <mailto:dev-commits-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 07 Feb 2021 05:38:50 -0000

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

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

commit efb1bb8d4cbb70a5f7723f214f476442d947e3dd
Author:     Li-Wen Hsu <lwhsu@FreeBSD.org>
AuthorDate: 2021-02-07 05:38:24 +0000
Commit:     Li-Wen Hsu <lwhsu@FreeBSD.org>
CommitDate: 2021-02-07 05:38:24 +0000

    Sync with www.freebsd.org
    
    Approved by:    carlavilla (implicitly)
---
 documentation/themes/beastie/i18n/en.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/documentation/themes/beastie/i18n/en.toml b/documentation/themes/beastie/i18n/en.toml
index c4d1463ea2..7cabfd089a 100644
--- a/documentation/themes/beastie/i18n/en.toml
+++ b/documentation/themes/beastie/i18n/en.toml
@@ -116,7 +116,7 @@ other = "Subversion Repository"
 other = "Git Repository"
 
 [gitMirror]
-other = "Git Mirror"
+other = "GitHub Mirror"
 
 [phabricator]
 other = "Code Review (Phabricator)"

From owner-dev-commits-doc-all@freebsd.org  Sun Feb  7 06:38:15 2021
Return-Path: <owner-dev-commits-doc-all@freebsd.org>
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 D33304FA4CD
 for <dev-commits-doc-all@mailman.nyi.freebsd.org>;
 Sun,  7 Feb 2021 06:38:15 +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 4DYKGv5fsLz3n10;
 Sun,  7 Feb 2021 06:38:15 +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 B50AC1FE06;
 Sun,  7 Feb 2021 06:38:15 +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 1176cF3q000696;
 Sun, 7 Feb 2021 06:38:15 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
 by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1176cFKq000695;
 Sun, 7 Feb 2021 06:38:15 GMT (envelope-from git)
Date: Sun, 7 Feb 2021 06:38:15 GMT
Message-Id: <202102070638.1176cFKq000695@gitrepo.freebsd.org>
To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org
From: Li-Wen Hsu <lwhsu@FreeBSD.org>
Subject: git: ace7a25543 - main - Fix navigation links on i18n pages
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: ace7a25543bbe2ef76b4fbb0a67d13f731915360
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
 <dev-commits-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-doc-all/>
List-Post: <mailto:dev-commits-doc-all@freebsd.org>
List-Help: <mailto:dev-commits-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 07 Feb 2021 06:38:15 -0000

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

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

commit ace7a25543bbe2ef76b4fbb0a67d13f731915360
Author:     Li-Wen Hsu <lwhsu@FreeBSD.org>
AuthorDate: 2021-02-07 06:37:25 +0000
Commit:     Li-Wen Hsu <lwhsu@FreeBSD.org>
CommitDate: 2021-02-07 06:37:25 +0000

    Fix navigation links on i18n pages
    
    PR:             253134
    Reported by:    wosch
    Approved by:    carlavilla (implicitly)
---
 .../beastie/layouts/partials/site-navigation.html  | 38 +++++++++++-----------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/documentation/themes/beastie/layouts/partials/site-navigation.html b/documentation/themes/beastie/layouts/partials/site-navigation.html
index 98f0a5eb79..08d1db8a41 100644
--- a/documentation/themes/beastie/layouts/partials/site-navigation.html
+++ b/documentation/themes/beastie/layouts/partials/site-navigation.html
@@ -13,35 +13,35 @@
     {{ end }}
 
     <li>
-      <a href={{ printf "%s%s%s" $.Site.Params.websiteURL $language "about" }}>{{ i18n "about" }}</a>
+      <a href={{ printf "%s%s/%s" $.Site.Params.websiteURL $language "about" }}>{{ i18n "about" }}</a>
       <ul>
         <li>
-          <a href={{ printf "%s%s%s" $.Site.Params.websiteURL $language "projects/newbies/" }}>{{ i18n "introduction" }}</a>
+          <a href={{ printf "%s%s/%s" $.Site.Params.websiteURL $language "projects/newbies/" }}>{{ i18n "introduction" }}</a>
         </li>
         <li>
-          <a href={{ printf "%s%s%s" $.Site.Params.websiteURL $language "features" }}>{{ i18n "features" }}</a>
+          <a href={{ printf "%s%s/%s" $.Site.Params.websiteURL $language "features" }}>{{ i18n "features" }}</a>
         </li>
         <li>
-          <a href={{ printf "%s%s%s" $.Site.Params.websiteURL $language "advocacy" }}>{{ i18n "advocacy" }}</a>
+          <a href={{ printf "%s%s/%s" $.Site.Params.websiteURL $language "advocacy" }}>{{ i18n "advocacy" }}</a>
         </li>
         <li>
-          <a href={{ printf "%s%s%s" $.Site.Params.websiteURL $language "marketing" }}>{{ i18n "marketing" }}</a>
+          <a href={{ printf "%s%s/%s" $.Site.Params.websiteURL $language "marketing" }}>{{ i18n "marketing" }}</a>
         </li>
         <li>
-          <a href={{ printf "%s%s%s" $.Site.Params.websiteURL $language "privacy" }}>{{ i18n "privacyPolicy" }}</a>
+          <a href={{ printf "%s%s/%s" $.Site.Params.websiteURL $language "privacy" }}>{{ i18n "privacyPolicy" }}</a>
         </li>
       </ul>
     </li>
   </ul>
   <ul>
     <li>
-      <a href={{ printf "%s%s%s" $.Site.Params.websiteURL $language "where" }}>{{ i18n "getFreeBSD" }}</a>
+      <a href={{ printf "%s%s/%s" $.Site.Params.websiteURL $language "where" }}>{{ i18n "getFreeBSD" }}</a>
       <ul>
         <li>
-          <a href={{ printf "%s%s%s" $.Site.Params.websiteURL $language "releases" }}>{{ i18n "releaseInformation" }}</a>
+          <a href={{ printf "%s%s/%s" $.Site.Params.websiteURL $language "releases" }}>{{ i18n "releaseInformation" }}</a>
         </li>
         <li>
-          <a href={{ printf "%s%s%s" $.Site.Params.websiteURL $language "releng" }}>{{ i18n "releaseEngineering" }}</a>
+          <a href={{ printf "%s%s/%s" $.Site.Params.websiteURL $language "releng" }}>{{ i18n "releaseEngineering" }}</a>
         </li>
       </ul>
     </li>
@@ -76,19 +76,19 @@
   </ul>
   <ul>
     <li>
-      <a href={{ printf "%s%s%s" $.Site.Params.websiteURL $language "community" }}>{{ i18n "community" }}</a>
+      <a href={{ printf "%s%s/%s" $.Site.Params.websiteURL $language "community" }}>{{ i18n "community" }}</a>
       <ul>
         <li>
-          <a href={{ printf "%s%s%s" $.Site.Params.websiteURL $language "community/mailinglists/" }}>{{ i18n "mailingLists" }}</a>
+          <a href={{ printf "%s%s/%s" $.Site.Params.websiteURL $language "community/mailinglists/" }}>{{ i18n "mailingLists" }}</a>
         </li>
         <li>
           <a href="https://forums.FreeBSD.org">{{ i18n "forums" }}</a>
         </li>
         <li>
-          <a href={{ printf "%s%s%s" $.Site.Params.websiteURL $language "usergroups" }}>{{ i18n "userGroups" }}</a>
+          <a href={{ printf "%s%s/%s" $.Site.Params.websiteURL $language "usergroups" }}>{{ i18n "userGroups" }}</a>
         </li>
         <li>
-          <a href={{ printf "%s%s%s" $.Site.Params.websiteURL $language "events" }}>{{ i18n "events" }}</a>
+          <a href={{ printf "%s%s/%s" $.Site.Params.websiteURL $language "events" }}>{{ i18n "events" }}</a>
         </li>
         <li>
           <a href="http://freebsdjournal.com">{{ i18n "FreeBSDJournal" }}</a>
@@ -101,7 +101,7 @@
   </ul>
   <ul>
     <li>
-      <a href={{ printf "%s%s%s" $.Site.Params.websiteURL $language "projects" }}>{{ i18n "developers" }}</a>
+      <a href={{ printf "%s%s/%s" $.Site.Params.websiteURL $language "projects" }}>{{ i18n "developers" }}</a>
       <ul>
         <li>
           <a href="https://wiki.FreeBSD.org/IdeasPage">{{ i18n "projectIdeas" }}</a>
@@ -129,19 +129,19 @@
   </ul>
   <ul>
     <li>
-      <a href={{ printf "%s%s%s" $.Site.Params.websiteURL $language "support" }}>{{ i18n "support" }}</a>
+      <a href={{ printf "%s%s/%s" $.Site.Params.websiteURL $language "support" }}>{{ i18n "support" }}</a>
       <ul>
         <li>
-          <a href={{ printf "%s%s%s" $.Site.Params.websiteURL $language "commercial" }}>{{ i18n "vendors" }}</a>
+          <a href={{ printf "%s%s/%s" $.Site.Params.websiteURL $language "commercial" }}>{{ i18n "vendors" }}</a>
         </li>
         <li>
-          <a href={{ printf "%s%s%s" $.Site.Params.websiteURL $language "security" }}>{{ i18n "securityInformation" }}</a>
+          <a href={{ printf "%s%s/%s" $.Site.Params.websiteURL $language "security" }}>{{ i18n "securityInformation" }}</a>
         </li>
         <li>
           <a href="https://bugs.FreeBSD.org/search/">{{ i18n "bugReports" }}</a>
         </li>
         <li>
-          <a href={{ printf "%s%s%s" $.Site.Params.websiteURL $language "support" }}>{{ i18n "submittingBugReports" }}</a>
+          <a href={{ printf "%s%s/%s" $.Site.Params.websiteURL $language "support" }}>{{ i18n "submittingBugReports" }}</a>
         </li>
       </ul>
     </li>
@@ -154,7 +154,7 @@
           <a href="https://www.freebsdfoundation.org/donate/">{{ i18n "monetaryDonations" }}</a>
         </li>
         <li>
-          <a href={{ printf "%s%s%s" $.Site.Params.websiteURL $language "donations/#systems/" }}>{{ i18n "hardwareDonations" }}</a>
+          <a href={{ printf "%s%s/%s" $.Site.Params.websiteURL $language "donations/#systems/" }}>{{ i18n "hardwareDonations" }}</a>
         </li>
       </ul>
     </li>

From owner-dev-commits-doc-all@freebsd.org  Sun Feb  7 06:57:23 2021
Return-Path: <owner-dev-commits-doc-all@freebsd.org>
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 D17F24FAC43
 for <dev-commits-doc-all@mailman.nyi.freebsd.org>;
 Sun,  7 Feb 2021 06:57:23 +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 4DYKhz5dpqz3nwZ;
 Sun,  7 Feb 2021 06:57:23 +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 B47381FBC8;
 Sun,  7 Feb 2021 06:57:23 +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 1176vNhx026394;
 Sun, 7 Feb 2021 06:57:23 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
 by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1176vNY6026393;
 Sun, 7 Feb 2021 06:57:23 GMT (envelope-from git)
Date: Sun, 7 Feb 2021 06:57:23 GMT
Message-Id: <202102070657.1176vNY6026393@gitrepo.freebsd.org>
To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org
From: Li-Wen Hsu <lwhsu@FreeBSD.org>
Subject: git: 407939b640 - main - Fox build on Cirrus CI
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: 407939b6406893e9c32b1503e11d72c32876e4c3
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
 <dev-commits-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-doc-all/>
List-Post: <mailto:dev-commits-doc-all@freebsd.org>
List-Help: <mailto:dev-commits-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 07 Feb 2021 06:57:23 -0000

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

URL: https://cgit.FreeBSD.org/doc/commit/?id=407939b6406893e9c32b1503e11d72c32876e4c3

commit 407939b6406893e9c32b1503e11d72c32876e4c3
Author:     Li-Wen Hsu <lwhsu@FreeBSD.org>
AuthorDate: 2021-02-07 06:55:41 +0000
Commit:     Li-Wen Hsu <lwhsu@FreeBSD.org>
CommitDate: 2021-02-07 06:55:41 +0000

    Fox build on Cirrus CI
    
    While here, reduce timeout setting because hugo is fast :)
    
    Approved by:    carlavilla (implicitly)
---
 .cirrus.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 32800c21e5..4edb6ca00b 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -8,9 +8,9 @@ env:
 
 task:
   only_if: $CIRRUS_BRANCH != 'svn_head'
-  timeout_in: 120m
+  timeout_in: 10m
   install_script:
-    - pkg install -y docproj
+    - pkg install -y gohugo python37 rubygem-asciidoctor rubygem-rouge
   test_script:
-    - make all
+    - make
 

From owner-dev-commits-doc-all@freebsd.org  Sun Feb  7 11:45:09 2021
Return-Path: <owner-dev-commits-doc-all@freebsd.org>
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 352725298A8
 for <dev-commits-doc-all@mailman.nyi.freebsd.org>;
 Sun,  7 Feb 2021 11:45:09 +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 4DYS5111qNz4WZ6;
 Sun,  7 Feb 2021 11:45:09 +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 15DAA23B24;
 Sun,  7 Feb 2021 11:45:09 +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 117Bj8ju003049;
 Sun, 7 Feb 2021 11:45:08 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
 by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 117Bj8sn003048;
 Sun, 7 Feb 2021 11:45:08 GMT (envelope-from git)
Date: Sun, 7 Feb 2021 11:45:08 GMT
Message-Id: <202102071145.117Bj8sn003048@gitrepo.freebsd.org>
To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org
From: Li-Wen Hsu <lwhsu@FreeBSD.org>
Subject: git: 6597f8a602 - main - Add FOSDEM 2021 event
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: 6597f8a60272d46d205dd713be739b6e93922f68
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
 <dev-commits-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-doc-all/>
List-Post: <mailto:dev-commits-doc-all@freebsd.org>
List-Help: <mailto:dev-commits-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 07 Feb 2021 11:45:09 -0000

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

URL: https://cgit.FreeBSD.org/doc/commit/?id=6597f8a60272d46d205dd713be739b6e93922f68

commit 6597f8a60272d46d205dd713be739b6e93922f68
Author:     Li-Wen Hsu <lwhsu@FreeBSD.org>
AuthorDate: 2021-02-07 11:44:32 +0000
Commit:     Li-Wen Hsu <lwhsu@FreeBSD.org>
CommitDate: 2021-02-07 11:44:32 +0000

    Add FOSDEM 2021 event
    
    Approved by:    carlavilla (implicitly)
---
 website/data/en/events/events2021.toml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/website/data/en/events/events2021.toml b/website/data/en/events/events2021.toml
index a6d30a1298..97378aaa49 100644
--- a/website/data/en/events/events2021.toml
+++ b/website/data/en/events/events2021.toml
@@ -11,3 +11,11 @@ endDate = "2021-01-27"
 site = "live.FreeBSD.org"
 description = "On January 27th at 21:00 UTC we will hold a \"FreeBSD Office Hours\", an interactive online event where users, contributors, and developers can ask questions or to offer comments. The topic will be \"Bhyve Q&amp;A\", hosted by Peter Grehan. For more information, please see the <a href=\"https://wiki.freebsd.org/OfficeHours\">Office Hours</a> page on the FreeBSD wiki."
 
+[[events]]
+id = "fosdem-2021"
+name = "FOSDEM 2021"
+url = "https://fosdem.org/2021/"
+startDate = "2021-02-06"
+endDate = "2021-02-07"
+site = "Online"
+description = "Every year, thousands of developers of free and open source software from all over the world gather at the event in Brussels. In 2021, they will gather online.  Be sure to stop by the <a href=\"https://stands.fosdem.org/stands/freebsd_project/\">FreeBSD stand</a> and <a href=\"https://fosdem.org/2021/schedule/track/bsd/\">BSD devroom</a> to get the latest on FreeBSD."

From owner-dev-commits-doc-all@freebsd.org  Sun Feb  7 14:20:00 2021
Return-Path: <owner-dev-commits-doc-all@freebsd.org>
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 13ED452DAFB
 for <dev-commits-doc-all@mailman.nyi.freebsd.org>;
 Sun,  7 Feb 2021 14:20:00 +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 4DYWWg71C4z4gWG;
 Sun,  7 Feb 2021 14:19:59 +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 DF82C259BA;
 Sun,  7 Feb 2021 14:19:59 +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 117EJxEf099722;
 Sun, 7 Feb 2021 14:19:59 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
 by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 117EJxvg099721;
 Sun, 7 Feb 2021 14:19:59 GMT (envelope-from git)
Date: Sun, 7 Feb 2021 14:19:59 GMT
Message-Id: <202102071419.117EJxvg099721@gitrepo.freebsd.org>
To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org
From: Nuno Eduardo Simões Leal Teixeira <eduardo@FreeBSD.org>
Subject: git: 17eef34c77 - main - Steps 1-4 from the Committer's guide
 (eduardo)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: eduardo
X-Git-Repository: doc
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 17eef34c77ad195a794db792593547a086bd140b
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
 <dev-commits-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-doc-all/>
List-Post: <mailto:dev-commits-doc-all@freebsd.org>
List-Help: <mailto:dev-commits-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 07 Feb 2021 14:20:00 -0000

The branch main has been updated by eduardo (ports committer):

URL: https://cgit.FreeBSD.org/doc/commit/?id=17eef34c77ad195a794db792593547a086bd140b

commit 17eef34c77ad195a794db792593547a086bd140b
Author:     Nuno Eduardo Simões Leal Teixeira <eduardo@FreeBSD.org>
AuthorDate: 2021-02-07 13:52:47 +0000
Commit:     Nuno Eduardo Simões Leal Teixeira <eduardo@FreeBSD.org>
CommitDate: 2021-02-07 14:18:04 +0000

    Steps 1-4 from the Committer's guide (eduardo)
---
 .../articles/contributors/contrib-additional.adoc  |  1 -
 .../articles/contributors/contrib-committers.adoc  |  1 +
 .../content/en/articles/pgpkeys/_index.adoc        |  3 ++
 documentation/static/pgpkeys/eduardo.key           | 45 ++++++++++++++++++++++
 shared/authors.adoc                                |  4 ++
 website/data/en/news/news.toml                     |  4 ++
 6 files changed, 57 insertions(+), 1 deletion(-)

diff --git a/documentation/content/en/articles/contributors/contrib-additional.adoc b/documentation/content/en/articles/contributors/contrib-additional.adoc
index 2ab881349b..462cdaf85f 100644
--- a/documentation/content/en/articles/contributors/contrib-additional.adoc
+++ b/documentation/content/en/articles/contributors/contrib-additional.adoc
@@ -1662,7 +1662,6 @@
 * Noritaka Ishizumi mailto:graphite@jp.FreeBSD.org[graphite@jp.FreeBSD.org]
 * Noritoshi Demizu mailto:demizu@dd.iij4u.or.jp[demizu@dd.iij4u.or.jp]
 * Noriyuki Soda mailto:soda@sra.co.jp[soda@sra.co.jp]
-* Nuno Teixeira mailto:ed.arrakis@gmail.com[ed.arrakis@gmail.com]
 * Oddbjorn Steffensen mailto:oddbjorn@tricknology.org[oddbjorn@tricknology.org]
 * Oh Junseon mailto:hollywar@mail.holywar.net[hollywar@mail.holywar.net]
 * Olaf Wagner mailto:wagner@luthien.in-berlin.de[wagner@luthien.in-berlin.de]
diff --git a/documentation/content/en/articles/contributors/contrib-committers.adoc b/documentation/content/en/articles/contributors/contrib-committers.adoc
index 95023143f4..6093fe086d 100644
--- a/documentation/content/en/articles/contributors/contrib-committers.adoc
+++ b/documentation/content/en/articles/contributors/contrib-committers.adoc
@@ -398,3 +398,4 @@
 * {mizhka}
 * {tz}
 * {samm}
+* {eduardo}
diff --git a/documentation/content/en/articles/pgpkeys/_index.adoc b/documentation/content/en/articles/pgpkeys/_index.adoc
index 37f33e07fc..cb924fe54d 100644
--- a/documentation/content/en/articles/pgpkeys/_index.adoc
+++ b/documentation/content/en/articles/pgpkeys/_index.adoc
@@ -1779,3 +1779,6 @@ include::static/pgpkeys/mwlucas.key[]
 
 === `{dhw}`
 include::static/pgpkeys/dhw.key[]
+
+=== `{eduardo}`
+include::static/pgpkeys/eduardo.key[]
diff --git a/documentation/static/pgpkeys/eduardo.key b/documentation/static/pgpkeys/eduardo.key
new file mode 100644
index 0000000000..483b6ec1d2
--- /dev/null
+++ b/documentation/static/pgpkeys/eduardo.key
@@ -0,0 +1,45 @@
+// sh addkey.sh eduardo 83E906AB840C723A ;
+
+[.literal-block-margin]
+....
+pub   rsa2048/83E906AB840C723A 2021-01-29 [SC] [expires: 2024-01-29]
+      Key fingerprint = 53EF EC13 6388 D018 3F12  6CF6 83E9 06AB 840C 723A
+uid                            Nuno Eduardo Simões Leal Teixeira <ed.arrakis@gmail.com>
+sub   rsa2048/C25E09130A2D621D 2021-01-29 [E] [expires: 2024-01-29]
+
+....
+
+[.literal-block-margin]
+....
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBGATxfwBCADcReUlY7+xNre77ZO0JXA3wHltMnvZPHlsCRV5U8fQTx1eGLBx
+Vg35xGhWyhXmneEudwTnQssFlxqGH9+S5lpuFa49hrynpf60jyZ0eBZnpIVKdXLv
+x5BIRWx/FHDFBrFEvuCAPh/F7Ghw8mR9kRxFyc/01YKz2T7fUZw/Gazoay2LsH+e
+v3EtyRq8us9a52A+0LJUSoVKtp56s3h4fo7B62/g56Jn6aeLftDTRML7CfhNn7Vx
+r/H3apwLPHcvX5LQIezDoSijyNC0VUBfKvgDD0wd4a4D7kaqFqHYLWmRhFjEoeR8
+7++JyUU6eMWszdcqf/V0ahcsrT4a949dlun/ABEBAAG0OU51bm8gRWR1YXJkbyBT
+aW3DtWVzIExlYWwgVGVpeGVpcmEgPGVkLmFycmFraXNAZ21haWwuY29tPokBVAQT
+AQoAPhYhBFPv7BNjiNAYPxJs9oPpBquEDHI6BQJgE8X8AhsDBQkFo5qABQsJCAcD
+BRUKCQgLBRYDAgEAAh4BAheAAAoJEIPpBquEDHI60IkIAL4eDqbI1EfQBkFIdwfi
+iH5VxSyT6xTYRfzd69Jl5oRx6cRInU5vQbJxEdzcNpyp+XFVvTjds9cuVeqqH/ZP
+J1Nnp4ZDR0KJsdhV8H6p2YbfuK+mIk7Fss7EU9KlNeiDVyxBA7G0FKzMdk3fun25
+sPyf2LuOy92PaPtrQVLVrLoXyc9Bw0eZr3VUQsX/nL4nTblOyBW8EYFcuefeBelG
+Q0k+0AQuKmceX83wxckSOgqCDPgIbY81jg6sQeTmmNdfw9N4Jaxi3Pc22ch6Jms5
+bvzi20hnboYs9dVxkbqEyWVKiMBXvrHAmbZKnpMAtn2A7/ytHAPhw4UlMnep6O3P
+09y5AQ0EYBPF/AEIAM4DyZl1eBL5xq+wWYMHnPMjFV9P4ncZSvOzo1kXguq+y8PU
+F35OoF7c0pv/3A7eeNO66ix31shzS5Wz1xNm8jn+BBVsvPYXYSYavsUv4wnbBH4X
+S/5T130tRysYLjFhPLv++FX0E3wkm8/vFiC/3h+0kIEDhS5yKqxvBTug5NX1f2/9
+JAEL0Ap8Bhlr7q8V883AinjWWWSHwE0k61x1zsp4X3ZLKLpSmCoiiq1D6w/5+fJ9
+vT7unOWv/HNHJ0cOsSYTWt/Iq1i+oujGz1Tf07qa08c2dvtxOc95vLP/FM6Eg0XI
+Y74OLXRc0Ou/03lEBAbJc/4qhhhUsZ5ewWqr4NsAEQEAAYkBPAQYAQoAJhYhBFPv
+7BNjiNAYPxJs9oPpBquEDHI6BQJgE8X8AhsMBQkFo5qAAAoJEIPpBquEDHI6QNMH
+/3FKADYIayAOfG1ytvzSG6nPRsmdYChjstIh0KeReDMgCgojjDyUKVEk9gvQqA19
+dNOWPU/aSz8ERFMONwRbzOXATGlMnI9tClwGFpqI+eTybuTnAJP1OLI1doM4FngS
+W366JPjDazUEygAIpq7mlskv7fFOh8jsLtlAt87bYtevz1PQBH9Vm3FTQ4fGavf0
+1lPqGzti8u43iU9XywrAeL2m3gSy0WGqHyl21VwKxJzOl/Vsd53NQGy8nnGYdqNm
+nkB8XsueDRyW5JvslIhWPIO3eYxHdMUpOMmMqmkq7+5Cvm+Ub8vkAerwf5wJ6nAY
+cMSgsrnxF32dwVRy60KM9IY=
+=+ryt
+-----END PGP PUBLIC KEY BLOCK-----
+....
diff --git a/shared/authors.adoc b/shared/authors.adoc
index dc60134d96..9b022c4b41 100644
--- a/shared/authors.adoc
+++ b/shared/authors.adoc
@@ -970,6 +970,10 @@
 :edavis-email: edavis@FreeBSD.org
 :edavis: {edavis-name}[{edavis-email}]
 
+:eduardo-name: Nuno Teixeira
+:eduardo-email: eduardo@FreeBSD.org
+:eduardo: {eduardo-name}[{eduardo-email}]
+
 :edwin-name: Edwin Groothuis
 :edwin-email: edwin@FreeBSD.org
 :edwin: {edwin-name}[{edwin-email}]
diff --git a/website/data/en/news/news.toml b/website/data/en/news/news.toml
index 209ae7e313..3832967f77 100644
--- a/website/data/en/news/news.toml
+++ b/website/data/en/news/news.toml
@@ -1,6 +1,10 @@
 # Sort news by year, month and day
 # $FreeBSD$
 
+[[news]]
+date = "2021-01-27"
+description = "New committer: <a href=\"mailto:eduardo@FreeBSD.org\">Nuno Teixeira</a> (ports)"
+
 [[news]]
 date = "2021-01-25"
 description = "Website and Documentation converted to Hugo and AsciiDoctor"

From owner-dev-commits-doc-all@freebsd.org  Sun Feb  7 14:33:00 2021
Return-Path: <owner-dev-commits-doc-all@freebsd.org>
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 9010752E29E
 for <dev-commits-doc-all@mailman.nyi.freebsd.org>;
 Sun,  7 Feb 2021 14:33:00 +0000 (UTC)
 (envelope-from dbaio@FreeBSD.org)
Received: from smtp.freebsd.org (smtp.freebsd.org
 [IPv6:2610:1c1:1:606c::24b:4])
 (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 "smtp.freebsd.org", Issuer "R3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 4DYWph3nbmz4hDk;
 Sun,  7 Feb 2021 14:33:00 +0000 (UTC)
 (envelope-from dbaio@FreeBSD.org)
Received: from t480.local (unknown [187.59.152.49])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 (Authenticated sender: dbaio/mail)
 by smtp.freebsd.org (Postfix) with ESMTPSA id 7ACA4A6B5;
 Sun,  7 Feb 2021 14:32:59 +0000 (UTC)
 (envelope-from dbaio@FreeBSD.org)
Date: Sun, 7 Feb 2021 11:32:57 -0300
From: "Danilo G. Baio" <dbaio@FreeBSD.org>
To: Nuno Eduardo =?utf-8?Q?Sim=C3=B5es?= Leal Teixeira <eduardo@FreeBSD.org>
Cc: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org,
 garga@FreeBSD.org
Subject: Re: git: 17eef34c77 - main - Steps 1-4 from the Committer's guide
 (eduardo)
Message-ID: <20210207143257.fg4cfdx7zwjk3xwj@t480.local>
References: <202102071419.117EJxvg099721@gitrepo.freebsd.org>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
 protocol="application/pgp-signature"; boundary="dmp2obhq2yai6bdc"
Content-Disposition: inline
In-Reply-To: <202102071419.117EJxvg099721@gitrepo.freebsd.org>
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
 <dev-commits-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-doc-all/>
List-Post: <mailto:dev-commits-doc-all@freebsd.org>
List-Help: <mailto:dev-commits-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 07 Feb 2021 14:33:00 -0000


--dmp2obhq2yai6bdc
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Sun, Feb 07, 2021 at 02:19:59PM +0000, Nuno Eduardo Sim=F5es Leal Teixei=
ra wrote:
> The branch main has been updated by eduardo (ports committer):
>=20
> URL: https://cgit.FreeBSD.org/doc/commit/?id=3D17eef34c77ad195a794db79259=
3547a086bd140b
>=20
> commit 17eef34c77ad195a794db792593547a086bd140b
> Author:     Nuno Eduardo Sim=F5es Leal Teixeira <eduardo@FreeBSD.org>
> AuthorDate: 2021-02-07 13:52:47 +0000
> Commit:     Nuno Eduardo Sim=F5es Leal Teixeira <eduardo@FreeBSD.org>
> CommitDate: 2021-02-07 14:18:04 +0000
>=20
>     Steps 1-4 from the Committer's guide (eduardo)

Approved by:	garga (mentor), dbaio (mentor)
Differential Revision:	https://reviews.freebsd.org/D28476

Next commits will have all info.

Regards.
--=20
Danilo G. Baio (dbaio)

--dmp2obhq2yai6bdc
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQKTBAABCgB9FiEEORj0UTsjzCy+enIkmpN7LfMuiNcFAmAf+hlfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDM5
MThGNDUxM0IyM0NDMkNCRTdBNzIyNDlBOTM3QjJERjMyRTg4RDcACgkQmpN7LfMu
iNfVBRAAmTJY+aGFlwZq8eNwO+SjQu2UXV6VhUBaznk+Rv2e0nWLTsZnMWSurYKG
DcLgWKsT2arkJv3Ig7B6jYc6/DgPfefaj7UINmMpUdVFHpSGLbWd41o2gnZZh131
Pnsb6rkSFPSM/iz9RG9/5yBj8eo6DNSu6jYI6lY1/z/WVs97uQ4uUxtv/WLgtA2c
M8jJzJ1AISCVKU06ju3gVr0w/xxD5JW+EsjFOwheAJS3hOnW5W+j3fXR9dY4eifJ
e0XkRiFFBTvb1xh3ghYB5Z1s5eIqf5ggwJoyZvie1zw1SOVnAZOtQbGWtDkEc6Fw
cjg5QtRmkUVgMw6mFvcOAkmYYMYMAkcrAYBvAshpnrxRY9R3qhuBVcqr2uecMX5u
o9Ew/wK5ECOTdvOi1KCxKgON5s6Ch1TmAoVWNty+dl0FcqLidpl19jN9my09F5i+
BWDdpq61zCgZI/2JAheEIlbK+qLg7Aykec4gDgXtorbZGcuRFfgCEi321wWXGLqg
o36kDEUo+rYgvgntU8Ul0RjWGSVxJfdGvO1/IOFroWdAphqs0G96rRULGiLy7QgG
hxn8jmRP5rI1WNlfQiHwQu6BGLA4HuiQmm8ym9SL6Qc+VuMIiZL9jhW9nuZV3cxl
WmyKbC2aT2hc6Q65GoQZQyDqP0hEa5qLuXhlz4ocE+UL8j8OdEo=
=48jq
-----END PGP SIGNATURE-----

--dmp2obhq2yai6bdc--

From owner-dev-commits-doc-all@freebsd.org  Sun Feb  7 15:53:45 2021
Return-Path: <owner-dev-commits-doc-all@freebsd.org>
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 0BEDC53004D
 for <dev-commits-doc-all@mailman.nyi.freebsd.org>;
 Sun,  7 Feb 2021 15:53:45 +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 4DYYbr6wmrz4lv4;
 Sun,  7 Feb 2021 15:53:44 +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 E093A2702D;
 Sun,  7 Feb 2021 15:53:44 +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 117Fri6p028775;
 Sun, 7 Feb 2021 15:53:44 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
 by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 117Fri5c028774;
 Sun, 7 Feb 2021 15:53:44 GMT (envelope-from git)
Date: Sun, 7 Feb 2021 15:53:44 GMT
Message-Id: <202102071553.117Fri5c028774@gitrepo.freebsd.org>
To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org
From: Rene Ladan <rene@FreeBSD.org>
Subject: git: 89407529ff - main - Note the shorter expiration time for ports
 bits on /internal/expire-bits
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: rene
X-Git-Repository: doc
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 89407529ff8f561963d9064148d80ef2c52326d0
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
 <dev-commits-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-doc-all/>
List-Post: <mailto:dev-commits-doc-all@freebsd.org>
List-Help: <mailto:dev-commits-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 07 Feb 2021 15:53:45 -0000

The branch main has been updated by rene:

URL: https://cgit.FreeBSD.org/doc/commit/?id=89407529ff8f561963d9064148d80ef2c52326d0

commit 89407529ff8f561963d9064148d80ef2c52326d0
Author:     Rene Ladan <rene@FreeBSD.org>
AuthorDate: 2021-02-07 15:49:45 +0000
Commit:     Rene Ladan <rene@FreeBSD.org>
CommitDate: 2021-02-07 15:52:46 +0000

    Note the shorter expiration time for ports bits on /internal/expire-bits
    
    Reported by:    gerald
    Approved by:    core (emaste, implicit, documenting existing policy)
---
 website/content/en/internal/expire-bits.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website/content/en/internal/expire-bits.adoc b/website/content/en/internal/expire-bits.adoc
index e6d1e4dd62..56bcb0cd89 100644
--- a/website/content/en/internal/expire-bits.adoc
+++ b/website/content/en/internal/expire-bits.adoc
@@ -11,6 +11,6 @@ Over time, FreeBSD committers may find other demands on their time, and decide t
 
 == Policy
 
-Committers that have not made a commit in 18 months may be removed from the access file from time to time. Committers that wish to get back their commit bits will have to reapply with the appropriate authority.
+Documentation and source committers that have not made a commit in 18 months may be removed from the access file from time to time. For ports committers this period is 12 months. Committers that wish to get back their commit bits will have to reapply with the appropriate authority.
 
 If all of a committer's commit bits expire, then the committer's `FreeBSD.org` account may also be suspended at the FreeBSD Core Team's discretion. An account is suspended by disabling login access and any other services (such as CGI scripts or non-trivial mail forwarding configurations) that execute under the committer's account. Simple mail forwarding will continue to work, and an individual may e-mail `core@FreeBSD.org` to update mail forwarding settings. The committer's files may or may not be preserved at the FreeBSD Core Team's discretion. A suspended account will be reactivated if any of a committer's commit bits are restored.

From owner-dev-commits-doc-all@freebsd.org  Sun Feb  7 18:37:42 2021
Return-Path: <owner-dev-commits-doc-all@freebsd.org>
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 4A8FC533B59
 for <dev-commits-doc-all@mailman.nyi.freebsd.org>;
 Sun,  7 Feb 2021 18:37:42 +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 4DYdF21fBLz3Cbf;
 Sun,  7 Feb 2021 18:37:42 +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 2B4D8F57;
 Sun,  7 Feb 2021 18:37:42 +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 117IbgMp037909;
 Sun, 7 Feb 2021 18:37:42 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
 by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 117IbghI037908;
 Sun, 7 Feb 2021 18:37:42 GMT (envelope-from git)
Date: Sun, 7 Feb 2021 18:37:42 GMT
Message-Id: <202102071837.117IbghI037908@gitrepo.freebsd.org>
To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org
From: Fernando Apesteguía <fernape@FreeBSD.org>
Subject: git: 5d0182eabb - main - [handbook]: Document how to mount NTFS disks
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: fernape
X-Git-Repository: doc
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 5d0182eabb0093075b114ffead5db19da6a2cbcb
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
 <dev-commits-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-doc-all/>
List-Post: <mailto:dev-commits-doc-all@freebsd.org>
List-Help: <mailto:dev-commits-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-doc-all>, 
 <mailto:dev-commits-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 07 Feb 2021 18:37:42 -0000

The branch main has been updated by fernape:

URL: https://cgit.FreeBSD.org/doc/commit/?id=5d0182eabb0093075b114ffead5db19da6a2cbcb

commit 5d0182eabb0093075b114ffead5db19da6a2cbcb
Author:     Fernando Apesteguía <fernape@FreeBSD.org>
AuthorDate: 2021-01-27 14:49:48 +0000
Commit:     Fernando Apesteguía <fernape@FreeBSD.org>
CommitDate: 2021-02-07 18:31:53 +0000

    [handbook]: Document how to mount NTFS disks
    
    How to mount NTFS disks is a FAQ in our chats and forums.
    Add a section in handbook/disks under "18. Storage" with
    straightforward information on how to mount NTFS disks.
    
    PR:     251109
    Submitted by:
    Reported by:    0mp@
    Reviewed by:
    Approved by:    0mp@ (mentor)
    Obtained from:
    MFC after:
    MFH:
    Relnotes:
    Security:
    Sponsored by:
    Differential Revision:  https://reviews.freebsd.org/D28131
---
 .../content/en/books/handbook/disks/_index.adoc    | 86 ++++++++++++++++++++++
 1 file changed, 86 insertions(+)

diff --git a/documentation/content/en/books/handbook/disks/_index.adoc b/documentation/content/en/books/handbook/disks/_index.adoc
index 4d2d6f99d3..955e7f713a 100644
--- a/documentation/content/en/books/handbook/disks/_index.adoc
+++ b/documentation/content/en/books/handbook/disks/_index.adoc
@@ -1006,6 +1006,92 @@ To format the floppy with FAT, issue:
 
 The disk is now ready for use. To use the floppy, mount it with man:mount_msdosfs[8]. One can also install and use package:emulators/mtools[] from the Ports Collection.
 
+[[using-ntfs]]
+== Using NTFS Disks
+
+This section explains how to mount NTFS disks in FreeBSD.
+
+NTFS (New Technology File System) is a proprietary journaling file system
+developed by Microsoft(R).  It has been the default file system in Microsoft
+Windows(R) for many years.  FreeBSD can mount NTFS volumes using a FUSE file
+system.  These file systems are implemented as user space programs which
+interact with the man:fusefs[5] kernel module via a well defined interface.
+
+[.procedure]
+====
+*Procedure: Steps to Mount a NTFS Disk*
+
+. Before using a FUSE file system we need to load the man:fusefs[5] kernel
+module:
++
+[source,bash]
+....
+# kldload fusefs
+....
++
+Use man:sysrc[8] to load the module at startup:
++
+[source,bash]
+....
+# sysrc kld_list+=fusefs
+....
+
+. Install the actual NTFS file system from packages as in the example (see
+crossref:ports[pkgng-intro,Using pkg for Binary Package Management]) or from
+ports (see crossref:ports[ports-using,Using the Ports Collection]):
++
+[source,bash]
+....
+# pkg install fusefs-ntfs
+....
+
+. Last we need to create a directory where the file system will be mounted:
++
+[source,bash]
+....
+# mkdir /mnt/usb
+....
+
+. Suppose a USB disk is plugged in.  The disk partition information can be
+viewed with man:gpart[8]:
++
+[source,bash]
+....
+# gpart show da0
+=>	  63  1953525105  da0 MBR   (932G)
+	  63  1953525105    1 ntfs  (932G)
+....
+
+. We can mount the disk using the following command:
++
+[source,bash]
+....
+# ntfs-3g /dev/da0s1 /mnt/usb/
+....
+The disk is now ready to use.
++
+. Additionally, an entry can be added to /etc/fstab:
++
+[.programlisting]
+....
+/dev/da0s1  /mnt/usb	ntfs mountprog=/usr/local/bin/ntfs-3g,noauto,rw  0 0
+....
++
+Now the disk can be now mounted with:
++
+[source,bash]
+....
+# mount /mnt/usb
+....
+
+. The disk can be unmounted with:
++
+[source,bash]
+....
+# umount /mnt/usb/
+....
+====
+
 [[backup-basics]]
 == Backup Basics