From owner-svn-doc-all@FreeBSD.ORG  Mon Jan 12 21:26:37 2015
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@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 AD32ADB4;
 Mon, 12 Jan 2015 21:26:37 +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 99680F47;
 Mon, 12 Jan 2015 21:26:37 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0CLQbl6044877;
 Mon, 12 Jan 2015 21:26:37 GMT (envelope-from bjk@FreeBSD.org)
Received: (from bjk@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0CLQbGG044875;
 Mon, 12 Jan 2015 21:26:37 GMT (envelope-from bjk@FreeBSD.org)
Message-Id: <201501122126.t0CLQbGG044875@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bjk set sender to bjk@FreeBSD.org
 using -f
From: Benjamin Kaduk <bjk@FreeBSD.org>
Date: Mon, 12 Jan 2015 21:26:37 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r46193 - head/en_US.ISO8859-1/htdocs/news/status
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all/>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Jan 2015 21:26:37 -0000

Author: bjk
Date: Mon Jan 12 21:26:36 2015
New Revision: 46193
URL: https://svnweb.freebsd.org/changeset/doc/46193

Log:
  Fix typo
  
  Submitted by:	allanjude
  Approved by:	hrs (mentor, blanket)

Modified:
  head/en_US.ISO8859-1/htdocs/news/status/report-2014-10-2014-12.xml

Modified: head/en_US.ISO8859-1/htdocs/news/status/report-2014-10-2014-12.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/news/status/report-2014-10-2014-12.xml	Mon Jan 12 21:14:41 2015	(r46192)
+++ head/en_US.ISO8859-1/htdocs/news/status/report-2014-10-2014-12.xml	Mon Jan 12 21:26:36 2015	(r46193)
@@ -298,7 +298,7 @@
 	<ul>
 	  <li>Stricter checking of the path passed via the plist</li>
 	  <li>Change in the ABI to be closer to MACHINE_ARCH</li>
-	  <li>Add three-way merge functionnality</li>
+	  <li>Add three-way merge functionality</li>
 	  <li>Add conservative upgrade support for multi repository configurations</li>
 	  <li>Multirepository priority</li>
 	</ul>