From owner-svn-src-all@FreeBSD.ORG  Tue Jul  8 15:09:55 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 95DE548A;
 Tue,  8 Jul 2014 15:09:55 +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 828A42DB1;
 Tue,  8 Jul 2014 15:09:55 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s68F9t9J023301;
 Tue, 8 Jul 2014 15:09:55 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s68F9tf4023300;
 Tue, 8 Jul 2014 15:09:55 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201407081509.s68F9tf4023300@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Tue, 8 Jul 2014 15:09:55 +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: r268411 - 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
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: Tue, 08 Jul 2014 15:09:55 -0000

Author: gjb
Date: Tue Jul  8 15:09:55 2014
New Revision: 268411
URL: http://svnweb.freebsd.org/changeset/base/268411

Log:
  Document r268161, mkimg(1) merged to stable/10.
  
  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	Tue Jul  8 15:04:35 2014	(r268410)
+++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml	Tue Jul  8 15:09:55 2014	(r268411)
@@ -265,6 +265,9 @@
       device is an active kernel console, otherwise it is equivalent
       to <literal>off</literal>.</para>
 
+    <para revision="268161">The &man.mkimg.1; utility has been merged
+      from &os;-CURRENT.</para>
+
     <sect3 xml:id="rc-scripts">
       <title><filename>/etc/rc.d</filename> Scripts</title>