From 56b00859329c343f6e0aedfbc2428ab9cc6ee85a Mon Sep 17 00:00:00 2001
From: gjb <gjb@FreeBSD.org>
Date: Thu, 25 Jun 2015 18:44:12 +0000
Subject: [PATCH] Document r282901, RACCT/RCTL in GENERIC by default.

Sponsored by:	The FreeBSD Foundation
---
 release/doc/en_US.ISO8859-1/relnotes/article.xml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/release/doc/en_US.ISO8859-1/relnotes/article.xml b/release/doc/en_US.ISO8859-1/relnotes/article.xml
index 0d38345b50e2..e0f7af20eb49 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/article.xml
+++ b/release/doc/en_US.ISO8859-1/relnotes/article.xml
@@ -703,6 +703,19 @@
 	&man.rctl.8; with the <literal>GENERIC</literal> kernel.
 	A new kernel configuration option,
 	<literal>RACCT_DISABLED</literal> has also been added.</para>
+
+      <para revision="282901" contrib="sponsor" sponsor="&ff;">The
+	<literal>GENERIC</literal> kernel configuration now includes
+	<literal>RACCT</literal> and <literal>RCTL</literal> by
+	default.</para>
+
+      <note>
+	<para>To enable <literal>RACCT</literal> and
+	  <literal>RCTL</literal> on a system using the
+	  <literal>GENERIC</literal> kernel configuration, add
+	  <literal>kern.racct.enable=1</literal> to
+	  &man.loader.conf.5;, and reboot the system.</para>
+      </note>
     </sect2>
   </sect1>