release-notes ArchSpecific-zh_CN.xml, 1.1, 1.2 ArchSpecificPPC-zh_CN.xml, 1.1, 1.2 ArchSpecificx86-zh_CN.xml, 1.1, 1.2 ArchSpecificx86_64-zh_CN.xml, 1.1, 1.2 BackwardsCompatibility-zh_CN.xml, 1.1, 1.2 Colophon-zh_CN.xml, 1.1, 1.2 DatabaseServers-zh_CN.xml, 1.1, 1.2 DevelopmentTools-zh_CN.xml, 1.1, 1.2 DevelopmentToolsGCC-zh_CN.xml, 1.1, 1.2 DevelopmentToolsJava-zh_CN.xml, 1.1, 1.2 Installer-zh_CN.xml, 1.1, 1.2 Introduction-zh_CN.xml, 1.1, 1.2 Makefile, 1.10, 1.11 Networking-zh_CN.xml, 1.1, 1.2 OverView-zh_CN.xml, 1.1, 1.2 PackageChanges-zh_CN.xml, 1.1, 1.2 PackageNotes-zh_CN.xml, 1.1, 1.2 RELEASE-NOTES-zh_CN.xml, 1.4, 1.5 Security-zh_CN.xml, 1.1, 1.2 SecuritySELinux-zh_CN.xml, 1.1, 1.2 Welcome-zh_CN.xml, 1.1, 1.2 fedora.css, 1.3, 1.4

Yuan Yijun (bbbush) fedora-docs-commits at redhat.com
Fri Jan 6 13:50:19 UTC 2006


Author: bbbush

Update of /cvs/docs/release-notes
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7138

Modified Files:
	ArchSpecific-zh_CN.xml ArchSpecificPPC-zh_CN.xml 
	ArchSpecificx86-zh_CN.xml ArchSpecificx86_64-zh_CN.xml 
	BackwardsCompatibility-zh_CN.xml Colophon-zh_CN.xml 
	DatabaseServers-zh_CN.xml DevelopmentTools-zh_CN.xml 
	DevelopmentToolsGCC-zh_CN.xml DevelopmentToolsJava-zh_CN.xml 
	Installer-zh_CN.xml Introduction-zh_CN.xml Makefile 
	Networking-zh_CN.xml OverView-zh_CN.xml 
	PackageChanges-zh_CN.xml PackageNotes-zh_CN.xml 
	RELEASE-NOTES-zh_CN.xml Security-zh_CN.xml 
	SecuritySELinux-zh_CN.xml Welcome-zh_CN.xml fedora.css 
Log Message:
update zh_CN files, need further check.


Index: ArchSpecific-zh_CN.xml
===================================================================
RCS file: /cvs/docs/release-notes/ArchSpecific-zh_CN.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ArchSpecific-zh_CN.xml	5 Jan 2006 20:31:11 -0000	1.1
+++ ArchSpecific-zh_CN.xml	6 Jan 2006 13:50:12 -0000	1.2
@@ -1,7 +1,141 @@
-<!--
-Local variables:
-mode: xml
-sgml-parent-document:("RELEASE-NOTES-en.xml" "article" "section")
-fill-column: 72
-End:
+<?xml version="1.0" encoding="utf-8"?>
+<section id="sn-arch-specific">
+  <title>硬件体系结构相关要点</title>
+  <section id="sn-hardware-reqs">
+    <title>硬件需求</title>
+    <para>下列信息包含了要安装 &DISTRO; &DISTROVER; 所需的最小的硬件需求。</para>
+    <note>
+      <title>注意</title>
+      <para>对于特定的安装方式和/或安装后用途,可能需要满足其他硬件组件 (例如显卡和网卡) 的相容性。</para>
+    </note>
+    <!-- Something like this needs to be said, but this really needs a -->
+<!-- better treatment and probably a new section devoted to help resources.
+  <para>
+    This section does not address hardware compatability.  To find out
+    about using a specific piece of hardware with &FC; &LOCALVER; 
+  </para>
 -->
+    <section>
+      <title>CPU 需求</title>
+      <para>这一章列出了 &DISTRO; &DISTROVER; 需要的 CPU 特性。</para>
+      <note arch="x86">
+        <title>注意</title>
+        <para>下列 CPU 特性是以 Intel 处理器的方式表述的。其他处理器 (主要是来自 AMD, Cyrix 和 VIA 的那些) 如果与 Intel 处理器兼容,也可以用于 &DISTRO;。</para>
+      </note>
+      <itemizedlist arch="x86">
+        <listitem>
+          <para>最小需求:奔腾级别 — &FC; &LOCALVER; 特别为奔腾 4 CPU 进行了优化,但是仍然支持更早的 CPU (例如奔腾,高能奔腾,奔腾 II,奔腾 III,也包括 AMD å’Œ VIA 的处理器)。这样优化的原因是,如果仅为奔腾级别优化,在非奔腾级的处理器上会带来性能损失;并且奔腾 4 的调度有着很大区别,值得这样做。</para>
+        </listitem>
+        <listitem>
+          <para>文本模式的推荐配置:200 MHz 奔腾或以上</para>
+        </listitem>
+        <listitem>
+          <para>图形模式的推荐配置:400 MHz 奔腾 II 或以上</para>
+        </listitem>
+      </itemizedlist>
+      <itemizedlist arch="x86_64">
+        <listitem>
+          <para>AMD64 处理器 (包括 Athlon64 和 Opteron)</para>
+        </listitem>
+        <listitem>
+          <para>带有 <trademark class="registered">Intel</trademark> Extended Memory 64 Technology (<trademark class="registered">Intel</trademark> EM64T) 的 Intel 处理器</para>
+        </listitem>
+      </itemizedlist>
+    </section>
+    <section>
+      <title>硬盘空间需求</title>
+      <para>这一章列出了安装 &DISTRO; &DISTROVER; 的硬盘需求</para>
+      <note>
+        <title>注意</title>
+        <para>下列给出的是 &DISTRO; &DISTROVER; <emphasis>安装完成后</emphasis> 的硬盘需求。但是,在安装过程中,为运行安装程序,需要更多磁盘空间。更多的磁盘空间大致等于 (CD-ROM 1 中的) <filename>/Fedora/base/stage2.img</filename> 大小加上安装完毕的系统中 <filename>/var/lib/rpm</filename> 的大小。</para>
+        <!-- Update these figures every release -->
+        <para>实际上,这意味着对于最小安装,至少需要 90MB 的附加空间,对于 "everything" 完全安装,需要至多 175MB 附加空间。</para>
+        <para>另外,需要附加空间来存放用户数据。至少要有 5% 空闲空间,系统才能正常运作。</para>
+      </note>
+      <!-- Get actual numbers from installer, multiply by 1.1, and round -->
+      <!-- up to the nearest 10MB or .1GB -->
+      <para>此列表针对 32 位 x86 系统:</para>
+      <itemizedlist arch="x86">
+        <listitem>
+          <para>自定义安装 (最小安装):620MB</para>
+        </listitem>
+        <listitem>
+          <para>服务器:1.1GB</para>
+        </listitem>
+        <listitem>
+          <para>个人桌面:2.3GB</para>
+        </listitem>
+        <listitem>
+          <para>工作站:3.0GB</para>
+        </listitem>
+        <listitem>
+          <para>自定义安装 (完全安装):6.9GB</para>
+        </listitem>
+      </itemizedlist>
+      <para>此列表针对 64 位 x86_64 系统:</para>
+      <itemizedlist arch="x86_64">
+        <listitem>
+          <para>自定义安装 (最小安装):900MB</para>
+        </listitem>
+        <listitem>
+          <para>服务器:1.5GB</para>
+        </listitem>
+        <listitem>
+          <para>个人桌面:2.7GB</para>
+        </listitem>
+        <listitem>
+          <para>工作站 3.4GB</para>
+        </listitem>
+        <listitem>
+          <para>自定义安装 (完全安装):7.5GB</para>
+        </listitem>
+      </itemizedlist>
+    </section>
+    <section>
+      <title>内存需求</title>
+      <para>这一章列出了安装 &DISTRO; &DISTROVER; 的内存需求</para>
+      <para>此列表针对 32 位 x86 系统:</para>
+      <itemizedlist arch="x86">
+        <listitem>
+          <para>文本模式最小值:64MB</para>
+        </listitem>
+        <listitem>
+          <para>图形模式最小值:192MB</para>
+        </listitem>
+        <listitem>
+          <para>图形模式推荐值:256MB</para>
+        </listitem>
+      </itemizedlist>
+      <para>此列表针对 64 位 x86_64 系统:</para>
+      <itemizedlist arch="x86_64">
+        <listitem>
+          <para>文本模式最小值:128MB</para>
+        </listitem>
+        <listitem>
+          <para>图形模式最小值:256MB</para>
+        </listitem>
+        <listitem>
+          <para>图形模式推荐值:512MB</para>
+        </listitem>
+      </itemizedlist>
+    </section>
+    <section id="sn-hardware-reqs-ppc">
+      <title>PPC 硬件需求</title>
+      <para>这一章列出了在 PowerPC (PPC) 上安装 &FC; &LOCALVER; 的最小硬件需求。</para>
+      <itemizedlist>
+        <listitem>
+          <para>最小值:PowerPC G3 / POWER4</para>
+        </listitem>
+        <listitem>
+          <para>&FC; &LOCALVER; 支持 <quote>New World</quote> 一代的 Apple Power Macintosh (自 1999 发布), Genesi Pegasos II, 以及 IBM 32-bit RS/6000 机器。它也支持 64 位 G5 处理器,以及 IBM eServer pSeries 中的 POWER 处理器。</para>
+        </listitem>
+        <listitem>
+          <para>文本模式推荐值:233MHz G3 或更佳</para>
+        </listitem>
+        <listitem>
+          <para>图形模式推荐值:400MHz G3 或更佳</para>
+        </listitem>
+      </itemizedlist>
+    </section>
+  </section>
+</section>


