From 58cc2f596ea3eaeaaf0f3c5d59f52325f03e0929 Mon Sep 17 00:00:00 2001
From: Glen Barber <gjb@FreeBSD.org>
Date: Wed, 5 Dec 2018 17:52:05 +0000
Subject: [PATCH] Document r338666, armv6/armv7 capsicum support enabled by
 default.

Sponsored by:	The FreeBSD Foundation
---
 en_US.ISO8859-1/htdocs/releases/12.0R/relnotes/relnotes.xml | 4 +++-
 en_US.ISO8859-1/htdocs/releases/12.0R/share/xml/release.ent | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/en_US.ISO8859-1/htdocs/releases/12.0R/relnotes/relnotes.xml b/en_US.ISO8859-1/htdocs/releases/12.0R/relnotes/relnotes.xml
index fb91d0e583..411b299a29 100644
--- a/en_US.ISO8859-1/htdocs/releases/12.0R/relnotes/relnotes.xml
+++ b/en_US.ISO8859-1/htdocs/releases/12.0R/relnotes/relnotes.xml
@@ -591,7 +591,9 @@
     <sect2 xml:id="hardware-arm">
       <title>ARM Support</title>
 
-      <para>&nbsp;</para>
+      <para revision="338666" contrib="sponsor" sponsor="&ff;">Support
+	for &man.capsicum.4; has been enabled on &arch.armv6; and
+	&arch.armv7; by default.</para>
     </sect2>
   </sect1>
 
diff --git a/en_US.ISO8859-1/htdocs/releases/12.0R/share/xml/release.ent b/en_US.ISO8859-1/htdocs/releases/12.0R/share/xml/release.ent
index c4cbf17bd1..cd9285a046 100644
--- a/en_US.ISO8859-1/htdocs/releases/12.0R/share/xml/release.ent
+++ b/en_US.ISO8859-1/htdocs/releases/12.0R/share/xml/release.ent
@@ -70,6 +70,8 @@
 <!-- Architecture names -->
 <!ENTITY arch.amd64 "amd64">
 <!ENTITY arch.arm "arm">
+<!ENTITY arch.armv6 "armv6">
+<!ENTITY arch.armv7 "armv7">
 <!ENTITY arch.arm64 "aarch64">
 <!ENTITY arch.i386 "i386">
 <!ENTITY arch.mips "mips">