From owner-svn-src-head@freebsd.org  Thu May 25 18:46:15 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1D497D8228E;
 Thu, 25 May 2017 18:46:15 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 E1C081CFF;
 Thu, 25 May 2017 18:46:14 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v4PIkDGt062097;
 Thu, 25 May 2017 18:46:13 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4PIkDrv062096;
 Thu, 25 May 2017 18:46:13 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201705251846.v4PIkDrv062096@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bapt set sender to
 bapt@FreeBSD.org using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Thu, 25 May 2017 18:46:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r318892 - head/usr.bin/diff3
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 25 May 2017 18:46:15 -0000

Author: bapt
Date: Thu May 25 18:46:13 2017
New Revision: 318892
URL: https://svnweb.freebsd.org/changeset/base/318892

Log:
  Update the diff3 manpage to reflect the fact the version in freebsd does
  not use temporary files nor uses a /usr/libexec/diff3prog

Modified:
  head/usr.bin/diff3/diff3.1

Modified: head/usr.bin/diff3/diff3.1
==============================================================================
--- head/usr.bin/diff3/diff3.1	Thu May 25 18:16:17 2017	(r318891)
+++ head/usr.bin/diff3/diff3.1	Thu May 25 18:46:13 2017	(r318892)
@@ -30,7 +30,7 @@
 .\"     @(#)diff3.1	8.2 (Berkeley) 4/18/94
 .\" $FreeBSD$
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd May 25, 2017
 .Dt DIFF3 1
 .Os
 .Sh NAME
@@ -157,26 +157,6 @@ The lines beneath this notation are rang
 different in file
 .Va n .
 .El
-.Sh ENVIRONMENT
-.Bl -tag -width TMPDIR
-.It Ev TMPDIR
-If the environment variable
-.Ev TMPDIR
-exists,
-.Nm
-will use the directory specified by
-.Ev TMPDIR
-as the temporary directory.
-.El
-.Sh FILES
-.Bl -tag -width /usr/libexec/diff3 -compact
-.It Pa /tmp/d3a.XXXXXXXXXX
-temporary file
-.It Pa /tmp/d3b.XXXXXXXXXX
-temporary file
-.It Pa /usr/libexec/diff3
-the actual executable
-.El
 .Sh SEE ALSO
 .Xr diff 1 ,
 .Xr ed 1 ,