Synchornize with English versions.

Obtained from: The FreeBSD Simplified Chinese Project
svn path=/www/; revision=28948
2006-10-27 06:15:17 +00:00 · 2006-10-27 06:15:17 +00:00 · 0eaaeae04c · 2020-12-08 03:00:23 +00:00
commit 0eaaeae04c
parent 22d3f41a74
11 changed files with 714 additions and 131 deletions
--- a/zh_CN/about.sgml
+++ b/zh_CN/about.sgml
@ -5,7 +5,7 @@
 ]>

 <!-- The FreeBSD Simplified Chinese Documentation Project -->
-<!-- Original Revision: 1.5 -->
+<!-- Original Revision: 1.10 -->

 <html>
    &header;
@ -14,13 +14,12 @@

 		      <p>FreeBSD 是一种先进的操作系统，它支持 x86
 			兼容(包括 Pentium&reg; 和 Athlon&trade;)、amd64
-			兼容(包括 Opteron&trade;、Athlon 64 和 EM64T)、
-			Alpha/AXP、IA-64、PC-98以及 UltraSPARC&reg; 
+			兼容(包括 Opteron&trade;、Athlon&trade;64 和 EM64T)、
+			ARM、IA-64、PC-98以及 UltraSPARC&reg; 
 			架构的计算机。FreeBSD 源于 BSD ──美国加州大学伯克利分校开发
 			&unix;/> 版本它由来自世界各地的 <a
-			href="&enbase;/doc/en_US.ISO8859-1/articles/contributors/index.html">
-			志愿者</a>开发和维护。 FreeBSD 为不同架构的计算机系统提供
-			了不同程度的支持，请参考 <a
+			  href="&enbase;/doc/en_US.ISO8859-1/articles/contributors/staff-committers.html">	志愿者</a>
+			开发和维护。 FreeBSD 为不同架构的计算机系统提供了不同程度的支持， 请参考 <a
 			href="&base;/platforms/index.html">系统平台</a> 网页了解更
 			多内容。</p>

@ -51,10 +50,9 @@
 			DVD 光盘、软盘、磁带以及 MS-DOS&reg; 分区等，
 			如果您拥有网络连接，您甚至可以 <i>直接</i> 
 			通过匿名 FTP，或者 NFS 服务器安装 FreeBSD。
-			您所需要的全部工具只是两张格式化过的 1.44MB
-			软盘， 以及我们为您准备的 <a
+			您只需按照我们为您准备的 <a
                        href="&enbase;/doc/zh_CN.GB2312/books/handbook/install.html">
-			安装指导</a>。</p>
+			安装指导</a> 操作就可以了。</p>

 		      <h2>FreeBSD 是 <i>free</i> 的</h2>

@ -86,8 +84,9 @@
 			<a href="http://www.FreeBSDFoundation.org">FreeBSD 基金会</a>
 			是一个非赢利性组织， 对其捐款是完全课税减免的。
 			要了解更多有关 FreeBSD 基金会的信息，
-			请和 <a href="mailto:board@FreeBSDFoundation.org">
-			board@FreeBSDFoundation.org</a> 联系，或致信：
+			请和 <a
+			  href="mailto:board&#64;FreeBSDFoundation.org">board&#64;FreeBSDFoundation.org</a>
+			联系，或致信：
 			The FreeBSD Foundation,	7321 Brockway Dr.
 			Boulder, CO 80303, USA.</p>

--- a/zh_CN/applications.sgml
+++ b/zh_CN/applications.sgml
@ -1,11 +1,11 @@
 <!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
-<!ENTITY date "$FreeBSD: www/zh_CN/applications.sgml,v 1.1 2006/07/11 15:27:47 delphij Exp $">
+<!ENTITY date "$FreeBSD$">
 <!ENTITY title "关于 FreeBSD 的应用">
 <!ENTITY % navinclude.about "INCLUDE">
 ]>

 <!-- The FreeBSD Simplified Chinese Project -->
-<!-- Original revision: 1.31 -->
+<!-- Original revision: 1.33 -->

 <html>
    &header;
@ -73,10 +73,10 @@
 	  甚至提供各式各样的其他服务。</li>

 	<li><b>软件开发。</b> FreeBSD 提供了一整套开发工具，
-	  这其中包括了 GNU C/C++ 编译器和调试器， 以及
-	  Perl 脚本语言。 您还可以使用 &java; 或 Tcl/Tk 来进行开发。
-	  出自之外， 流行的编译器如 XEmacs， 以及更多深奥的编程语言如 Icon，
-	  也能很好地工作。 此外， FreeBSD 还提供了易于构建和使用的各种共享库。</li>
+	  这其中包括了 GNU C/C++ 编译器和调试器。
+	  举例而言， 您还可以使用 &java; 或 Tcl/Tk， 以及一些更深奥的开发语言如 Icon 来进行开发。
+	  此外， FreeBSD 还提供了易于构建和使用的各种共享库。 您可以从众多流行的强大的文本编辑器， 例如
+	  XEmacs 和 vim 中选择自己喜欢来使用。</li>

 	<li><b>网络冲浪。</b> 真正的 UNIX 工作站， 是绝佳的 Internet
 	  冲浪板。 FreeBSD 版本的 <a
--- a/zh_CN/developers.sgml
+++ b/zh_CN/developers.sgml
@ -7,197 +7,525 @@ us to update author names, or the representation of those names (such
 as adding email addresses), by just editing a single file.

 The FreeBSD Simplified Chinese Project
-Original Revision: 1.137
+Original Revision: 1.140

-$FreeBSD: www/zh_CN/developers.sgml,v 1.1.1002.9 2006/06/13 21:55:06 delphij Exp $
+$FreeBSD$

 -->

-<!-- FreeBSD Contributors -->
+<!-- FreeBSD Committers -->
+<!ENTITY a.aaron "Aaron Dalton">
+<!ENTITY a.abial "Andrzej Bialecki">
 <!ENTITY a.ache "Andrey A. Chernov">
+<!ENTITY a.acm "Jos&eacute; Alonso C&aacute;rdenas M&aacute;rquez">
+<!ENTITY a.adam "Adam David">
+<!ENTITY a.adamw "Adam Weinberger">
 <!ENTITY a.ade "Ade Lovett">
+<!ENTITY a.adrian "Adrian Chadd">
+<!ENTITY a.ahze "Michael Johnson">
+<!ENTITY a.akiyama "Shunsuke Akiyama">
+<!ENTITY a.alane "Alan Eldridge">
 <!ENTITY a.alc "Alan L. Cox">
+<!ENTITY a.ale "Alex Dupre">
+<!ENTITY a.alepulver "Alejandro Pulver">
+<!ENTITY a.alex "Alexander Langer">
+<!ENTITY a.alexbl "Alexander Botero-Lowry">
 <!ENTITY a.alfred "Alfred Perlstein">
+<!ENTITY a.ambrisko "Doug Ambrisko">
+<!ENTITY a.amorita "Akio Morita">
+<!ENTITY a.amurai "Atsushi Murai">
+<!ENTITY a.anders "Anders Nordby">
+<!ENTITY a.andre "Andre Oppermann">
+<!ENTITY a.andreas "Andreas Klemm">
+<!ENTITY a.andy "Andrey Zakhvatov">
 <!ENTITY a.anholt "Eric Anholt">
-<!ENTITY a.andre "Andre&nbsp;Oppermann">
+<!ENTITY a.anray "Andrey Slusar">
 <!ENTITY a.archie "Archie Cobbs">
 <!ENTITY a.ariff "Ariff Abdullah">
-<!ENTITY a.arr "Andrew Reiter">
+<!ENTITY a.arr "Andrew R. Reiter">
+<!ENTITY a.arun "Arun Sharma">
+<!ENTITY a.arved "Tilman Linneweh">
 <!ENTITY a.asami "Satoshi Asami">
-<!ENTITY a.asmodai "Jeroen Ruigrok">
+<!ENTITY a.asmodai "Jeroen Ruigrok/Asmodai">
+<!ENTITY a.assar "Assar Westerlund">
+<!ENTITY a.avatar "졺揭빽">
+<!ENTITY a.awebster "Andrew Webster">
+<!ENTITY a.az "Andrej Zverev">
+<!ENTITY a.babkin "Sergey Babkin">
+<!ENTITY a.bakul "Bakul Shah">
+<!ENTITY a.barner "Simon Barner">
+<!ENTITY a.bbraun "Rob Braun">
 <!ENTITY a.bde "Bruce Evans">
+<!ENTITY a.bean "Rebecca Visger">
+<!ENTITY a.ben "Ben Smithurst">
 <!ENTITY a.benno "Benno Rice">
 <!ENTITY a.billf "Bill Fumerola">
 <!ENTITY a.blackend "Marc Fonvieille">
