Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 13 Jan 2008 08:44:35 GMT
From:      John Birrell <jb@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 133175 for review
Message-ID:  <200801130844.m0D8iYAj020794@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=133175

Change 133175 by jb@jb_freebsd1 on 2008/01/13 08:44:22

	IFC

Affected files ...

.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/book.sgml#9 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/geom/chapter.sgml#11 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/mirrors/chapter.sgml#13 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/x11/chapter.sgml#14 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/porters-handbook/book.sgml#22 integrate
.. //depot/projects/dtrace/src/contrib/cvs/AUTHORS#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/BUGS#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/ChangeLog#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/FAQ#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/FREEBSD-Xlist#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/FREEBSD-upgrade#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/HACKING#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/INSTALL#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/Makefile.in#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/NEWS#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/README#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/TESTS#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/TODO#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/acinclude.m4#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/aclocal.m4#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/config.h.in#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/configure#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/configure.in#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/contrib/ChangeLog#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/contrib/Makefile.am#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/contrib/Makefile.in#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/contrib/README#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/contrib/clmerge.in#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/contrib/cln_hist.in#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/contrib/commit_prep.in#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/contrib/cvs2vendor.sh#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/contrib/cvs_acls.html#1 branch
.. //depot/projects/dtrace/src/contrib/cvs/contrib/cvs_acls.in#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/contrib/cvscheck.sh#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/contrib/debug_check_log.sh#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/contrib/descend.sh#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/contrib/log.in#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/contrib/log_accum.in#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/contrib/mfpipe.in#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/contrib/pvcs2rcs.in#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/contrib/rcs-to-cvs.sh#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/contrib/rcs2log.sh#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/contrib/rcs2sccs.sh#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/contrib/rcslock.in#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/contrib/sccs2rcs.in#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/diff/ChangeLog#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/diff/Makefile.am#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/diff/Makefile.in#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/doc/ChangeLog#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/doc/Makefile.am#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/doc/Makefile.in#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/doc/cvs.1#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/doc/cvs.man.footer#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/doc/cvs.man.header#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/doc/cvs.texinfo#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/doc/cvsclient.texi#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/doc/mkman.in#4 delete
.. //depot/projects/dtrace/src/contrib/cvs/doc/mkman.pl#1 branch
.. //depot/projects/dtrace/src/contrib/cvs/doc/stamp-1#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/doc/stamp-vti#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/doc/version-client.texi#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/doc/version.texi#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/lib/ChangeLog#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/lib/Makefile.am#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/lib/Makefile.in#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/lib/fncase.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/lib/getdate#1 branch
.. //depot/projects/dtrace/src/contrib/cvs/lib/getpass.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/lib/regex.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/lib/system.h#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/lib/test-getdate.sh#1 branch
.. //depot/projects/dtrace/src/contrib/cvs/lib/xtime.h#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/man/ChangeLog#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/man/Makefile.am#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/man/Makefile.in#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/man/cvs.1#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/ChangeLog#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/Makefile.am#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/Makefile.in#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/add.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/admin.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/annotate.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/buffer.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/buffer.h#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/checkin.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/checkout.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/classify.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/client.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/client.h#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/commit.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/create_adm.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/cvs.h#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/cvsrc.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/diff.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/edit.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/entries.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/expand_path.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/fileattr.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/filesubr.c#5 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/find_names.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/hardlink.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/hardlink.h#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/hash.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/hash.h#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/history.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/history.h#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/ignore.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/import.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/lock.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/log.c#5 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/login.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/logmsg.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/main.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/mkmodules.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/modules.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/myndbm.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/myndbm.h#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/no_diff.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/parseinfo.c#5 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/patch.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/rcs.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/rcs.h#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/rcscmds.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/recurse.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/release.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/remove.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/repos.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/root.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/root.h#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/run.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/sanity.sh#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/server.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/server.h#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/stack.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/stack.h#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/status.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/subr.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/tag.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/update.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/vers_ts.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/version.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/watch.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/wrapper.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/zlib.c#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/tools/ChangeLog#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/tools/Makefile.am#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/tools/Makefile.in#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/tools/README#4 integrate
.. //depot/projects/dtrace/src/etc/defaults/rc.conf#25 integrate
.. //depot/projects/dtrace/src/etc/rc.firewall#7 integrate
.. //depot/projects/dtrace/src/etc/rc.firewall6#5 integrate
.. //depot/projects/dtrace/src/gnu/usr.bin/Makefile#7 integrate
.. //depot/projects/dtrace/src/lib/libc/stdlib/heapsort.c#5 integrate
.. //depot/projects/dtrace/src/lib/libc/stdlib/qsort.c#5 integrate
.. //depot/projects/dtrace/src/sbin/setkey/parse.y#6 integrate
.. //depot/projects/dtrace/src/share/man/man5/rc.conf.5#21 integrate
.. //depot/projects/dtrace/src/share/man/man9/mbuf_tags.9#4 integrate
.. //depot/projects/dtrace/src/sys/arm/arm/support.S#6 integrate
.. //depot/projects/dtrace/src/sys/cam/scsi/scsi_da.c#14 integrate
.. //depot/projects/dtrace/src/sys/contrib/dev/acpica/evgpe.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/acpica/Osd/OsdSchedule.c#6 integrate
.. //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_multiq.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/puc/pucdata.c#7 integrate
.. //depot/projects/dtrace/src/tools/tools/nanobsd/nanobsd.sh#14 integrate
.. //depot/projects/dtrace/src/usr.sbin/inetd/inetd.8#5 integrate
.. //depot/projects/dtrace/src/usr.sbin/iostat/iostat.c#7 integrate
.. //depot/projects/dtrace/www/en/donations/wantlist.sgml#27 integrate
.. //depot/projects/dtrace/www/en/releases/6.3R/schedule.sgml#5 integrate
.. //depot/projects/dtrace/www/en/releases/7.0R/schedule.sgml#10 integrate

