3 files changed, 38 insertions, 21 deletions

diff --git a/zh_CN.GB2312/books/handbook/bibliography/chapter.sgml b/zh_CN.GB2312/books/handbook/bibliography/chapter.sgml
index 4e689ac5c2..f58aebeb4f 100644
--- a/zh_CN.GB2312/books/handbook/bibliography/chapter.sgml
+++ b/zh_CN.GB2312/books/handbook/bibliography/chapter.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Chinese Documentation Project
 
-     Original Revision: 1.87
+     Original Revision: 1.88
      $FreeBSD$
 -->
 
@@ -157,10 +157,11 @@
 
     <itemizedlist>
       <listitem>
-	<para><ulink url="http://www.AbsoluteBSD.com/">Absolute
-	  BSD: The Ultimate Guide to FreeBSD</ulink>, 出版商：
-	  <ulink url="http://www.nostarch.com/">No Starch Press</ulink>, 2002.
-	  ISBN: 1886411743</para>
+	<para><ulink url="http://www.absoluteFreeBSD.com/">Absolute
+	  FreeBSD, 2nd Edition:  The Complete Guide to FreeBSD</ulink>,
+	  出版商： <ulink
+	  url="http://www.nostarch.com/">No Starch Press</ulink>, 2007.
+	  ISBN: 978-1-59327-151-0</para>
       </listitem>
 
       <listitem>
diff --git a/zh_CN.GB2312/books/handbook/desktop/chapter.sgml b/zh_CN.GB2312/books/handbook/desktop/chapter.sgml
index dc380237c6..e38888b072 100644
--- a/zh_CN.GB2312/books/handbook/desktop/chapter.sgml
+++ b/zh_CN.GB2312/books/handbook/desktop/chapter.sgml
@@ -2,7 +2,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Project
 
-     Original Revision: 1.95
+     Original Revision: 1.96
      $FreeBSD$
 -->
 
@@ -175,11 +175,11 @@
 
       <screen>&prompt.root; <userinput>pkg_add -r firefox</userinput></screen>
 
-      <para>这将会安装 <application>Firefox</application> 2.X，
-        如果你希望运行 <application>Firefox</application> 3.X，
-        则执行如下的命令：</para>
+      <para>这将会安装 <application>Firefox</application> 3.6，
+	如果希望运行 <application>Firefox</application> 3.5，
+	则应使用下面的命令：</para>
 
-      <screen>&prompt.root; <userinput>pkg_add -r firefox3</userinput></screen>
+      <screen>&prompt.root; <userinput>pkg_add -r firefox35</userinput></screen>
 
       <para>如果你希望从源代码编译的话，
         可以通过 Ports Collection 安装：</para>
@@ -187,9 +187,9 @@
       <screen>&prompt.root; <userinput>cd /usr/ports/www/firefox</userinput>
 &prompt.root; <userinput>make install clean</userinput></screen>
 
-      <para>For <application>Firefox</application> 3.X, in the
-	previous command replace <literal>firefox</literal> with
-	<literal>firefox3</literal>.</para>
+      <para>对于 <application>Firefox</application> 3.5，
+	对应的命令中的 <literal>firefox</literal> 应改为
+	<literal>firefox35</literal>。</para>
     </sect2>
 
     <sect2 id="moz-java-plugin">
@@ -198,6 +198,9 @@
       <note>
 	<para>在这一节和下一节中，
 	  我们均假定您已经安装了 <application>Firefox</application>。</para>
+
+	<para>目前， &java; 插件还不能够配合
+	  <application>Firefox</application> 3.6 使用。</para>
       </note>
 
       <para>&os; 基金会拥有来自 Sun Microsystems 的关于发布针对 &os;
@@ -222,16 +225,22 @@
 	您应在这个列表中找到 <application>&java;</application>
 	插件。 如果不是这样的话， 每个用户则需要运行如下命令：</para>
 