-<!ENTITY a.bmah "Bruce A. Mah">
+<!ENTITY a.bland "Alexander Nedotsukov">
+<!ENTITY a.bmah "쯩都뵈">
 <!ENTITY a.bmilekic "Bosko Milekic">
 <!ENTITY a.bms "Bruce M. Simpson">
+<!ENTITY a.bp "Boris Popov">
 <!ENTITY a.brd "Brad Davis">
+<!ENTITY a.brandon "Brandon Gillespie">
 <!ENTITY a.brian "Brian Somers">
 <!ENTITY a.brooks "Brooks Davis">
-<!ENTITY a.brueffer "Christian Brueffer">
+<!ENTITY a.brueffer "Christian Br&uuml;ffer">
 <!ENTITY a.bruno "Bruno Ducrot">
+<!ENTITY a.bsam "Boris Samorodov">
+<!ENTITY a.bsd "Brian S. Dean">
+<!ENTITY a.bvs "Vitaly Bogdanov">
 <!ENTITY a.bz "Bjoern A. Zeeb">
-<!ENTITY a.carvay "J. Vicente Carrasco">
+<!ENTITY a.cawimm "Charles A. Wimmer">
+<!ENTITY a.carvay "J. Vicente Carrasco Vay&aacute;">
+<!ENTITY a.cel "Chuck Lever">
 <!ENTITY a.ceri "Ceri Davies">
+<!ENTITY a.cg "Cameron Grant">
+<!ENTITY a.charnier "Philippe Charnier">
 <!ENTITY a.chern "Chern Lee">
+<!ENTITY a.chinsan "뼝행<EBBC9D>">
+<!ENTITY a.chm "Christoph Herrmann">
 <!ENTITY a.chris "Chris Costello">
+<!ENTITY a.chuckr "Chuck Robey">
+<!ENTITY a.cjc "Crist J. Clark">
+<!ENTITY a.cjh "Junho CHOI">
 <!ENTITY a.clement "Clement Laforet">
+<!ENTITY a.clive "주땜尿">
+<!ENTITY a.clsung "芥漣징">
 <!ENTITY a.cognet "Olivier Houchard">
+<!ENTITY a.cokane "Coleman Kane">
 <!ENTITY a.cp "Chuck Paterson">
 <!ENTITY a.cperciva "Colin Percival">
+<!ENTITY a.cpiazza "Chris Piazza">
 <!ENTITY a.cracauer "Martin Cracauer">
-<!ENTITY a.csjp "Christian Peron">
+<!ENTITY a.csgr "Geoff Rehmet">
+<!ENTITY a.cshumway "Christopher Shumway">
+<!ENTITY a.csjp "Christian S.J. Peron">
+<!ENTITY a.cwt "Chris Timmons">
+<!ENTITY a.cy "Cy Schubert">
+<!ENTITY a.daichi "Daichi GOTO">
+<!ENTITY a.damien "Damien Bergamini">
+<!ENTITY a.dan "Dan Moschuk">
+<!ENTITY a.danfe "Alexey Dokuchaev">
+<!ENTITY a.danger "Daniel Ger&#382;o">
+<!ENTITY a.danny "Daniel O'Callaghan">
 <!ENTITY a.dannyboy "Daniel Harris">
+<!ENTITY a.darrenr "Darren Reed">
 <!ENTITY a.das "David Schultz">
 <!ENTITY a.davidc "Chad David">
+<!ENTITY a.davidn "David Nugent">
 <!ENTITY a.davidxu "ÐìÒÝ·æ">
+<!ENTITY a.dbaker "Daniel Baker">
+<!ENTITY a.dburr "Donald Burr">
+<!ENTITY a.dcs "Daniel C. Sobral">
 <!ENTITY a.dd "Dima Dorfman">
+<!ENTITY a.dds "Diomidis D. Spinellis">
 <!ENTITY a.dec "David E. Cross">
 <!ENTITY a.deischen "Daniel Eischen">
-<!ENTITY a.des "Dag-Erling Smorgrav">
+<!ENTITY a.delphij "쟀則">
+<!ENTITY a.demon "Dmitry Sivachenko">
+<!ENTITY a.den "Denis Peplin">
+<!ENTITY a.des "Dag-Erling C. Sm&oslash;rgrav">
 <!ENTITY a.dfr "Doug Rabson">
-<!ENTITY a.dillon "Matt Dillon">
+<!ENTITY a.dg "David Greenman">
+<!ENTITY a.dhartmei "Daniel Hartmeier">
+<!ENTITY a.dhw "David Wolfskill">
+<!ENTITY a.dick "Richard Seaman Jr.">
+<!ENTITY a.dillon "Matthew Dillon">
+<!ENTITY a.dima "Dima Ruban">
+<!ENTITY a.dinoex "Dirk Meyer">
+<!ENTITY a.dirk "Dirk Fr&ouml;mberg">
+<!ENTITY a.dmlb "Duncan Barclay">
 <!ENTITY a.dougb "Doug Barton">
+<!ENTITY a.dt "Dmitrij Tejblum">
+<!ENTITY a.dufault "Peter Dufault">
+<!ENTITY a.dumbbell "Jean-S&eacute;bastien P&eacute;dron">
+<!ENTITY a.dwcjr "David W. Chapman Jr.">
 <!ENTITY a.dwhite "Doug White">
 <!ENTITY a.dwmalone "David Malone">
+<!ENTITY a.edwin "Edwin Groothuis">
+<!ENTITY a.ehaupt "Emanuel Haupt">
 <!ENTITY a.eik "Oliver Eikemeier">
 <!ENTITY a.eivind "Eivind Eklund">
+<!ENTITY a.ejc "Eric J. Chet">
 <!ENTITY a.emaste "Ed Maste">
 <!ENTITY a.emax "Maksim Yevmenkin">
+<!ENTITY a.emoore "Eric Moore">
+<!ENTITY a.eric "Eric Melville">
+<!ENTITY a.erich "Eric L. Hernes">
 <!ENTITY a.erwin "Erwin Lansing">
+<!ENTITY a.fanf "Tony Finch">
 <!ENTITY a.fenner "Bill Fenner">
+<!ENTITY a.fjoe "Max Khon">
+<!ENTITY a.flathill "Seiichirou Hiraoka">
+<!ENTITY a.flz "Florent Thoumie">
+<!ENTITY a.foxfair "빚磎봉">
+<!ENTITY a.fsmp "Steve Passe">
+<!ENTITY a.furuta "Atsushi Furuta">
 <!ENTITY a.gad "Garance A Drosehn">
 <!ENTITY a.gallatin "Andrew Gallatin">
-<!ENTITY a.gibbs "Justin Gibbs">
+<!ENTITY a.garga "Renato Botelho">
+<!ENTITY a.garys "Gary W. Swearingen">
+<!ENTITY a.gerald "Gerald Pfeifer">
+<!ENTITY a.ghelmer "Guy Helmer">
+<!ENTITY a.gibbs "Justin T. Gibbs">
+<!ENTITY a.gioria "Sebastien Gioria">
+<!ENTITY a.girgen "Palle Girgensohn">
+<!ENTITY a.gj "Gary Jennejohn">
 <!ENTITY a.glebius "Gleb Smirnoff">
+<!ENTITY a.glewis "Greg Lewis">
 <!ENTITY a.gnn "George V. Neville-Neil">
 <!ENTITY a.gordon "Gordon Tetlow">
-<!ENTITY a.green "Brian Feldman">
+<!ENTITY a.gpalmer "Gary Palmer">
+<!ENTITY a.graichen "Thomas Graichen">
+<!ENTITY a.green "Brian F. Feldman">
 <!ENTITY a.grehan "Peter Grehan">
+<!ENTITY a.greid "George C. A. Reid">
 <!ENTITY a.grog "Greg Lehey">
+<!ENTITY a.groudier "Gerard Roudier">
+<!ENTITY a.gryphon "Coranth Gryphon">
+<!ENTITY a.gshapiro "Gregory Neil Shapiro">
+<!ENTITY a.gsutter "Gregory Sutter">
 <!ENTITY a.guido "Guido van Rooij">
-<!ENTITY a.harti "Harti Brandt">
+<!ENTITY a.hanai "Hiroyuki HANAI">
+<!ENTITY a.harti "Hartmut Brandt">
+<!ENTITY a.helbig "Wolfgang Helbig">
+<!ENTITY a.hm "Hellmuth Michaelis">
 <!ENTITY a.hmp "Hiten Pandya">
+<!ENTITY a.hoek "Tim Vanderhoek">
+<!ENTITY a.horikawa "Kazuo Horikawa">
+<!ENTITY a.hosokawa "Tatsumi Hosokawa">
+<!ENTITY a.hq "Herve Quiroz">
 <!ENTITY a.hrs "Hiroki Sato">
 <!ENTITY a.hsu "ÐìÃô½Ü">
 <!ENTITY a.iedowse "Ian Dowse">
