From ad983df092d16527b0a56d79640d43c5e4657809 Mon Sep 17 00:00:00 2001
From: hrs <hrs@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Thu, 30 Apr 2009 21:39:56 +0000
Subject: [PATCH] Merge r191705 change in the English version.

Submitted by:	delphij
Approved by:	re (implicit)


git-svn-id: svn://svn.freebsd.org/base/releng/7.2@191706 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 .../doc/zh_CN.GB2312/relnotes/article.sgml    | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/release/doc/zh_CN.GB2312/relnotes/article.sgml b/release/doc/zh_CN.GB2312/relnotes/article.sgml
index 2f6b9ea7..7c8fa91e 100644
--- a/release/doc/zh_CN.GB2312/relnotes/article.sgml
+++ b/release/doc/zh_CN.GB2312/relnotes/article.sgml
@@ -6,7 +6,7 @@
 %release;
 
 <!-- The FreeBSD Simplified Chinese Project -->
-<!-- Original Revision: 191669 -->
+<!-- Original Revision: 191705 -->
 ]>
 
 <article>
@@ -263,15 +263,17 @@
       <para>&os; 32-λ ϵͳµ÷Ó÷­Òë²ãÐÂÔöÁËΪ
 	<literal>VFS_AIO</literal> °²×° 32-λ ϵͳµ÷ÓõÄÖ§³Ö¡£</para>
 
-      <para arch="amd64,i386">&os; ÐéÄâÄÚ´æ×ÓϵͳÐÂÔöÁ˶ÔÓÚ
-	<application>Superpages</application> µÄÖ§³Ö¡£
-	<application>Superpages</application> ÊÇÒ»ÏîÖ¼ÔÚÏÖ´ú´¦ÀíÆ÷ÉÏÁî
+      <para arch="amd64,i386">&os; ÐéÄâÄÚ´æ×ÓϵͳÐÂÔöÁËÕë¶ÔÓ¦ÓóÌÐòµÄ͸Ã÷
+	<application>superpages</application> Ö§³Ö£»
+	Ó¦ÓóÌÐòµÄÄÚ´æÒ³»á¸ù¾ÝʹÓÃÇé¿ö¶¯Ì¬µØÉý¼¶Îª superpage£¬
+	»ò·´Ö®½µ¼¶ÎªÆÕͨÄÚ´æÒ³£¬ ¶øÎÞÐë¶Ô³ÌÐò´úÂë½øÐÐÈκÎÐ޸ġ£
+	ÕâÒ»±ä¶¯ÔÚ·¢»ÓÏÖ´ú´¦ÀíÆ÷¶Ô´óÄÚ´æÒ³Ö§³ÖµÄÓÅÊÆ£¬
+	°üÀ¨Ìá¸ßÐéÄâÄÚ´æϵͳµÄ¿Õ¼äЧÂÊ£¬ ÒÔ¼°½µµÍ
 	TLB (translation lookaside buffer£¬ ¿ìËÙÒ³±íת»»»º³å)
-	Äܹ»½«´ó¿éÎïÀíÄÚ´æÇøÓòÓ³Éäµ½ÐéÄâµØÖ·¿Õ¼äÖеļ¼Êõ¡£
-	Õâ¿ÉÒÔ°ïÖúʹÓôóÁ¿¹²ÏíÄÚ´æµÄÓ¦ÓýÚÊ¡Äڴ濪Ïú£¬
-	²¢ÇÒÓÉÓÚ¼õÉÙÁË TLB »º³åδÃüÖÐÏÖÏó´Ó¶ø¸ÄÉÆÐÔÄÜ¡£
-	ĬÈÏÇé¿öÏÂÕâÒ»ÌØÐÔ²¢²»¿ªÆô£¬ Äú¿ÉÒÔͨ¹ý½«Òýµ¼¼ÓÔØÆ÷±äÁ¿
-	<varname>vm.pmap.pg_ps_enabled</varname> ÉèΪ
+	δÃüÖЬFÏó¶ø¸ÄÉÆÐÔÄܵÄͬʱ£¬
+	ÓÖ±ÜÃâÁËÐèÒªÐÞ¸ÄÓ¦ÓóÌÐòÒÔ¼°½µµÍÐéÄâÄÚ´æÁé»îÐÔµÄȱµã¡£
+	ÕâÒ»ÌØÐÔĬÈϲ¢²»¿ªÆô£¬ Äú¿ÉÒÔͨ¹ý½«Òýµ¼¼ÓÔØÆ÷±äÁ¿
+ 	<varname>vm.pmap.pg_ps_enabled</varname> ÉèΪ
 	<literal>1</literal> À´ÆôÓÃËü¡£</para>
 
       <sect3 id="boot">
@@ -318,7 +320,7 @@
 	  ÐÅÏ¢¡¢ ¶Áд»úÆ÷רÓüĴæÆ÷ (machine specific registers, MSR)£¬
 	  ÒÔ¼°¸üРCPU ¹Ì¼þµÈ¡£</para>
 
-	<para>&man.cpufreq.4; Çý¶¯ÐÂÔöÁ˼ÓÔØÆ÷±äÁ¿
+	<para>&man.cpufreq.4; Çý¶¯ÐÂÔöÁËÒýµ¼¼ÓÔØÆ÷±äÁ¿
 	  <varname>hw.est.msr_info</varname>¡£
 	  µ±´Ë±äÁ¿ÉèΪ <literal>1</literal> ʱ£¬
 	  Çý¶¯»á³¢ÊÔ´´½¨Ö»°üº¬×î¸ßºÍ×îµÍʱÖÓƵÂʵļòµ¥ÁÐ±í£¬
-- 
2.42.0