Index: ArchSpecificPPC-zh_CN.xml
===================================================================
RCS file: /cvs/docs/release-notes/ArchSpecificPPC-zh_CN.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ArchSpecificPPC-zh_CN.xml	5 Jan 2006 20:31:11 -0000	1.1
+++ ArchSpecificPPC-zh_CN.xml	6 Jan 2006 13:50:12 -0000	1.2
@@ -1,7 +1,83 @@
-<!--
-Local variables:
-mode: xml
-sgml-parent-document:("RELEASE-NOTES-en.xml" "article" "section")
-fill-column: 72
-End:
--->
+<?xml version="1.0" encoding="utf-8"?>
+<section id="sn-arch-specific-ppc">
+  <title>PPC 相关</title>
+  <para>本节包含所有 &DISTRO 特定于 PPC 硬件平台的信息。</para>
+  <section id="sn-arch-specific-ppc-hardware-reqs">
+    <title>PPC 硬件需求</title>
+    <para>这一章列出了在 PowerPC (PPC) 上安装 &FC; &LOCALVER; 的最小硬件需求。</para>
+    <itemizedlist>
+      <listitem>
+        <para>最小值:PowerPC G3 / POWER4</para>
+      </listitem>
+      <listitem>
+        <para>&DISTRO; &DISTROVER; 只支持 <trademark class="registered">Apple</trademark> 在 1999 左右及其后发布的 <quote>New World</quote> 级别的 Power Macintosh。</para>
+      </listitem>
+      <listitem>
+        <para>&DISTRO; &DISTROVER; 也支持 <trademark class="registered">IBM</trademark> eServer™pSeries™,<trademark class="registered">IBM</trademark> RS/6000™ 以及 Genesi Pegasos II 计算机。</para>
+      </listitem>
+      <listitem>
+        <para>文本模式推荐值:233MHz G3 或更佳,64MiB 内存</para>
+      </listitem>
+      <listitem>
+        <para>图形模式推荐值:400MHz G3 或更佳,128MiB 内存</para>
+      </listitem>
+    </itemizedlist>
+  </section>
+  <section id="sn-arch-specific-ppc-installation-notes">
+    <title>PPC 安装</title>
+    <itemizedlist>
+      <listitem>
+        <para>&FC; 安装盘中的 DVD 或第一张 CD 是可以在所支持的硬件平台上启动的。另外,可以在 DVD 或第一张 CD 的 <filename>images/</filename> 目录找到可启动的 CD 镜像。硬件不同,它们的行为也不同:</para>
+      </listitem>
+      <listitem>
+        <para>
+          <trademark class="registered">Apple</trademark> Macintosh</para>
+        <itemizedlist>
+          <listitem>
+            <para>引导程序自动启动适当的 32 位或 64 位安装程序。电源管理支持,包括休眠和背光级别管理,包含在 <command>apmud</command> 软件包中,可以在 &FEX; 中找到。与 &FC; 匹配的 &FEX; 默认已为 <command>yum</command> 配置好了。安装系统后,可以在终端中运行 <command>yum install apmud</command> 来安装 <command>apmud</command>。</para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
+      <listitem>
+        <para>64-bit <trademark class="registered">IBM</trademark> eServerâ„¢ pSeriesâ„¢ (POWER4/POWER5)</para>
+        <itemizedlist>
+          <listitem>
+            <para>使用 <ulink url="/OpenFirmware">OpenFirmware</ulink> 启动 CD 后,引导管理器 (<command>yaboot</command>) 自动引导 64 位的安装程序。</para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
+      <listitem>
+        <para>32-bit CHRP (<trademark class="registered">IBM</trademark> RS/6000™ 及其他)</para>
+        <itemizedlist>
+          <listitem>
+            <para>使用 <ulink url="/OpenFirmware">OpenFirmware</ulink> 启动 CD 后,在 <prompt>boot:</prompt> 提示符下选择 <filename>linux32</filename> 启动镜像,引导 32 位的安装程序。否则,64 位安装程序会自动引导,而它无法运行。</para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
+      <listitem>
+        <para>Genesi Pegasos II</para>
+        <itemizedlist>
+          <listitem>
+            <para>在本文档撰写时,Pegasos 支持 ISO9660 文件系统的固件尚未发布,但是可以使用网络启动盘。在 OpenFirmware 提示符下,输入命令:</para>
+          </listitem>
+        </itemizedlist>
+        <para>boot cd: /images/netboot/ppc32.img</para>
+        <itemizedlist>
+          <listitem>
+            <para>您还需要手动配置 Pegasos 上的 OpenFirmware 来使得装好的 &FC; 系统可以启动。您需要设置 <envar>boot-device</envar> 和 <envar>boot-file</envar> 环境变量为正确的值。</para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
+      <listitem>
+        <para>网络启动</para>
+        <itemizedlist>
+          <listitem>
+            <para>在安装树的 images/netboot/ 目录有包含安装程序内核与 ramdisk 的一组镜像文件。它们主要用途是通过 TFTP 实现网络启动,但是也可以用在其他地方。</para>
+            <para>
+              <command>yaboot</command> 支持 <trademark class="registered">IBM</trademark> eServer™ pSeries™ 和 <trademark class="registered">Apple</trademark> Macintosh 通过 TFTP 启动。&FED; 推荐使用 yaboot 来访问 netboot 镜像文件。</para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
+    </itemizedlist>
+  </section>
+</section>


Index: ArchSpecificx86-zh_CN.xml
===================================================================
RCS file: /cvs/docs/release-notes/ArchSpecificx86-zh_CN.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ArchSpecificx86-zh_CN.xml	5 Jan 2006 20:31:11 -0000	1.1
+++ ArchSpecificx86-zh_CN.xml	6 Jan 2006 13:50:12 -0000	1.2
@@ -1,7 +1,53 @@
-<!--
-Local variables:
-mode: xml
-sgml-parent-document:("RELEASE-NOTES-en.xml" "article" "section")
-fill-column: 72
-End:
--->
+<?xml version="1.0" encoding="utf-8"?>
+<section id="sn-arch-specific-x86">
+  <title>x86 相关</title>
+  <para>本节包含所有 &FC 特定于 x86 硬件平台的信息。</para>
+  <section id="sn-arch-specific-x86-hardware-reqs">
+    <title>x86 硬件需求</title>
+    <para>下列信息包含了要安装 &DISTRO; &DISTROVER; test1 所需的最小的硬件需求。</para>
+    <para>对于特定的安装方式和/或安装后用途,可能需要满足其他硬件组件 (例如显卡和网卡) 的相容性。</para>
+    <section id="sn-arch-specific-x86-cpu-reqs">
+      <title>CPU 需求</title>
+      <para>这一章列出了 &DISTRO; &DISTROVER; test1 需要的 CPU 特性。</para>
+      <para>下列 CPU 特性是以 Intel 处理器的方式表述的。其他处理器 (主要是来自 AMD, Cyrix 和 VIA 的那些) 如果与 Intel 处理器兼容,也可以用于 &DISTRO;。</para>
+      <itemizedlist>
+        <listitem>
+          <para>最小需求:奔腾级别 — &FC; &LOCALVER; test1 特别为奔腾 4 CPU 进行了优化,但是仍然支持更早的 CPU (例如奔腾,高能奔腾,奔腾 II,奔腾 III,也包括 AMD å’Œ VIA 的处理器)。这样优化的原因是,如果仅为奔腾级别优化,在非奔腾级的处理器上会带来性能损失;并且奔腾 4 的调度有着很大区别,值得这样做。</para>
+        </listitem>
+        <listitem>
+          <para>文本模式的推荐配置:200 MHz 奔腾或以上</para>
+        </listitem>
+        <listitem>
+          <para>图形模式的推荐配置:400 MHz 奔腾 II 或以上</para>
+        </listitem>
+        <listitem>
+          <para>AMD64 处理器 (包括 Athlon64 和 Opteron)</para>
+        </listitem>
+        <listitem>
+          <para>带有 <trademark class="registered">Intel</trademark> Extended Memory 64 Technology (<trademark class="registered">Intel</trademark> EM64T) 的 Intel 处理器</para>
+        </listitem>
+      </itemizedlist>
+      <para></para>
+      <section id="sn-arch-specific-x86-memory-reqs">
+        <title>内存需求</title>
+        <para>这一章列出了安装 &DISTRO; &DISTROVER; test1 的内存需求</para>
+        <para>此列表针对 32 位 x86 系统:</para>
+        <itemizedlist>
+          <listitem>
+            <para>文本模式最小值:64MB</para>
+          </listitem>
+          <listitem>
+            <para>图形模式最小值:192MB</para>
+          </listitem>
+          <listitem>
+            <para>图形模式推荐值:256MB</para>
+          </listitem>
+        </itemizedlist>
+      </section>
+    </section>
+    <section id="sn-arch-specific-x86-installation-notes">
+      <title>x86 安装要点</title>
+      <para>安装程序正在重新设计。&DISTRO test 1 未提供安装类型选项。</para>
+    </section>
+  </section>
+</section>