+<!ENTITY a.ijliao "죔亶쌤">
+<!ENTITY a.ikob "Katsushi Kobayashi">
 <!ENTITY a.imp "Warner Losh">
+<!ENTITY a.imura "R. Imura">
+<!ENTITY a.issei "Issei Suzuki">
+<!ENTITY a.itetcu "Ion-Mihai Tetcu">
+<!ENTITY a.itojun "Jun-ichiro Itoh">
+<!ENTITY a.iwasaki "Mitsuru IWASAKI">
 <!ENTITY a.jake "Jake Burkholder">
 <!ENTITY a.jasone "Jason Evans">
+<!ENTITY a.jayanth "Jayanth Vijayaraghavan">
+<!ENTITY a.jb "John Birrell">
 <!ENTITY a.jcamou "Jesus R. Camou">
+<!ENTITY a.jdp "John Polstra">
 <!ENTITY a.jedgar "Chris D. Faulhaber">
 <!ENTITY a.jeff "Jeff Roberson">
+<!ENTITY a.jeh "James Housley">
+<!ENTITY a.jehamby "Jake Hamby">
 <!ENTITY a.jennifer "Jennifer Yang">
+<!ENTITY a.jesper "Jesper Skriver">
 <!ENTITY a.jesusr "Jesus Rodriguez">
+<!ENTITY a.jfieber "John Fieber">
+<!ENTITY a.jfitz "James FitzGibbon">
+<!ENTITY a.jfv "Jack F. Vogel">
+<!ENTITY a.jgreco "Joe Greco">
+<!ENTITY a.jhay "John Hay">
 <!ENTITY a.jhb "John Baldwin">
-<!ENTITY a.jkh "Jordan Hubbard">
+<!ENTITY a.jhs "Julian Stacey">
+<!ENTITY a.jim "Jim Mock">
+<!ENTITY a.jkh "Jordan K. Hubbard">
+<!ENTITY a.jkim "Jung-uk Kim">
+<!ENTITY a.jkois "Johann Kois">
 <!ENTITY a.jkoshy "Joseph Koshy">
 <!ENTITY a.jlemon "Jonathan Lemon">
+<!ENTITY a.jlrobin "James L. Robinson">
+<!ENTITY a.jmacd "Joshua Peck Macdonald">
 <!ENTITY a.jmallett "Juli Mallett">
+<!ENTITY a.jmas "Jose M. Alcaide">
+<!ENTITY a.jmb "Jonathan M. Bresler">
+<!ENTITY a.jmelo "Jean Milanez Melo">
 <!ENTITY a.jmg "John-Mark Gurney">
+<!ENTITY a.jmz "Jean-Marc Zucconi">
 <!ENTITY a.joe "Josef Karthauser">
-<!ENTITY a.joe.halpin "Joe Halpin">
 <!ENTITY a.joel "Joel Dahl">
+<!ENTITY a.joerg "J&ouml;rg Wunsch">
+<!ENTITY a.johan "Johan Karlsson">
+<!ENTITY a.johans "Johan van Selst">
+<!ENTITY a.john "John Cavanaugh">
+<!ENTITY a.jon "Jonathan Chen">
+<!ENTITY a.josef "Josef El-Rayes">
+<!ENTITY a.jseger "Justin Seger">
 <!ENTITY a.julian "Julian Elischer">
-<!ENTITY a.jwd "John W. De Boskey">
-<!ENTITY a.jwojdacki "Justin Wojdacki">
+<!ENTITY a.jvh "Johannes Helander">
+<!ENTITY a.jwd "John W. DeBoskey">
+<!ENTITY a.jylefort "Jean-Yves Lefort">
 <!ENTITY a.kan "Alexander Kabaev">
+<!ENTITY a.karl "Karl Strickland">
+<!ENTITY a.kato "Takenori KATO">
 <!ENTITY a.kbyanc "Kelly Yancey">
 <!ENTITY a.keichii "Îâ¾´Ôª">
-<!ENTITY a.ken "Kenneth Merry">
+<!ENTITY a.keith "Jing-Tang Keith Jang">
+<!ENTITY a.ken "Kenneth D. Merry">
 <!ENTITY a.kensmith "Ken Smith">
-<!ENTITY a.keramida "Giorgos&nbsp;Keramidas">
-<!ENTITY a.kmacy "Kip&nbsp;Macy">
-<!ENTITY a.knu "Akinori&nbsp;MUSHA">
+<!ENTITY a.keramida "Giorgos Keramidas">
+<!ENTITY a.kevlo "쭈剋소寬">
+<!ENTITY a.kib "Konstantin Belousov">
+<!ENTITY a.kientzle "Tim Kientzle">
+<!ENTITY a.kiri "Kazuhiko Kiriyama">
+<!ENTITY a.kjc "Kenjiro Cho">
+<!ENTITY a.kmacy "Kip Macy">
+<!ENTITY a.knu "Akinori MUSHA">
 <!ENTITY a.krion "Kirill Ponomarew">
 <!ENTITY a.kris "Kris Kennaway">
 <!ENTITY a.kuriyama "Jun Kuriyama">
+<!ENTITY a.kwm "Koop Mast">
+<!ENTITY a.lars "Lars Fredriksen">
+<!ENTITY a.lawrance "Sam Lawrance">
+<!ENTITY a.lbr "Lars Balker Rasmussen">
 <!ENTITY a.le "Lukas Ertl">
+<!ENTITY a.leeym "쟀珞츠">
+<!ENTITY a.lesi "Dejan Lesjak">
+<!ENTITY a.lev "Lev Serebryakov">
+<!ENTITY a.lile "Larry Lile">
 <!ENTITY a.linimon "Mark Linimon">
-<!ENTITY a.lioux "Mario Sergio Fujikawa Ferreira">
+<!ENTITY a.lioux "M&aacute;rio S&eacute;rgio Fujikawa Ferreira">
+<!ENTITY a.ljo "L Jonas Olsson">
+<!ENTITY a.lkoeller "Lars Koeller">
+<!ENTITY a.lofi "Michael Nottebrock">
+<!ENTITY a.logo "Valentino Vaschetto">
+<!ENTITY a.lth "Lars Thegler">
 <!ENTITY a.luigi "Luigi Rizzo">
+<!ENTITY a.luoqi "냈쭤펼">
+<!ENTITY a.maho "Maho Nakata">
 <!ENTITY a.marcel "Marcel Moolenaar">
+<!ENTITY a.marck "Dmitry Morozovsky">
 <!ENTITY a.marcus "Joe Marcus Clarke">
 <!ENTITY a.marius "Marius Strobl">
-<!ENTITY a.markm "Mark&nbsp;Murray">
-<!ENTITY a.marks "Mark&nbsp;Santcroos">
+<!ENTITY a.markm "Mark Murray">
+<!ENTITY a.marko "Mark Ovens">
+<!ENTITY a.markp "Mark Pulford">
+<!ENTITY a.marks "Mark Santcroos">
+<!ENTITY a.markus "Markus Br&uuml;ffer">
+<!ENTITY a.martin "Martin Renters">
 <!ENTITY a.mat "Mathieu Arnold">
-<!ENTITY a.matk "Mathew&nbsp;Kanner">
-<!ENTITY a.maxim "Maxim&nbsp;Konovalov">
+<!ENTITY a.matk "Mathew Kanner">
+<!ENTITY a.matteo "Matteo Riondato">
+<!ENTITY a.matusita "Makoto Matsushita">
+<!ENTITY a.max "Masafumi NAKANE">
+<!ENTITY a.maxim "Maxim Konovalov">
+<!ENTITY a.mb "Maxim Bolotin">
+<!ENTITY a.mbarkah "Ade Barkah">
 <!ENTITY a.mbr "Martin Blapp">
+<!ENTITY a.mckay "Stephen McKay">
 <!ENTITY a.mckusick "Kirk McKusick">
-<!ENTITY a.mdodd "Matthew Dodd">
+<!ENTITY a.mdodd "Matthew N. Dodd">
+<!ENTITY a.metal "Koichi Suzuki">
+<!ENTITY a.mezz "Jeremy Messenger">
+<!ENTITY a.mharo "Michael Haro">
+<!ENTITY a.mheinen "Martin Heinen">
+<!ENTITY a.mi "Mikhail Teterin">
+<!ENTITY a.mich "Michael L. Hostbaek">
 <!ENTITY a.mike "Mike Barcroft">
 <!ENTITY a.mikeh "Mike Heffner">
 <!ENTITY a.mini "Jonathan Mini">
-<!ENTITY a.mkm "Kyle Martin">
+<!ENTITY a.mita "Yoshio MITA">
+<!ENTITY a.miwi "Martin Wilke">
+<!ENTITY a.mjacob "Matthew Jacob">
+<!ENTITY a.mks "Mike Spengler">
 <!ENTITY a.mlaier "Max Laier">
