From owner-svn-src-user@FreeBSD.ORG  Sat Nov  1 23:46:50 2008
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8F3D5106567E;
	Sat,  1 Nov 2008 23:46:50 +0000 (UTC)
	(envelope-from edwin@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 7CF548FC1D;
	Sat,  1 Nov 2008 23:46:50 +0000 (UTC)
	(envelope-from edwin@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mA1Nko8M022957;
	Sat, 1 Nov 2008 23:46:50 GMT (envelope-from edwin@svn.freebsd.org)
Received: (from edwin@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mA1Nkos3022954;
	Sat, 1 Nov 2008 23:46:50 GMT (envelope-from edwin@svn.freebsd.org)
Message-Id: <200811012346.mA1Nkos3022954@svn.freebsd.org>
From: Edwin Groothuis <edwin@FreeBSD.org>
Date: Sat, 1 Nov 2008 23:46:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r184542 - in user/edwin/releasenotes/head/release: .
	doc/en_US.ISO8859-1/hardware
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 01 Nov 2008 23:46:50 -0000

Author: edwin
Date: Sat Nov  1 23:46:50 2008
New Revision: 184542
URL: http://svn.freebsd.org/changeset/base/184542

Log:
  MFS

Modified:
  user/edwin/releasenotes/head/release/   (props changed)
  user/edwin/releasenotes/head/release/Makefile
  user/edwin/releasenotes/head/release/doc/en_US.ISO8859-1/hardware/article.sgml

Modified: user/edwin/releasenotes/head/release/Makefile
==============================================================================
--- user/edwin/releasenotes/head/release/Makefile	Sat Nov  1 23:39:21 2008	(r184541)
+++ user/edwin/releasenotes/head/release/Makefile	Sat Nov  1 23:46:50 2008	(r184542)
@@ -957,13 +957,13 @@ cdrom.1:
 	@rm -f ${CD_LIVEFS}/boot/device.hints
 	@cp ${RD}/trees/base/boot/device.hints ${CD_LIVEFS}/boot/device.hints
 .endif
+	@echo "CD_VERSION = ${BUILDNAME}" > ${CD_LIVEFS}/cdrom.inf
 .if defined(MAKE_DVD)
 	@cp -Rp ${RD}/kernels/GENERIC/ ${CD_DVD1}/boot/kernel
 	@rm -f ${CD_DVD1}/boot/kernel/*.symbols
 	@rm -f ${CD_DVD1}/.profile
 	@cp ${.CURDIR}/fixit.profile ${CD_DVD1}/.profile
 	@ln -sf /rescue ${CD_DVD1}/stand
-	@echo "CD_VERSION = ${BUILDNAME}" > ${CD_LIVEFS}/cdrom.inf
 	@echo "CD_VERSION = ${BUILDNAME}" > ${CD_DVD1}/cdrom.inf
 	@rm -f ${CD_DVD1}/boot/loader.conf
 	@cp ${RD}/mfsroot/mfsroot.gz ${CD_DVD1}/boot/mfsroot.gz
@@ -1033,7 +1033,7 @@ cdrom.2:
 	@echo "CD_VOLUME = 1" >> ${CD_DVD1}/cdrom.inf
 .endif
 .if !defined(NODOC)
-	echo "Building CDROM docs filesystem image"
+	@echo "Building CDROM docs filesystem image"
 	@mkdir -p ${CD_DOCS}
 	@echo "CD_VERSION = ${BUILDNAME}" > ${CD_DOCS}/cdrom.inf
 	@mkdir -p ${CD_DOCS}/usr/share/doc

Modified: user/edwin/releasenotes/head/release/doc/en_US.ISO8859-1/hardware/article.sgml
==============================================================================
--- user/edwin/releasenotes/head/release/doc/en_US.ISO8859-1/hardware/article.sgml	Sat Nov  1 23:39:21 2008	(r184541)
+++ user/edwin/releasenotes/head/release/doc/en_US.ISO8859-1/hardware/article.sgml	Sat Nov  1 23:46:50 2008	(r184542)
@@ -90,7 +90,7 @@
 	</listitem>
 
 	<listitem>
-	  <para>&intel; 64-bit &xeon; (<quote>Nacona</quote>).  This
+	  <para>&intel; 64-bit &xeon; (<quote>Nocona</quote>).  This
 	    processor is fabricated on 90nm process technology, and
 	    operates with 2.80 to 3.60 GHz (FSB 800MHz) and &intel;
 	    E7520/E7525/E7320 chipsets.</para>