From owner-svn-src-all@FreeBSD.ORG  Wed Jul 16 12:41:51 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 66B3AE2C;
 Wed, 16 Jul 2014 12:41:51 +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 533E12391;
 Wed, 16 Jul 2014 12:41:51 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6GCfpEg064361;
 Wed, 16 Jul 2014 12:41:51 GMT (envelope-from gavin@svn.freebsd.org)
Received: (from gavin@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6GCfpcI064360;
 Wed, 16 Jul 2014 12:41:51 GMT (envelope-from gavin@svn.freebsd.org)
Message-Id: <201407161241.s6GCfpcI064360@svn.freebsd.org>
From: Gavin Atkinson <gavin@FreeBSD.org>
Date: Wed, 16 Jul 2014 12:41:51 +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: r268755 - stable/10/games/fortune/datfiles
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: Wed, 16 Jul 2014 12:41:51 -0000

Author: gavin
Date: Wed Jul 16 12:41:50 2014
New Revision: 268755
URL: http://svnweb.freebsd.org/changeset/base/268755

Log:
  Merge r268295 from head:
    Fix equation and limerick to be correct.  NetBSD fixed this 14 years ago
    (src/games/fortune/datfiles/fortunes2 1.7).
  
  PR:		188714
  Submitted by:	ksmakoto dd.iij4u.or.jp

Modified:
  stable/10/games/fortune/datfiles/fortunes
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/games/fortune/datfiles/fortunes
==============================================================================
--- stable/10/games/fortune/datfiles/fortunes	Wed Jul 16 12:41:49 2014	(r268754)
+++ stable/10/games/fortune/datfiles/fortunes	Wed Jul 16 12:41:50 2014	(r268755)
@@ -570,7 +570,7 @@ writing.  Always pick on the correct idi
 the verb.  Last but not least, avoid cliches like the plague; seek
 viable alternatives.
 %
-	      1/2
+	      1/3
 	 /\(3)
 	 |     2			  1/3
 	 |    z dz cos(3 * PI / 9) = ln (e   )
@@ -578,7 +578,7 @@ viable alternatives.
 	\/ 1
 
 The integral of z squared, dz
-From 1 to the square root of 3
+From 1 to the cube root of 3
 	Times the cosine
 	Of 3 PI over nine
 Is the log of the cube root of e