-<!ENTITY a.mohans "Mohan&nbsp;Srinivasan">
+<!ENTITY a.mnag "Marcus Alves Grando">
+<!ENTITY a.mohans "Mohan Srinivasan">
+<!ENTITY a.motoyuki "Motoyuki Konno">
 <!ENTITY a.mp "Mark Peek">
-<!ENTITY a.msmith "Mike Smith">
+<!ENTITY a.mph "Matthew Hunt">
+<!ENTITY a.mpp "Mike Pritchard">
+<!ENTITY a.mr "Michael Reifenberger">
+<!ENTITY a.msmith "Michael Smith">
+<!ENTITY a.mtaylor "Mark J. Taylor">
 <!ENTITY a.mtm "Mike Makonnen">
 <!ENTITY a.murray "Murray Stokely">
 <!ENTITY a.mux "Maxime Henrion">
-<!ENTITY a.mwlucas "Michael Lucas">
+<!ENTITY a.mwlucas "Michael W. Lucas">
+<!ENTITY a.naddy "Christian Weisgerber">
+<!ENTITY a.nakai "Yukihiro Nakai">
+<!ENTITY a.nate "Nate Williams">
+<!ENTITY a.nbm "Neil Blakey-Milner">
 <!ENTITY a.nectar "Jacques Vidrine">
 <!ENTITY a.netchild "Alexander Leidinger">
+<!ENTITY a.newton "Mark Newton">
+<!ENTITY a.nhibma "Nick Hibma">
+<!ENTITY a.niels "Niels Heinen">
 <!ENTITY a.nik "Nik Clayton">
+<!ENTITY a.niklas "Niklas Saers">
 <!ENTITY a.njl "Nate Lawson">
+<!ENTITY a.nobutaka "Nobutaka MANTANI">
 <!ENTITY a.non "Noriaki Mitsunaga">
+<!ENTITY a.nork "Norikatsu Shigemura">
+<!ENTITY a.novel "Roman Bogorodskiy">
 <!ENTITY a.nsayer "Nick Sayer">
-<!ENTITY a.nyan "Takahashi Yoshihiro">
+<!ENTITY a.nsouch "Nicolas Souchu">
+<!ENTITY a.nyan "Yoshihiro Takahashi">
+<!ENTITY a.obraun "Oliver Braun">
 <!ENTITY a.obrien "David O'Brien">
+<!ENTITY a.okazaki "Tetsurou OKAZAKI">
+<!ENTITY a.oleg "Oleg Bulyzhin">
+<!ENTITY a.olgeni "Jimmy Olgeni">
+<!ENTITY a.oliver "Oliver Lehmann">
+<!ENTITY a.onoe "Atsushi Onoe">
+<!ENTITY a.orion "Orion Hodson">
+<!ENTITY a.osa "Sergey A. Osokin">
+<!ENTITY a.pat "쟀暾씰">
+<!ENTITY a.patrick "Patrick S. Gardella">
+<!ENTITY a.paul "Paul Richards">
 <!ENTITY a.pav "Pav Lucistnik">
-<!ENTITY a.pavalos "Peter Avalos">
 <!ENTITY a.pb "Pierre Beyssac">
-<!ENTITY a.pdeuskar "Prafulla Deuskar">
+<!ENTITY a.pdeuskar "Prafulla S. Deuskar">
+<!ENTITY a.pds "Peter da Silva">
+<!ENTITY a.peadar "Peter Edwards">
+<!ENTITY a.perky "Hye-Shik Chang">
+<!ENTITY a.petef "Pete Fritchman">
 <!ENTITY a.peter "Peter Wemm">
 <!ENTITY a.phantom "Alexey Zelkin">
 <!ENTITY a.philip "Philip Paeps">
 <!ENTITY a.phk "Poul-Henning Kamp">
+<!ENTITY a.pho "Peter Holm">
+<!ENTITY a.piero "Piero Serini">
+<!ENTITY a.pirzyk "Jim Pirzyk">
+<!ENTITY a.piso "Paolo Pisati">
 <!ENTITY a.pjd "Pawel Jakub Dawidek">
+<!ENTITY a.proven "Chris Provenzano">
 <!ENTITY a.ps "Paul Saab">
-<!ENTITY a.re "re@FreeBSD.org">
+<!ENTITY a.pst "Paul Traina">
+<!ENTITY a.qingli "Qing Li">
+<!ENTITY a.rafan "렀휠람">
+<!ENTITY a.rees "Jim Rees">
+<!ENTITY a.reg "Jeremy Lea">
 <!ENTITY a.remko "Remko Lodder">
+<!ENTITY a.rgrimes "Rodney Grimes">
+<!ENTITY a.ricardag "Ricardo AG">
+<!ENTITY a.rich "Rich Murphey">
 <!ENTITY a.rik "Roman Kurakin">
 <!ENTITY a.rink "Rink Springer">
-<!ENTITY a.robert "Robert&nbsp;Drehmel">
-<!ENTITY a.ru "Ruslan Ermilov">
-<!ENTITY a.rushani "Hideyuki KURASHINA">
-<!ENTITY a.rwatson "Robert Watson">
+<!ENTITY a.rnordier "Robert Nordier">
+<!ENTITY a.roam "Peter Pentchev">
+<!ENTITY a.robert "Robert Drehmel">
 <!ENTITY a.roberto "Ollivier Robert">
 <!ENTITY a.rodrigc "Craig Rodrigues">
+<!ENTITY a.roger "Roger Hardiman">
+<!ENTITY a.rpratt "Randy Pratt">
+<!ENTITY a.rrs "Randall R. Stewart">
+<!ENTITY a.rse "Ralf S. Engelschall">
+<!ENTITY a.rsm "Scott Mitchell">
+<!ENTITY a.ru "Ruslan Ermilov">
+<!ENTITY a.rushani "Hideyuki KURASHINA">
+<!ENTITY a.rv "Rajesh Vaidheeswarran">
+<!ENTITY a.rvb "Robert V. Baron">
+<!ENTITY a.rwatson "Robert Watson">
+<!ENTITY a.sada "SADA Kenji">
+<!ENTITY a.sah "Sam Hopkins">
 <!ENTITY a.sam "Sam Leffler">
+<!ENTITY a.sanpei "Yoshiro Sanpei MIHIRA">
+<!ENTITY a.sat "Andrew Pantyukhin">
 <!ENTITY a.schweikh "Jens Schweikhardt">
 <!ENTITY a.scop "Ville Skytt&auml;">
-<!ENTITY a.scottl "Scott&nbsp;Long">
-<!ENTITY a.sheldonh "Sheldon&nbsp;Hearn">
+<!ENTITY a.scottl "Scott Long">
+<!ENTITY a.scrappy "Marc G. Fournier">
+<!ENTITY a.se "Stefan Esser">
+<!ENTITY a.seanc "Sean Chittenden">
+<!ENTITY a.sef "Sean Eric Fagan">
+<!ENTITY a.sem "Sergey Matveychuk">
+<!ENTITY a.semenu "Semen Ustimenko">
+<!ENTITY a.sergei "Sergei Kolobov">
+<!ENTITY a.sf "Satsuki FUJISHIMA">
+<!ENTITY a.shafeeq "Shafeeq Sinnamohideen">
+<!ENTITY a.shaun "Shaun Amott">
+<!ENTITY a.sheldonh "Sheldon Hearn">
+<!ENTITY a.shiba "Takeshi Shibagaki">
+<!ENTITY a.shige "Shigeyuki Fukushima">
+<!ENTITY a.shin "Yoshinobu Inoue">
 <!ENTITY a.silby "Mike Silbersack">
 <!ENTITY a.simokawa "Hidetoshi Shimokawa">
 <!ENTITY a.simon "Simon L. Nielsen">
+<!ENTITY a.skv "Sergey Skvortsov">
+<!ENTITY a.smace "Scott Mace">
+<!ENTITY a.smkelly "Sean Kelly">
+<!ENTITY a.smpatel "Sujal Patel">
 <!ENTITY a.sobomax "Maxim Sobolev">
 <!ENTITY a.sos "S&oslash;ren Schmidt">
 <!ENTITY a.ssouhlal "Suleiman Souhlal">
+<!ENTITY a.stanislav "G. Adam Stanislav">
+<!ENTITY a.stark "Gene Stark">
+<!ENTITY a.stas "Stanislav Sedov">
+<!ENTITY a.stb "Stefan Bethke">
+<!ENTITY a.stefan "Stefan Walter">
 <!ENTITY a.stefanf "Stefan Farfeleder">
+<!ENTITY a.stephane "St&eacute;phane Legrand">
 <!ENTITY a.steve "Steve Price">