Differences ...

==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/book.sgml#9 (text+ko) ====

@@ -2,8 +2,8 @@
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Documentation Project
 
-     Original Revision: 1.171
-     $FreeBSD: doc/zh_CN.GB2312/books/handbook/book.sgml,v 1.12 2007/04/17 03:12:05 delphij Exp $
+     Original Revision: 1.172
+     $FreeBSD: doc/zh_CN.GB2312/books/handbook/book.sgml,v 1.13 2008/01/12 14:04:56 loader Exp $
 -->
 
 <!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -76,6 +76,7 @@
       <year>2005</year>
       <year>2006</year>
       <year>2007</year>
+      <year>2008</year>
       <holder>The FreeBSD Documentation Project</holder>
     </copyright>
 
@@ -88,6 +89,7 @@
       <year>2005</year>
       <year>2006</year>
       <year>2007</year>
+      <year>2008</year>
       <holder>&cnproj.freebsd.org;</holder>
     </copyright>
 

==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/geom/chapter.sgml#11 (text+ko) ====

@@ -3,7 +3,7 @@
      The FreeBSD Simplified Chinese Project
 
      Original Revision: 1.38
-     $FreeBSD: doc/zh_CN.GB2312/books/handbook/geom/chapter.sgml,v 1.12 2007/12/31 15:10:15 loader Exp $
+     $FreeBSD: doc/zh_CN.GB2312/books/handbook/geom/chapter.sgml,v 1.13 2008/01/12 14:04:57 loader Exp $
 -->
 
 <chapter id="GEOM">
@@ -33,7 +33,7 @@
     <para>本章将介绍以 &os; GEOM 框架来使用磁盘。
       这包括了使用这一框架来配置的主要的 <acronym
       role="Redundant Array of Inexpensive Disks">RAID</acronym>
-      控制工具。 这一仗不会深入讨论 GEOM
+      控制工具。 这一章不会深入讨论 GEOM
       如何处理或控制 I/O、 其下层的子系统或代码。
       您可以从 &man.geom.4; 联机手册及其众多 SEE ALSO 参考文献中得到这些信息。
       这一章也不是对 <acronym>RAID</acronym> 配置的权威介绍,

==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/mirrors/chapter.sgml#13 (text+ko) ====

@@ -2,8 +2,8 @@
      The FreeBSD Documentation Project
      The FreeBSD Chinese Documentation Project
 
-     Original Revision: 1.442
-     $FreeBSD: doc/zh_CN.GB2312/books/handbook/mirrors/chapter.sgml,v 1.19 2007/12/12 05:30:51 loader Exp $
+     Original Revision: 1.443
+     $FreeBSD: doc/zh_CN.GB2312/books/handbook/mirrors/chapter.sgml,v 1.20 2008/01/12 14:04:57 loader Exp $
 -->
 
 <appendix id="mirrors">
@@ -2478,6 +2478,24 @@
       </varlistentry>
 
       <varlistentry>
+	<term>RELENG_7</term>
+
+	<listitem>
+	  <para>这是 FreeBSD-7.X 的开发分支,
+	    也被称作 FreeBSD 7-STABLE。</para>
+	</listitem>
+      </varlistentry>
+
+      <varlistentry>
+	<term>RELENG_7_0</term>
+
+	<listitem>
+	  <para>FreeBSD-7.0 的发行版分支, 只用于安全公告,
+	    以及其他重要更新。</para>
+	</listitem>
+      </varlistentry>
+
+      <varlistentry>
 	<term>RELENG_6</term>
 
 	<listitem>
