From owner-svn-src-all@FreeBSD.ORG  Mon Aug 25 13:15:18 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@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 013869B8;
 Mon, 25 Aug 2014 13:15:17 +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 E033D39F5;
 Mon, 25 Aug 2014 13:15:17 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PDFHDT091719;
 Mon, 25 Aug 2014 13:15:17 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PDFHAe091718;
 Mon, 25 Aug 2014 13:15:17 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201408251315.s7PDFHAe091718@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: Mon, 25 Aug 2014 13:15:17 +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: r270554 - stable/10/release/doc/en_US.ISO8859-1/relnotes
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 25 Aug 2014 13:15:18 -0000

Author: gjb
Date: Mon Aug 25 13:15:17 2014
New Revision: 270554
URL: http://svnweb.freebsd.org/changeset/base/270554

Log:
  Document r266953, silence error message if there is
  nothing to compare.
  
  Sponsored by:	The FreeBSD Foundation

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

Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml
==============================================================================
--- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml	Mon Aug 25 13:15:14 2014	(r270553)
+++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml	Mon Aug 25 13:15:17 2014	(r270554)
@@ -554,6 +554,11 @@
 	ends event collection after the specified number of
 	seconds.</para>
 
+      <para revision="266953">The &man.mergemaster.8; utility has
+	been updated to avoid printing
+	<quote><filename>/var/tmp/temproot</filename>
+	  disappeared</quote> if there is nothing to compare.</para>
+
       <para revision="267113">The default &man.newsyslog.conf.5; now
 	includes files in the
 	<filename>/etc/newsyslog.conf.d/</filename> and