From 36011ccc464b60037cf4891be5febe7c3f3dbb3e Mon Sep 17 00:00:00 2001
From: Glen Barber <gjb@FreeBSD.org>
Date: Mon, 10 Dec 2018 19:37:58 +0000
Subject: [PATCH] Document r333322, carp(4) state as INIT when
 net.inet.carp.allow=0.

Sponsored by:	The FreeBSD Foundation
---
 en_US.ISO8859-1/htdocs/releases/12.0R/relnotes/relnotes.xml | 6 ++++++
 1 file changed, 6 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 627380a00b..6069e4084a 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
@@ -912,6 +912,12 @@
     <sect2 xml:id="network-general">
       <title>General Network</title>
 
+      <para revision="333322" contrib="sponsor" sponsor="&ix;">The
+	&man.carp.4; interface has been updated to keep the state as
+	<literal>INIT</literal> instead of <literal>MASTER</literal>
+	when the <literal>net.inet.carp.allow</literal> &man.sysctl.8;
+	is set to <literal>0</literal>.</para>
+
       <para>The &man.pf.4; packet filter is now usable within
 	a &man.jail.8; using &man.vnet.9;.</para>