PERFORCE change 133578 for review

[John Birrell]

http://perforce.freebsd.org/chv.cgi?CH=133578

Change 133578 by jb at jb_freebsd1 on 2008/01/18 19:27:19

	IFC

Affected files ...

.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml#14 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/printing/chapter.sgml#5 integrate
.. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/firewalls/chapter.sgml#4 integrate
.. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/printing/chapter.sgml#2 integrate
.. //depot/projects/dtrace/doc/share/mk/doc.xml.mk#7 integrate
.. //depot/projects/dtrace/doc/share/sgml/freebsd.ent#14 integrate
.. //depot/projects/dtrace/doc/share/sgml/man-refs.ent#23 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/advanced-networking/chapter.sgml#15 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/printing/chapter.sgml#6 integrate
.. //depot/projects/dtrace/src/Makefile.inc1#36 integrate
.. //depot/projects/dtrace/src/contrib/gdb/FREEBSD-diffs#1 branch
.. //depot/projects/dtrace/src/contrib/top/display.c#4 integrate
.. //depot/projects/dtrace/src/contrib/top/layout.h#4 integrate
.. //depot/projects/dtrace/src/contrib/top/machine.h#5 integrate
.. //depot/projects/dtrace/src/contrib/top/top.c#7 integrate
.. //depot/projects/dtrace/src/contrib/top/top.h#5 integrate
.. //depot/projects/dtrace/src/gnu/usr.bin/cvs/Makefile#5 integrate
.. //depot/projects/dtrace/src/gnu/usr.bin/cvs/contrib/Makefile#5 integrate
.. //depot/projects/dtrace/src/gnu/usr.bin/gdb/kgdb/kgdb.h#6 integrate
.. //depot/projects/dtrace/src/gnu/usr.bin/gdb/kgdb/main.c#4 integrate
.. //depot/projects/dtrace/src/gnu/usr.bin/gdb/kgdb/trgt.c#5 integrate
.. //depot/projects/dtrace/src/include/unistd.h#9 integrate
.. //depot/projects/dtrace/src/lib/libarchive/archive_read_extract.c#10 integrate
.. //depot/projects/dtrace/src/lib/libarchive/archive_read_support_format_cpio.c#9 integrate
.. //depot/projects/dtrace/src/lib/libarchive/archive_read_support_format_zip.c#11 integrate
.. //depot/projects/dtrace/src/lib/libarchive/archive_write_disk.c#3 integrate
.. //depot/projects/dtrace/src/lib/libarchive/test/Makefile#3 integrate
.. //depot/projects/dtrace/src/lib/libarchive/test/test_write_disk.c#2 integrate
.. //depot/projects/dtrace/src/lib/libarchive/test/test_write_disk_hardlink.c#1 branch
.. //depot/projects/dtrace/src/lib/libc/amd64/_fpmath.h#4 integrate
.. //depot/projects/dtrace/src/lib/libc/gen/getttyent.c#5 integrate
.. //depot/projects/dtrace/src/lib/libc/i386/_fpmath.h#4 integrate
.. //depot/projects/dtrace/src/lib/libc/ia64/_fpmath.h#4 integrate
.. //depot/projects/dtrace/src/lib/libc/inet/inet_network.c#5 integrate
.. //depot/projects/dtrace/src/lib/libc/stdlib/grantpt.c#6 integrate
.. //depot/projects/dtrace/src/lib/libc/sys/access.2#6 integrate
.. //depot/projects/dtrace/src/lib/libthr/Makefile#14 integrate
.. //depot/projects/dtrace/src/lib/libutil/pty.3#4 integrate
.. //depot/projects/dtrace/src/lib/libutil/pty.c#7 integrate
.. //depot/projects/dtrace/src/lib/msun/src/math_private.h#5 integrate
.. //depot/projects/dtrace/src/lib/msun/src/s_rintl.c#2 integrate
.. //depot/projects/dtrace/src/sbin/quotacheck/quotacheck.c#7 integrate
.. //depot/projects/dtrace/src/share/man/man4/mfi.4#5 integrate
.. //depot/projects/dtrace/src/share/man/man4/pcib.4#3 integrate
.. //depot/projects/dtrace/src/share/man/man5/src.conf.5#13 integrate
.. //depot/projects/dtrace/src/share/man/man7/clocks.7#4 integrate
.. //depot/projects/dtrace/src/share/misc/pci_vendors#6 integrate
.. //depot/projects/dtrace/src/share/mk/bsd.own.mk#19 integrate
.. //depot/projects/dtrace/src/share/zoneinfo/leapseconds#6 integrate
.. //depot/projects/dtrace/src/sys/amd64/amd64/pmap.c#33 integrate
.. //depot/projects/dtrace/src/sys/amd64/include/_types.h#4 integrate
.. //depot/projects/dtrace/src/sys/amd64/include/float.h#4 integrate
.. //depot/projects/dtrace/src/sys/amd64/isa/clock.c#8 integrate
.. //depot/projects/dtrace/src/sys/arm/arm/pmap.c#27 integrate
.. //depot/projects/dtrace/src/sys/arm/xscale/ixp425/if_npe.c#5 integrate
.. //depot/projects/dtrace/src/sys/boot/forth/loader.conf.5#4 integrate
.. //depot/projects/dtrace/src/sys/conf/files#65 integrate
.. //depot/projects/dtrace/src/sys/crypto/rijndael/rijndael-api.c#4 integrate
.. //depot/projects/dtrace/src/sys/crypto/rijndael/test00.c#4 integrate
.. //depot/projects/dtrace/src/sys/dev/acpica/acpi_hpet.c#7 integrate
.. //depot/projects/dtrace/src/sys/dev/acpica/acpi_hpet.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/an/if_an.c#9 integrate
.. //depot/projects/dtrace/src/sys/dev/an/if_an_pci.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/an/if_anreg.h#5 integrate
.. //depot/projects/dtrace/src/sys/dev/ath/if_ath.c#17 integrate
.. //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_adapter.h#7 integrate
.. //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_main.c#6 integrate
.. //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_multiq.c#3 integrate
.. //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_osdep.h#5 integrate
.. //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_sge.c#6 integrate
.. //depot/projects/dtrace/src/sys/dev/cxgb/sys/cxgb_support.c#3 integrate
.. //depot/projects/dtrace/src/sys/dev/cxgb/sys/mvec.h#5 integrate
.. //depot/projects/dtrace/src/sys/dev/cxgb/sys/uipc_mvec.c#7 integrate
.. //depot/projects/dtrace/src/sys/dev/drm/drm_drv.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/gem/if_gem.c#10 integrate
.. //depot/projects/dtrace/src/sys/dev/hptrr/hptrr_osm_bsd.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/if_ndis/if_ndis.c#12 integrate
.. //depot/projects/dtrace/src/sys/dev/msk/if_msk.c#6 integrate
.. //depot/projects/dtrace/src/sys/dev/mxge/eth_z8e.h#2 integrate
.. //depot/projects/dtrace/src/sys/dev/mxge/ethp_z8e.h#2 integrate
.. //depot/projects/dtrace/src/sys/dev/mxge/if_mxge.c#10 integrate
.. //depot/projects/dtrace/src/sys/dev/mxge/if_mxge_var.h#6 integrate
.. //depot/projects/dtrace/src/sys/dev/mxge/mxge_lro.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/mxge/mxge_mcp.h#5 integrate
.. //depot/projects/dtrace/src/sys/dev/mxge/mxge_rss_eth_z8e.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/mxge/mxge_rss_ethp_z8e.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/mxge/rss_eth_z8e.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/mxge/rss_ethp_z8e.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/nfe/if_nfe.c#12 integrate
.. //depot/projects/dtrace/src/sys/dev/pci/pci_user.c#9 integrate
.. //depot/projects/dtrace/src/sys/dev/re/if_re.c#15 integrate
.. //depot/projects/dtrace/src/sys/dev/stge/if_stge.c#8 integrate
.. //depot/projects/dtrace/src/sys/dev/wpi/if_wpi.c#5 integrate
.. //depot/projects/dtrace/src/sys/fs/udf/udf_vfsops.c#13 integrate
.. //depot/projects/dtrace/src/sys/i386/i386/pmap.c#29 integrate
.. //depot/projects/dtrace/src/sys/i386/isa/clock.c#9 integrate
.. //depot/projects/dtrace/src/sys/kern/genassym.sh#4 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_cpu.c#6 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_mib.c#8 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_rwlock.c#12 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_time.c#12 integrate
.. //depot/projects/dtrace/src/sys/kern/sched_ule.c#25 integrate
.. //depot/projects/dtrace/src/sys/kern/tty_pty.c#11 integrate
.. //depot/projects/dtrace/src/sys/kern/uipc_mbuf.c#10 integrate
.. //depot/projects/dtrace/src/sys/kern/uipc_shm.c#2 integrate
.. //depot/projects/dtrace/src/sys/modules/mxge/Makefile#3 integrate
.. //depot/projects/dtrace/src/sys/modules/mxge/mxge_rss_eth_z8e/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/mxge/mxge_rss_ethp_z8e/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/net/if_bridge.c#28 integrate
.. //depot/projects/dtrace/src/sys/netinet/tcp_usrreq.c#13 integrate
.. //depot/projects/dtrace/src/sys/nfsserver/nfs_srvsubs.c#11 integrate
.. //depot/projects/dtrace/src/sys/pci/if_rlreg.h#11 integrate
.. //depot/projects/dtrace/src/sys/sys/mbuf.h#13 integrate
.. //depot/projects/dtrace/src/sys/sys/time.h#14 integrate
.. //depot/projects/dtrace/src/tools/build/options/WITHOUT_FORTRAN#3 delete
.. //depot/projects/dtrace/src/tools/regression/posixshm/Makefile#1 branch
.. //depot/projects/dtrace/src/tools/regression/posixshm/posixshm.c#1 branch
.. //depot/projects/dtrace/src/tools/regression/posixshm/posixshm.t#1 branch
.. //depot/projects/dtrace/src/tools/regression/posixshm/test.c#1 branch
.. //depot/projects/dtrace/src/tools/regression/posixshm/test.h#1 branch
.. //depot/projects/dtrace/src/tools/tools/aac/aac_checkq.c#4 integrate
.. //depot/projects/dtrace/src/usr.bin/systat/cmds.c#4 integrate
.. //depot/projects/dtrace/src/usr.bin/systat/convtbl.c#6 integrate
.. //depot/projects/dtrace/src/usr.bin/systat/devs.c#4 integrate
.. //depot/projects/dtrace/src/usr.bin/systat/fetch.c#4 integrate
.. //depot/projects/dtrace/src/usr.bin/systat/icmp.c#5 integrate
.. //depot/projects/dtrace/src/usr.bin/systat/icmp6.c#5 integrate
.. //depot/projects/dtrace/src/usr.bin/systat/iostat.c#6 integrate
.. //depot/projects/dtrace/src/usr.bin/systat/ip.c#5 integrate
.. //depot/projects/dtrace/src/usr.bin/systat/ip6.c#5 integrate
.. //depot/projects/dtrace/src/usr.bin/systat/keyboard.c#4 integrate
.. //depot/projects/dtrace/src/usr.bin/systat/main.c#5 integrate
.. //depot/projects/dtrace/src/usr.bin/systat/mbufs.c#6 integrate
.. //depot/projects/dtrace/src/usr.bin/systat/netcmds.c#4 integrate
.. //depot/projects/dtrace/src/usr.bin/systat/netstat.c#6 integrate
.. //depot/projects/dtrace/src/usr.bin/systat/pigs.c#7 integrate
.. //depot/projects/dtrace/src/usr.bin/systat/swap.c#7 integrate
.. //depot/projects/dtrace/src/usr.bin/systat/tcp.c#6 integrate
.. //depot/projects/dtrace/src/usr.bin/systat/vmstat.c#7 integrate
.. //depot/projects/dtrace/src/usr.bin/top/machine.c#9 integrate
.. //depot/projects/dtrace/src/usr.bin/wall/wall.c#4 integrate
.. //depot/projects/dtrace/www/en/administration.sgml#3 integrate
.. //depot/projects/dtrace/www/en/cgi/man.cgi#7 integrate
.. //depot/projects/dtrace/www/en/community.sgml#4 integrate
.. //depot/projects/dtrace/www/en/donations/wantlist.sgml#28 integrate
.. //depot/projects/dtrace/www/en/events/Makefile#5 integrate
.. //depot/projects/dtrace/www/en/events/rss.xsl#1 branch
.. //depot/projects/dtrace/www/en/gnome/newsflash.xsl#5 integrate
.. //depot/projects/dtrace/www/en/gnome/rss2.xsl#2 integrate
.. //depot/projects/dtrace/www/en/java/Makefile#3 integrate
.. //depot/projects/dtrace/www/en/java/java-rss.xsl#1 branch
.. //depot/projects/dtrace/www/en/java/news.xml#2 integrate
.. //depot/projects/dtrace/www/en/java/newsflash.sgml#7 delete
.. //depot/projects/dtrace/www/en/java/newsflash.xsl#1 branch
.. //depot/projects/dtrace/www/en/layout/css/navigation.css#3 integrate
.. //depot/projects/dtrace/www/en/news/Makefile#7 integrate
.. //depot/projects/dtrace/www/en/news/status/status.sgml#10 integrate
.. //depot/projects/dtrace/www/en/releases/6.3R/Makefile#2 integrate
.. //depot/projects/dtrace/www/en/releases/6.3R/docbook.css#1 branch
.. //depot/projects/dtrace/www/en/releases/6.3R/errata.html#1 branch
.. //depot/projects/dtrace/www/en/releases/6.3R/hardware-alpha.html#1 branch
.. //depot/projects/dtrace/www/en/releases/6.3R/hardware-amd64.html#1 branch
.. //depot/projects/dtrace/www/en/releases/6.3R/hardware-i386.html#1 branch
.. //depot/projects/dtrace/www/en/releases/6.3R/hardware-pc98.html#1 branch
.. //depot/projects/dtrace/www/en/releases/6.3R/hardware-sparc64.html#1 branch
.. //depot/projects/dtrace/www/en/releases/6.3R/hardware.sgml#1 branch
.. //depot/projects/dtrace/www/en/releases/6.3R/installation-alpha.html#1 branch
.. //depot/projects/dtrace/www/en/releases/6.3R/installation-amd64.html#1 branch
.. //depot/projects/dtrace/www/en/releases/6.3R/installation-i386.html#1 branch
.. //depot/projects/dtrace/www/en/releases/6.3R/installation-pc98.html#1 branch
.. //depot/projects/dtrace/www/en/releases/6.3R/installation-sparc64.html#1 branch
.. //depot/projects/dtrace/www/en/releases/6.3R/installation.sgml#1 branch
.. //depot/projects/dtrace/www/en/releases/6.3R/readme.html#1 branch
.. //depot/projects/dtrace/www/en/releases/6.3R/relnotes-alpha.html#1 branch
.. //depot/projects/dtrace/www/en/releases/6.3R/relnotes-amd64.html#1 branch
.. //depot/projects/dtrace/www/en/releases/6.3R/relnotes-i386.html#1 branch
.. //depot/projects/dtrace/www/en/releases/6.3R/relnotes-pc98.html#1 branch
.. //depot/projects/dtrace/www/en/releases/6.3R/relnotes-sparc64.html#1 branch
.. //depot/projects/dtrace/www/en/releases/6.3R/relnotes.sgml#1 branch
.. //depot/projects/dtrace/www/en/releng/index.sgml#26 integrate
.. //depot/projects/dtrace/www/share/mk/doc.xml.mk#8 integrate
.. //depot/projects/dtrace/www/share/sgml/advisories.xml#16 integrate
.. //depot/projects/dtrace/www/share/sgml/header.ent#9 integrate
.. //depot/projects/dtrace/www/share/sgml/libcommon.xsl#8 integrate
.. //depot/projects/dtrace/www/share/sgml/news.xml#33 integrate
.. //depot/projects/dtrace/www/share/sgml/templates.events.xsl#3 integrate
.. //depot/projects/dtrace/www/share/sgml/templates.newsflash.xsl#3 integrate
.. //depot/projects/dtrace/www/share/sgml/templates.press-rss.xsl#1 branch
.. //depot/projects/dtrace/www/share/sgml/templates.press.xsl#4 integrate
.. //depot/projects/dtrace/www/zh_CN/releases/6.3R/Makefile#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/6.3R/docbook.css#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/6.3R/errata.html#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/6.3R/hardware-amd64.html#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/6.3R/hardware-i386.html#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/6.3R/hardware.sgml#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/6.3R/installation-alpha.html#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/6.3R/installation-amd64.html#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/6.3R/installation-i386.html#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/6.3R/installation-pc98.html#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/6.3R/installation-powerpc.html#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/6.3R/installation-sparc64.html#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/6.3R/installation.sgml#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/6.3R/readme.html#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/6.3R/relnotes-alpha.html#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/6.3R/relnotes-amd64.html#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/6.3R/relnotes-i386.html#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/6.3R/relnotes-pc98.html#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/6.3R/relnotes-powerpc.html#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/6.3R/relnotes-sparc64.html#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/6.3R/relnotes.sgml#1 branch
.. //depot/projects/dtrace/www/zh_CN/releases/Makefile#4 integrate

