From owner-svn-src-all@FreeBSD.ORG  Sun Mar 30 04:55:34 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 30AB239B;
 Sun, 30 Mar 2014 04:55:34 +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 0211519B;
 Sun, 30 Mar 2014 04:55:33 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2U4tXSK075977;
 Sun, 30 Mar 2014 04:55:33 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2U4tXGn075976;
 Sun, 30 Mar 2014 04:55:33 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201403300455.s2U4tXGn075976@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Sun, 30 Mar 2014 04:55:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r263929 - head/usr.bin/units
X-SVN-Group: head
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.17
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: Sun, 30 Mar 2014 04:55:34 -0000

Author: eadler
Date: Sun Mar 30 04:55:33 2014
New Revision: 263929
URL: http://svnweb.freebsd.org/changeset/base/263929

Log:
  Teach units(1) that an erg and ergon are the same thing.

Modified:
  head/usr.bin/units/units.lib

Modified: head/usr.bin/units/units.lib
==============================================================================
--- head/usr.bin/units/units.lib	Sun Mar 30 04:40:41 2014	(r263928)
+++ head/usr.bin/units/units.lib	Sun Mar 30 04:55:33 2014	(r263929)
@@ -298,6 +298,7 @@ N			newton
 joule			nt-m
 J			joule
 cal			4.1868 joule
+ergon			erg
 
 / Electrical