@@ -2487,6 +2505,15 @@
       </varlistentry>
 
       <varlistentry>
+	<term>RELENG_6_3</term>
+
+	<listitem>
+	  <para>FreeBSD-6.3 的发行版分支, 只用于安全公告,
+	    以及其他重要更新。</para>
+	</listitem>
+      </varlistentry>
+
+      <varlistentry>
 	<term>RELENG_6_2</term>
 
 	<listitem>
@@ -2700,6 +2727,22 @@
 
     <variablelist>
       <varlistentry>
+	<term>RELENG_7_0_0_RELEASE</term>
+
+	<listitem>
+	  <para>FreeBSD 7.0</para>
+	</listitem>
+      </varlistentry>
+
+      <varlistentry>
+	<term>RELENG_6_3_0_RELEASE</term>
+
+	<listitem>
+	  <para>FreeBSD 6.3</para>
+	</listitem>
+      </varlistentry>
+
+      <varlistentry>
 	<term>RELENG_6_2_0_RELEASE</term>
 
 	<listitem>

==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/x11/chapter.sgml#14 (text+ko) ====

@@ -2,8 +2,8 @@
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Project
 
-     Original Revision: 1.184
-     $FreeBSD: doc/zh_CN.GB2312/books/handbook/x11/chapter.sgml,v 1.21 2007/12/12 05:30:51 loader Exp $
+     Original Revision: 1.185
+     $FreeBSD: doc/zh_CN.GB2312/books/handbook/x11/chapter.sgml,v 1.22 2008/01/12 14:04:57 loader Exp $
 -->
 
 <chapter id="x11">
@@ -361,7 +361,15 @@
     <sect2>
       <title>配置 X11</title>
 
-      <para>配置 X11 需要几步。 第一步是以超级用户的身份建立初始的配置文件:</para>
+      <para>对于 <application>&xorg;</application> 7.3 这个版本,
+	可以不需要任何的配置文件就能运行,在提示符下键如下命令:</para>
+
+      <screen>&prompt.user; <userinput>startx</userinput></screen>
+
+      <para>如果这个命令并不能启动 X11,
+	也许是默认的配置文件不适合你机器的配置, 这时候就需要手工配置
+	X11 了。 配置 X11 需要几步,
+	第一步是以超级用户的身份建立初始的配置文件:</para>
 
       <screen>&prompt.root; <userinput>Xorg -configure</userinput></screen>
 

==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/porters-handbook/book.sgml#22 (text+ko) ====

@@ -2,8 +2,8 @@
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Project
 
-     Original Revision: 1.893
-     $FreeBSD: doc/zh_CN.GB2312/books/porters-handbook/book.sgml,v 1.31 2008/01/02 07:17:57 loader Exp $
+     Original Revision: 1.895
+     $FreeBSD: doc/zh_CN.GB2312/books/porters-handbook/book.sgml,v 1.32 2008/01/12 14:04:57 loader Exp $
 -->
 
 <!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -30,6 +30,7 @@
       <year>2005</year>
       <year>2006</year>
       <year>2007</year>
+      <year>2008</year>
       <holder role="mailto:doc@FreeBSD.org">The FreeBSD Documentation
 	Project</holder>
     </copyright>
@@ -45,6 +46,7 @@
       <year>2005</year>
       <year>2006</year>
       <year>2007</year>
+      <year>2008</year>
       <holder>&cnproj.freebsd.org;</holder>
     </copyright>
 
@@ -10641,6 +10643,10 @@
 		    <entry>603100</entry>
 		  </row>
 		  <row>
+		    <entry>修正了 bit macro 的多字节支持之后的 6.3-STABLE。</entry>
+		    <entry>603101</entry>
+		  </row>
+		  <row>
 		    <entry>7.0-CURRENT。</entry>
 		    <entry>700000</entry>
 		  </row>
@@ -10905,7 +10911,7 @@
 		    <entry>700054</entry>
 		  </row>
 		  <row>
-		    <entry>MFC 了恢复对 FreeBSD 4/5/6 版本的 PCIOCGETCONF、
+		    <entry>7.0-RELEASE, 以及 MFC 了恢复对 FreeBSD 4/5/6 版本的 PCIOCGETCONF、
 		      PCIOCREAD 和 PCIOCWRITE IOCTL ABI 向下兼容之后的 7.0-CURRENT,
 		      这一变动导致 PCIOCGETCONF IOCTL 的 ABI 再次发生变化。</entry>
 		    <entry>700055</entry>