Index: ArchSpecificx86_64-zh_CN.xml
===================================================================
RCS file: /cvs/docs/release-notes/ArchSpecificx86_64-zh_CN.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ArchSpecificx86_64-zh_CN.xml	5 Jan 2006 20:31:11 -0000	1.1
+++ ArchSpecificx86_64-zh_CN.xml	6 Jan 2006 13:50:12 -0000	1.2
@@ -1,7 +1,31 @@
-<!--
-Local variables:
-mode: xml
-sgml-parent-document:("RELEASE-NOTES-en.xml" "article" "section")
-fill-column: 72
-End:
--->
+<?xml version="1.0" encoding="utf-8"?>
+<section id="sn-arch-specific-x86-64">
+  <title>x86_64 相关</title>
+  <para>本节包含所有 &DISTRO 特定于 x86_64 硬件平台的信息。</para>
+  <section id="sn-arch-specific-x86-64-hardware-reqs">
+    <title>x86_64 硬件需求</title>
+    <para>下列信息包含了要安装 &DISTRO; &DISTROVER; test1 所需的最小的硬件需求。</para>
+    <para>对于特定的安装方式和/或安装后用途,可能需要满足其他硬件组件 (例如显卡和网卡) 的相容性。</para>
+    <para></para>
+    <section id="sn-arch-specific-x86-64-memory-reqs">
+      <title>内存需求</title>
+      <para>这一章列出了安装 &DISTRO; &DISTROVER; test1 的内存需求</para>
+      <para>此列表针对 64 位 x86_64 系统:</para>
+      <itemizedlist>
+        <listitem>
+          <para>文本模式最小值:128MB</para>
+        </listitem>
+        <listitem>
+          <para>图形模式最小值:256MB</para>
+        </listitem>
+        <listitem>
+          <para>图形模式推荐值:512MB</para>
+        </listitem>
+      </itemizedlist>
+    </section>
+    <section id="sn-arch-specific-x86-64-installation-notes">
+      <title>x86_64 安装要点</title>
+      <para>æ— </para>
+    </section>
+  </section>
+</section>


Index: BackwardsCompatibility-zh_CN.xml
===================================================================
RCS file: /cvs/docs/release-notes/BackwardsCompatibility-zh_CN.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BackwardsCompatibility-zh_CN.xml	5 Jan 2006 20:31:11 -0000	1.1
+++ BackwardsCompatibility-zh_CN.xml	6 Jan 2006 13:50:12 -0000	1.2
@@ -1,7 +0,0 @@
-<!--
-Local variables:
-mode: xml
-sgml-parent-document:("RELEASE-NOTES-en.xml" "article" "section")
-fill-column: 72
-End:
--->


Index: Colophon-zh_CN.xml
===================================================================
RCS file: /cvs/docs/release-notes/Colophon-zh_CN.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Colophon-zh_CN.xml	5 Jan 2006 20:31:11 -0000	1.1
+++ Colophon-zh_CN.xml	6 Jan 2006 13:50:12 -0000	1.2
@@ -1,7 +1,88 @@
-<!--
-Local variables:
-mode: xml
-sgml-parent-document:("RELEASE-NOTES-en.xml" "article" "section")
-fill-column: 72
-End:
--->
+<?xml version="1.0" encoding="utf-8"?>
+<section id="sn-colophon">
+  <title>&FC; 发行注记题署</title>
+  <note>
+    <title>文档草案题署</title>
+    <para>本文档为草案,因此不完整且不完善。</para>
+  </note>
+  <para>我们使用 colophon (题署)这个词的含义在于:</para>
+  <itemizedlist>
+    <listitem>
+      <para>承认贡献者的努力,同时提供负责制度。</para>
+    </listitem>
+    <listitem>
+      <para>解释工具及创建过程。</para>
+    </listitem>
+  </itemizedlist>
+  <section>
+    <title>贡献者</title>
+    <itemizedlist>
+      <listitem>
+        <para>Andrew Martynov (译者,俄文)</para>
+      </listitem>
+      <listitem>
+        <para>Anthony Green (beat 作者)</para>
+      </listitem>
+      <listitem>
+        <para>Bob Jensen</para>
+      </listitem>
+      <listitem>
+        <para>Dave Malcolm (beat 作者)</para>
+      </listitem>
+      <listitem>
+        <para>David Woodhouse (beat 作者)</para>
+      </listitem>
+      <listitem>
+        <para>Francesco Tombolini (译者,意大利文)</para>
+      </listitem>
+      <listitem>
+        <para>Gavin Henry (beat 作者)</para>
+      </listitem>
+      <listitem>
+        <para>Jens Petersen (beat 作者)</para>
+      </listitem>
+      <listitem>
+        <para>Joe Orton (beat 作者)</para>
+      </listitem>
+      <listitem>
+        <para>Josh Bressers (beat 作者)</para>
+      </listitem>
+      <listitem>
+        <para>Karsten Wade (beat 作者, 主编, 发布)</para>
+      </listitem>
+      <listitem>
+        <para>LuyaTshimbalanga (beat 作者)</para>
+      </listitem>
+      <listitem>
+        <para>PatrickBarnes (beat 作者, 编辑)</para>
+      </listitem>
+      <listitem>
+        <para>Rahul Sundaram (beat 作者, 编辑)</para>
+      </listitem>
+      <listitem>
+        <para>Sekine Tatsuo (译者,日文)</para>
+      </listitem>
+      <listitem>
+        <para>Steve Dickson (beat 作者)</para>
+      </listitem>
+      <listitem>
+        <para>Stuar tElliss (编辑)</para>
+      </listitem>
+      <listitem>
+        <para>Thomas Graf (beat 作者)</para>
+      </listitem>
+      <listitem>
+        <para>Tommy Reynolds (工具)</para>
+      </listitem>
+      <listitem>
+        <para>Yoshinari Takaoka (译者,工具)</para>
+      </listitem>
+      <listitem>
+        <para>Yuan Yijun (译者,简体中文)</para>
+      </listitem>
+    </itemizedlist>
+  </section>
+  <section>
+    <title>创建过程</title>
+  </section>
+</section>


Index: DatabaseServers-zh_CN.xml
===================================================================
RCS file: /cvs/docs/release-notes/DatabaseServers-zh_CN.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DatabaseServers-zh_CN.xml	5 Jan 2006 20:31:11 -0000	1.1
+++ DatabaseServers-zh_CN.xml	6 Jan 2006 13:50:12 -0000	1.2
@@ -1,7 +0,0 @@
-<!--
-Local variables:
-mode: xml
-sgml-parent-document:("RELEASE-NOTES-en.xml" "article" "section")
-fill-column: 72
-End:
--->


Index: DevelopmentTools-zh_CN.xml
===================================================================
RCS file: /cvs/docs/release-notes/DevelopmentTools-zh_CN.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DevelopmentTools-zh_CN.xml	5 Jan 2006 20:31:11 -0000	1.1
+++ DevelopmentTools-zh_CN.xml	6 Jan 2006 13:50:12 -0000	1.2
@@ -9,181 +9,4 @@
 
 ]>
 --><section id="sn-devel">
