From owner-svn-src-stable@FreeBSD.ORG  Thu Aug 28 21:16:31 2014
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@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 8967B182;
 Thu, 28 Aug 2014 21:16:31 +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 74953124F;
 Thu, 28 Aug 2014 21:16:31 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7SLGVGN096428;
 Thu, 28 Aug 2014 21:16:31 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7SLGVxO096427;
 Thu, 28 Aug 2014 21:16:31 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201408282116.s7SLGVxO096427@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: Thu, 28 Aug 2014 21:16:31 +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: r270767 - stable/10/release/doc/en_US.ISO8859-1/relnotes
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 28 Aug 2014 21:16:31 -0000

Author: gjb
Date: Thu Aug 28 21:16:30 2014
New Revision: 270767
URL: http://svnweb.freebsd.org/changeset/base/270767

Log:
  We do not differentiate the SMP from GENERIC kernel anymore,
  so remove mention of it.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml

Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml
==============================================================================
--- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml	Thu Aug 28 21:14:32 2014	(r270766)
+++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml	Thu Aug 28 21:16:30 2014	(r270767)
@@ -1244,7 +1244,7 @@
       (and snapshots of the various security branches) are supported
       using the &man.freebsd-update.8; utility.  The binary upgrade
       procedure will update unmodified userland utilities, as well as
-      unmodified <filename>GENERIC</filename> or <acronym>SMP</acronym> kernels distributed as a part of an
+      unmodified <filename>GENERIC</filename> kernel distributed as a part of an
       official &os; release.  The &man.freebsd-update.8; utility
       requires that the host being upgraded have Internet
       connectivity.</para>