Differences ...

==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml#14 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml,v 1.78 2007/12/28 20:17:18 remko Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml,v 1.80 2008/01/17 17:50:30 remko Exp $
 -->
 
 <chapter id="firewalls">
@@ -153,7 +153,11 @@
       &man.altq.4; and &man.dummynet.4;.  Dummynet has traditionally been
       closely tied with <acronym>IPFW</acronym>, and
       <acronym>ALTQ</acronym> with
-      <acronym>IPF</acronym>/<acronym>PF</acronym>.  IPF,
+      <acronym>PF</acronym>.  Traffic shaping for <acronym>IPFILTER</acronym> can currently
+      be done with <acronym>IPFILTER</acronym> for NAT and filtering and
+      <acronym>IPFW</acronym> with &man.dummynet.4;
+      <emphasis>or</emphasis> by using <acronym>PF</acronym> with
+      <acronym>ALTQ</acronym>.
       IPFW, and PF all use rules to control the access of packets to and
       from your system, although they go about it different ways and
       have different rule syntaxes.</para>

==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/printing/chapter.sgml#5 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/printing/chapter.sgml,v 1.99 2008/01/14 13:40:18 keramida Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/printing/chapter.sgml,v 1.100 2008/01/15 14:56:50 keramida Exp $
 -->
 
 <chapter id="printing">