-  <title>开发工具</title>
-  <section id="sn-java-development">
-    <title>类 Java 环境</title>
-    <para>&FC; &LOCALVER; 发行版中包含了类 Java 的自由开源环境。</para>
-    <para>它包含三个组件:GNU Java 运行时环境 (<filename>libgcj</filename>),Eclipse Java 编译器 (<command>ecj</command>),以及一些包装和链接 (<filename>java-gcj-compat</filename>),使得运行时和编译器以类似其他 Java 环境的方式来呈现。</para>
-    <para>一些重量级的软件包,包括 Openoffice.org Base, Eclipse, 和 Apache Tomcat, 以及此次发行中的其他 Java 软件包,与这个环境是兼容的。</para>
-    <para>要得到更多信息,请参阅 FAQ:</para>
-    <para>
-      <ulink url="http://www.fedoraproject.org/wiki/JavaFAQ">http://www.fedoraproject.org/wiki/JavaFAQ</ulink>
-    </para>
-  </section>
-
-
-<!-- Content commented out, no update performed by beat writer yet.
-  <section id="sn-devel-gcc">
-    <title>GCC Compiler Collection</title>
-    <para>
-      &DISTRO; &DISTROVER; has been built using  <abbrev>GCC</abbrev>
-      4.0, which is included with the distribution.
-    </para>
-    <itemizedlist>
-      <title>Caveats</title>
-      <listitem>
-        <para>
-          <abbrev>GDB</abbrev> 6.1 or newer is needed to debug binaries
-	  unless compiled using the <parameter
-	    class="option">-fno-var-tracking</parameter> compilation
-	  option.
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          The <parameter class="option">-fwritable-strings</parameter>
-	  option is no longer accepted.
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          English-language diagnostic messages now use Unicode quotes;
-	  if you cannot read this, set your <envar>LC_CTYPE</envar>
-	  environment variable to "<filename>C</filename>" or
-	  change your terminal emulator.
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          The <filename>specs</filename> file is no longer installed on
-	  most systems. Ordinary users will not notice, but developers
-	  who need to alter the file can use the <parameter
-	    class="option">-dumpspecs</parameter> option to generate the
-	  file for editing.
-        </para>
-      </listitem>
-    </itemizedlist>
-    <itemizedlist>
-      <title>Code Generation</title>
-      <listitem>
-        <para>
-          The <abbrev>SSA</abbrev> code optimizer is now included and
-	  brings with it better constant propagation, partial redundancy
-	  elimination, load and store code motion, strength reduction,
-	  dead storage elimination, better detection of unreachable
-	  code, and tail recursion by accumulation.
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Autovectorization is supported. This technique achieves higher
-	  performance for repetitive loop code, in some circumstances.
-        </para>
-      </listitem>
-    </itemizedlist>
-    <itemizedlist>
-      <title>Language Extentions</title>
-      <listitem>
-        <para>
-          A <computeroutput>sentinel</computeroutput> attribute has been
-	  added so that the compiler will now issue a warning if a
-	  function such as <function>execl(char *path, const char *arg,
-	    ...)</function>, which requires a <literal>NULL</literal>
-	  list terminator is missing the <literal>NULL</literal>.
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          The <wordasword>cast-as-lvalue</wordasword>,
-	  <wordasword>conditional-expression-as-lvalue</wordasword>, and
-	  <wordasword>compund-expression-as-lvalue</wordasword>
-	  extentions have been removed.
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          The <computeroutput>#pragma pack()</computeroutput> semantics
-	  have been brought closer to those used by other compilers.
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Taking the address of a variable declared with the
-	  <computeroutput>register</computeroutput> modifier now
-	  generates an error instead of a warning.
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Arrays of incomplete element types now generate an error. This
-	  implies no forward reference to structure definitions.
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          The basic compiler, without any optimization (<parameter
-	    class="option">-O0</parameter>), has been measured as much
-	  as 25% faster in real-world code.
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Libraries may now contain function-scope static variables in
-	  multi-threaded programs. The <parameter
-	    class="option">-fno-threadsafe-statics</parameter> can be
-	  used by embedded developers to turn off this feature, but
-	  ordinary users should never do this.
-        </para>
-      </listitem>
-    </itemizedlist>
-    <itemizedlist>
-      <title>Java</title>
-      <listitem>
-	<para>
-          To avoid naming conflicts: <filename>rmic</filename> is now
-	  <filename>grmic</filename>; <filename>rmiregistry</filename>
-	  is now <filename>grmiregistry</filename>; and
-	  <filename>jar</filename> is now <filename>fastjar</filename>.
-        </para>
-      </listitem>
-      <listitem>
-	<para>
-	  The <application>GCJ</application> compiler can now be used as
-	  a just-in-time (<abbrev>JIT</abbrev>) tool by using the
-	  <filename>gnu.jit</filename> facilities.
-	</para>
-      </listitem>
-      <listitem>
-	<para>
-	  More support of the <abbrev>AWT</abbrev> and
-	  <abbrev>SWING</abbrev> packages have been added.
-	</para>
-      </listitem>
-    </itemizedlist>
-    <itemizedlist>
-      <title>FORTRAN</title>
-      <listitem>
-	<para>
-	  The <abbrev>GNU</abbrev> <application>FORTRAN 77</application>
-	  front end has been replaced by a new <application>FORTRAN
-	    90/95</application> recognizer.
-	</para>
-      </listitem>
-    </itemizedlist>
-    <itemizedlist>
-      <title>Eclipse Development Environment</title>
-      <listitem>
-	<para>
-	  Eclipse 3.1M6 has been compiled as a native application.
-	</para>
-      </listitem>
-      <listitem>
-	<para>
-	  The C Development Tool (<abbrev>CDT</abbrev>) has been
-	  included.
-	</para>
-      </listitem>
-    </itemizedlist>
-  </section>
--->
-</section>
+  <title>开发工具</title> &DEVELOPMENT-TOOLS-JAVA; &DEVELOPMENT-TOOLS-GCC;</section>


Index: DevelopmentToolsGCC-zh_CN.xml
===================================================================
RCS file: /cvs/docs/release-notes/DevelopmentToolsGCC-zh_CN.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DevelopmentToolsGCC-zh_CN.xml	5 Jan 2006 20:31:11 -0000	1.1
+++ DevelopmentToolsGCC-zh_CN.xml	6 Jan 2006 13:50:12 -0000	1.2
@@ -1,7 +0,0 @@
-<!--
-Local variables:
-mode: xml
-sgml-parent-document:("RELEASE-NOTES-en.xml" "article" "section")
-fill-column: 72
-End:
--->


Index: DevelopmentToolsJava-zh_CN.xml
===================================================================
RCS file: /cvs/docs/release-notes/DevelopmentToolsJava-zh_CN.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DevelopmentToolsJava-zh_CN.xml	5 Jan 2006 20:31:11 -0000	1.1
+++ DevelopmentToolsJava-zh_CN.xml	6 Jan 2006 13:50:12 -0000	1.2
@@ -1,7 +1,11 @@
-<!--
-Local variables:
-mode: xml
-sgml-parent-document:("RELEASE-NOTES-en.xml" "article" "section")
-fill-column: 72
-End:
--->
+<?xml version="1.0" encoding="utf-8"?>
+<section id="sn-java">
+  <title>类 Java 环境</title>
+  <para>&FC; &LOCALVER; 发行版中包含了类 Java 的自由开源环境。</para>
+  <para>它包含三个组件:GNU Java 运行时环境 (<filename>libgcj</filename>),Eclipse Java 编译器 (<command>ecj</command>),以及一些包装和链接 (<filename>java-gcj-compat</filename>),使得运行时和编译器以类似其他 Java 环境的方式来呈现。</para>
+  <para>一些重量级的软件包,包括 Openoffice.org Base, Eclipse, 和 Apache Tomcat, 以及此次发行中的其他 Java 软件包,与这个环境是兼容的。</para>
+  <para>要得到更多信息,请参阅 FAQ:</para>
+  <para>
+    <ulink url="http://www.fedoraproject.org/wiki/JavaFAQ">http://www.fedoraproject.org/wiki/JavaFAQ</ulink>
+  </para>
+</section>


Index: Installer-zh_CN.xml
===================================================================
RCS file: /cvs/docs/release-notes/Installer-zh_CN.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Installer-zh_CN.xml	5 Jan 2006 20:31:11 -0000	1.1
+++ Installer-zh_CN.xml	6 Jan 2006 13:50:12 -0000	1.2
@@ -116,7 +116,7 @@
         <para>某些硬件配置 (尤其是包含 LCD 显示器的配置) 可能在启动 &DISTRO; 安装程序时遇到问题。这种情况下,重启并在启动命令行中加入 "<command>nofb</command>" 选项。</para>
         <note>
           <title>注意</title>
-          <para>中文,日文和韩文图形化安装过程如果使用 "<command>nofb</command>" 选项启动,将以英文开始,然后在图形化安装过程开始之后切换到合适的语言。</para>
+          <para>中文,日文和韩文图形化安装过程如果使用 <option>nofb</option> 选项启动,将以英文开始,然后在图形化安装过程开始之后切换到合适的语言。</para>
         </note>
       </listitem>
       <listitem arch="x86">


Index: Introduction-zh_CN.xml
===================================================================
RCS file: /cvs/docs/release-notes/Introduction-zh_CN.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Introduction-zh_CN.xml	5 Jan 2006 20:31:11 -0000	1.1
+++ Introduction-zh_CN.xml	6 Jan 2006 13:50:12 -0000	1.2
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <section id="sn-intro">
-  <title>介绍,以及关于本文档</title>
+  <title>对 &FP; 的介绍,以及技术发行注记</title>
   <para>&PROJ; 是一个由 &RH; 发起的开放的项目,可以自由参与,由一个特别的团体领导,遵循一定的项目目标。项目的成果包括 &DISTRO;,这是一个完整的,可用于各种用途的,完全使用开源软件构建的操作系统。</para>
   <note>
     <title>注意</title>


Index: Makefile
===================================================================
RCS file: /cvs/docs/release-notes/Makefile,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Makefile	5 Jan 2006 19:22:24 -0000	1.10
+++ Makefile	6 Jan 2006 13:50:12 -0000	1.11
@@ -10,7 +10,7 @@
 #
 # Document-specific definitions.
 #
-LANGUAGES      	= en #it ja_JP ru zh_CN
+LANGUAGES      	= en zh_CN #it ja_JP ru 
                      # uncomment languages when you have all the same
                      # fies localized as are listed in XMLEXTRAFILES
 DOCBASE        	= RELEASE-NOTES


Index: Networking-zh_CN.xml
===================================================================
RCS file: /cvs/docs/release-notes/Networking-zh_CN.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Networking-zh_CN.xml	5 Jan 2006 20:31:11 -0000	1.1
+++ Networking-zh_CN.xml	6 Jan 2006 13:50:12 -0000	1.2
@@ -91,7 +91,6 @@
   </variablelist>
   <section sn="kernel-userspace-tools">
     <title>用户空间的工具</title>
