From owner-svn-src-stable-7@FreeBSD.ORG  Thu Oct 30 04:55:13 2008
Return-Path: <owner-svn-src-stable-7@FreeBSD.ORG>
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 982801065673;
	Thu, 30 Oct 2008 04:55:13 +0000 (UTC)
	(envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 7D0348FC19;
	Thu, 30 Oct 2008 04:55:13 +0000 (UTC)
	(envelope-from delphij@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 m9U4tDSC041938;
	Thu, 30 Oct 2008 04:55:13 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id m9U4tDmx041936;
	Thu, 30 Oct 2008 04:55:13 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <200810300455.m9U4tDmx041936@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Thu, 30 Oct 2008 04:55:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r184463 - in stable/7/release/doc/zh_CN.GB2312:
	hardware relnotes
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	<svn-src-stable-7.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-7>
List-Post: <mailto:svn-src-stable-7@freebsd.org>
List-Help: <mailto:svn-src-stable-7-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 30 Oct 2008 04:55:13 -0000

Author: delphij
Date: Thu Oct 30 04:55:12 2008
New Revision: 184463
URL: http://svn.freebsd.org/changeset/base/184463

Log:
  Sync with English revisions.
  
  Approved by:	re (hrs)

Modified:
  stable/7/release/doc/zh_CN.GB2312/hardware/article.sgml
  stable/7/release/doc/zh_CN.GB2312/relnotes/article.sgml

Modified: stable/7/release/doc/zh_CN.GB2312/hardware/article.sgml
==============================================================================
--- stable/7/release/doc/zh_CN.GB2312/hardware/article.sgml	Thu Oct 30 04:16:40 2008	(r184462)
+++ stable/7/release/doc/zh_CN.GB2312/hardware/article.sgml	Thu Oct 30 04:55:12 2008	(r184463)
@@ -88,7 +88,7 @@
     </listitem>
 
     <listitem>
-      <para>&intel; 64-位 &xeon; (<quote>Nacona</quote>)。
+      <para>&intel; 64-位 &xeon; (<quote>Nocona</quote>)。
 	这类处理器采用 90nm 制程工艺制造， 配合 &intel; E7520/E7525/E7320 芯片组，
 	能够运行于 2.80 到 3.60 GHz (FSB 800MHz)。</para>
     </listitem>
@@ -392,7 +392,7 @@
 <!--
 	The FreeBSD Simplified Chinese Project
 
-	Original Revision: 175946
+	Original Revision: 184311
 -->
 
 <!--

Modified: stable/7/release/doc/zh_CN.GB2312/relnotes/article.sgml
==============================================================================
--- stable/7/release/doc/zh_CN.GB2312/relnotes/article.sgml	Thu Oct 30 04:16:40 2008	(r184462)
+++ stable/7/release/doc/zh_CN.GB2312/relnotes/article.sgml	Thu Oct 30 04:55:12 2008	(r184463)
@@ -6,7 +6,7 @@
 %release;
 
 <!-- The FreeBSD Simplified Chinese Project -->
-<!-- Original Revision: 182188 -->
+<!-- Original Revision: 183702 -->
 <!-- Text constants which probably don't need to be changed.-->
 
 <!-- The marker for MFCs. -->
@@ -129,7 +129,7 @@
     <title>对内核的改动</title>
     
     <para>为内核调试器 &man.ddb.4; 新增了输出捕捉机制。
-      来自 &man.ddb.4; 的輸入和输出内容会自动捕捉到一个内存缓冲区，
+      来自 &man.ddb.4; 的输入和输出内容会自动捕捉到一个内存缓冲区，
       以便在随后通过 &man.sysctl.8; 或 textdump 来读取和分析。
       新增的 <command>capture</command> 命令可以控制这个功能。</para>
 
@@ -253,6 +253,12 @@
     <para><application>OpenPAM</application> 从
       Figwort 版升级到了 Hydrangea 版。</para>
 
+    <para><application>OpenSSH</application> 从
+      4.5p1 版升级到了 5.1p1 版。</para>
+
+    <para><application>sendmail</application> 从
+      8.14.2 版升级到了 8.14.3 版。</para>
+
     <para>时区数据库从
       <application>tzdata2007h</application> 版升级到了
       <application>tzdata2008b</application> 版。</para>