@@ -1797,9 +1797,9 @@
               
         <programlisting>:if=/usr/local/libexec/psif:</programlisting>
 
-        <para>You should also specify the <literal>rw</literal> capability.
-	  When this capability is present, <application>LPD</application>
-	  opens the printer in read-write mode.</para>
+	<para>The <literal>rw</literal> capability should be also included in
+	  order to let <application>LPD</application> to open the printer in
+	  the read-write mode.</para>
             
         <para>If you have a parallel &postscript; printer (and therefore cannot
           use two-way communication with the printer, which

==== //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/firewalls/chapter.sgml#4 (text+ko) ====

@@ -1,9 +1,9 @@
 <!--
      The FreeBSD Mongolian Documentation Project
 
-     Original revision 1.78
+     Original revision 1.80
 
-     $FreeBSD: doc/mn_MN.UTF-8/books/handbook/firewalls/chapter.sgml,v 1.8 2008/01/10 19:36:15 keramida Exp $
+     $FreeBSD: doc/mn_MN.UTF-8/books/handbook/firewalls/chapter.sgml,v 1.9 2008/01/18 18:52:10 keramida Exp $
 -->
 
 <chapter id="firewalls">
@@ -135,8 +135,13 @@
       <emphasis>IPFIREWALL</emphasis> (<acronym>IPFW</acronym> гэж нэрлэх нь элбэг),
       ба <emphasis>OpenBSD-н PacketFilter</emphasis> (<acronym>PF</acronym> гэж нэрлэх нь элбэг).
       &os; нь мөн урсгалыг хязгаарлах(үндсэндээ зурвасын өргөнийг хязгаарлах) хоёр багцын хамт ирдэг:
-      &man.altq.4; болон &man.dummynet.4;.  Dummynet нь <acronym>IPFW</acronym>-тай, харин
-      <acronym>ALTQ</acronym> нь <acronym>IPF</acronym>/<acronym>PF</acronym>-тай нягт холбоотой ажилладаг.  IPF,
+      &man.altq.4; болон &man.dummynet.4;.  Dummynet нь анхнаасаа <acronym>IPFW</acronym>-тай, харин
+      <acronym>ALTQ</acronym> нь <acronym>PF</acronym>-тэй нягт холбоотой ажилладаг.
+      <acronym>IPFILTER</acronym>-ийн хувьд урсгал хязгаарлалтыг хийхдээ 
+      NAT болон шүүлтэд <acronym>IPFILTER</acronym>-ийг ба 
+      <acronym>IPFW</acronym>-ийг &man.dummynet.4;-тэй цуг юм уу 
+      <emphasis>эсвэл</emphasis> <acronym>PF</acronym>-ийг 
+      <acronym>ALTQ</acronym>-тай цуг ашиглан хийж болно.
       IPFW, ба PF нь бүгд систем уруу орж байгаа болон гарч байгаа урсгалыг дүрмүүдийн тусламжтай удирдах боловч
       синтаксын хувьд ч, арга замын хувьд ч өөр өөр байдаг.</para>
 

==== //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/printing/chapter.sgml#2 (text+ko) ====

@@ -1,9 +1,9 @@
 <!--
      The FreeBSD Mongolian Documentation Project
 
-     Original revision 1.96
+     Original revision 1.100
 
-     $FreeBSD: doc/mn_MN.UTF-8/books/handbook/printing/chapter.sgml,v 1.4 2007/05/30 11:40:40 keramida Exp $
+     $FreeBSD: doc/mn_MN.UTF-8/books/handbook/printing/chapter.sgml,v 1.5 2008/01/16 03:36:35 keramida Exp $
 -->
 
 <chapter id="printing">
@@ -1563,9 +1563,9 @@
               <cmdsynopsis>
                 <command>filter-name</command>
                 <arg>-c</arg>
-                <arg choice="plain">-w<replaceable>width</replaceable></arg>
-                <arg choice="plain">-l<replaceable>length</replaceable></arg>
-                <arg choice="plain">-i<replaceable>indent</replaceable></arg>
+                <arg choice="plain">-w <replaceable>width</replaceable></arg>
+                <arg choice="plain">-l <replaceable>length</replaceable></arg>
+                <arg choice="plain">-i <replaceable>indent</replaceable></arg>
                 <arg choice="plain">-n <replaceable>login</replaceable></arg>
                 <arg choice="plain">-h <replaceable>host</replaceable></arg>
                 <arg choice="plain"><replaceable>acct-file</replaceable></arg>
@@ -1659,8 +1659,8 @@
               <cmdsynopsis>
                 <command>filter-name</command>
                 <arg
-                  choice="plain">-x<replaceable>pixel-width</replaceable></arg>
-                <arg choice="plain">-y<replaceable>pixel-height</replaceable></arg>
+                  choice="plain">-x <replaceable>pixel-width</replaceable></arg>
+                <arg choice="plain">-y <replaceable>pixel-height</replaceable></arg>
                 <arg choice="plain">-n <replaceable>login</replaceable></arg>
                 <arg choice="plain">-h <replaceable>host</replaceable></arg>
                 <arg choice="plain"><replaceable>acct-file</replaceable></arg>
@@ -1683,8 +1683,8 @@
 
               <cmdsynopsis>
                 <command>filter-name</command>
-                <arg choice="plain">-w<replaceable>width</replaceable></arg>
-                <arg choice="plain">-l<replaceable>length</replaceable></arg>
+                <arg choice="plain">-w <replaceable>width</replaceable></arg>
+                <arg choice="plain">-l <replaceable>length</replaceable></arg>
               </cmdsynopsis>
 
               		эдгээр нь текст шүүлтүүрийн <option>-w</option> болон
@@ -1787,9 +1787,9 @@
               
         <programlisting>:if=/usr/local/libexec/psif:</programlisting>
 
-        <para>Та бас <literal>rw</literal> боломжийг зааж өгөх хэрэгтэй; 
-	энэ нь <application>LPD</application>-д хэвлэгчийг унших-бичих горимоор 
-	онгойлгохыг хэлж өгдөг.</para>
+        <para><application>LPD</application>-д хэвлэгчийг унших-бичих горимоор 
+	онгойлгох боломж олгохын тулд <literal>rw</literal> боломж нь бас 
+	орсон байх шаардлагатай.</para>
             
         <para>Хэрэв танд зэрэгцээ &postscript; хэвлэгч байгаа (бөгөөд 
 	тиймээс <command>lprps</command>-д хэрэгтэй хоёр талын холбоог хэвлэгчтэй 

==== //depot/projects/dtrace/doc/share/mk/doc.xml.mk#7 (text+ko) ====

@@ -1,5 +1,5 @@
 # doc.xml.mk
-# $FreeBSD: doc/share/mk/doc.xml.mk,v 1.12 2008/01/07 10:08:29 murray Exp $
+# $FreeBSD: doc/share/mk/doc.xml.mk,v 1.13 2008/01/16 08:21:47 murray Exp $
 
 XML_CATALOG_FILES=	file://${.OBJDIR}/catalog-cwd.xml \
 			file://${DOC_PREFIX}/${LANGCODE}/share/sgml/catalog.xml \
@@ -169,6 +169,7 @@
 XML_NEWS_PRESS=		${WEB_PREFIX}/share/sgml/press.xml
 .endif
 XSL_NEWS_PRESS=		${WEB_PREFIX}/share/sgml/templates.press.xsl
+XSL_NEWS_PRESS_RSS=	${WEB_PREFIX}/share/sgml/templates.press-rss.xsl
 XSL_NEWS_PRESS_OLD=	${WEB_PREFIX}/share/sgml/templates.oldpress.xsl
 
 # DEPENDSET: events  ..........................................................

==== //depot/projects/dtrace/doc/share/sgml/freebsd.ent#14 (text+ko) ====

@@ -1,7 +1,7 @@
 <!-- -*- sgml -*-
      DocBook Miscellaneous FreeBSD Entities.
 
-     $FreeBSD: doc/share/sgml/freebsd.ent,v 1.97 2008/01/14 07:55:57 hrs Exp $
+     $FreeBSD: doc/share/sgml/freebsd.ent,v 1.98 2008/01/18 19:05:50 bmah Exp $
 
 This file is now valid XML as well as SGML.  Please do not add CDATA
 attributes or anything else that will prevent this file from being
@@ -53,8 +53,8 @@
 <!-- The currently released version of FreeBSD.  This value is used to
      create some links on web sites and such, so do NOT change it until
      it's really release time -->
-<!ENTITY rel.current "6.2">
-<!ENTITY rel.current.date "Jan 2007">
+<!ENTITY rel.current "6.3">
+<!ENTITY rel.current.date "Jan 2008">
 <!ENTITY rel.current.notes 'http://www.FreeBSD.org/releases/&rel.current;R/notes.html'>
 <!ENTITY rel.current.hardware 'http://www.FreeBSD.org/releases/&rel.current;R/hardware.html'>
 <!ENTITY rel.current.errata 'http://www.FreeBSD.org/releases/&rel.current;R/errata.html'>

==== //depot/projects/dtrace/doc/share/sgml/man-refs.ent#23 (text+ko) ====

@@ -20,7 +20,7 @@
      lexicographical order by the entity (i.e., the dots used in place of
      special characters should not be expanded when comparing).
 
-     $FreeBSD: doc/share/sgml/man-refs.ent,v 1.446 2008/01/01 23:55:27 bmah Exp $
+     $FreeBSD: doc/share/sgml/man-refs.ent,v 1.447 2008/01/15 02:29:12 hrs Exp $
 -->
 
 <!ENTITY man...1 "<citerefentry/<refentrytitle/[/<manvolnum/1//">
@@ -2552,6 +2552,7 @@
 <!ENTITY man.pthread.setspecific.3 "<citerefentry/<refentrytitle/pthread_setspecific/<manvolnum/3//">
 <!ENTITY man.pthread.sigmask.3 "<citerefentry/<refentrytitle/pthread_sigmask/<manvolnum/3//">
 <!ENTITY man.pthread.testcancel.3 "<citerefentry/<refentrytitle/pthread_testcancel/<manvolnum/3//">
+<!ENTITY man.ptsname.3 "<citerefentry/<refentrytitle/ptsname/<manvolnum/3//">
 <!ENTITY man.pty.3 "<citerefentry/<refentrytitle/pty/<manvolnum/3//">
 <!ENTITY man.publickey.3 "<citerefentry/<refentrytitle/publickey/<manvolnum/3//">
 <!ENTITY man.putc.3 "<citerefentry/<refentrytitle/putc/<manvolnum/3//">

==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/advanced-networking/chapter.sgml#15 (text+ko) ====

@@ -3,7 +3,7 @@
      The FreeBSD Chinese Documentation Project
 
      Original revision: 1.404
-     $FreeBSD: doc/zh_CN.GB2312/books/handbook/advanced-networking/chapter.sgml,v 1.17 2007/12/31 15:10:14 loader Exp $
+     $FreeBSD: doc/zh_CN.GB2312/books/handbook/advanced-networking/chapter.sgml,v 1.18 2008/01/16 08:22:58 loader Exp $
 -->
 
 <chapter id="advanced-networking">
@@ -2591,7 +2591,7 @@
 	²ÎÊýÄܹ»¿ØÖÆÍøÇÅÔÚת·¢±íÖб£´æ¶àÉÙ¸ö MAC µØÖ·£¬
 	ÒÔ¼°±íÏîÖÐÖ÷»úµÄ¹ýÆÚʱ¼ä¡£ ÆäËû²ÎÊý¿ØÖÆÉú³ÉÊ÷µÄÔËת·½Ê½¡£</para>
 
-      <para>½«³ÉÔ±ÍøÂç½Ó¿Ú¼ÙÈçÍøÇÅ¡£ ΪÁËÈÃÍøÇÅÄܹ»ÎªËùÓÐÍøÇųÉÔ±½Ó¿Úת·¢°ü£¬
+      <para>½«³ÉÔ±ÍøÂç½Ó¿Ú¼ÓÈëÍøÇÅ¡£ ΪÁËÈÃÍøÇÅÄܹ»ÎªËùÓÐÍøÇųÉÔ±½Ó¿Úת·¢°ü£¬
 	ÍøÇŽӿںÍËùÓгÉÔ±½Ó¿Ú¶¼ÐèÒª´¦ÓÚÆôÓÃ״̬£º</para>
 
       <screen>&prompt.root; <userinput>ifconfig bridge0 addm fxp0 addm fxp1 up</userinput>

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

@@ -2,8 +2,8 @@
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Project
 
-     Original Revision: 1.96
-     $FreeBSD: doc/zh_CN.GB2312/books/handbook/printing/chapter.sgml,v 1.6 2006/06/03 15:34:24 delphij Exp $
+     Original Revision: 1.100
+     $FreeBSD: doc/zh_CN.GB2312/books/handbook/printing/chapter.sgml,v 1.7 2008/01/15 18:30:34 loader Exp $
 -->
 
 <chapter id="printing">
@@ -1493,9 +1493,9 @@
               <cmdsynopsis>
                 <command>filter-name</command>
                 <arg>-c</arg>
-                <arg choice="plain">-w<replaceable>width</replaceable></arg>
-                <arg choice="plain">-l<replaceable>length</replaceable></arg>
-                <arg choice="plain">-i<replaceable>indent</replaceable></arg>
+                <arg choice="plain">-w <replaceable>width</replaceable></arg>
+                <arg choice="plain">-l <replaceable>length</replaceable></arg>
+                <arg choice="plain">-i <replaceable>indent</replaceable></arg>
                 <arg choice="plain">-n <replaceable>login</replaceable></arg>
                 <arg choice="plain">-h <replaceable>host</replaceable></arg>
                 <arg choice="plain"><replaceable>acct-file</replaceable></arg>
@@ -1585,8 +1585,8 @@
               <cmdsynopsis>
                 <command>filter-name</command>
                 <arg
-                  choice="plain">-x<replaceable>pixel-width</replaceable></arg>
-                <arg choice="plain">-y<replaceable>pixel-height</replaceable></arg>
+                  choice="plain">-x <replaceable>pixel-width</replaceable></arg>
+                <arg choice="plain">-y <replaceable>pixel-height</replaceable></arg>
                 <arg choice="plain">-n <replaceable>login</replaceable></arg>
                 <arg choice="plain">-h <replaceable>host</replaceable></arg>
                 <arg choice="plain"><replaceable>acct-file</replaceable></arg>
@@ -1607,8 +1607,8 @@
 
               <cmdsynopsis>
                 <command>filter-name</command>
-                <arg choice="plain">-w<replaceable>width</replaceable></arg>
-                <arg choice="plain">-l<replaceable>length</replaceable></arg>
+                <arg choice="plain">-w <replaceable>width</replaceable></arg>
+                <arg choice="plain">-l <replaceable>length</replaceable></arg>
               </cmdsynopsis>
 
               <option>-w</option> ºÍ

==== //depot/projects/dtrace/src/Makefile.inc1#36 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile.inc1,v 1.591 2007/12/04 12:55:27 yar Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.592 2008/01/16 15:05:49 brueffer Exp $
 #
 # Make command line options:
 #	-DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -237,7 +237,7 @@
 # cross-tools stage
 XMAKE=		TOOLS_PREFIX=${WORLDTMP} ${BMAKE} \
 		TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
-		-DWITHOUT_FORTRAN -DWITHOUT_GDB
+		-DWITHOUT_GDB
 
 # world stage
 WMAKEENV=	${CROSSENV} \

==== //depot/projects/dtrace/src/contrib/top/display.c#4 (text+ko) ====

@@ -8,7 +8,7 @@
  *  Copyright (c) 1984, 1989, William LeFebvre, Rice University
  *  Copyright (c) 1989, 1990, 1992, William LeFebvre, Northwestern University
  *
- * $FreeBSD: src/contrib/top/display.c,v 1.9 2005/05/19 13:34:19 keramida Exp $
+ * $FreeBSD: src/contrib/top/display.c,v 1.10 2008/01/18 01:43:13 peter Exp $
  */
 
 /*
@@ -78,8 +78,10 @@
 static int *lmemory;
 static int *lswap;
 
+static int num_cpus;
 static int *cpustate_columns;
 static int cpustate_total_length;
+static int cpustates_column;
 
 static enum { OFF, ON, ERASE } header_status = ON;
 
@@ -87,6 +89,29 @@
 static void summary_format();
 static void line_update();
 
+int  x_lastpid =	10;
+int  y_lastpid =	0;
+int  x_loadave =	33;
+int  x_loadave_nompid =	15;
+int  y_loadave =	0;
+int  x_procstate =	0;
+int  y_procstate =	1;
+int  x_brkdn =		15;
+int  y_brkdn =		1;
+int  x_mem =		5;
+int  y_mem =		3;
+int  x_swap =		6;
+int  y_swap =		4;
+int  y_message =	5;
+int  x_header =		0;
+int  y_header =		6;
+int  x_idlecursor =	0;
+int  y_idlecursor =	5;
+int  y_procs =		7;
+
+int  y_cpustates =	2;
+int  Header_lines =	7;
+
 int display_resize()
 
 {
@@ -138,6 +163,12 @@
 
     /* call resize to do the dirty work */
     lines = display_resize();
+    num_cpus = statics->ncpus;
+    cpustates_column = 5;	/* CPU: */
+    if (num_cpus != 1)
+    cpustates_column += 2;	/* CPU 0: */
+    for (i = num_cpus; i > 9; i /= 10)
+	cpustates_column++;
 
     /* only do the rest if we need to */
     if (lines > -1)
@@ -153,7 +184,7 @@
 	num_swap = string_count(swap_names);
 	lswap = (int *)malloc(num_swap * sizeof(int));
 	num_cpustates = string_count(cpustate_names);
-	lcpustates = (int *)malloc(num_cpustates * sizeof(int));
+	lcpustates = (int *)malloc(num_cpustates * sizeof(int) * num_cpus);
 	cpustate_columns = (int *)malloc(num_cpustates * sizeof(int));
 
 	memory_names = statics->memory_names;
@@ -365,14 +396,13 @@
     }
 }
 