-    <title>iproute</title>
     <para>直到内核版本 2.6.12,IPv4 地址删除算法都不考虑前缀长度。由于内核变化,如果没有提供前缀长度,iproute2 工具会提出警告,可能有无意的删除:</para>
     <screen>
 ip addr list dev eth0


Index: OverView-zh_CN.xml
===================================================================
RCS file: /cvs/docs/release-notes/OverView-zh_CN.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- OverView-zh_CN.xml	5 Jan 2006 20:31:11 -0000	1.1
+++ OverView-zh_CN.xml	6 Jan 2006 13:50:12 -0000	1.2
@@ -1,546 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
 <section id="sn-overview">
-  <title>本次发布概况</title>
-
-<!--
-  <para>
-    The following list includes brief summaries of some of the more
-    significant aspects of &DISTRO; &DISTROVER;:
-  </para>
+  <title>&FC; &LOCALVER; 的新内容概览</title>
   <itemizedlist>
     <listitem>
+      <para>Xen 虚拟软件以及 yum 软件管理程序被很好地集成在 &FED; 安装程序中。安装程序的界面更加友好。包含了远程日志和更好的出错回溯支持。</para>
+    </listitem>
+    <listitem>
       <para>
-	&DISTRO; &DISTROVER; contains the following changes:
-      </para>
-      <itemizedlist>
-	<listitem>
-	  <para>
-	    Support for the PowerPC (PPC) architecture.
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    GCC 4.0
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    GNOME 2.10
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    KDE 3.4 — includes new accessibility features.  You
-	    can manage these new features in <guimenu>KDS Control
-	      Center</guimenu><guisubmenu>Regional &
-	      Accessibility</guisubmenu><guisubmenu>Accessibility</guisubmenu>.
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    Native Eclipse 3.1M6 (part of a free Java stack)
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    MySQL 4.1
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    PHP 5.0
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    Xen 2 (virtualization to run multiple versions of an OS)
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    GFS 6.1-0.pre22 (cluster file system)
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    Evince 0.2.1 (universal document viewer)
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    GDM 2.6 - Includes early login capability
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    &SEL; — This release includes coverage for 80 new
-	    daemons by the targeted policy.  There are changes to the
-	    handling of Booleans.  The targeted policy is enabled by
-	    default.  For more information, refer to:  <ulink
-	      url="http://fedora.redhat.com/docs/selinux-faq/">http://fedora.redhat.com/docs/selinux-faq/</ulink>. 
-	    This is the complete list of daemons covered by the targeted
-	    policy:
-	  </para>
-	  <itemizedlist>
-	    <listitem>
-	      <para>
-		<command>NetworkManager</command>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<command>amanda</command>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<command>apache</command>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<command>apmd</command>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<command>arpwatch</command>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<command>auditd</command>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<command>bluetooth</command>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<command>canna</command>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<command>cardmgr</command>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<command>checkpolicy</command>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<command>chkpwd</command>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<command>compat</command>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<command>comsat</command>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<command>consoletype</command>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<command>cpucontrol</command>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<command>cpuspeed</command>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<command>crond</command>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<command>cups</command>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<command>cvs</command>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<command>cyrus</command>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<command>dbskkd</command>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<command>dbusd</command>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<command>dhcpc</command>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<command>dhcpd</command>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<command>dictd</command>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<command>dmidecode</command>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<command>dovecot</command>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<command>fingerd</command>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<command>fsadm</command>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<command>ftpd</command>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<command>getty</command>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<command>hald</command>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<command>hostname</command>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<command>hotplug</command>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<command>howl</command>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<command>hwclock</command>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<command>i18n_input</command>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<command>ifconfig</command>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<command>inetd</command>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<command>init</command>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<command>initrc</command>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<command>innd</command>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<command>kerberos</command>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<command>klogd</command>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<command>ktalkd</command>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<command>kudzu</command>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<command>ldconfig</command>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<command>load_policy</command>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<command>login</command>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<command>lpd</command>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<command>mailman</command>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<command>modutil</command>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<command>mta</command>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<command>mysqld</command>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<command>named</command>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<command>netutils</command>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<command>nscd</command>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<command>ntpd</command>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<command>portmap</command>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<command>postgresql</command>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<command>ppd</command>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<command>privoxy</command>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<command>radius</command>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<command>radvd</command>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<command>restorecon</command>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<command>rlogind</command>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<command>rpcd</command>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<command>rpm</command>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<command>rshd</command>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<command>rsync</command>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<command>samba</command>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<command>saslauthd</command>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<command>sendmail</command>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<command>setfiles</command>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<command>slapd</command>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<command>snmpd</command>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<command>squid</command>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<command>ssh</command>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<command>stunnel</command>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<command>syslogd</command>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<command>telnetd</command>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<command>tftpd</command>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<command>udev</command>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<command>updfstab</command>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<command>uucpd</command>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<command>webalizer</command>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<command>winbind</command>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<command>xdm</command>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<command>ypbind</command>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<command>ypserv</command>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<command>zebra</command>
-	      </para>
-	    </listitem>
-	  </itemizedlist>
-	</listitem>
-      </itemizedlist>
+        <application>Pup</application>,一个 yum 的图形化更新程序,替换了 <application>rhn-applet</application>。</para>
+    </listitem>
+    <listitem>
+      <para>GNOME 2.12 和 KDE 3.4 桌面环境包含其中。</para>
+    </listitem>
+    <listitem>
+      <para>GNOME Power Manager 和 GNOME Screensaver 包含其中,作为本次发布的技术前瞻。</para>
+    </listitem>
+    <listitem>
+      <para>OpenOffice.org 2.0 最终版也包含在内。OpenOffice.org 使用系统中很多软件包,使得性能和效率得以提升。</para>
+    </listitem>
+    <listitem>
+      <para>Xorg X11R7 候选发布 rc2 也包含在本次发布中。这是第一个模块化版本,添加新的特性以及修复错误可以更快地进行。</para>
+    </listitem>
+    <listitem>
+      <para>Kernel 2.6.14 包含其中。本次发布启用了软件休眠支持。</para>
+    </listitem>
+    <listitem>
+      <para>SCIM 在本次发布中替换了 IIIMF。</para>
+    </listitem>
+    <listitem>
+      <para>动画鼠标光标风格进行了改变。</para>
+    </listitem>
+    <listitem>
+      <para>&FP; 有了新的 logo (标识)。</para>
     </listitem>
   </itemizedlist>
--->
+  <para>有关这一版的 Fedora 提议和意见,请访问 <ulink url="http://fedoraproject.org/wiki/RoadMap">http://fedoraproject.org/wiki/RoadMap</ulink>。</para>
 </section>


Index: PackageChanges-zh_CN.xml
===================================================================
RCS file: /cvs/docs/release-notes/PackageChanges-zh_CN.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PackageChanges-zh_CN.xml	5 Jan 2006 20:31:11 -0000	1.1
+++ PackageChanges-zh_CN.xml	6 Jan 2006 13:50:12 -0000	1.2
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <section id="sn-package-movement">
-  <title>Packages Movement</title>
+  <title>Packages Changes</title>
   <!-- 
   FIXME
   Needs updating of entire contents for FC5.


Index: PackageNotes-zh_CN.xml
===================================================================
RCS file: /cvs/docs/release-notes/PackageNotes-zh_CN.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PackageNotes-zh_CN.xml	5 Jan 2006 20:31:11 -0000	1.1
+++ PackageNotes-zh_CN.xml	6 Jan 2006 13:50:12 -0000	1.2
@@ -70,7 +70,7 @@
       <para>目录 <filename>~/</filename> 是当前登录的用户的个人目录的简写,通常等同于 <filename>/home/username/</filename>。</para>
       <para>另外,在连接服务器时,OpenSSH 不再配置为默认进行 X11 转发。要启用 X11 转发,必须指定 <option>-X</option> 或 <option>-Y</option> 选项,或者在 <filename>~/.ssh/config</filename> 中设置 <option>ForwardX11</option> 选项。</para>
       <para>使用 <option>-X</option> 选项时,<command>ssh</command> 客户端的行为有了变化。在 OpenSSH 3.8 及新版中,X11 转发的方式是应用程序默认作为不可信的客户端。过去,X11 转发的方式是应用程序总是作为可信的客户端运行。一些应用程序在作为不可信的客户端运行时,可能无法正常工作。要将应用程序作为可信的客户端运行,应当使用 <option>-Y</option> 选项而不是 <option>-X</option> 选项,或者在 <filename>~/.ssh/config</filename> 中设置 <option>ForwardX11Trusted</option> 选项。</para>
-    </section> &JAVA-PACKAGE;</section>
+    </section> &PACKAGE-NOTES-JAVA;</section>
   <section id="sn-packages-core">
     <title>核心</title>
     <para>这一章包含 &DISTRO; 最重要的组件,包括内核。</para> &KERNEL; &SECURITY;</section> &DEVELOPMENT-TOOLS; &I18N; &PRINTING; &MULTIMEDIA; &WEB-SERVERS; &SAMBA; &XORG; &ENTERTAINMENT;</section>


