Index: en_US.ISO8859-1/books/faq/book.xml
===================================================================
--- en_US.ISO8859-1/books/faq/book.xml
+++ en_US.ISO8859-1/books/faq/book.xml
@@ -3426,8 +3426,9 @@
 	  <programlisting>vfs.zfs.trim.enabled=0</programlisting>
 
 	  <note>
-	    <para>ZFS TRIM may not work with all configurations, such
-	      as a ZFS filesystem on a GELI-backed device.</para>
+	    <para>ZFS TRIM support was added to GELI as of
+	      r<revnumber>286444</revnumber>.  Please see
+	      &man.geli.8; and the <option>-T</option> switch.</para>
 	  </note>
 	</answer>
       </qandaentry>
Index: en_US.ISO8859-1/books/handbook/basics/chapter.xml
===================================================================
--- en_US.ISO8859-1/books/handbook/basics/chapter.xml
+++ en_US.ISO8859-1/books/handbook/basics/chapter.xml
@@ -388,6 +388,14 @@
 	  <systemitem class="username">news</systemitem>, and
 	  <systemitem class="username">www</systemitem>.</para>
 
+	<warning>
+	  <para>Care must be taken when using the operator group, as
+	    unintended superuser-like access privileges may be
+	    granted, including but not limited to shutdown, reboot,
+	    and access to all items in <filename>/dev</filename>
+	    in the group.</para>
+	</warning>
+
 	<indexterm>
 	  <primary>accounts</primary>
 	  <secondary><systemitem