+#ifdef no_more
 /*
  *  *_cpustates(states, names) - print the cpu state percentages
  *
  *  Assumptions:  cursor is on the PREVIOUS line
  */
 
-static int cpustates_column;
-
 /* cpustates_tag() calculates the correct tag to use to label the line */
 
 char *cpustates_tag()
@@ -398,6 +428,7 @@
     cpustates_column = strlen(use);
     return(use);
 }
+#endif
 
 i_cpustates(states)
 
@@ -406,11 +437,18 @@
 {
     register int i = 0;
     register int value;
-    register char **names = cpustate_names;
+    register char **names;
     register char *thisname;
+    int cpu;
+
+for (cpu = 0; cpu < num_cpus; cpu++) {
+    names = cpustate_names;
 
     /* print tag and bump lastline */
-    printf("\n%s", cpustates_tag());
+    if (num_cpus == 1)
+	printf("\nCPU: ");
+    else
+	printf("\nCPU %d: ", cpu);
     lastline++;
 
     /* now walk thru the names and print the line */
@@ -423,14 +461,15 @@
 
 	    /* if percentage is >= 1000, print it as 100% */
 	    printf((value >= 1000 ? "%s%4.0f%% %s" : "%s%4.1f%% %s"),
-		   i++ == 0 ? "" : ", ",
+		   (i++ % num_cpustates) == 0 ? "" : ", ",
 		   ((float)value)/10.,
 		   thisname);
 	}
     }