Index: RELEASE-NOTES-zh_CN.xml
===================================================================
RCS file: /cvs/docs/release-notes/RELEASE-NOTES-zh_CN.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- RELEASE-NOTES-zh_CN.xml	6 Jan 2006 00:26:46 -0000	1.4
+++ RELEASE-NOTES-zh_CN.xml	6 Jan 2006 13:50:12 -0000	1.5
@@ -1,40 +1,50 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY FEEDBACK SYSTEM "./feedback-zh_CN.xml" >
-<!ENTITY HARDWARE-REQS SYSTEM "./hardware-reqs-zh_CN.xml" >
-<!ENTITY INSTALL-NOTES SYSTEM "./install-notes-zh_CN.xml" >
-<!ENTITY SPLASH SYSTEM "./splash-zh_CN.xml" >
-<!ENTITY INTRO SYSTEM "./intro-zh_CN.xml" >
-<!ENTITY OVERVIEW SYSTEM "./overview-zh_CN.xml" >
-<!ENTITY PACKAGE-MOVEMENT SYSTEM "./package-movement-zh_CN.xml" >
-<!ENTITY PACKAGE-NOTES SYSTEM "./package-notes-zh_CN.xml" >
-<!ENTITY PROJECT-OVERVIEW SYSTEM "./project-overview-zh_CN.xml" >
-<!ENTITY KERNEL SYSTEM "./kernel-zh_CN.xml" >
-<!ENTITY SAMBA SYSTEM "./samba-zh_CN.xml" >
-<!ENTITY PRINTING SYSTEM "./printing-zh_CN.xml" >
-<!ENTITY SERVER-TOOLS SYSTEM "./server-tools-zh_CN.xml" >
-<!ENTITY DEVELOPMENT-TOOLS SYSTEM "./development-tools-zh_CN.xml" >
-<!ENTITY SECURITY SYSTEM "./security-zh_CN.xml" >
-<!ENTITY FILE-SYSTEMS SYSTEM "./file-systems-zh_CN.xml" >
-<!ENTITY FILE-SERVERS SYSTEM "./file-servers-zh_CN.xml" >
-<!ENTITY DATABASE-SERVERS SYSTEM "./database-servers-zh_CN.xml" >
-<!ENTITY WEB-SERVERS SYSTEM "./web-servers-zh_CN.xml" >
-<!ENTITY DAEMONS SYSTEM "./daemons-zh_CN.xml" >
-<!ENTITY MULTIMEDIA SYSTEM "./multimedia-zh_CN.xml" >
-<!ENTITY MISC-SERVER SYSTEM "./misc-server-zh_CN.xml" >
-<!ENTITY JAVA-PACKAGE SYSTEM "./java-package-zh_CN.xml" >
-<!ENTITY NETWORKING SYSTEM "./networking-zh_CN.xml" >
-<!ENTITY XORG SYSTEM "./xorg-zh_CN.xml" >
-<!ENTITY ENTERTAINMENT SYSTEM "./entertainment-zh_CN.xml" >
-<!ENTITY I18N SYSTEM "./i18n-zh_CN.xml" >
-<!ENTITY LEGACY SYSTEM "./legacy-zh_CN.xml" >
+<!ENTITY ARCH-SPECIFIC SYSTEM "./ArchSpecific-zh_CN.xml" >
+<!ENTITY ARCH-SPECIFIC-PPC SYSTEM "./ArchSpecificPPC-zh_CN.xml" >
+<!ENTITY ARCH-SPECIFIC-x86 SYSTEM "./ArchSpecificx86-zh_CN.xml" >
+<!ENTITY ARCH-SPECIFIC-x86-64 SYSTEM "./ArchSpecificx86_64-zh_CN.xml" >
+<!ENTITY BACKWARDS-COMPATIBILITY SYSTEM "./BackwardsCompatbility" >
+<!ENTITY COLOPHON SYSTEM "./Colophon-zh_CN.xml" >
+<!ENTITY DATABASE-SERVERS SYSTEM "./DatabaseServers-zh_CN.xml" >
+<!ENTITY DESKTOP SYSTEM "./Desktop-zh_CN.xml" >
+<!ENTITY DEVELOPMENT-TOOLS SYSTEM "./DevelopmentTools-zh_CN.xml" >
+<!ENTITY DEVELOPMENT-TOOLS-GCC SYSTEM "./DevelopmentToolsGCC-zh_CN.xml" >
+<!ENTITY DEVELOPMENT-TOOLS-JAVA SYSTEM "./DevelopmentToolsJava-zh_CN.xml" >
+<!ENTITY ENTERTAINMENT SYSTEM "./Entertainment-zh_CN.xml" >
+<!ENTITY FEEDBACK SYSTEM "./Feedback-zh_CN.xml" >
+<!ENTITY FILE-SYSTEMS SYSTEM "./FileSystems-zh_CN.xml" >
+<!ENTITY FILE-SERVERS SYSTEM "./FileServers-zh_CN.xml" >
+<!ENTITY I18N SYSTEM "./I18n-zh_CN.xml" >
+<!ENTITY INSTALLER SYSTEM "./Installer-zh_CN.xml" >
+<!ENTITY INTRO SYSTEM "./Introduction-zh_CN.xml" >
+<!ENTITY KERNEL SYSTEM "./Kernel-zh_CN.xml" >
+<!ENTITY LEGACY SYSTEM "./Legacy-zh_CN.xml" >
+<!ENTITY MULTIMEDIA SYSTEM "./Multimedia-zh_CN.xml" >
+<!ENTITY NETWORKING SYSTEM "./Networking-zh_CN.xml" >
+<!ENTITY OVERVIEW SYSTEM "./OverView-zh_CN.xml" >
+<!ENTITY PACKAGE-CHANGES SYSTEM "./PackageChanges-zh_CN.xml" >
+<!ENTITY PACKAGE-NOTES SYSTEM "./PackageNotes-zh_CN.xml" >
+<!ENTITY PACKAGE-NOTES-JAVA SYSTEM "./PackageNotesJava-zh_CN.xml" >
+<!ENTITY PRINTING SYSTEM "./Printing-zh_CN.xml" >
+<!ENTITY PROJECT-OVERVIEW SYSTEM "./ProjectOverview-zh_CN.xml" >
+<!ENTITY SAMBA SYSTEM "./Samba-zh_CN.xml" >
+<!ENTITY SECURITY SYSTEM "./Security-zh_CN.xml" >
+<!ENTITY SECURITY-SELINUX SYSTEM "./SecuritySELinux-zh_CN.xml" >
+<!ENTITY SERVER-TOOLS SYSTEM "./ServerTools-zh_CN.xml" >
+<!ENTITY SYSTEM-DAEMONS SYSTEM "./SystemDaemons-zh_CN.xml" >
+<!ENTITY WEB-SERVERS SYSTEM "./WebServers-zh_CN.xml" >
+<!ENTITY WELCOME SYSTEM "./Welcome-zh_CN.xml" >
+<!ENTITY XORG SYSTEM "./Xorg-zh_CN.xml" >
+<!-- *************** COMMON FDP entities *************** -->
  <!ENTITY % FEDORA-ENTITIES-EN SYSTEM "../docs-common/common/fedora-entities-zh_CN.ent">
  %FEDORA-ENTITIES-EN;
  <!ENTITY LEGALNOTICE SYSTEM "../docs-common/common/legalnotice-en.xml">
- <!ENTITY DOCNAME "RELEASE-NOTES">
- <!ENTITY DOCVERSION "&FCX;&DISTROVER;">
- <!ENTITY DOCDATE "2005-11-24-T23:10+0000"
- <!ENTITY DOCID "&DOCNAME;-&DOCVERSION; (&DOCDATE;)">
+
+<!ENTITY DOCNAME "RELEASE-NOTES">
+<!ENTITY DOCVERSION "&FCX;&DISTROVER;">
+<!ENTITY DOCDATE "2005-11-24-T23:10+0000">
+<!ENTITY DOCID "&DOCNAME;-&DOCVERSION; (&DOCDATE;)"> <!-- version of manual and date -->
 <!ENTITY LOCALVER "5 test1">
 <!ENTITY NAME "Fedora">
 <!ENTITY PROJ "&FP;">
@@ -49,4 +59,4 @@
     <copyright>
       <year>2005</year>
       <holder>&FORMAL-RHI;</holder>
-    </copyright> &LEGALNOTICE-RELNOTES;</articleinfo> &SPLASH; &LEGALNOTICE-SECTION; &INTRO; &HARDWARE-REQS; &OVERVIEW; &INSTALL-NOTES; &PACKAGE-NOTES; &LEGACY; &PACKAGE-MOVEMENT; &PROJECT-OVERVIEW;</article>
+    </copyright> &LEGALNOTICE-RELNOTES;</articleinfo> &WELCOME; &OVERVIEW; &LEGALNOTICE-SECTION; &FEEDBACK; &INTRO; &INSTALLER; &ARCH-SPECIFIC; &NETWORKING; &PACKAGE-NOTES; &LEGACY; &PACKAGE-CHANGES; &PROJECT-OVERVIEW;</article>


Index: Security-zh_CN.xml
===================================================================
RCS file: /cvs/docs/release-notes/Security-zh_CN.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Security-zh_CN.xml	5 Jan 2006 20:31:11 -0000	1.1
+++ Security-zh_CN.xml	6 Jan 2006 13:50:12 -0000	1.2
@@ -35,12 +35,4 @@
         </listitem>
       </varlistentry>
     </variablelist>