@@ -10947,6 +10953,15 @@
 		    <entry>kdb_enter() 增加 "why" 参数之后的 8.0-CURRENT。</entry>
 		    <entry>800007</entry>
 		  </row>
+		  <row>
+		    <entry>在去除 LK_EXCLUPGRADE 选项后的 8.0-CURRENT。</entry>
+		    <entry>800008</entry>
+		  </row>
+		  <row>
+		    <entry>引入 <function>lockmgr_disown()</function> 后的
+		      8.0-CURRENT。</entry>
+		    <entry>800009</entry>
+		  </row>
 		</tbody>
 	      </tgroup>
 	    </table>

==== //depot/projects/dtrace/src/contrib/cvs/AUTHORS#4 (text+ko) ====

@@ -49,9 +49,11 @@
 remote repository access code.
 
 Larry Jones and Derek Price <derek@ximbiot.com> have been maintaining and
-enhancing CVS for some years.  Mark D. Baushke <mdb@cvshome.org> came on in
+enhancing CVS for some years.  Mark D. Baushke <mdb@gnu.org> came on in
 2003.
 
+Conrad Pino <Conrad@Pino.com> began maintaining the Windows port in 2004.
+
 There have been many, many contributions not listed here.  Consult the
 individual ChangeLog files in each directory for a more complete idea.
 

==== //depot/projects/dtrace/src/contrib/cvs/BUGS#4 (text+ko) ====

@@ -88,22 +88,6 @@
 noticed under BSDI.
 
 