+}
 
     /* copy over values into "last" array */
-    memcpy(lcpustates, states, num_cpustates * sizeof(int));
+    memcpy(lcpustates, states, num_cpustates * sizeof(int) * num_cpus);
 }
 
 u_cpustates(states)
@@ -439,14 +478,18 @@
 
 {
     register int value;
-    register char **names = cpustate_names;
+    register char **names;
     register char *thisname;
     register int *lp;
     register int *colp;
+    int cpu;
+
+for (cpu = 0; cpu < num_cpus; cpu++) {
+    names = cpustate_names;
 
-    Move_to(cpustates_column, y_cpustates);
-    lastline = y_cpustates;
-    lp = lcpustates;
+    Move_to(cpustates_column, y_cpustates + cpu);
+    lastline = y_cpustates + cpu;
+    lp = lcpustates + (cpu * num_cpustates);
     colp = cpustate_columns;
 
     /* we could be much more optimal about this */
@@ -458,8 +501,8 @@
 	    if (*lp != *states)
 	    {
 		/* yes, move and change */
-		Move_to(cpustates_column + *colp, y_cpustates);
-		lastline = y_cpustates;
+		Move_to(cpustates_column + *colp, y_cpustates + cpu);
+		lastline = y_cpustates + cpu;
 
 		/* retrieve value and remember it */
 		value = *states;
@@ -479,30 +522,39 @@
 	colp++;
     }
 }
+}
 
 z_cpustates()
 
 {
     register int i = 0;
-    register char **names = cpustate_names;
+    register char **names;
     register char *thisname;
     register int *lp;
+    int cpu;
+
+for (cpu = 0; cpu < num_cpus; cpu++) {
+    names = cpustate_names;
 
     /* show tag and bump lastline */
-    printf("\n%s", cpustates_tag());
+    if (num_cpus == 1)
+	printf("\nCPU: ");
+    else
+	printf("\nCPU %d: ", cpu);
     lastline++;
 
     while ((thisname = *names++) != NULL)
     {
 	if (*thisname != '\0')
 	{
-	    printf("%s    %% %s", i++ == 0 ? "" : ", ", thisname);
+	    printf("%s    %% %s", (i++ % num_cpustates) == 0 ? "" : ", ", thisname);
 	}
     }
+}
 
     /* fill the "last" array with all -1s, to insure correct updating */
     lp = lcpustates;
-    i = num_cpustates;
+    i = num_cpustates * num_cpus;
     while (--i >= 0)
     {
 	*lp++ = -1;

==== //depot/projects/dtrace/src/contrib/top/layout.h#4 (text+ko) ====

@@ -4,26 +4,28 @@
  *  This file defines the locations on tne screen for various parts of the
  *  display.  These definitions are used by the routines in "display.c" for
  *  cursor addressing.
+ *
+ * $FreeBSD: src/contrib/top/layout.h,v 1.3 2008/01/18 01:43:13 peter Exp $
  */
 
-#define  x_lastpid	10
-#define  y_lastpid	0
-#define  x_loadave	33
-#define  x_loadave_nompid	15
-#define  y_loadave	0
-#define  x_procstate	0
-#define  y_procstate	1
-#define  x_brkdn	15
-#define  y_brkdn	1
-#define  x_mem		5
-#define  y_mem		3
-#define  x_swap		6
-#define  y_swap		4
-#define  y_message	5
-#define  x_header	0
-#define  y_header	6
-#define  x_idlecursor	0
-#define  y_idlecursor	5
-#define  y_procs	7
+extern int  x_lastpid;		/* 10 */
+extern int  y_lastpid;		/* 0 */
+extern int  x_loadave;		/* 33 */
+extern int  x_loadave_nompid;	/* 15 */
+extern int  y_loadave;		/* 0 */
+extern int  x_procstate;	/* 0 */
+extern int  y_procstate;	/* 1 */
+extern int  x_brkdn;		/* 15 */
+extern int  y_brkdn;		/* 1 */
+extern int  x_mem;		/* 5 */
+extern int  y_mem;		/* 3 */
+extern int  x_swap;		/* 6 */
+extern int  y_swap;		/* 4 */
+extern int  y_message;		/* 5 */
+extern int  x_header;		/* 0 */
+extern int  y_header;		/* 6 */
+extern int  x_idlecursor;	/* 0 */
+extern int  y_idlecursor;	/* 5 */
+extern int  y_procs;		/* 7 */
 
-#define  y_cpustates	2
+extern int  y_cpustates;	/* 2 */

==== //depot/projects/dtrace/src/contrib/top/machine.h#5 (text+ko) ====

@@ -1,5 +1,5 @@
 /*
- * $FreeBSD: src/contrib/top/machine.h,v 1.9 2007/05/04 15:42:58 rafan Exp $
+ * $FreeBSD: src/contrib/top/machine.h,v 1.10 2008/01/18 01:43:13 peter Exp $
  */
 
 /*
@@ -20,6 +20,7 @@
 #ifdef ORDER
     char **order_names;
 #endif
+    int ncpus;
 };
 
 /*
@@ -43,6 +44,8 @@
     int    *memory;
     int    *swap;
     struct timeval boottime;
+    unsigned long cpumask;	/* bitfield of cpu states represented */
+    int    ncpus;
 };
 
 /* cpu_states is an array of percentages * 10.  For example, 

==== //depot/projects/dtrace/src/contrib/top/top.c#7 (text+ko) ====

@@ -13,7 +13,7 @@
  *  Copyright (c) 1994, 1995, William LeFebvre, Argonne National Laboratory
  *  Copyright (c) 1996, William LeFebvre, Group sys Consulting
  *
- * $FreeBSD: src/contrib/top/top.c,v 1.24 2008/01/09 18:06:24 obrien Exp $
+ * $FreeBSD: src/contrib/top/top.c,v 1.25 2008/01/18 01:43:13 peter Exp $
  */
 
 /*
@@ -66,6 +66,7 @@
 extern int overstrike;
 
 static int fmt_flags = 0;
+int pcpu_stats = No;
 
 /* signal handling routines */
 sigret_t leave();
@@ -282,7 +283,7 @@
 	    optind = 1;
 	}
 