-  </section>
-  <section id="sn-security-selinux-changes">
-    <title>SELinux 的变化</title>
-    <para>Mult-Category Security (MCS) SELinux 包含在 &FC; &LOCALVER; 中。更多信息请阅读这篇内容丰富的文章:</para>
-    <para>
-      <ulink url="http://www.livejournal.com/users/james_morris/5583.html">http://www.livejournal.com/users/james_morris/5583.html</ulink>
-    </para>
-  </section>
-</section>
+  </section> &SECURITY-SELINUX;</section>


Index: SecuritySELinux-zh_CN.xml
===================================================================
RCS file: /cvs/docs/release-notes/SecuritySELinux-zh_CN.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SecuritySELinux-zh_CN.xml	5 Jan 2006 20:31:11 -0000	1.1
+++ SecuritySELinux-zh_CN.xml	6 Jan 2006 13:50:12 -0000	1.2
@@ -1,7 +1,8 @@
-<!--
-Local variables:
-mode: xml
-sgml-parent-document:("RELEASE-NOTES-en.xml" "article" "section")
-fill-column: 72
-End:
--->
+<?xml version="1.0" encoding="utf-8"?>
+<section id="sn-security-selinux-changes">
+  <title>SELinux 的变化</title>
+  <para>Mult-Category Security (MCS) SELinux 包含在 &FC; &LOCALVER; 中。更多信息请阅读这篇内容丰富的文章:</para>
+  <para>
+    <ulink url="http://www.livejournal.com/users/james_morris/5583.html">http://www.livejournal.com/users/james_morris/5583.html</ulink>
+  </para>
+</section>


Index: Welcome-zh_CN.xml
===================================================================
RCS file: /cvs/docs/release-notes/Welcome-zh_CN.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Welcome-zh_CN.xml	5 Jan 2006 20:31:11 -0000	1.1
+++ Welcome-zh_CN.xml	6 Jan 2006 13:50:12 -0000	1.2
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<section id="sn-splash">
+<section id="sn-welcome">
   <title>欢迎使用 &FC; &LOCALVER;</title>
   <para>&FC; 是一个完全自由的,用户友好的,安全通用的平台,基于 Linux。它允许任何人自由地使用、修改和重发布,无论现在还是将来。&FP; 是一个开源项目,引领尖端技术和理念,得到了 &RH; 的赞助和 &FED; 社群的支持。</para>
   <caution>
@@ -30,7 +30,7 @@
   <itemizedlist>
     <listitem>
       <para>
-        <xref linkend="sn-new-in-fc"/>
+        <xref linkend="sn-overview"/>
       </para>
     </listitem>
     <listitem>
