svn commit: r270554 - stable/10/release/doc/en_US.ISO8859-1/relnotes

[Glen Barber]

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