+<!ENTITY a.sumikawa "Munechika Sumikawa">
+<!ENTITY a.suz "SUZUKI Shinsuke">
+<!ENTITY a.swallace "Steven Wallace">
+<!ENTITY a.syrinx "Shteryana Shopova">
+<!ENTITY a.tackerman "Tony Ackerman">
 <!ENTITY a.takawata "Takanori Watanabe">
 <!ENTITY a.tanimura "Seigo Tanimura">
+<!ENTITY a.taoka "Satoshi Taoka">
+<!ENTITY a.tdb "Tim Bishop">
+<!ENTITY a.tedm "Ted Mittelstaedt">
 <!ENTITY a.tegge "Tor Egge">
+<!ENTITY a.tg "Thomas Gellekum">
+<!ENTITY a.thepish "Peter Hawkins">
+<!ENTITY a.thierry "Thierry Thomas">
+<!ENTITY a.thomas "Thomas Quinot">
+<!ENTITY a.thompsa "Andrew Thompson">
 <!ENTITY a.ticso "Bernd Walter">
 <!ENTITY a.tjr "Tim J. Robbins">
-<!ENTITY a.tmm "Thomas Moestl">
+<!ENTITY a.tmclaugh "Tom McLaughlin">
+<!ENTITY a.tmm "Thomas M&ouml;stl">
+<!ENTITY a.tobez "Anton Berezin">
+<!ENTITY a.tom "Tom Hukins">
+<!ENTITY a.tomsoft "Thomas-Henning von Kamptz">
+<!ENTITY a.torstenb "Torsten Blum">
+<!ENTITY a.toshi "Toshihiko Arai">
 <!ENTITY a.trevor "Trevor Johnson">
 <!ENTITY a.trhodes "Tom Rhodes">
-<!ENTITY a.truckman "Don Lewis">
+<!ENTITY a.truckman "Don &ldquo;Truck&rdquo; Lewis">
+<!ENTITY a.tshiozak "Takuya SHIOZAKI">
+<!ENTITY a.twinterg "Thomas Wintergerst">
+<!ENTITY a.uch "Yasushi UCHIYAMA">
+<!ENTITY a.ue "Udo Erdelhoff">
+<!ENTITY a.ugen "Ugen J.S.Antsilevich">
+<!ENTITY a.uhclem "Frank Durda IV">
+<!ENTITY a.ulf "Ulf Zimmermann">
 <!ENTITY a.ume "Hajimu UMEMOTO">
+<!ENTITY a.unfurl "Bill Swingle">
 <!ENTITY a.ups "Stephan Uphoff">
+<!ENTITY a.vanilla "其힛揭">
+<!ENTITY a.vd "Vasil Dimov">
+<!ENTITY a.viny "Vincent Tougait">
+<!ENTITY a.vkashyap "Vinod Kashyap">
+<!ENTITY a.vs "Volker Stolz">
+<!ENTITY a.vsevolod "Vsevolod Stakhov">
 <!ENTITY a.wes "Wes Peters">
+<!ENTITY a.whiteside "Don Whiteside">
 <!ENTITY a.wilko "Wilko Bulte">
 <!ENTITY a.will "Will Andrews">
+<!ENTITY a.wjv "Johann Visagie">
+<!ENTITY a.wkoszek "Wojciech A. Koszek">
 <!ENTITY a.wollman "Garrett Wollman">
+<!ENTITY a.wosch "Wolfram Schneider">
 <!ENTITY a.wpaul "Bill Paul">
+<!ENTITY a.wsalamon "Wayne Salamon">
+<!ENTITY a.wsanchez "Wilfredo S&aacute;nchez">
+<!ENTITY a.wylie "Wylie Stilwell">
 <!ENTITY a.yar "Yar Tikhiy">
+<!ENTITY a.yoichi "Yoichi NAKAYAMA">
+<!ENTITY a.yokota "Kazutaka YOKOTA">
+<!ENTITY a.yongari "Pyun YongHyeon">
+<!ENTITY a.xride "S&oslash;ren Straarup">
+<!ENTITY a.zarzycki "Dave Zarzycki">
+<!ENTITY a.znerd "Ernst de Haan">
+
+<!-- Additional contributors -->
+<!ENTITY a.re "re@FreeBSD.org">
+<!ENTITY a.mkm "Kyle&nbsp;Martin">
+<!ENTITY a.joe.halpin "Joe&nbsp;Halpin">
+<!ENTITY a.pavalos "Peter&nbsp;Avalos">
+<!ENTITY a.jwojdacki "Justin&nbsp;Wojdacki">

 <!-- Below we list the various hats.  This is used in internal/staff.sgml
 so that we may keep a list of hat owners and modify only this file. -->
--- a/zh_CN/index.xsl
+++ b/zh_CN/index.xsl
@ -5,8 +5,8 @@
 ]>

 <!-- The FreeBSD Simplified Chinese Documentation Project -->
-<!-- Original revision: 1.151 -->
-<!-- $FreeBSD: www/zh_CN/index.xsl,v 1.1 2006/07/11 15:27:47 delphij Exp $ -->
+<!-- Original revision: 1.156 -->
+<!-- $FreeBSD$ -->

 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
  <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl"/>
@ -22,7 +22,6 @@
  <xsl:param name="news.project.xml" select="'none'"/>
  <xsl:param name="events.xml-master" select="'none'"/>
  <xsl:param name="events.xml" select="'none'"/>
-  <xsl:param name="curdate.xml" select="'none'"/>

  <xsl:output type="html" encoding="&xml.encoding;"
              doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN"/>
@ -46,7 +45,7 @@
 	  title="FreeBSD 安全公告" href="&enbase;/security/advisories.rdf" />
 	<link rel="alternate" type="application/rss+xml"
 	  title="FreeBSD GNOME Project 新闻" href="&enbase;/gnome/news.rdf" />
-	
+
 	<!-- Formatted to be easy to spam harvest, please do not reformat. -->
 	<xsl:comment>
        Spamtrap, do not email:
@ -68,19 +67,17 @@
 		<div id="FRONTFEATURELEFT">
 			<div id="FRONTFEATURECONTENT">
 				<h1>
-				  基于 BSD UNIX&#174;
+				  基于 BSD &unix;
 				</h1>
 				<p>