@@ -52,341 +52,4 @@
       <para>关于 &FP; (<ulink url="http://fedora.redhat.com/about/">http://fedora.redhat.com/about/</ulink>)</para>
     </listitem>
   </itemizedlist>
-  <section id="sn-new-in-fc">
-    <title>&FC; &LOCALVER; 的新内容</title>
-    <itemizedlist>
-      <listitem>
-        <para>Xen 虚拟软件以及 yum 软件管理程序被很好地集成在 &FED; 安装程序中。安装程序的界面更加友好。包含了远程日志和更好的出错回溯支持。</para>
-      </listitem>
-      <listitem>
-        <para>
-          <application>Pup</application>,一个 yum 的图形化更新程序,替换了 <application>rhn-applet</application>。</para>
-      </listitem>
-      <listitem>
-        <para>GNOME 2.12 和 KDE 3.4 桌面环境包含其中。</para>
-      </listitem>
-      <listitem>
-        <para>GNOME Power Manager 和 GNOME Screensaver 包含其中,作为本次发布的技术前瞻。</para>
-      </listitem>
-      <listitem>
-        <para>OpenOffice.org 2.0 最终版也包含在内。OpenOffice.org 使用系统中很多软件包,使得性能和效率得以提升。</para>
-      </listitem>
-      <listitem>
-        <para>Xorg X11R7 候选发布 rc2 也包含在本次发布中。这是第一个模块化版本,添加新的特性以及修复错误可以更快地进行。</para>
-      </listitem>
-      <listitem>
-        <para>Kernel 2.6.14 包含其中。本次发布启用了软件休眠支持。</para>
-      </listitem>
-      <listitem>
-        <para>SCIM 在本次发布中替换了 IIIMF。</para>
-      </listitem>
-      <listitem>
-        <para>动画鼠标光标风格进行了改变。</para>
-      </listitem>
-      <listitem>
-        <para>&FP; 有了新的 logo (标识)。</para>
-      </listitem>
-    </itemizedlist>
-    <para>有关这一版的 Fedora 提议和意见,请访问 <ulink url="http://fedoraproject.org/wiki/RoadMap">http://fedoraproject.org/wiki/RoadMap</ulink>。</para>
-  </section>
-
-<!-- commented out until the content can be updated
-  <section id="sn-new-in-fc">
-    <title>New in &FC; &LOCALVER;</title>
-    <para>
-      &FC; &LOCALVER; is the latest version of the free and popular &FC;
-      platform with a number of unique features and significant
-      improvements over previous versions.  This section provides an
-      overview of the major highlights in this release.
-    </para>
-    <itemizedlist>
-      <listitem>
-	<para>
-	  Desktop Enhancements — The &FED; desktop brings to you
-	  the latest software such as GNOME 2.10 and KDE 3.4 with a new
-	  look and feel.  GNOME has the new simple and elegant Clearlooks
-	  default theme that is inspired by the classic Red Hat
-	  Bluecurve theme, as shown in <xref
-	  linkend="ex-desktop-screenshot-clearlooks"/>.
-	</para>
-	<example id="ex-desktop-screenshot-clearlooks">
-	  <title>New desktop featuring Clearlooks and Evince</title>
-	  <mediaobject id="txt-fedora-desktop-screenshot">
-	    <imageobject>
-	      <imagedata fileref="./figs/Fedora_Desktop.eps" format="EPS"/>
-	    </imageobject>
-	    <imageobject>
-	      <imagedata fileref="./figs/Fedora_Desktop.png" format="PNG"/>
-	    </imageobject>
-	    <textobject>
-	      <para>
-		Screenshot of Fedora desktop showing Firefox in the
-		background and the new universal document viewer Evince
-		in the foreground.  Evince is displaying Lawrence
-		Lessig's Free Culture.
-	      </para>
-	    </textobject>
-	  </mediaobject>
-	</example>      
-      </listitem>
-      <listitem>
-	<para>
-	  Improved Productivity
-	</para>
-	<itemizedlist>
-	  <listitem>
-	    <para>
-	      Evince (<ulink
-		url="http://www.gnome.org/projects/evince/">http://www.gnome.org/projects/evince/</ulink>) 
-	      is a document viewer for multiple document formats such as
-	      pdf, postscript, and many others.  Evince replaces a whole
-	      category of document viewers with a single simple
-	      application.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      OpenOffice.org 2.0 (<ulink
-		url="http://www.openoffice.org/product2/index.html">http://www.openoffice.org/product2/index.html</ulink>) 
-	      is an office productivity suite.  This latest version
-	      includes several enhancements such as improved Microsoft
-	      Office compatibility, completely revamped Impress
-	      presentation software, and native support for the
-	      OpenDocument format. This version also introduces Base, a
-	      fully integrated database management software. You can
-	      find the extensive list of new features at <ulink
-		url="http://marketing.openoffice.org/2.0/featureguide.html">http://marketing.openoffice.org/2.0/featureguide.html</ulink>.</para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Eclipse 3.1 is an open and extensible software development
-	      platform that is an Integrated Development Environment
-	      (<acronym>IDE</acronym>) useful for programming in any
-	      language. 
-	    </para>
-	  </listitem>
-	</itemizedlist>
-      </listitem>
-      <listitem>
-	<para>
-	  Support for PowerPC (PPC) Architecture — Refer to <xref
-	    linkend="sn-hardware-reqs-ppc"/> and <xref
-	    linkend="sn-install-notes-ppc"/>.
-	</para>
-      </listitem>
-      <listitem>
-	<para>
-	  Improved Security — &SEL; is a security architecture
-	  that protects applications and users through finely grained
-	  mandatory security controls.  The default targeted policy has
-	  been improved to cover 80 additional daemons. You can read
-	  more in the technical release notes
-	  <xref linkend="sn-overview"/>.
-	</para>
-      </listitem>
-      <listitem>
-	<para>
-	  Integrated Clustering Technology — Global File System
-	  (<acronym>GFS</acronym>) is an open source clustering file
-	  system that allows a cluster of Linux servers to share a
-	  common storage pool. &FC; &LOCALVER; has integrated GFS within
-	  the system to manage your storage in an efficient way.  You
-	  can read more at <ulink
-	    url="http://www.redhat.com/software/rha/gfs/">http://www.redhat.com/software/rha/gfs/</ulink> 
-	  and <ulink
-	    url="http://www.redhat.com/docs/manuals/enterprise/">http://www.redhat.com/docs/manuals/enterprise/</ulink>.
-	</para>
-      </listitem>
-      <listitem>
-	<para>
-	  Built-in Virtualization — Xen is a virtual machine that
-	  can securely run multiple operating systems in their own
-	  sandboxed domains.  Xen has been integrated into &FC; to work
-	  in a seamless fashion.  You can read more about Xen at <ulink
-	    url="http://fedora.redhat.com/projects/virtualization/">http://fedora.redhat.com/projects/virtualization/</ulink>.
-	</para>
-      </listitem>
-      <listitem>
-	<para>
-	  Solid Platform — &FC; &LOCALVER; includes and integrates
-	  the latest 4.0 version of GNU Compiler Collection, which has a
-	  rewritten optimization infrastructure and improved support for
-	  a native open source Java software stack.  This stack includes
-	  parts of OpenOffice.org 2.0., Eclipse, and Apache Jakarta,
-	  among others.
-	</para>
-      </listitem>
-    </itemizedlist>
-  </section>
-  <section id="sn-why-no-mp3">
-    <title>MP3 Codecs and Other Patented or Closed Source Software</title>
-    <para>
-      This section is a brief explanation of why certain software is not
-      included in &FC; or &FEX;.  This information was drawn directly
-      from the canonical wiki page:
-    </para>
-    <para>
-      <ulink
-	url="http://fedoraproject.org/wiki/ForbiddenItems">http://fedoraproject.org/wiki/ForbiddenItems</ulink>
-    </para>
-    <para>
-      A frequent question of the &FP; is why certain items are not
-      included in &FC; or &FEX;. This briefly explains some of the
-      reasons.
-    </para>
-    <para>
-      Other items, such as file systems support, requires community
-      participation.  For more information, refer to <ulink
-	url="http://fedoraproject.org/wiki/Wishlist">http://fedoraproject.org/wiki/Wishlist</ulink>
-    </para>
-    <variablelist>
-      <varlistentry>
-	<term>NTFS</term>
-	<listitem>
-	  <para>
-	    NTFS Support is not included in the &FC; kernel because of
-	    patent concerns. Using a file system natively supported by
-	    Linux such as ext3 is a better option. If you must share
-	    files between Windows and Linux on a single system, use
-	    FAT/FAT32 (vfat) instead. For sharing across a network,
-	    Samba is a good option.
-	  </para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-	<term>MP3 encode/decode functionality</term>
-	<listitem>
-	  <para>
-	    MP3 support is not included in any &FC; application because
-	    MP3 is heavily patented in several regions including the
-	    United States. The patent holder is unwilling to give an
-	    unrestricted patent grant, as required by the GPL. Other
-	    platforms might have paid the royalty and/or included
-	    proprietary software. Other Linux distributions not based in
-	    a region affected by the patent might ship MP3
-	    decoders/encoders. However, &FC; cannot and does not ship
-	    MP3 decoders/encoders in order to serve the goal of shipping
-	    only free and open source software. Using other open source
-	    formats such as Ogg Vorbis (a lossy codec that has better
-	    quality than MP3) or FLAC (a lossless codec) is highly
-	    recommended.
-	  </para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-	<term>NVIDIA 3D drivers</term>
-	<listitem>
-	  <para>
-	    The NVIDIA 3D drivers are closed source. &FC; does not
-	    include proprietary binaries. Consider using an Intel or any
-	    other manufacturer that supports open source cards with full
-	    specifications and/or source code.
-	  </para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-	<term>ATI 3D drivers</term>
-	<listitem>
-	  <para>
-	    The ATI 3D drivers are closed source. &FC; does not include
-	    proprietary binaries. Consider using an Intel or any other
-	    manufacturer that supports open source cards with full
-	    specifications and/or source code.
-	  </para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-	<term>RealPlayer</term>
-	<listitem>
-	  <para>
-	    RealPlayer is a closed source application. &FC; does not
-	    include proprietary binaries. Consider using open source
-	    codecs that do not have patent restrictions.
-	  </para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-	<term>DVD video playback</term>
-	<listitem>
-	  <para>
-	    DVD video playback (of CSS encrypted DVDs) may violate the
-	    US DMCA (refer to <ulink
-	      url="http://en.wikipedia.org/wiki/DMCA">http://en.wikipedia.org/wiki/DMCA</ulink>) 
-	    because it may be considered circumventing an encryption
-	    mechanism. Additionally, MPEG2 is a patented codec, so even
-	    DVDs without encryption cannot be played. Consider using
-	    open source unencrypted mediums such as Ogg Theora formats.
-	  </para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-	<term>Mono</term>
-	<listitem>
-	  <para>
-	    Mono packages are not currently included due to potential
-	    legal issues. (Pending more input.) Applications can be
-	    written in other languages that are open source, such as
-	    Python, Perl, or Ruby. Java is cross-platform and GCJ is a
-	    relatively mature open source implementation of it. These
-	    are not direct one-to-one equivalents with .NET but might
-	    serve your purpose.
-	  </para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-	<term>Cryptology (mcrypt)</term>
-	<listitem>
-	  <para>
-	    Some cryptology related packages such as mcrypt are not
-	    included within &FC; due to US export restrictions. Consider
-	    using non-restricted cryptographical methods instead.
-	  </para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-	<term>szip</term>
-	<listitem>
-	  <para>
-	    The szip license is too restrictive for inclusion in &FEX;.
-	    Use other open source alternatives.
-	  </para>
-	</listitem>
-      </varlistentry>
-    </variablelist>
-    <para>
-      In conclusion:
-    </para>
-    <itemizedlist>
-      <listitem>
-	<para> If it is proprietary, it cannot be included in &FED;.
-	</para>
-      </listitem>
-      <listitem>
-	<para>
-	  If it is legally encumbered, it cannot be included in &FED;.
-	</para>
-      </listitem>
-      <listitem>
-	<para>
-	  If it violates US Federal law, it cannot be included in &FED;.
-	</para>
-      </listitem>
-    </itemizedlist>
-    <para>
-      Of course, the logical followup is: "But I want to get foo and do
-      bar, how can I do one of the items listed above?"
-    </para>
-    <para>
-      The unofficial <ulink
-	url="http://fedorafaq.org">http://fedorafaq.org</ulink> provides
-      useful answers on commonly asked questions. However, these are
-      completely unsupported by the &FP;. The &FP; encourages using free
-      and open source software.
-    </para>
-    <para>
-      The binary only drivers can be acquired from the vendors. You can
-      find many interesting things with Google.
-    </para>
-  </section>
--->
 </section>


Index: fedora.css
===================================================================
RCS file: /cvs/docs/release-notes/fedora.css,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fedora.css	23 Nov 2005 05:38:24 -0000	1.3
+++ fedora.css	6 Jan 2006 13:50:12 -0000	1.4
@@ -5,35 +5,44 @@
 Written by Tammy Fox and Garrett LeSage
 
 Copyright 2003 Tammy Fox, Garrett LeSage, and Red Hat, Inc.
+Copywight 2005 Tommy Reynolds <Tommy.Reynolds at MegaCoder.com>
 
 License: GPL
 
 */
 
+body	{
+	background-attachment	scroll;
+	background-color:	#FEFEFF;
+	background-image:	url('watermark.png');
+	background-position:	top center;
+	background-repeat:	repeat;
+}
+
 li p {
 	display: inline;
 }
 
 div.table table {
 	width: 95%;
-	background-color: #DCDCDC; 
+	background-color: #DCDCDC;
 	color: #000000;
 	border-spacing: 0;
 }
 
 div.table table th {
-	border: 1px solid #A9A9A9;	
+	border: 1px solid #A9A9A9;
 	background-color: #A9A9A9;
 	color: #000000;
 }
 
 div.table table td {
-	border: 1px solid #A9A9A9; 
+	border: 1px solid #A9A9A9;
 	background-color: #DCDCDC;
 	color: #000000;
 	padding: 0.5em;
 	margin-bottom: 0.5em;
-	margin-top: 2px; 
+	margin-top: 2px;
 
 }
 
@@ -66,35 +75,35 @@
 }
 
 hr {
-        border: 0;
-        border-bottom: 1px solid #ccc;
+	border: 0;
+	border-bottom: 1px solid #ccc;
 }
 
 h1, h2, h3, h4 {
-        font-family: luxi sans,sans-serif;
+	font-family: luxi sans,sans-serif;
 	color: #22437f;
 	font-weight: bold;
 }
 h1 {
-        font-size: 1.75em;
+	font-size: 1.75em;
 }
-      
+
 h2 {
-        font-size: 1.25em;
+	font-size: 1.25em;
 }
 
 h3 {
-        font-size: 1.1em;
+	font-size: 1.1em;
 }
 
 a:link {
-        color: #900;
+	color: #900;
 }
 a:visited {
-        color: #48468f;
+	color: #48468f;
 }
 a:hover {
-        color: #f20;
+	color: #f20;
 }
 
 code.screen, pre.screen {
@@ -113,12 +122,12 @@
 
 div.example {
 	padding: 10px;
-        border: 1px solid #bbb;
+	border: 1px solid #bbb;
 	margin: 0.5em 2em;
 }
 
 .procedure ol li {
-        margin-bottom: 0.5em;
+	margin-bottom: 0.5em;
 }
 .procedure ol li li {
 	/* prevent inheritance */




More information about the Fedora-docs-commits mailing list