-* Spaces in arguments to `cvs diff' are currently split on spaces and tabs
-before being passed to diff.  This can often cause diff to abort since it can
-no longer interpret its options string and if it can, coincidentally,
-interpret its option string, then the problem may be output in unexpected
-formats.
-
-
-* `release' of a project subdir does not remove the `subdir' entry from
-  `./CVS/Entries'.
-
-
-* Most of the remote commands are encountering assertion failures when listing
-  the toplevel of the repository (e.g. `cvs rlog .').  This appears to be
-  related to the symlinked CVS root fix.
-
-
 * Status
 
                              /*-------.

==== //depot/projects/dtrace/src/contrib/cvs/ChangeLog#4 (text+ko) ====

@@ -1,3 +1,281 @@
+2006-06-09  Derek Price  <derek@ximbiot.com>
+
+	* NEWS: Note client/server conflict fix.
+
+2006-05-25  Derek Price  <derek@ximbiot.com>
+
+	* configure.in: Accept --with-rsh argument to set RSH_DFLT in config.h.
+	Prefer `remsh' to `rsh' when autodetecting and comment rationale.
+
+2006-04-27  Derek Price  <derek@ximbiot.com>
+
+	* acinclude.m4 (ACX_WITH_GSSAPI): Detect libgss for HP-UX.
+	* NEWS: Note that GSSAPI builds under HP-UX.
+	(Report from Larry Jones <lawrence.jones@ugs.com>.)
+
+2006-03-07  Derek Price  <derek@ximbiot.com>
+
+	* NEWS: Note rtag fixes.
+
+2006-02-26  Derek Price  <derek@ximbiot.com>
+
+	* NEWS: Note CVSADM fix as an efficiency improvement.
+
+2006-02-01  Derek Price  <derek@ximbiot.com>
+
+	* NEWS: Note unconditional val-tags lock removal.
+
+	* NEWS: Note history buffer overflow fix.
+
+2006-01-30  Derek Price  <derek@ximbiot.com>
+
+	* NEWS: Note nonblocking flow control pipe fix.
+
+2005-12-09  Derek Price  <derek@ximbiot.com>
+
+	* NEWS: Note misc doc & bug fixes.
+
+2005-12-07  Derek Price  <derek@ximbiot.com>
+
+	* NEWS: Note recognition of :extssh:.
+
+2005-10-18  Derek Price  <derek@ximbiot.com>
+
+	* KEYS: New file, suggested by Antoine Lexy-Lambert <antoine@gmx.de>.
+	* README: Mention KEYS file.
+
+2005-09-26  Derek Price  <derek@ximbiot.com>
+
+	[bug #14639]
+	* acinclude.m4: Find the crypto library on FreeBSD 5.x.
+	Patch from Serguei E. Leontiev <lse@CryptoPro.ru>.
+
+	* NEWS: Note FreeBSD 5.x GSSAPI fix.
+
+	* NEWS: Note fsync'd commits.
+
+2005-09-24  Derek Price  <derek@ximbiot.com>
+
+	* NEWS, HACKING: Standardize on Automake 1.9.6.
+
+2005-09-22  Derek Price  <derek@ximbiot.com>
+
+	* NEWS: Mention conflict fixes.
+
+2005-09-13  Derek Price  <derek@ximbiot.com>
+
+	* TESTS: Mention new $username8 & $anyusername variables.
+
+2005-09-04  Larry Jones  <lawrence.jones@ugs.com>
+
+	* NEWS: s/bug-cvs@gnu.org/bug-cvs@nongnu.org/.
+	* configure.in: s/info-cvs@gnu.org/info-cvs@nongnu.org/.
+	* configure: Regenerated.
+
+2005-09-01  Derek Price  <derek@ximbiot.com>
+
+	* AUTHORS, DEVEL-CVS, HACKING, README: Update links, email addresses,
+	& mailing list descriptions.
+
+2005-09-01  Derek Price  <derek@ximbiot.com>
+
+	* FAQ: Update links.
+
+2005-09-01  Derek Price  <derek@ximbiot.com>
+
+	* HACKING, INSTALL, README, README.VMS, configure.in: Update links and
+	email addresses.
+
+2005-08-31  Derek Price  <derek@ximbiot.com>
+
+	* www/.htaccess: Remove this file.
+
+2005-08-31  Derek Price  <derek@ximbiot.com>
+
+	* cvs.spec.in: Note last spec file change in internal ChangeLog.
+
+2005-08-31  Derek Price  <derek@ximbiot.com>
+
+	* NEWS: Note spec file repair.
+
+2005-08-31  Derek Price  <derek@ximbiot.com>
+
+	* cvs.spec.in: Update links to point to Savannah.  s/Copyright/License/
+	for RPM 4.mumble.
+
+2005-08-30  Larry Jones  <lawrence.jones@ugs.com>
+
+	* NEWS: Note import locking fix.
+
+2005-07-12  Derek Price  <derek@ximbiot.com>
+
+	* FAQ, HACKING, INSTALL: Add copyright notices.
+
+2005-07-11  Derek Price  <derek@ximbiot.com>
+
+	* FAQ, HACKING, INSTALL: Update license notices.
+
+2005-06-02  Derek Price  <derek@ximbiot.com>
+
+	* NEWS: Note server compression hang fix.
+
+2005-06-01  Conrad T. Pino  <Conrad@Pino.com>
+
+	* makewin32.cmd: Add Windows NT command file to build CVS Project.
+	  Imported from revision 1.2 on feature branch.
+
+2005-05-27  Derek Price  <derek@ximbiot.com>
+
+	* NEWS: Note diff space split fix.
+	* BUGS: Remove diff space split note.
+
+2005-05-03  Derek Price  <derek@ximbiot.com>
+
+	* INSTALL: Add footnote about compiling a CVS checkout of CVS on a
+	case-insensitive UNIX file system like Mac OS X.
+
+2005-05-02  Derek Price  <derek@ximbiot.com>
+
+	* TODO (231): Renumber as...
+	(234): ...this to match numbering on 1.12.x.
+
+2005-05-02  Derek Price  <derek@ximbiot.com>
+
+	* TODO (231): New item.
+	(22, 30, 31): Remove completed items.
+
+2005-05-02  Derek Price  <derek@ximbiot.com>
+
+	* NEWS: Note new val-tags locks.
+
+2005-04-30  Derek Price  <derek@ximbiot.com>
+
+	* NEWS: Note new history locks.
+
+2005-04-20  Derek Price  <derek@ximbiot.com>
+
+	* NEWS: Note log overflow fix.
+
+2005-04-15  Derek Price  <derek@ximbiot.com>
+
+	* NEWS: Note Klocwork fixes.
+
+2005-04-14  Derek Price  <derek@ximbiot.com>
+
+	* NEWS: Note contrib Perl taint vulnerability fix.
+
+2005-03-23  Derek Price  <derek@ximbiot.com>
+
+	* ylwrap: New file.
+
+2005-03-15  Derek Price  <derek@ximbiot.com>
+
+	* HACKING, NEWS: Note new Automake version.
+
+2005-03-04  Jim Hyslop  <jhyslop@ieee.org>
+
+	* NEWS: Note fix for compile errors on IRIX 5.3.
+
+2005-02-22  Derek Price  <derek@ximbiot.com>
+
+	* NEWS: Note recent watch on/off fileattr fix.
+
+2005-01-31  Derek Price  <derek@ximbiot.com>
+
+	* AUTHORS: Add Conrad Pino.
+	* README: Update copyright notice.
+
+2005-01-29  Derek Price  <derek@ximbiot.com>
+
+	* NEWS: Note some recent changes.
+
+2004-11-17  Derek Price  <derek@ximbiot.com>
+
+	* NEWS: Note "red file" fix source inclusion.
+
+2004-11-05  Conrad T. Pino  <Conrad@Pino.com>
+
+	* cvsnt.dep: Regenerated after complete rebuild.
+	* cvsnt.mak: Regenerated after complete rebuild.
+
+2004-11-03  Derek Price  <derek@ximbiot.com>
+
+	* HACKING, NEWS: Note new Autoconf & Automake versions.
+
+2004-10-29  Derek Price  <derek@ximbiot.com>
+
+	* NEWS: Note xreadlink fix.
+
+2004-10-26  Derek Price  <derek@ximbiot.com>
+
+	* NEWS: Note GSSAPI error message fix.
+
+2004-10-19  Derek Price  <derek@ximbiot.com>
+
+	* NEWS: Note resurrection fix.
+
+2004-10-14  Derek Price  <derek@ximbiot.com>
+
+	* NEWS: Note new import branch verification.
+
+2004-09-25  Derek Price  <derek@ximbiot.com>
+
+	* configure.in: Use doc/mkman.pl as source for doc/mkman.
+
+2004-09-08  Conrad T. Pino <Conrad@Pino.com>
+
+	* cvsnt.dsp: Add "windows-NT/JmgStat.c" to project.  Add
+	"windows-NT/JmgStat.h" to project.  Add "lib/xsize.h" to project.
+	* cvsnt.dep: Regenerated for "cvsnt.dsp" change.
+	* cvsnt.mak: Regenerated for "cvsnt.dsp" change.
+
+2004-09-07  Derek Price  <derek@ximbiot.com>
+
+	* NEWS: Note Windows DST fix.
+
+2004-09-03  Derek Price  <derek@ximbiot.com>
+
+	* HACKING: Codify backwards compatibility conventions.  Remove outdated
+	reference to very old MSVC++ releases.
+
+2004-08-30  Derek Price  <derek@ximbiot.com>
+
+	* NEWS: Note compliance of log_accum.pl with Perl 5.8.5.
+
+2004-08-24  Derek Price  <derek@ximbiot.com>
+
+	* TODO (24, 49, 92, 113): Remove completed/obsolescent items.
+
+2004-08-24  Derek Price  <derek@ximbiot.com>
+
+	* BUGS: Remove release subdir note.  This was fixed with the commit on
+	2004-02-25, based on Matthew Ogilvie's patch.
+
+2004-08-24  Derek Price  <derek@ximbiot.com>
+
+	* NEWS: Note r* . fix.
+	* BUGS: Remove r* . note.
+
+2004-08-24  Derek Price  <derek@ximbiot.com>
+
+	* NEWS: Note invalid tag fix.
+
+2004-08-24  Mark D. Baushke  <mdb@cvshome.org>
+
+	* NEWS: Note that modules -a bugfix has a change in behavior.
+
+2004-06-22  Derek Price  <derek@ximbiot.com>
+
+	* NEWS: Note Conrad's Windows fix.
+
+2004-06-21  Derek Price  <derek@ximbiot.com>
+
+	* .cvsignore: Ignore GPG signature files for distributions.
+
+2004-06-10  Derek Price  <derek@ximbiot.com>
+
+	* NEWS: Note manual update.
+
 2004-06-09  Derek Price  <derek@ximbiot.com>
 
 	* NEWS: Note Stefan & Sebastian's security fixes.

==== //depot/projects/dtrace/src/contrib/cvs/FAQ#4 (text+ko) ====

@@ -1,3 +1,24 @@
+-------------------------------------------------------------------------------
+
+   CVS is Copyright (C) 1989-2005 The Free Software Foundation, Inc.
+
+   CVS is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 1, or (at your option)
+   any later version.
+
+   More details are available in the COPYING file but, in simplified
+   terms, this means that any distributed modifications you make to
+   this software must also be released under the GNU General Public
+   License.
+
+   CVS is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+-------------------------------------------------------------------------------
+
 This file contains a CVS FAQ.  Until 1995 it was maintained by David
 Grubbs.  It was out of date and not being maintained, but it had a
 certain following and in 1997 Pascal Molli decided to start
@@ -13,13 +34,14 @@
 and insert things like tables of contents).
 
 The answers which are dated "6/13/1997" below are really from the 1995
-FAQ, for the most part.  Many of them are out of date.  If you have
-some time, you are encouraged to double-check them against other
-sources like the Cederqvist manual and update the FAQ.  If you don't
-have such time, take them with a grain of salt or a few.
+FAQ, for the most part.  Many of them are out of date.  The current FAQ may
+be found at <http://ximbiot.com/cvs/wiki/index.php?title=CVS_FAQ>.  If you have
+some time, you are encouraged to export that FAQ as text and import it here.
+If you don't have such time, take the answers in this file with at least a few
+grains of salt.
 
-Since Feb. 2000 CVS is being maintained by OpenAvenue, Inc. and many of
-the existing resources have been centeralized on http://www.cvshome.org.
+Since August, 2005, many of the existing CVS resources have been centralized on
+<http://cvs.nongnu.org>; & <http://ximbiot.com>.
 
   Category: /, all questions
   
@@ -1899,7 +1921,8 @@
         GIC is no longer being maintained and tkCVS is recommended
         instead.
 
-        For more on tkCVS, see http://www.cvshome.org/dev/addontkcvs.html.
+        For more on tkCVS, see
+	<http://ximbiot.com/cvs/cvshome/dev/addontkcvs.html>.
 
         kingdon@cyclic.com
 

==== //depot/projects/dtrace/src/contrib/cvs/FREEBSD-Xlist#4 (text+ko) ====

@@ -1,5 +1,4 @@
-$FreeBSD: src/contrib/cvs/FREEBSD-Xlist,v 1.1 2004/06/09 20:14:53 des Exp $
-
+$FreeBSD: src/contrib/cvs/FREEBSD-Xlist,v 1.2 2008/01/13 05:50:33 obrien Exp $
 */*.com
 */*.dep
 */*.dsp
