From owner-svn-src-releng@FreeBSD.ORG  Fri Oct 17 15:30:58 2014
Return-Path: <owner-svn-src-releng@FreeBSD.ORG>
Delivered-To: svn-src-releng@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id DC516C8F;
 Fri, 17 Oct 2014 15:30:58 +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 C8AE37D9;
 Fri, 17 Oct 2014 15:30:58 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9HFUwxX011856;
 Fri, 17 Oct 2014 15:30:58 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9HFUwZr011855;
 Fri, 17 Oct 2014 15:30:58 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201410171530.s9HFUwZr011855@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: Fri, 17 Oct 2014 15:30:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-releng@freebsd.org
Subject: svn commit: r273225 - releng/10.1/release/doc/en_US.ISO8859-1/relnotes
X-SVN-Group: releng
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-releng@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the release engineering / security commits to
 the src tree <svn-src-releng.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-releng>,
 <mailto:svn-src-releng-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-releng/>
List-Post: <mailto:svn-src-releng@freebsd.org>
List-Help: <mailto:svn-src-releng-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-releng>,
 <mailto:svn-src-releng-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 17 Oct 2014 15:30:59 -0000

Author: gjb
Date: Fri Oct 17 15:30:58 2014
New Revision: 273225
URL: https://svnweb.freebsd.org/changeset/base/273225

Log:
  Document r273098, options for displaying mkimg(1) internals
  
  Approved by:	re (implicit)
  Sponsored by:	The FreeBSD Foundation

Modified:
  releng/10.1/release/doc/en_US.ISO8859-1/relnotes/article.xml

Modified: releng/10.1/release/doc/en_US.ISO8859-1/relnotes/article.xml
==============================================================================
--- releng/10.1/release/doc/en_US.ISO8859-1/relnotes/article.xml	Fri Oct 17 15:30:55 2014	(r273224)
+++ releng/10.1/release/doc/en_US.ISO8859-1/relnotes/article.xml	Fri Oct 17 15:30:58 2014	(r273225)
@@ -1311,6 +1311,43 @@
       <para revision="272819">Support for QCOW and QCOW2 disk image
 	formats has been added to the &man.mkimg.1; utility.</para>
 
+      <para revision="273098">The &man.mkimg.1; utility has been
+	updated to include three options used to print information
+	about &man.mkimg.1; itself:</para>
+
+      <informaltable frame="none" pgwide="0">
+	<tgroup cols="2">
+	  <colspec colwidth="1*"/>
+	  <colspec colwidth="1*"/>
+	  <thead>
+	    <row>
+	      <entry>Option</entry>
+	      <entry>Output</entry>
+	    </row>
+	  </thead>
+
+	  <tbody>
+	    <row>
+	      <entry><literal>--version</literal></entry>
+	      <entry>The current version of the &man.mkimg.1;
+		utility</entry>
+	    </row>
+
+	    <row>
+	      <entry><literal>--formats</literal></entry>
+	      <entry>The disk image file formats supported by
+		&man.mkimg.1;</entry>
+	    </row>
+
+	    <row>
+	      <entry><literal>--schemes</literal></entry>
+	      <entry>The partition schemes supported by
+		&man.mkimg.1;</entry>
+	    </row>
+	  </tbody>
+	</tgroup>
+      </informaltable>
+
       <sect3 xml:id="rc-scripts">
 	<title><filename>/etc/rc.d</filename> Scripts</title>