From owner-svn-src-stable@FreeBSD.ORG  Wed Sep  3 16:46:44 2014
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 81CF3C97;
 Wed,  3 Sep 2014 16:46:44 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6CC4A13D4;
 Wed,  3 Sep 2014 16:46:44 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s83Gkid0029510;
 Wed, 3 Sep 2014 16:46:44 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s83GkiAi029508;
 Wed, 3 Sep 2014 16:46:44 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201409031646.s83GkiAi029508@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Wed, 3 Sep 2014 16:46:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r271040 - in stable/10/release/doc:
 en_US.ISO8859-1/relnotes share/xml
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 03 Sep 2014 16:46:44 -0000

Author: gjb
Date: Wed Sep  3 16:46:43 2014
New Revision: 271040
URL: http://svnweb.freebsd.org/changeset/base/271040

Log:
  Document r270997, zdb(8) included in /rescue.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml
  stable/10/release/doc/share/xml/vendor.ent

Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml
==============================================================================
--- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml	Wed Sep  3 16:46:41 2014	(r271039)
+++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml	Wed Sep  3 16:46:43 2014	(r271040)
@@ -1177,6 +1177,13 @@
 	facility has been added to the &man.pam.group.8;
 	module.</para>
 
+      <para revision="270997" contrib="vendor" vendor="&freenas;">The
+	&man.zdb.8; utility is now included in the set of applications
+	installed in the <filename
+	  class="directory">/rescue</filename> environment, making it
+	possible to examine &man.zfs.8; filesystems when <filename
+	  class="directory">/usr</filename> is unavailable.</para>
+
       <sect3 xml:id="rc-scripts">
 	<title><filename>/etc/rc.d</filename> Scripts</title>
 

Modified: stable/10/release/doc/share/xml/vendor.ent
==============================================================================
--- stable/10/release/doc/share/xml/vendor.ent	Wed Sep  3 16:46:41 2014	(r271039)
+++ stable/10/release/doc/share/xml/vendor.ent	Wed Sep  3 16:46:43 2014	(r271040)
@@ -10,4 +10,6 @@
 
 <!ENTITY chelsio	"Chelsio">
 
+<!ENTITY freenas	"FreeNAS">
+
 <!ENTITY highpoint	"HighPoint">