From bdc5e1138582482dce9216d0787fafbe31821c41 Mon Sep 17 00:00:00 2001
From: Glen Barber <gjb@FreeBSD.org>
Date: Wed, 5 Dec 2018 20:18:15 +0000
Subject: [PATCH] Document r337023, security.jail.vmm_allowed sysctl(8) to
 allow running bhyve(8) within a jail(8).

Sponsored by:	The FreeBSD Foundation
---
 en_US.ISO8859-1/htdocs/releases/12.0R/relnotes/relnotes.xml | 6 ++++++
 en_US.ISO8859-1/htdocs/releases/12.0R/share/xml/sponsor.ent | 3 +++
 2 files changed, 9 insertions(+)

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 9fdc2a51fa..a8a9d5960c 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
@@ -622,6 +622,12 @@
 	use the Amazon&reg; internal <application>NTP</application>
 	service by default.</para>
 
+      <para revision="337023" contrib="sponsor"
+	sponsor="&hbsd;, &g2inc;">A new &man.sysctl.8;,
+	<literal>security.jail.vmm_allowed</literal>, has been added,
+	which when set to <literal>1</literal> allows &man.bhyve.8;
+	use within a &man.jail.8;.</para>
+
       <para revision="338321">Amazon&reg; EC2&trade; AMI instances now
 	disable the PS/2 keyboard and mouse devices by default,
 	reducing overall boot time by 2.5 seconds.</para>
diff --git a/en_US.ISO8859-1/htdocs/releases/12.0R/share/xml/sponsor.ent b/en_US.ISO8859-1/htdocs/releases/12.0R/share/xml/sponsor.ent
index 1dbe984565..c8530bb89a 100644
--- a/en_US.ISO8859-1/htdocs/releases/12.0R/share/xml/sponsor.ent
+++ b/en_US.ISO8859-1/htdocs/releases/12.0R/share/xml/sponsor.ent
@@ -29,11 +29,14 @@
 <!ENTITY ff		"The&nbsp;&os;&nbsp;Foundation">
 <!ENTITY ff.url		"https://www.FreeBSDFoundation.org/">
 
+<!ENTITY g2inc		"G2, Inc.">
 <!ENTITY gandi		"Gandi.net">
 <!ENTITY google		"Google">
 
 <!ENTITY juniper	"Juniper Networks, Inc.">
 
+<!ENTITY hbsd		"HardenedBSD">
+
 <!ENTITY intelcorp	"Intel Corporation">
 <!ENTITY ix		"iXsystems">