-	while ((i = getopt(ac, av, "CSIHabijnquvs:d:U:m:o:t")) != EOF)
+	while ((i = getopt(ac, av, "CSIHPabijnpquvs:d:U:m:o:t")) != EOF)
 	{
 	    switch(i)
 	    {
@@ -407,6 +408,14 @@
 		ps.jail = !ps.jail;
 		break;
 
+	      case 'P':
+		pcpu_stats = Yes;
+		break;
+
+	      case 'p':
+		pcpu_stats = No;
+		break;
+
 	      default:
 		fprintf(stderr,
 "Top version %s\n"

==== //depot/projects/dtrace/src/contrib/top/top.h#5 (text+ko) ====

@@ -1,5 +1,5 @@
 /*
- * $FreeBSD: src/contrib/top/top.h,v 1.4 2007/04/14 10:16:51 stas Exp $
+ * $FreeBSD: src/contrib/top/top.h,v 1.5 2008/01/18 01:43:13 peter Exp $
  */
 /*
  *  Top - a top users display for Berkeley Unix
@@ -11,7 +11,7 @@
 #define VERSION		3
 
 /* Number of lines of header information on the standard screen */
-#define Header_lines	7
+extern int Header_lines;	/* 7 */
 
 /* Maximum number of columns allowed for display */
 #define MAX_COLS	128
@@ -45,3 +45,5 @@
 #define FMT_SHOWARGS 0x00000001
 
 extern enum displaymodes displaymode;
+
+extern int pcpu_stats;

==== //depot/projects/dtrace/src/gnu/usr.bin/cvs/Makefile#5 (text+ko) ====

@@ -1,5 +1,5 @@
-# $FreeBSD: src/gnu/usr.bin/cvs/Makefile,v 1.17 2008/01/13 08:58:25 obrien Exp $
+# $FreeBSD: src/gnu/usr.bin/cvs/Makefile,v 1.18 2008/01/16 17:16:36 obrien Exp $
 
-SUBDIR = lib libdiff cvs cvsbug doc
+SUBDIR = lib libdiff cvs contrib cvsbug doc
 
 .include <bsd.subdir.mk>

==== //depot/projects/dtrace/src/gnu/usr.bin/cvs/contrib/Makefile#5 (text+ko) ====

@@ -1,4 +1,6 @@
-# $FreeBSD: src/gnu/usr.bin/cvs/contrib/Makefile,v 1.19 2008/01/13 09:45:53 obrien Exp $
+# $FreeBSD: src/gnu/usr.bin/cvs/contrib/Makefile,v 1.20 2008/01/16 17:15:59 obrien Exp $
+
+.POSIX:
 
 .include "../Makefile.inc"
 

==== //depot/projects/dtrace/src/gnu/usr.bin/gdb/kgdb/kgdb.h#6 (text+ko) ====

@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/gnu/usr.bin/gdb/kgdb/kgdb.h,v 1.6 2007/11/16 22:17:37 jhb Exp $
+ * $FreeBSD: src/gnu/usr.bin/gdb/kgdb/kgdb.h,v 1.7 2008/01/17 21:43:12 jhb Exp $
  */
 
 #ifndef _KGDB_H_
@@ -32,6 +32,7 @@
 struct thread_info;
 
 extern kvm_t *kvm;
+extern char *kernel;
 
 struct kthr {
 	struct kthr	*next;
@@ -63,5 +64,6 @@
 char        *kgdb_thr_extra_thread_info(int);
 
 uintptr_t kgdb_lookup(const char *sym);
+CORE_ADDR kgdb_parse(const char *exp);
 
 #endif /* _KGDB_H_ */

==== //depot/projects/dtrace/src/gnu/usr.bin/gdb/kgdb/main.c#4 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/main.c,v 1.11 2006/01/04 23:17:52 kan Exp $");
+__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/main.c,v 1.12 2008/01/17 21:43:12 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
@@ -75,7 +75,7 @@
 static int verbose;
 
 static char crashdir[PATH_MAX];
-static char *kernel;
+char *kernel;
 static char *remote;
 static char *vmcore;
 
@@ -178,7 +178,7 @@
 		kgdb_new_objfile_chain(objfile);
 }
 
-static CORE_ADDR
+CORE_ADDR
 kgdb_parse(const char *exp)
 {
 	struct cleanup *old_chain;

==== //depot/projects/dtrace/src/gnu/usr.bin/gdb/kgdb/trgt.c#5 (text+ko) ====

@@ -25,13 +25,16 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/trgt.c,v 1.5 2006/10/16 20:06:32 jhb Exp $");
+__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/trgt.c,v 1.6 2008/01/17 21:43:12 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/proc.h>
+#include <sys/stat.h>
 #include <sys/sysctl.h>
 #include <sys/user.h>
+#include <libgen.h>
 #include <kvm.h>
+#include <string.h>
 
 #include <defs.h>
 #include <command.h>
@@ -40,6 +43,9 @@
 #include <inferior.h>
 #include <regcache.h>
 #include <target.h>
+#include <objfiles.h>
+#include <gdbcore.h>
+#include <language.h>
 
 #include "kgdb.h"
 
@@ -199,6 +205,268 @@
 	kgdb_switch_to_thread(thr);
 }
 
+static int
+kld_ok (char *path)
+{
+	struct stat sb;
+
+	if (stat(path, &sb) == 0 && S_ISREG(sb.st_mode))
+		return (1);
+	return (0);
+}

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