-				  FreeBSD&#174; 是可以用于 x86 兼容机 (包括
-				  Pentium&#174;、 Athlon&#8482;)、
-				  amd64 兼容机 (包括 Opteron&#8482;、 Athlon 64 和 EM64T)、
-				  UltraSPARC&#174;、 IA-64 和 PC-98， 以及 ARM
-				  硬件架构上的一种先进的操作系统。 它源于 BSD，
-				  由加州大学伯克利分校开发的 UNIX&#174; 版本，
-				  并由来自世界各地的 <a href="&enbase;/doc/en_US.ISO8859-1/articles/contributors/staff-committers.html">大批志愿者</a>
-				  持续开发和维护。 对于一些其它的
-				  <a href="&base;/platforms/">硬件平台</a>，
-				  它也提供了不同程度的支持。
+				  FreeBSD&reg; 是可以用于
+				  x86 兼容机 (包括 Pentium&reg; 和 Athlon&trade;)、
+				  amd64 兼容机 (包括 Opteron&trade;、 Athlon&trade;64 和 EM64T)、
+				  UltraSPARC&reg;、 IA-64、 PC-98 以及 ARM 硬件架构上的一种先进的操作系统。
+				  它源于 BSD， 由加州大学伯克利分校开发的 &unix; 版本。 目前由
+				  <a href="&base;/doc/en_US.ISO8859-1/articles/contributors/staff-committers.html">一支包含大量开发人员的团队</a> 维护。
+				  对于一些其它的 <a href="&base;/platforms/">硬件平台</a> 的支持，
+				  也正处于不同的开发阶段。
 				</p>
 				<div id="TXTFRONTFEATURELINK">
 				&#187;<a href="&base;/about.html" title="了解更多">了解更多</a>
@ -96,29 +93,29 @@
 				</div> <!-- frontgetcontent -->
 			  <div class="frontgetbot"><div><b style="display: none">.</b></div></div>
 			</div> <!-- frontgetroundbox -->
-			
+
 			<div id="FRONTRELEASES">
 			  <div id="FRONTRELEASESCONTENT" class="txtshortcuts">
-				  <h2><a href="&base;/releases/">最新版本</a></h2>
+				  <h2><a href="&base;/releases/"> 最新版本 </a></h2>
 				  <ul id="FRONTRELEASESLIST">
 					<li>
 					  <a href="&enbase;/&u.rel.announce;">生产适用版 &rel.current;</a>
 					</li>
 					<li>
-					  <a href="&enbase;/&u.rel2.announce;">生产适用版(旧式) &rel2.current;</a>
+					  <a href="&enbase;/&u.rel2.announce;">(旧式)生产适用版 &rel2.current;</a>
 					</li>
 			    <xsl:if test="'&beta.testing;' != 'IGNORE'">
 					<li>
 					  <a href="&base;/where.html#helptest">将发布的版本
-					    &betarel.current; - &betarel.vers;</a>
+				            &betarel.current; - &betarel.vers;</a>
 					</li>
-				    </xsl:if>
+			    </xsl:if>
 			    <xsl:if test="'&beta2.testing;' != 'IGNORE'">
 					<li>
 					  <a href="&base;/where.html#helptest">将发布的版本
-					    &betarel2.current; - &betarel2.vers;</a>
+				            &betarel2.current; - &betarel2.vers;</a>
 					</li>
-				    </xsl:if>
+			    </xsl:if>
 				  </ul>
 			  </div> <!-- FRONTRELEASESCONTENT -->
 			</div> <!-- FRONTRELEASES -->
@ -177,10 +174,10 @@
 					  <a href="&enbase;/community/mailinglists.html" title="邮件列表">邮件列表</a>
 					</li>
 					<li>
-					  <a href="&enbase;/send-pr.html" title="报告 Bug">报告 Bug</a>
+					  <a href="&base;/send-pr.html" title="报告 Bug">报告 Bug</a>
 					</li>
 					<li>
-					  <a href="&enbase;/doc/zh_CN.GB2312/books/faq/index.html" title="FAQ">FAQ</a>
+					  <a href="&enbase;/doc/en_US.ISO8859-1/books/faq/index.html" title="FAQ">FAQ</a>
 					</li>
 					<li>
 					  <a href="&enbase;/doc/zh_CN.GB2312/books/handbook/index.html" title="Handbook">使用手册</a>
@ -204,7 +201,7 @@
 			  <div class="frontnewbot"><div><b style="display: none">.</b></div></div>
 			</div> <!-- frontnewroundbox -->
 		</div> <!-- FEATURERIGHT -->
-				
+
            </div> <!-- FRONTFEATURECONTAINER -->

 	    <br class="clearboth" />
@ -225,7 +222,7 @@
 					<a href="&base;/news/newsflash.html" title="更多新闻">更多新闻</a>
 				  </li>
 				  <li class="last-child">
-					<a href="&base;/news/news.rdf" title="新闻 RSS Feed"><img class="rssimage" src="&enbase;/layout/images/ico_rss.png" width="27" height="12" alt="News RSS Feed" /></a>
+					<a href="&base;/news/news.rdf" title="新闻 RSS Feed"><img class="rssimage" src="&enbase;/layout/images/ico_rss.png" width="27" height="12" alt="新闻 RSS Feed" /></a>
 				  </li>
 				</ul>
 			  </div> <!-- unnamed -->
@ -243,7 +240,6 @@
 			<xsl:call-template name="html-index-events-items">
 				<xsl:with-param name="events.xml-master" select="$events.xml-master" />
 				<xsl:with-param name="events.xml" select="$events.xml" />
-				<xsl:with-param name="curdate.xml" select="$curdate.xml" />
 			</xsl:call-template>

 			  <div>
@ -330,8 +326,8 @@

 	FreeBSD 标志是 FreeBSD
 	基金会的注册商标。 FreeBSD Project 使用此商标得到了 <a
-	  href="http://www.freebsdfoundation.org/legal/guidelines.shtml">FreeBSD 基金会</a>
-	  的许可。
+	  href="http://www.freebsdfoundation.org/documents/Guidelines.shtml">FreeBSD 基金会</a>
+	的许可。

      </div> <!-- FOOTER -->
    </div> <!-- CONTAINER -->
--- a/zh_CN/internet.sgml
+++ b/zh_CN/internet.sgml
@ -1,11 +1,11 @@
 <!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
-<!ENTITY date "$FreeBSD: www/zh_CN/internet.sgml,v 1.1 2006/07/11 15:27:47 delphij Exp $">
+<!ENTITY date "$FreeBSD$">
 <!ENTITY title "关于 FreeBSD 与互联网络">
 <!ENTITY % navinclude.about "INCLUDE">
 ]>

 <!-- The FreeBSD Simplified Chinese Documentation Project -->
-<!-- Original Revision: 1.35 -->
+<!-- Original Revision: 1.37 -->

 <html>
    &header;
@ -41,14 +41,15 @@
      
      <p>FreeBSD 允许您使用其所附带的软件将 PC 变为 World Wide Web 服务器， 或
 	Usenet 新闻中转站。 使用其所包含的 SAMBA 软件，
-	您甚至可以与您的 Win95 或 NT 工作站提供文件和打印机共享，
+	您甚至可以与您的 Microsoft&reg;
+	Windows&reg; 工作站提供文件和打印机共享，
 	而通过 PCNFS 验证服务， 它也可以用来支持运行 PC/NFS 的终端。
 	FreeBSD 也支持 Appletalk 和 Novell 客户/服务端网络 (通过使用一个 <a
 	  href="http://www.netcon.com/">可选的商业软件包</a>)，
 	使其成为了真正的 "Intranet" 网络解决方案。</p>

      <p>FreeBSD 也能够处理类似 <a
-	  href="http://www.cis.ohio-state.edu/htbin/rfc/rfc1323.html">RFC-1323</a>
+	  href="http://www.ietf.org/rfc/rfc1323.txt">RFC-1323</a>
 	高性能扩展这样的 TCP 扩展， 以及 SLIP 和按需拨号的 PPP。 这些特性。
 	使它成为了一个适应从家庭拨号上网到企业系统管理员的不同需要的操作系统。</p>

--- a/zh_CN/security/security.sgml
+++ b/zh_CN/security/security.sgml
@ -1,15 +1,15 @@
 <!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/zh_CN/security/security.sgml,v 1.1 2006/07/11 15:27:53 delphij Exp $">
+<!ENTITY date "$FreeBSD$">
 <!ENTITY title "FreeBSD 安全信息">
 <!ENTITY % navinclude.support "INCLUDE">
 <!ENTITY % developers SYSTEM "../developers.sgml"> %developers;
 <!ENTITY advisories.html.inc SYSTEM "advisories.html.inc">
 ]>
 <!-- The FreeBSD Simplified Chinese Documentation Project -->
-<!-- Original revision: 1.187 -->
+<!-- Original revision: 1.189 -->

-<!-- $FreeBSD: www/zh_CN/security/security.sgml,v 1.1 2006/07/11 15:27:53 delphij Exp $ -->
+<!-- $FreeBSD$ -->

 <html>
  &header;
@ -110,8 +110,7 @@
    并对效果进行必要的测试， 以及同受影响的各方进行协调。</p>

  <p>如果某一安全漏洞会使 FreeBSD Project 的资源受到直接威胁，
-    则安全长官 <em>将会</em> 通知若干 <a
-      href="mailto:admins@FreeBSD.org">FreeBSD 集群管理员</a> 存在这样的安全漏洞。</p>
+    则安全长官 <em>将会</em> 通知若干 FreeBSD 集群管理员 存在这样的安全漏洞。</p>

  <p>如果需要，安全安全长官可能会邀请更多的 FreeBSD 项目开发人员，
    甚至本项目以外的开发人员参与讨论， 以全面地认识所收到的安全漏洞报告或修正问题。
--- a/zh_CN/send-pr.sgml
+++ b/zh_CN/send-pr.sgml
@ -1,14 +1,14 @@
-<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
-<!ENTITY date "$FreeBSD: www/zh_CN/send-pr.sgml,v 1.1 2006/07/11 15:27:47 delphij Exp $">
+<!DOCTYPE html PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
+<!ENTITY date "$FreeBSD$">
 <!ENTITY title "提交 FreeBSD 问题报告">
-<!ENTITY copyright "这一 gnats 问题报告提交报告机制 版权所有 &copy; 1996
+<!ENTITY copyright "此 gnats 问题报告提交报告机制 版权所有 &copy; 1996
 The NetBSD Foundation, Inc.  保留所有权利。">
 <!ENTITY % navinclude.support "INCLUDE">
 <!ENTITY bugbusters "bugbusters@FreeBSD.org">
 ]>

 <!-- The FreeBSD Simplified Chinese Documentation Project -->
-<!-- Original Revision 1.52 -->
+<!-- Original Revision 1.54 -->

 <html>
    &header;
@ -43,6 +43,11 @@
      您所使用来提交问题报告的电子邮件地址， 将通过 web 界面公之于众，
      因此您应使用有效的垃圾邮件过滤器。</p>