-      <screen>&prompt.user; <userinput>ln -s /usr/local/diablo-jre1.6.0/plugin/i386/ns7/libjavaplugin_oji.so \
+      <screen>&prompt.user; <userinput>ln -s /usr/local/diablo-jre1.6.0/plugin/<replaceable>i386</replaceable>/ns7/libjavaplugin_oji.so \
   $HOME/.mozilla/plugins/</userinput></screen>
 
       <para>or, if you installed the <application>Diablo
 	&jdk;</application> package:</para>
 
-      <screen>&prompt.user; <userinput>ln -s /usr/local/diablo-jdk1.6.0/jre/plugin/i386/ns7/libjavaplugin_oji.so \
+      <screen>&prompt.user; <userinput>ln -s /usr/local/diablo-jdk1.6.0/jre/plugin/<replaceable>i386</replaceable>/ns7/libjavaplugin_oji.so \
   $HOME/.mozilla/plugins/</userinput></screen>
 
-      <para>然后重新启动浏览器。</para>
+      <para>然后重启浏览器。</para>
+
+      <note>
+	<para>以上命令假定您使用的是
+	  &arch.i386; 平台， 不过， 我们也提供适用于 &arch.amd64;
+	  的预编译包。</para>
+      </note>
     </sect2>
 
     <sect2 id="moz-flash-plugin">
diff --git a/zh_CN.GB2312/books/handbook/virtualization/chapter.sgml b/zh_CN.GB2312/books/handbook/virtualization/chapter.sgml
index f2bfc680ce..df441808e3 100644
--- a/zh_CN.GB2312/books/handbook/virtualization/chapter.sgml
+++ b/zh_CN.GB2312/books/handbook/virtualization/chapter.sgml
@@ -2,7 +2,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Project
 
-     Original Revision: 1.23
+     Original Revision: 1.24
      $FreeBSD$
 -->
 
@@ -248,6 +248,13 @@
       </sect3>
 
     </sect2>
+<!--
+Deactive/hide this section as the instruction in there do NOT work anyore:
+- FreeBSD 7.0 has reached its EOL a long time ago.
+- The needed files from www.fsmware.com are not available anymore, as the
+  server is dead.  So it is impossible to follow the instructions in here.
+
+jkois@FreeBSD.org, 2010-06-18
 
     <sect2 id="virtualization-guest-xen">
       <sect2info>
@@ -258,7 +265,7 @@
 	    <contrib>原作 </contrib>
           </author>
         </authorgroup>
-        <!-- Mar/Apr 2007 -->
+
       </sect2info>
 
       <title>在 Linux 上通过 &xen; 运行 &os;</title>
@@ -333,7 +340,7 @@ module /boot/vmlinuz-2.6.16.33-xen0 root=/dev/hda1 ro</programlisting>
 
               <screen>&prompt.root; <userinput>xm list</userinput>
 Name                                      ID   Mem VCPUs      State   Time(s)
-Domain-0                                   0   256     1     r-----  54452.9</screen>
+Domain-0                                   0   256     1     r&ndash;&ndash;&ndash;&ndash;&ndash;  54452.9</screen>
             </step>
           </procedure>
         </sect3>
@@ -381,7 +388,7 @@ extra += ",vfs.root.mountfrom=ufs:/dev/xbd769a"</programlisting>
 
       <screen>&prompt.root; <userinput>objcopy kernel-current -R __xen_guest</userinput>
 &prompt.root; <userinput>perl -e 'print "LOADER=generic,GUEST_OS=freebsd,GUEST_VER=7.0,XEN_VER=xen-3.0,BSD_SYMTAB,VIRT_BASE=0xC0000000\x00"' &gt; tmp</userinput>
-&prompt.root; <userinput>objcopy kernel-current --add-section __xen_guest=tmp</userinput></screen>
+&prompt.root; <userinput>objcopy kernel-current &ndash;&ndash;add-section __xen_guest=tmp</userinput></screen>
 
       <screen>&prompt.root; <userinput>objdump -j __xen_guest -s kernel-current</userinput>
 
@@ -536,7 +543,7 @@ xenbr1          8000.feffffffffff   no                  vif0.1
       </sect3>
 
     </sect2>
-
+-->
     <sect2 id="virtualization-guest-virtualpc">
       <title>&windows; 上的 Virtual PC</title>