From owner-svn-doc-all@FreeBSD.ORG  Thu Jan 17 00:21:13 2013
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id B1C7B9D3;
 Thu, 17 Jan 2013 00:21:13 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 9F256A43;
 Thu, 17 Jan 2013 00:21:13 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0H0LDu0019124;
 Thu, 17 Jan 2013 00:21:13 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0H0LDbf019123;
 Thu, 17 Jan 2013 00:21:13 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201301170021.r0H0LDbf019123@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Thu, 17 Jan 2013 00:21:13 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40660 - head/en_US.ISO8859-1/books/faq
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 17 Jan 2013 00:21:13 -0000

Author: gjb
Date: Thu Jan 17 00:21:13 2013
New Revision: 40660
URL: http://svnweb.freebsd.org/changeset/doc/40660

Log:
  Add a FAQ entry for ZFS TRIM support.

Modified:
  head/en_US.ISO8859-1/books/faq/book.xml

Modified: head/en_US.ISO8859-1/books/faq/book.xml
==============================================================================
--- head/en_US.ISO8859-1/books/faq/book.xml	Wed Jan 16 19:11:10 2013	(r40659)
+++ head/en_US.ISO8859-1/books/faq/book.xml	Thu Jan 17 00:21:13 2013	(r40660)
@@ -4500,6 +4500,31 @@ C:\="DOS"</programlisting>
 	    </note>
 	  </answer>
 	</qandaentry>
+
+	<qandaentry>
+	  <question id="zfs-ssd-trim">
+	    <para>Does ZFS support TRIM for Solid State Drives?</para>
+	  </question>
+
+	  <answer>
+	    <para>ZFS TRIM support was added to &os;&nbsp;10-CURRENT
+	      with revision r<svnref>240868</svnref>.  ZFS TRIM
+	      support is not yet available on the -STABLE
+	      branches.</para>
+
+	    <para>ZFS TRIM is enabled by default, and can be turned
+	      off by adding this line to
+	      <filename>/etc/sysctl.conf</filename>:</para>
+
+	    <programlisting>vfs.zfs.trim_disable=1</programlisting>
+
+	    <note>
+	      <para>ZFS TRIM may not work with all configurations,
+		such as a ZFS filesystem on a GELI-backed
+		device.</para>
+	    </note>
+	  </answer>
+	</qandaentry>
       </qandaset>
     </sect1>
   </chapter>