+    <p>如果您正提交补丁文件， 请注意我们只接受
+      text/* 类型的内容， 因此您的浏览器必须能够正确地发出文件类型信息。
+      如果您的浏览器做这项工作时有问题， 比较简单的办法是把文件改名，
+      使其以 '.txt' 结尾。</p>
+
    <p>最后， 您还应注意一点， 就是使用这一页面时， 您必须能够察看图片，
      这是我们用以阻止对这一系统进行滥用的一项措施。 我们非常遗憾不得不这样做，
      但这种做法是无法避免的。 如果您由于任何原因无法看到图片，
@ -57,7 +62,8 @@
      您可能会在这种情况下 <b>丢掉所作的成果</b>。
      请想法避免出现这种情况。</p>

-    <form action="http://www.FreeBSD.org/cgi/dosendpr.cgi" method="post">
+    <form action="http://www.FreeBSD.org/cgi/dosendpr.cgi" method="post"
+      enctype="multipart/form-data">
      <input type="hidden" name="submitterid" value="current-users" >
      <input type="hidden" name="confidential" value="no" >

@ -131,6 +137,10 @@
      <label for="fix">如果已知的话， 如何修正问题</label>：<br>
      <textarea name="fix" id="fix" rows="20" cols="80"></textarea><br><br>

+      <label for="patch">和/或补丁文件 (最大 100KB)</label>:
+      <input type="file" name="patch" id="patch" maxlength="102400"
+        accept="text/*" ><br>
+
      <label for="code-confirm">最后， 请输入下面图片中的文字，
 	以证明您不是机器人：<br><br>
      <img src="http://www.FreeBSD.org/cgi/confirm-code.cgi?db=sendpr"
--- a/zh_CN/share/sgml/libcommon.xsl
+++ b/zh_CN/share/sgml/libcommon.xsl
@ -6,6 +6,15 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
  <xsl:import href="http://www.FreeBSD.org/XML/www/share/sgml/libcommon.xsl"/>

+  <!-- Language-specific definitions should be put below this line -->
+  <!-- default format for date string -->
+  <xsl:param name="param-l10n-date-format-YMD"
+             select="'%Y 年 %M %D 日'" />
+  <xsl:param name="param-l10n-date-format-YM"
+             select="'%Y 年 %M'" />
+  <xsl:param name="param-l10n-date-format-MD"
+             select="'%M %D 日'" />
+
  <xsl:template name="html-news-list-newsflash-preface">
    <img src="&enbase;/gifs/news.jpg" align="right" border="0" width="193"
      height="144" alt="FreeBSD ÐÂÎÅËÙµÝ"/>
@ -68,20 +77,27 @@
    <xsl:param name="nummonth"/>
    <xsl:variable name="month" select="number($nummonth)"/>
    <xsl:choose>
-      <xsl:when test="$month=1">Janvier</xsl:when>
-      <xsl:when test="$month=2">F&#233;vrier</xsl:when>
-      <xsl:when test="$month=3">Mars</xsl:when>
-      <xsl:when test="$month=4">Avril</xsl:when>
-      <xsl:when test="$month=5">Mai</xsl:when>
-      <xsl:when test="$month=6">Juin</xsl:when>
-      <xsl:when test="$month=7">Juillet</xsl:when>
-      <xsl:when test="$month=8">Ao&#251;t</xsl:when>
-      <xsl:when test="$month=9">Septembre</xsl:when>
-      <xsl:when test="$month=10">Octobre</xsl:when>
-      <xsl:when test="$month=11">Novembre</xsl:when>
-      <xsl:when test="$month=12">D&#233;cembre</xsl:when>
-      <xsl:otherwise>Mois invalide</xsl:otherwise>
+      <xsl:when test="$month=1">一月</xsl:when>
+      <xsl:when test="$month=2">二月</xsl:when>
+      <xsl:when test="$month=3">三月</xsl:when>
+      <xsl:when test="$month=4">四月</xsl:when>
+      <xsl:when test="$month=5">五月</xsl:when>
+      <xsl:when test="$month=6">六月</xsl:when>
+      <xsl:when test="$month=7">七月</xsl:when>
+      <xsl:when test="$month=8">八月</xsl:when>
+      <xsl:when test="$month=9">九月</xsl:when>
+      <xsl:when test="$month=10">十月</xsl:when>
+      <xsl:when test="$month=11">十一月</xsl:when>
+      <xsl:when test="$month=12">十二月</xsl:when>
+      <xsl:otherwise>月份无效</xsl:otherwise>
    </xsl:choose>
  </xsl:template>

+  <xsl:template name="html-news-month-headings">
+    <xsl:param name="year" />
+    <xsl:param name="month" />
+
+    <xsl:value-of select="concat($year, ' 年 ', $month)" />
+  </xsl:template>
+
 </xsl:stylesheet>
--- a/zh_CN/share/sgml/news.xml
+++ b/zh_CN/share/sgml/news.xml
@ -20,7 +20,7 @@
     the contents of <title> will be preferred over <p>.

     The FreeBSD Simplified Chinese Documentation Project
-     Original Revision: 1.2
+     Original Revision: 1.17
     From: www/share/sgml/news.xml
 -->

@ -33,7 +33,128 @@

  <year>
    <name>2006</name>
+    <month>
+      <name>10</name>

+      <day>
+         <name>25</name>
+         <event>
+	   <title>Summer of Code 项目结项了</title>
+
+           <p>我们非常高兴全部 14 位学生都成功地完成了他们的 FreeBSD <a
+             href="&base;/projects/summerofcode-2006.html">Summer of
+             Code</a> 项目。 在此祝贺参与项目的导师和学生， 并感谢 <a
+             href="http://www.google.com/bsd">Google</a> 运营此项活动，
+             并为其提供资金赞助。</p>
+
+         </event>
+      </day>
+
+      <day>
+	 <name>19</name>
+	 <event>
+	   <title>2006 年第三季度开发进度报告</title>
+
+           <p>2006 年第三季度开发进度报告 <a
+             href="&base;/news/status/report-june-2006-oct-2006.html">现已发表</a>， 其中介绍了 49 项内容。</p>
+        </event>
+      </day>
+
+      <day>
+	 <name>14</name>
+	 <event>
+	  <title>用于 FreeBSD 的 GNOME 2.16.1 发布了</title>
+
+	  <p>GNOME 2.16.1 已经发布， 并已合并到了 FreeBSD
+	      ports tree。 请访问
+	      <a href="&enbase;/gnome/index.html">FreeBSD GNOME 主页</a>
+	      以查看正式的公告， 以及重要的
+	      <a href="&base;/gnome/docs/faq216.html">升级指南</a>。</p>
+      	</event>
+      </day>
+
+      <day>
+        <name>8</name>
+        <event>
+          <p>新增 committer：<a
+	    href="mailto:syrinx@FreeBSD.org">Shteryana Shopova</a>
+	    (src)</p>
+        </event>
+      </day>
+
+      <day>
+	<name>5</name>
+	<event>
+	  <title>FreeBSD 6.2-BETA2 发布了</title>
+
+	  <p>FreeBSD 6.2 的第二个 beta 版本现已 <a
+	    href="http://lists.freebsd.org/pipermail/freebsd-stable/2006-October/029171.html">发布</a>。
+	    用于 Tier-1 平台的 ISO 映像文件， 已可以通过众多的
+	    <a href="http://www.FreeBSD.org/doc/zh_CN.GB2312/books/handbook/mirrors-ftp.html">
+	    FreeBSD 镜像站点</a> 获得。</p>
+	</event>
+      </day>
+    </month>
+    <month>
+      <name>9</name>
+
+      <day>
+        <name>28</name>
+        <event>
+          <p>新增 committer：<a href="mailto:xride@FreeBSD.org">Soeren Straarup</a> (ports)</p>
+        </event>
+      </day>
+
+      <day>
+        <name>21</name>
+        <event>
+          <p>新增 committer：<a href="mailto:jfv@FreeBSD.org">Jack F. Vogel</a>
+            (src)</p>
+        </event>
+
+	<event>
+	  <title>FreeBSD 6.2-BETA1 发布了</title>
+
+	  <p>FreeBSD 6.2 的第一个 beta 版本现已 <a
+	    href="http://lists.freebsd.org/pipermail/freebsd-stable/2006-September/028584.html">发布</a>。
+	    本次 BETA1 的 ISO 映像文件， 已可以通过众多的
+	    <a href="http://www.FreeBSD.org/doc/zh_CN.GB2312/books/handbook/mirrors-ftp.html">
+	    FreeBSD 镜像站点</a> 获得。</p>
+	</event>
+      </day>
+
+      <day>
+        <name>20</name>
+        <event>
+          <p>新增 committer：<a href="mailto:chinsan@FreeBSD.org">黄青山</a>
+            (doc)</p>
+        </event>
+      </day>
+
+      <day>
+        <name>18</name>
+        <event>
+          <p>新增 committer：<a href="mailto:stas@FreeBSD.org">Stanislav Sedov</a>
+            (ports)</p>
+        </event>
+      </day>
+
+      <day>
+        <name>12</name>
+        <event>
+          <p>新增 committer：<a href="mailto:alexbl@FreeBSD.org">Alexander Botero-Lowry</a>
+            (ports)</p>
+        </event>
+      </day>
+
+      <day>
+	<name>1</name>
+	<event>
+	  <p>新增 committer：<a href="mailto:rrs@FreeBSD.org">Randall R. Stewart</a>
+            (src)</p>
+	</event>
+      </day>
+    </month>
    <month>
      <name>8</name>

--- a/zh_CN/share/sgml/press.xml
+++ b/zh_CN/share/sgml/press.xml
@ -8,7 +8,7 @@
 -->

 <!-- The FreeBSD Simplified Chinese Documentation Project -->
-<!-- Original Revision 1.208 -->
+<!-- Original Revision 1.13 -->

 <press>
  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
@ -20,9 +20,131 @@
  <year>
    <name>2006</name>

+    <month>
+      <name>10</name>
+
+      <story>
+	<name>iXsystems 因何收购 PC-BSD</name>
+	<url>http://www.onlamp.com/pub/a/bsd/2006/10/23/ixsystems-pc-bsd.html</url>
+	<site-name>OnLamp.com</site-name>
+	<site-url>http://www.onlamp.com/</site-url>
+	<date>2006 年 10 月 23 日</date>
+	<author>Dru Lavigne</author>
+	<p>一篇就 iXsystems Inc. 收购 PC-BSD 的针对 Kris Moore 和 Matt Olander
+	  的访谈。</p>
+      </story>
+
+      <story>
+	<name>利用虚拟化技术构建 NAS 设备</name>
+	<url>http://www.itweek.co.uk/2166671</url>
+	<site-name>IT Week</site-name>
+	<site-url>http://www.itweek.co.uk/</site-url>
+	<date>2006 年 10 月 18 日</date>
+	<author>Alan Stevens</author>
+	<p>在 VMWare 虚拟机中利用基于 FreeBSD 的 FreeNAS 建立您自己的虚拟网络存储设备。</p>
+      </story>
+
+      <story>
+	<name>Desktop FreeBSD： 全面优化的 6.x 安装</name>
+	<url>http://www.ofb.biz/safari/article/402.html</url>
+	<site-name>Open For Business</site-name>
+	<site-url>http://www.ofb.biz/</site-url>
+	<date>2006 年 10 月 12 日</date>
+	<author>Ed Hurst</author>
+	<p>本文介绍了如何为优化性能从源代码 (重) 联编 FreeBSD 系统。</p>
+      </story>
+
+      <story>
+	<name>基于 FreeBSD 的 PC-BSD 被 ‘收购’ 了</name>
+	<url>http://www.internetnews.com/dev-news/article.php/3637341</url>
+	<site-name>InternetNews.com</site-name>
+	<site-url>http://www.internetnews.com/</site-url>
+	<date>2006 年 10 月 12 日</date>
+	<author>Sean Michael Kerner</author>
+	<p>iXsystems Inc. 收购了 PC-BSD， 一种基于 FreeBSD 的桌面操作系统的商标权和知识产权。</p>
+      </story>
+
+      <story>
+	<name>将旧的笔记本电脑变为一套便携式网络故障排查系统</name>
+	<url>http://www.techbuilder.org/recipes/193105146</url>
+	<site-name>TechBuilder</site-name>
+	<site-url>http://www.techbuilder.org/</site-url>
+	<date>2006 年 10 月 09 日</date>
+	<author>David S. Markowitz</author>
+	<p>如何用旧的笔记本和 FreeBSD 来建立网络监控系统。</p>
+      </story>
+
+      <story>
+	<name>Desktop FreeBSD： 64-位 之未来</name>
+	<url>http://www.ofb.biz/safari/article/400.html</url>
+	<site-name>Open For Business</site-name>
+	<site-url>http://www.ofb.biz/</site-url>
+	<date>2006 年 10 月 04 日</date>
+	<author>Ed Hurst</author>
+	<p>这篇文章的作者介绍了建立令人满意的基于 FreeBSD 的 64-位桌面计算效果。</p>
+      </story>
+    </month>
+
+    <month>
+      <name>9</name>
+
+      <story>
+	<name>Win4BSD 发布了</name>
+	<url>http://win4bsd.com/content/index.php?option=com_content&amp;task=view&amp;id=20&amp;Itemid=2</url>
+	<site-name>Win4BSD</site-name>
+	<site-url>http://www.win4bsd.com/</site-url>
+	<date>2006 年 09 月 25 日</date>
+	<author>Dan Perlman</author>
+	<p>Virtual Bridges， 一家利用虚拟化技术实现企业和 SMB 解决方案的供应商今天宣布发布 Win4BSD
+	  Pro Desktop&trade;。 Win4BSD Pro Desktop 作为
+	  &os;/PC-BSD 的应用程序运行， 并允许用户运行 Windows 应用程序和桌面，
+	  而无需对 BSD 平台进行其它变动。</p>
+      </story>
+
+      <story>
+	<name>POSIX 异步 I/O</name>
+	<url>http://www.informit.com/articles/article.asp?p=607373&amp;seqNum=1&amp;rl=1</url>
+	<site-name>InformIT</site-name>
+	<site-url>http://www.informit.com/</site-url>
+	<date>2006 年 09 月 22 日</date>
+	<author>David Chisnall</author>
+	<p>介绍了 FreeBSD 和其它开源 OS 中的异步 I/O 编程。</p>
+      </story>
+
+      <story>
+	<name>DesktopBSD 1.0：用于桌面的 FreeBSD</name>
+	<url>http://os.newsforge.com/os/06/09/01/2053249.shtml</url>
+	<site-name>NewsForge</site-name>
+	<site-url>http://www.newsforge.com/</site-url>
+	<date>2006 年 09 月 11 日</date>
+	<author>Stefan Vrabie</author>
+	<p>关于 DesktopBSD 1.0 的评论。</p>
+      </story>
+
+      <story>
+	<name>(迟到的) FreeBSD 6.1 一瞥</name>
+	<url>http://weblog.infoworld.com/venezia/archives/007779.html</url>
+	<site-name>InfoWorld</site-name>
+	<site-url>http://www.infoworld.com/</site-url>
+	<date>2006 年 09 月 06 日</date>
+	<author>Paul Venezia</author>
+	<p>作者介绍了使用软 RAID 和 PF 的基于 FreeBSD 的邮件服务器和 Web 主机。</p>
+      </story>
+    </month>
+
    <month>
      <name>8</name>

+      <story>
+	<name>VMware 的虚拟设备竞赛 － 胜者是？</name>
+	<url>http://weblog.infoworld.com/virtualization/archives/2006/08/vmwares_virtual_1.html</url>
+	<site-name>InfoWorld</site-name>
+	<site-url>http://www.infoworld.com/</site-url>
+	<date>2006 年 08 月 15 日</date>
+	<author>David Marshall</author>
+	<p>基于 FreeBSD 的 FreeNAS 存储服务项目赢得了 VMWare Inc. 的虚拟化竞赛大奖。</p>
+      </story>
+
      <story>
 	<name>FreeBSD 6 中的高级安装任务</name>
 	<url>http://www.informit.com/articles/article.asp?p=597694&amp;rl=1</url>
--- a/zh_CN/where.sgml
+++ b/zh_CN/where.sgml
@ -1,12 +1,12 @@
 <!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
-<!ENTITY date "$FreeBSD: www/zh_CN/where.sgml,v 1.1 2006/07/11 15:27:47 delphij Exp $">
+<!ENTITY date "$FreeBSD$">
 <!ENTITY title "»ñÈ¡ FreeBSD">
 <!ENTITY % navinclude.download "INCLUDE">
 <!ENTITY url.rel "ftp://ftp.FreeBSD.org/pub/FreeBSD/releases">
 ]>

 <!-- The FreeBSD Simplified Chinese Documentation Project -->
-<!-- Original Revision: 1.84 -->
+<!-- Original Revision: 1.86 -->

 <html>
  &header;
@ -107,15 +107,6 @@
 	  <td><a href="&enbase;/releases/&rel.current;R/hardware-pc98.html">[²é¿´]</a></td>
 	  <td><a href="&base;/releases/&rel.current;R/installation-pc98.html">[²é¿´]</a></td>
 	</tr>
-	<tr>
-	  <td></td>
-	  <td>ppc</td>
-	  <td><!-- <a href="&url.rel;/ppc/&rel.current;-RELEASE">[°²×°ÎÄ¼þ]</a> -->[N/A]</td>
-	  <td><a href="&url.rel;/ppc/ISO-IMAGES/&rel.current;/">[ISO]</a></td>
-	  <td><!-- <a href="&enbase;/releases/&rel.current;R/relnotes-ppc.html">[²é¿´]</a> -->[N/A]</td>
-	  <td><!-- <a href="&enbase;/releases/&rel.current;R/hardware-ppc.html">[²é¿´]</a> -->[N/A]</td>
-	  <td><!-- <a href="&enbase;/releases/&rel.current;R/installation-ppc.html">[²é¿´]</a> -->[N/A]</td>
-	</tr>
 	<tr>
 	  <td></td>
 	  <td>sparc64</td>