@@ -11,6 +10,7 @@
 cvs.spec*
 cvsnt.*
 doc/*.info*
+doc/*.pdf
 doc/*.ps
 doc/texinfo.tex
 emx
@@ -18,4 +18,5 @@
 os2
 vms
 windows-NT
+ylwrap
 zlib

==== //depot/projects/dtrace/src/contrib/cvs/FREEBSD-upgrade#4 (text+ko) ====

@@ -1,4 +1,4 @@
-$FreeBSD: src/contrib/cvs/FREEBSD-upgrade,v 1.11 2004/06/09 20:51:26 des Exp $
+$FreeBSD: src/contrib/cvs/FREEBSD-upgrade,v 1.12 2008/01/13 06:35:22 obrien Exp $
 
 MAINTAINER=	peter@FreeBSD.org
 
@@ -16,16 +16,17 @@
 first.  Remove it when it looks ok.
 
 The initial import was done with:
-  cvs import src/contrib/cvs CVSHOME v1_8_1
+  cvs import src/contrib/cvs CVSHOME v1_11_22
 
 When new versions are imported, cvs will give instructions on how to merge
 the local and vendor changes when/if conflicts arise.
 
-The developers can be reached at:  <devel-cvs@cyclic.com>.  Local changes
+The developers can be reached at:  <devel-cvs@nongnu.org>.  Local changes
 that are suitable for public consumption should be submitted for inclusion
 in future releases.
 
 peter@freebsd.org - 20 Aug 1996
+obrien@freebsd.org - 12 Jan 2008
 
 Current local changes:
   - CVS_LOCAL_BRANCH_NUM environment variable support for choosing the
@@ -36,3 +37,9 @@
   - CVSROOT/options file
   - Variable keyword expansion controls including custom keywords.
   - $ CVSHeader$ keyword - like Header, but with $CVSROOT stripped off.
+  - 'CVS_OPTIONS' environmental variable support.
+  - Allow -D with -r on checkout.
+  - Support for "diff -j", allowing tag:date based diffs.
+  - iso8601 option keyword.
+  - Comprehensive "-T" CVS/Template support.
+  - We use the cvs.1 manpage from man/, not the offical one in doc/

==== //depot/projects/dtrace/src/contrib/cvs/HACKING#4 (text+ko) ====

@@ -1,10 +1,29 @@
 How to write code for CVS
 
+* License of CVS
+
+    CVS is Copyright (C) 1989-2005 The Free Software Foundation, Inc.
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 1, or (at your option)
+    any later version.
+
+    More details are available in the COPYING file but, in simplified
+    terms, this means that any distributed modifications you make to
+    this software must also be released under the GNU General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
 * Source
 
 Patches against the development version of CVS are most likely to be accepted:
 
-	$ cvs -d:pserver:anoncvs@cvs.cvshome.org/cvsroot co ccvs
+    $ CVS_RSH=ssh cvs -d:ext:anoncvs@savannah.nongnu.org:/cvsroot/cvs co ccvs
 
 * Compiler options
 
@@ -13,13 +32,28 @@
 might cause spurious warnings, but at least on some machines, there
 should be no spurious warnings.  For example:
 
-	$ CFLAGS="-g -Wall" ./configure
+    $ CFLAGS="-g -Wall" ./configure
 
 Configure is not very good at remembering this setting; it will get
 wiped out whenever you do a ./config.status --recheck, so you'll need
 to use:
 
-	$ CFLAGS="-g -Wall" ./config.status --recheck
+    $ CFLAGS="-g -Wall" ./config.status --recheck
+
+* Backwards Compatibility
+
+Only bug fixes are accepted into the stable branch.  New features should be
+applied to the trunk.
+
+If it is not inextricable from a bug fix, CVS's output (to stdout/stderr)
+should not be changed on the stable branch in order to best support scripts and
+other tools which parse CVS's output.  It is ok to change output between
+feature releases (on the trunk), though such changes should be noted in the
+NEWS file.
+
+Changes in the way CVS responds to command line options, config options, etc.
+should be accompanied by deprecation warnings for an entire stable series of
+releases before being changed permanently, if at all possible.
 
 * Indentation style
 
@@ -100,10 +134,6 @@
 and perhaps an exception or two we haven't mentioned).  This is the
 file standards.text at the GNU FTP sites.
 
-Filenames for .c and .h files may contain _ but should not contain -
-(the latter causes Visual C++ 2.1 to create makefiles which Visual C++
-4.0 cannot use).
-
 * Regenerating Build Files
 
 On UNIX, if you wish to change the Build files, you will need Autoconf and
@@ -115,13 +145,13 @@
 automatically aren't included in the generated Makefiles unless you run
 configure with the --enable-maintainer-mode option.
 
-The CVS Makefiles and configure script were built using Automake 1.7.9 and
-Autoconf 2.58, respectively.
+The CVS Makefiles and configure script were built using Automake 1.9.6 and
+Autoconf 2.59, respectively.
 
 There is a known bug in Autoconf 2.57 that will prevent the configure
 scripts it generates from working on some platforms.  Other combinations of
 autotool versions may or may not work.  If you get other versions to work,
-please send a report to <bug-cvs@gnu.org>.
+please send a report to <bug-cvs@nongnu.org>.
 
 * Writing patches (strategy)
 
@@ -174,7 +204,7 @@
 
 Include words like "I grant permission to distribute this patch under
 the terms of the GNU Public License" with your patch.  By sending a
-patch to bug-cvs@gnu.org, you implicitly grant this permission.
+patch to bug-cvs@nongnu.org, you implicitly grant this permission.
 
 Submitting a patch to bug-cvs is the way to reach the people who have
 signed up to receive such submissions (including CVS developers), but
@@ -203,27 +233,21 @@
 
 * Mailing lists
 
-Anyone can add themselves to the following mailing lists:
+In addition to the mailing lists listed in the README file, developers should
+take particular note of the following mailling lists:
 
-    dev.  Unless you are accepted as a CVS developer as
-      described in the DEVEL-CVS file, you will only be able to
-      read this list, not send to it.  The charter of the list is
-      also in DEVEL-CVS.
-    cvs.  The only messages sent to this list are sent
+    bug-cvs:  This is the list which users are requested to send bug reports
+      to.  General CVS development and design discussions also take place on
+      this list.
+    info-cvs:  This list is intended for user questions, but general CVS
+      development and design discussions sometimes take place on this list.
+    cvs-cvs:  The only messages sent to this list are sent
       automatically, via the CVS `loginfo' mechanism, when someone
       checks something in to the master CVS repository.
-    test-results.  The only messages sent to this list are sent
+    cvs-test-results:  The only messages sent to this list are sent
       automatically, daily, by a script which runs "make check"
       and "make remotecheck" on the master CVS sources.
-To subscribe to dev, cvs, or test-results, send
-a message to "<list>-subscribe@ccvs.cvshome.org" or visit
-http://ccvs.cvshome.org/servlets/ProjectMailingListList and follow the
-instructions there.
 
-One other list related to CVS development is bug-cvs.  This is the
-list which users are requested to send bug reports to.  Anyone can
-subscribe; to do so send mail to bug-cvs-request@gnu.org.
-
-Other CVS discussions take place on the info-cvs mailing list
-(send mail to info-cvs-request@gnu.org to subscribe) or on
-the newsgroup comp.software.config-mgmt.
+To subscribe to any of these lists, send mail to <list>-request@nongnu.org
+or visit http://savannah.nongnu.org/mail/?group=cvs and follow the instructions
+for the list you wish to subscribe to.

==== //depot/projects/dtrace/src/contrib/cvs/INSTALL#4 (text+ko) ====

@@ -1,4 +1,24 @@
-First, read the README file.  If you're still happy...
+-------------------------------------------------------------------------------

>>> TRUNCATED FOR MAIL (1000 lines) <<<



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200801130844.m0D8iYAj020794>