From owner-p4-projects@FreeBSD.ORG  Sun Feb  5 00:44:46 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 53ADA16A422; Sun,  5 Feb 2006 00:44:45 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 1293216A425
	for <perforce@freebsd.org>; Sun,  5 Feb 2006 00:44:45 +0000 (GMT)
	(envelope-from alc@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 34CB243D49
	for <perforce@freebsd.org>; Sun,  5 Feb 2006 00:44:44 +0000 (GMT)
	(envelope-from alc@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k150iihu073713
	for <perforce@freebsd.org>; Sun, 5 Feb 2006 00:44:44 GMT
	(envelope-from alc@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k150ihLZ073710
	for perforce@freebsd.org; Sun, 5 Feb 2006 00:44:43 GMT
	(envelope-from alc@freebsd.org)
Date: Sun, 5 Feb 2006 00:44:43 GMT
Message-Id: <200602050044.k150ihLZ073710@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	alc@freebsd.org using -f
From: Alan Cox <alc@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 91136 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 05 Feb 2006 00:44:46 -0000

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

Change 91136 by alc@alc_home on 2006/02/05 00:44:25

	IFC @91133

Affected files ...

.. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/contributors/contrib.develalumni.sgml#3 integrate
.. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/hats/article.sgml#2 integrate
.. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/p4-primer/article.sgml#2 integrate
.. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/audit/chapter.sgml#2 integrate
.. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/book.sgml#3 integrate
.. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/chapters.ent#2 integrate
.. //depot/projects/superpages/doc/share/sgml/man-refs.ent#5 integrate
.. //depot/projects/superpages/src/ObsoleteFiles.inc#5 integrate
.. //depot/projects/superpages/src/bin/sh/error.c#2 integrate
.. //depot/projects/superpages/src/bin/sh/eval.c#3 integrate
.. //depot/projects/superpages/src/bin/sh/expand.c#2 integrate
.. //depot/projects/superpages/src/bin/sh/jobs.c#3 integrate
.. //depot/projects/superpages/src/bin/sh/main.c#2 integrate
.. //depot/projects/superpages/src/bin/sh/miscbltin.c#3 integrate
.. //depot/projects/superpages/src/bin/sh/var.c#2 integrate
.. //depot/projects/superpages/src/bin/sh/var.h#2 integrate
.. //depot/projects/superpages/src/contrib/openbsm/CHANGELOG#2 integrate
.. //depot/projects/superpages/src/contrib/openbsm/FREEBSD-upgrade#1 branch
.. //depot/projects/superpages/src/contrib/openbsm/VERSION#2 integrate
.. //depot/projects/superpages/src/contrib/openbsm/bin/audit/audit.8#2 integrate
.. //depot/projects/superpages/src/contrib/openbsm/bin/auditreduce/auditreduce.1#2 integrate
.. //depot/projects/superpages/src/contrib/openbsm/bsm/audit_kevents.h#2 integrate
.. //depot/projects/superpages/src/contrib/openbsm/etc/audit_class#2 integrate
.. //depot/projects/superpages/src/contrib/openbsm/etc/audit_control#2 integrate
.. //depot/projects/superpages/src/contrib/openbsm/man/audit.log.5#2 integrate
.. //depot/projects/superpages/src/etc/etc.sparc64/ttys#2 integrate
.. //depot/projects/superpages/src/include/printf.h#3 integrate
.. //depot/projects/superpages/src/lib/libc/stdio/xprintf_time.c#3 integrate
.. //depot/projects/superpages/src/lib/libc/stdlib/malloc.c#7 integrate
.. //depot/projects/superpages/src/lib/libgssapi/gss_mech_switch.c#2 integrate
.. //depot/projects/superpages/src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#5 integrate
.. //depot/projects/superpages/src/release/doc/share/misc/dev.archlist.txt#5 integrate
.. //depot/projects/superpages/src/sbin/ifconfig/ifconfig.8#3 integrate
.. //depot/projects/superpages/src/sbin/ipfw/ipfw.8#3 integrate
.. //depot/projects/superpages/src/share/man/man4/audit.4#2 integrate
.. //depot/projects/superpages/src/share/mk/bsd.incs.mk#2 integrate
.. //depot/projects/superpages/src/share/mk/bsd.lib.mk#3 integrate
.. //depot/projects/superpages/src/share/mk/bsd.prog.mk#3 integrate
.. //depot/projects/superpages/src/sys/alpha/linux/syscalls.master#2 integrate
.. //depot/projects/superpages/src/sys/amd64/amd64/machdep.c#4 integrate
.. //depot/projects/superpages/src/sys/amd64/amd64/trap.c#5 integrate
.. //depot/projects/superpages/src/sys/amd64/ia32/ia32_syscall.c#3 integrate
.. //depot/projects/superpages/src/sys/arm/arm/identcpu.c#3 integrate
.. //depot/projects/superpages/src/sys/arm/arm/trap.c#4 integrate
.. //depot/projects/superpages/src/sys/arm/arm/undefined.c#3 integrate
.. //depot/projects/superpages/src/sys/arm/at91/at91.c#1 branch
.. //depot/projects/superpages/src/sys/arm/at91/at91_spi.c#1 branch
.. //depot/projects/superpages/src/sys/arm/at91/at91_spiio.h#1 branch
.. //depot/projects/superpages/src/sys/arm/at91/at91_spireg.h#1 branch
.. //depot/projects/superpages/src/sys/arm/at91/at91_st.c#1 branch
.. //depot/projects/superpages/src/sys/arm/at91/at91_streg.h#1 branch
.. //depot/projects/superpages/src/sys/arm/at91/at91_twi.c#1 branch
.. //depot/projects/superpages/src/sys/arm/at91/at91_twiio.h#1 branch
.. //depot/projects/superpages/src/sys/arm/at91/at91_twireg.h#1 branch
.. //depot/projects/superpages/src/sys/arm/at91/at91_usartreg.h#1 branch
.. //depot/projects/superpages/src/sys/arm/at91/at91rm92reg.h#1 branch
.. //depot/projects/superpages/src/sys/arm/at91/at91st.c#1 branch
.. //depot/projects/superpages/src/sys/arm/at91/at91var.h#1 branch
.. //depot/projects/superpages/src/sys/arm/at91/files.at91rm92#1 branch
.. //depot/projects/superpages/src/sys/arm/at91/files.kb920x#1 branch
.. //depot/projects/superpages/src/sys/arm/at91/hints.at91rm9200#1 branch
.. //depot/projects/superpages/src/sys/arm/at91/hints.at91sam9261#1 branch
.. //depot/projects/superpages/src/sys/arm/at91/if_ate.c#1 branch
.. //depot/projects/superpages/src/sys/arm/at91/if_atereg.h#1 branch
.. //depot/projects/superpages/src/sys/arm/at91/kb920x_machdep.c#1 branch
.. //depot/projects/superpages/src/sys/arm/at91/std.at91rm92#1 branch
.. //depot/projects/superpages/src/sys/arm/at91/std.kb920x#1 branch
.. //depot/projects/superpages/src/sys/arm/at91/uart_bus_at91usart.c#1 branch
.. //depot/projects/superpages/src/sys/arm/at91/uart_cpu_at91rm9200usart.c#1 branch
.. //depot/projects/superpages/src/sys/arm/at91/uart_dev_at91usart.c#1 branch
.. //depot/projects/superpages/src/sys/arm/conf/KB920X#1 branch
.. //depot/projects/superpages/src/sys/arm/conf/SKYEYE#1 branch
.. //depot/projects/superpages/src/sys/arm/xscale/i80321/i80321_aau.c#3 integrate
.. //depot/projects/superpages/src/sys/bsm/audit.h#3 integrate
.. //depot/projects/superpages/src/sys/bsm/audit_internal.h#2 integrate
.. //depot/projects/superpages/src/sys/bsm/audit_kevents.h#3 integrate
.. //depot/projects/superpages/src/sys/bsm/audit_record.h#2 integrate
.. //depot/projects/superpages/src/sys/compat/freebsd32/freebsd32_proto.h#4 integrate
.. //depot/projects/superpages/src/sys/compat/freebsd32/freebsd32_syscall.h#4 integrate
.. //depot/projects/superpages/src/sys/compat/freebsd32/freebsd32_syscalls.c#4 integrate
.. //depot/projects/superpages/src/sys/compat/freebsd32/freebsd32_sysent.c#4 integrate
.. //depot/projects/superpages/src/sys/compat/freebsd32/syscalls.master#4 integrate
.. //depot/projects/superpages/src/sys/conf/NOTES#8 integrate
.. //depot/projects/superpages/src/sys/conf/files#10 integrate
.. //depot/projects/superpages/src/sys/conf/files.pc98#3 integrate
.. //depot/projects/superpages/src/sys/conf/kmod.mk#6 integrate
.. //depot/projects/superpages/src/sys/conf/options#7 integrate
.. //depot/projects/superpages/src/sys/dev/advansys/adv_eisa.c#2 integrate
.. //depot/projects/superpages/src/sys/dev/advansys/adv_pci.c#3 integrate
.. //depot/projects/superpages/src/sys/dev/amr/amr.c#4 integrate
.. //depot/projects/superpages/src/sys/dev/amr/amr_pci.c#3 integrate
.. //depot/projects/superpages/src/sys/dev/amr/amrvar.h#3 integrate
.. //depot/projects/superpages/src/sys/dev/an/if_an.c#4 integrate
.. //depot/projects/superpages/src/sys/dev/asr/asr.c#3 integrate
.. //depot/projects/superpages/src/sys/dev/asr/i2odep.h#2 integrate
.. //depot/projects/superpages/src/sys/dev/bge/if_bge.c#6 integrate
.. //depot/projects/superpages/src/sys/dev/ce/if_ce.c#3 integrate
.. //depot/projects/superpages/src/sys/dev/em/if_em.h#4 integrate
.. //depot/projects/superpages/src/sys/dev/ep/if_ep.c#3 integrate
.. //depot/projects/superpages/src/sys/dev/ex/if_ex.c#3 integrate
.. //depot/projects/superpages/src/sys/dev/firewire/fwcrom.c#2 integrate
.. //depot/projects/superpages/src/sys/dev/if_ndis/if_ndis.c#5 integrate
.. //depot/projects/superpages/src/sys/dev/isp/isp.c#3 integrate
.. //depot/projects/superpages/src/sys/dev/isp/isp_freebsd.c#3 integrate
.. //depot/projects/superpages/src/sys/dev/isp/isp_freebsd.h#4 integrate
.. //depot/projects/superpages/src/sys/dev/isp/isp_inline.h#3 delete
.. //depot/projects/superpages/src/sys/dev/isp/isp_library.c#1 branch
.. //depot/projects/superpages/src/sys/dev/isp/isp_library.h#1 branch
.. //depot/projects/superpages/src/sys/dev/isp/isp_pci.c#5 integrate
.. //depot/projects/superpages/src/sys/dev/isp/isp_sbus.c#3 integrate
.. //depot/projects/superpages/src/sys/dev/isp/ispvar.h#3 integrate
.. //depot/projects/superpages/src/sys/dev/pccbb/pccbb.c#4 integrate
.. //depot/projects/superpages/src/sys/dev/pcf/pcf_isa.c#2 integrate
.. //depot/projects/superpages/src/sys/dev/sn/if_sn.c#3 integrate
.. //depot/projects/superpages/src/sys/dev/uart/uart_bus_ebus.c#3 integrate
.. //depot/projects/superpages/src/sys/dev/uart/uart_cpu_sparc64.c#2 integrate
.. //depot/projects/superpages/src/sys/fs/udf/ecma167-udf.h#2 integrate
.. //depot/projects/superpages/src/sys/fs/udf/udf_vfsops.c#5 integrate
.. //depot/projects/superpages/src/sys/fs/udf/udf_vnops.c#3 integrate
.. //depot/projects/superpages/src/sys/i386/conf/XBOX#2 integrate
.. //depot/projects/superpages/src/sys/i386/i386/identcpu.c#4 integrate
.. //depot/projects/superpages/src/sys/i386/i386/machdep.c#4 integrate
.. //depot/projects/superpages/src/sys/i386/i386/trap.c#5 integrate
.. //depot/projects/superpages/src/sys/i386/xbox/xbox.c#2 integrate
.. //depot/projects/superpages/src/sys/ia64/conf/SKI#3 integrate
.. //depot/projects/superpages/src/sys/kern/init_main.c#3 integrate
.. //depot/projects/superpages/src/sys/kern/init_sysent.c#4 integrate
.. //depot/projects/superpages/src/sys/kern/kern_acct.c#3 integrate
.. //depot/projects/superpages/src/sys/kern/kern_exec.c#6 integrate
.. //depot/projects/superpages/src/sys/kern/kern_exit.c#4 integrate
.. //depot/projects/superpages/src/sys/kern/kern_fork.c#3 integrate
.. //depot/projects/superpages/src/sys/kern/kern_sig.c#4 integrate
.. //depot/projects/superpages/src/sys/kern/kern_thread.c#4 integrate
.. //depot/projects/superpages/src/sys/kern/kern_umtx.c#3 integrate
.. //depot/projects/superpages/src/sys/kern/syscalls.c#4 integrate
.. //depot/projects/superpages/src/sys/kern/syscalls.master#4 integrate
.. //depot/projects/superpages/src/sys/kern/tty_pty.c#6 integrate
.. //depot/projects/superpages/src/sys/kern/vfs_bio.c#8 integrate
.. //depot/projects/superpages/src/sys/kern/vfs_syscalls.c#4 integrate
.. //depot/projects/superpages/src/sys/net/if.c#5 integrate
.. //depot/projects/superpages/src/sys/net/if.h#3 integrate
.. //depot/projects/superpages/src/sys/net/if_bridge.c#8 integrate
.. //depot/projects/superpages/src/sys/net/if_ethersubr.c#5 integrate
.. //depot/projects/superpages/src/sys/net/if_vlan.c#5 integrate
.. //depot/projects/superpages/src/sys/net/pfil.c#2 integrate
.. //depot/projects/superpages/src/sys/net/pfil.h#2 integrate
.. //depot/projects/superpages/src/sys/netinet/in_pcb.c#3 integrate
.. //depot/projects/superpages/src/sys/netinet/ip_dummynet.c#3 integrate
.. //depot/projects/superpages/src/sys/netinet/ip_fastfwd.c#3 integrate
.. //depot/projects/superpages/src/sys/netinet/ip_fw2.c#3 integrate
.. //depot/projects/superpages/src/sys/netinet/ip_input.c#4 integrate
.. //depot/projects/superpages/src/sys/netinet/ip_output.c#4 integrate
.. //depot/projects/superpages/src/sys/netinet6/ip6_forward.c#2 integrate
.. //depot/projects/superpages/src/sys/netinet6/ip6_input.c#4 integrate
.. //depot/projects/superpages/src/sys/netinet6/ip6_output.c#4 integrate
.. //depot/projects/superpages/src/sys/netinet6/udp6_usrreq.c#2 integrate
.. //depot/projects/superpages/src/sys/pc98/conf/NOTES#5 integrate
.. //depot/projects/superpages/src/sys/security/audit/audit.c#1 branch
.. //depot/projects/superpages/src/sys/security/audit/audit.h#1 branch
.. //depot/projects/superpages/src/sys/security/audit/audit_arg.c#1 branch
.. //depot/projects/superpages/src/sys/security/audit/audit_bsm.c#1 branch
.. //depot/projects/superpages/src/sys/security/audit/audit_bsm_klib.c#1 branch
.. //depot/projects/superpages/src/sys/security/audit/audit_bsm_token.c#1 branch
.. //depot/projects/superpages/src/sys/security/audit/audit_private.h#1 branch
.. //depot/projects/superpages/src/sys/security/audit/audit_syscalls.c#1 branch
.. //depot/projects/superpages/src/sys/security/audit/audit_trigger.c#1 branch
.. //depot/projects/superpages/src/sys/sys/proc.h#5 integrate
.. //depot/projects/superpages/src/sys/sys/sockio.h#2 integrate
.. //depot/projects/superpages/src/sys/sys/syscall.h#4 integrate
.. //depot/projects/superpages/src/sys/sys/syscall.mk#4 integrate
.. //depot/projects/superpages/src/sys/sys/sysproto.h#4 integrate
.. //depot/projects/superpages/src/sys/vm/vm_fault.c#7 integrate
.. //depot/projects/superpages/src/sys/vm/vm_pageout.c#11 integrate
.. //depot/projects/superpages/src/tools/tools/tinderbox/etc/releng_6.rc#3 integrate
.. //depot/projects/superpages/src/usr.bin/login/Makefile#2 integrate
.. //depot/projects/superpages/src/usr.bin/login/login.1#2 integrate
.. //depot/projects/superpages/src/usr.bin/login/login.c#2 integrate
.. //depot/projects/superpages/src/usr.bin/login/login.h#2 integrate
.. //depot/projects/superpages/src/usr.bin/login/login_audit.c#1 branch
.. //depot/projects/superpages/src/usr.sbin/Makefile#6 integrate
.. //depot/projects/superpages/src/usr.sbin/audit/Makefile#1 branch
.. //depot/projects/superpages/src/usr.sbin/auditd/Makefile#1 branch
.. //depot/projects/superpages/src/usr.sbin/auditreduce/Makefile#1 branch
.. //depot/projects/superpages/src/usr.sbin/config/configvers.h#3 integrate
.. //depot/projects/superpages/src/usr.sbin/config/mkmakefile.c#4 integrate
.. //depot/projects/superpages/src/usr.sbin/inetd/inetd.8#3 integrate
.. //depot/projects/superpages/src/usr.sbin/mergemaster/mergemaster.8#2 integrate
.. //depot/projects/superpages/src/usr.sbin/mergemaster/mergemaster.sh#3 integrate
.. //depot/projects/superpages/src/usr.sbin/praudit/Makefile#1 branch
.. //depot/projects/superpages/www/en/developers.sgml#6 integrate
.. //depot/projects/superpages/www/en/docproj/todo.sgml#2 integrate
.. //depot/projects/superpages/www/en/docs/books.sgml#5 integrate
.. //depot/projects/superpages/www/en/donations/wantlist.sgml#10 integrate
.. //depot/projects/superpages/www/en/projects/ideas/index.sgml#3 integrate
.. //depot/projects/superpages/www/en/releng/index.sgml#5 integrate
.. //depot/projects/superpages/www/en/snapshots/index.sgml#4 integrate
.. //depot/projects/superpages/www/fr/community/mailinglists.sgml#3 integrate
.. //depot/projects/superpages/www/fr/events/Makefile#2 integrate
.. //depot/projects/superpages/www/fr/events/events.xsl#3 integrate
.. //depot/projects/superpages/www/fr/gnome/includes.sgml#4 integrate
.. //depot/projects/superpages/www/fr/gnome/includes.xsl#3 integrate
.. //depot/projects/superpages/www/fr/gnome/index.xsl#4 integrate
.. //depot/projects/superpages/www/fr/gnome/newsflash.xsl#4 integrate
.. //depot/projects/superpages/www/fr/includes.xsl#5 integrate
.. //depot/projects/superpages/www/fr/news/oldnewsflash.xsl#2 integrate
.. //depot/projects/superpages/www/fr/news/status/status.sgml#4 integrate
.. //depot/projects/superpages/www/fr/platforms/ia64/index.xsl#3 integrate
.. //depot/projects/superpages/www/fr/platforms/ia64/todo.xsl#3 integrate
.. //depot/projects/superpages/www/fr/platforms/ppc.sgml#4 integrate
.. //depot/projects/superpages/www/fr/projects/newbies.sgml#4 integrate
.. //depot/projects/superpages/www/fr/relnotes.sgml#4 integrate

Differences ...

==== //depot/projects/superpages/doc/en_US.ISO8859-1/articles/contributors/contrib.develalumni.sgml#3 (text+ko) ====

@@ -1,7 +1,11 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.develalumni.sgml,v 1.4 2005/12/22 11:22:02 joel Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.develalumni.sgml,v 1.5 2006/02/03 18:19:15 joel Exp $ -->
 
   <itemizedlist>
     <listitem>
+      <para>&a.niklas; (2004 - 2006)</para>
+    </listitem>
+
+    <listitem>
       <para>&a.paul; (1993 - 2005)</para>
     </listitem>
 

==== //depot/projects/superpages/doc/en_US.ISO8859-1/articles/hats/article.sgml#2 (text+ko) ====

@@ -15,7 +15,7 @@
       </author>
     </authorgroup>
 
-    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/hats/article.sgml,v 1.8 2004/08/08 13:43:55 hrs Exp $</pubdate>
+    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/hats/article.sgml,v 1.9 2006/02/04 22:31:33 ceri Exp $</pubdate>
 
     <copyright>
       <year>2002</year>
@@ -79,11 +79,11 @@
   <para>Hats are answerable to core.  If they are doing good jobs,
     core will leave them alone.  If they are doing a bad job, core has
     the option to remove them.  Hats are expected to work with core if
-    core has issues with their performance of their duties They serve
+    core has issues with their performance of their duties.  They serve
     at the pleasure of core.</para>
 
   <para>Core sometimes will impose additional, specific requirements
-    for a given hat that does not apply to all hats.  These conditions
+    for a given hat that do not apply to all hats.  These conditions
     may change over time.</para>
 
   <para>Committers and others working with hats are expected to use

==== //depot/projects/superpages/doc/en_US.ISO8859-1/articles/p4-primer/article.sgml#2 (text+ko) ====

@@ -23,7 +23,7 @@
       </author>
     </authorgroup>
 
-    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/p4-primer/article.sgml,v 1.1 2005/11/24 20:03:47 blackend Exp $</pubdate>
+    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/p4-primer/article.sgml,v 1.2 2006/02/04 11:10:40 brueffer Exp $</pubdate>
 
     <legalnotice id="trademarks" role="trademarks">
       &tm-attrib.freebsd;
@@ -477,8 +477,8 @@
         MFP4 after:</programlisting>
 
   <para>It is good practice to provide at least 2-3 sentences that
-    describe what the changes are that you are submitting.  You say
-    should what the change does, why it was done that way or what
+    describe what the changes are that you are submitting.  You should
+    say what the change does, why it was done that way or what
     problem is solves, and what APIs it might change or other side
     effects it might have.  This text should replace the
     <literal>&lt;enter description here&gt;</literal> line in the template.

==== //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/audit/chapter.sgml#2 (text+ko) ====

@@ -1,17 +1,9 @@
 <!--
      The FreeBSD Documentation Project
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/audit/chapter.sgml,v 1.5 2005/08/13 10:45:01 delphij Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/audit/chapter.sgml,v 1.9 2006/02/04 21:08:50 rwatson Exp $
 -->
 
-<!--
-This version of the document assumes that the Audit system needs to be 
-installed as part of the trustedbsd/audit project. When/if audit becomes
-part of FreeBSD proper, then these sections should be removed, or at least
-reworded. The sections in question are marked with 'PROTOTYPE' labels in
-commentary.
--->
-
-<!-- Need more documenation on praudit, audtreduce, etc.  Plus more info
+<!-- Need more documentation on praudit, auditreduce, etc.  Plus more info
 on the triggers from the kernel (log rotation, out of space, etc).
 And the /dev/audit special file if we choose to support that.  Could use
 some coverage of integrating MAC with Event auditing and perhaps discussion
@@ -29,23 +21,31 @@
     </authorgroup>
   </chapterinfo>
 
-  <title>Kernel Event Auditing</title>
+  <title>Security Event Auditing</title>
 
   <sect1 id="audit-synopsis">
     <title>Synopsis</title>
 
     <indexterm><primary>AUDIT</primary></indexterm>
     <indexterm>
-      <primary>Kernel Event Auditing</primary>
+      <primary>Security Event Auditing</primary>
       <see>MAC</see>
     </indexterm>
 
-    <para>The &os;&nbsp;6.0 operating system release has included
+    <para>The &os;&nbsp;7-CURRENT development branch includes
       support for Event Auditing based on the &posix;.1e draft and
-      the &sun; <acronym>BSM</acronym> implementation.  Event auditing
-      permits the selective logging of security-relevant system events
-      for the purposes of system analysis, system monitoring, and
-      security evaluation.</para>
+      the &sun;'s published <acronym>BSM</acronym> API and file format.
+      Event auditing permits the selective logging of security-relevant
+      system events for the purposes of post-mortem analysis, system
+      monitoring, and intrusion detection.  After some settling time in
+      &os;&nbsp;7-CURRENT, this support will be merged to &os;&nbsp;6-STABLE
+      and appear in subsequent releases.</para>
+
+    <warning>
+      <para>The audit facility in FreeBSD is considered experimental, and
+	production deployment should occur only after careful consideration
+	of the risks of deploying experimental software.</para>
+    </warning>
 
     <para>This chapter will focus mainly on the installation and
       configuration of Event Auditing.  Explanation of audit policies,
@@ -87,16 +87,17 @@
 
     <warning>
       <para>Event auditing can generate a great deal of log file
-	data, exceeding gigabytes a week in some configurations.  An administrator
-	should read this chapter in its entirety to avoid possible
-	self inflicted <acronym>DoS</acronym> attacks due to improper
-	configuration.</para>
+	data, exceeding gigabytes a week in some configurations.  An
+	administrator should read this chapter in its entirety to avoid
+	possible self inflicted <acronym>DoS</acronym> attacks due to
+	improper configuration.</para>
     </warning>
 
     <para>The implementation of Event Auditing in &os; is similar to
       that of the &sun; Basic Security Module, or <acronym>BSM</acronym>
       library.  Thus, the configuration is almost completely
-      interchangeable with &solaris; and Darwin operating systems.</para>
+      interchangeable with &solaris; and Mac OS X/Darwin operating
+      systems.</para>
   </sect1>
 
   <sect1 id="audit-inline-glossary">
@@ -109,23 +110,48 @@
 
     <itemizedlist>
       <listitem>
-        <para><emphasis>class</emphasis>: A class specifies the category
-	  different actions the system are placed in.  For example,
-	  use of &man.login.1; could be placed in a class.</para>
+	<para><emphasis>event</emphasis>: An auditable event is
+	  an event that can be logged using the audit subsystem.  The
+	  administrator can configure which events will be audited.
+	  Examples of security-relevant events include the creation of
+	  a file, the building of a network connection, or the logging
+	  in of a user.  Events are either <quote>attributable</quote>,
+	  meaning that they can be traced back to a user
+	  authentication, or <quote>non-attributable</quote>.  Examples
+	  of non-attributable events are any events that occur before
+	  authentication has succeeded in the login process, such as
+	  failed authentication attempts.</para>
       </listitem>
 
       <listitem>
-	<para><emphasis>event</emphasis>: An event could be considered
-	  an action taken on the system.  Creating a file would be
-	  an event.</para>
+        <para><emphasis>class</emphasis>: Events may be assigned to
+	  one or more classes, usually based on the general category
+	  of the events, such as <quote>file creation</quote>,
+	  <quote>file access</quote>, or <quote>network</quote>.  Login
+	  and logout events are assigned to the <literal>lo</literal>
+	  class.  The use of classes allows the administrator to
+	  specify high level auditing rules without having to specify
+	  whether each individual auditable operation will be logged.</para>
       </listitem>
 
       <listitem>
-	<para><emphasis>record</emphasis>: A record is a log or a note
-	  about a specific action.</para>
+	<para><emphasis>record</emphasis>: A record is a log entry
+	  describing a security event.  Records typically have a
+	  record event type, information on the subject (user) associated
+	  with the event, time information, information on any objects,
+	  such as files, and information on whether the event corresponded
+	  to a successful operation.</para>
       </listitem>
 
       <listitem>
+	<para><emphasis>trail</emphasis>: An audit trail, or log file,
+	  consists of a series of audit records describing security
+	  events.  Typically, trails are in roughly chronological
+	  order with respect to the time events completed.  Only
+	  authorized processes are allowed to commit records to the
+	  audit trail.</para>
+
+      <listitem>
 	<para><emphasis>prefix</emphasis>: A prefix is considered to
 	  be the configuration element used to toggle auditing for
 	  success and failed events.</para>
@@ -136,7 +162,7 @@
   <sect1 id="audit-install">
     <title>Installing Audit Support</title>
 
-    <para>Support for Event Auditing should have been installed with
+    <para>Support for Event Auditing is installed with
       the normal <maketarget>installworld</maketarget> process.  An
       administrator may confirm this by viewing the contents
       of <filename role="directory">/etc/security</filename>.  Files
@@ -190,21 +216,19 @@
 
       <listitem>
 	<para><filename>audit_user</filename> - The events to audit
-	  for individual users.  A user name does not need to appear
-	  in here.</para>
+	  for individual users.  Users not appearing here will be
+	  subject to the default configuration in the control
+	  configuration file.</para>
       </listitem>
 
       <listitem>
 	<para><filename>audit_warn</filename> - A shell script
-	  used by auditd to form warning messages.</para>
+	  used by auditd to generate warning messages in
+	  exceptional situations, such as when space for audit
+	  records is running low.</para>
       </listitem>
     </itemizedlist>
 
-    <para>If these files do not exist, for whatever reason, they can
-      be installed easily by issuing the following commands:</para>
-
-    <screen>&prompt.root; <userinput>cd /usr/src/contrib/bsm/etc &amp;&amp; make install</userinput></screen>
-
     <sect2>
       <title>Audit File Syntax</title>
 
@@ -325,11 +349,6 @@
 	    Audit process operations, such as &man.exec.3; and
 	    &man.exit.3;.</para>
 	</listitem>
-
-	<listitem>
-	  <para><option>tf</option> - <literal>tfm</literal> -
-	    I HAVE NO CLUE!</para>
-	</listitem>
       </itemizedlist>
 
       <para>Following is a list of all supported audit prefixes:</para>
@@ -391,24 +410,30 @@
       <sect3 id="audit-auditcontrol">
         <title>The <filename>audit_control</filename> File</title>
 
-	<para>The <filename>audit_control</filename> contains some basic
+	<para>The <filename>audit_control</filename> file contains some basic
 	  defaults that the administrator may wish to modify.  Perhaps
 	  even set some new ones.  Viewing the contents of this file,
 	  we see the following:</para>
 
 	<programlisting>dir:/var/audit
-flags:lo,ad,-all,^-fa,^-fc,^-cl
+flags:lo
 minfree:20
 naflags:lo</programlisting>
 
-	<para>The <option>dir</option> is used to set the default
-	  directory where audit logs are stored.</para>
+	<para>The <option>dir</option> option is used to set the default
+	  directory where audit logs are stored.  Audit is frequently
+	  configured so that audit logs are stored on a dedicated file
+	  system, so as to prevent interference between the audit
+	  subsystem and other subsystems when file systems become full.
+	  </para>
 
-	<para>The <option>flags</option> is used to set the system-wide
-	  defaults.  The current setting,
+	<para>The <option>flags</option> option is used to set the
+	  system-wide defaults.  The current setting, <option>lo</option>
+	  configures the auditing of all &man.login.1; and &man.logout.1;
+	  actions.  A more complex example,
 	  <option>lo,ad,-all,^-fa,^-fc,^-cl</option> audits all system
 	  &man.login.1; and &man.logout.1; actions, all administrator
-	  actions, all failed events in the system, and finally disable
+	  actions, all failed events in the system, and finally disables
 	  auditing of failed attempts for <option>fa</option>,
 	  <option>fc</option>, and <option>cl</option>.  Even though
 	  the <option>-all</option> turned on the auditing of all
@@ -431,19 +456,17 @@
 	  to eighty (80) percent full.</para>
 
 	<para>The <option>naflags</option> option specifies audit
-	  flags to be considered non attributable; i.e.: classes of
-	  events which cannot be attributed to a specific user
-	  on the system.  This can be overridden with the
-	  <filename>audit_user</filename> configuration file.</para>
+	  classes to be audited for non-attributed events &mdash;
+	  that is, events for which there is no authenticated user.
+	  </para>
       </sect3>
 
       <sect3 id="audit-audituser">
 	<title>The <filename>audit_user</filename> File</title>
 
-	<para>The <filename>audit_user</filename> permits the
-	  administrator to map audit specific events to directly
-	  to users.  This adds a finer-grained control mechanism
-	  for all system users.</para>
+	<para>The <filename>audit_user</filename> file permits the
+	  administrator to determine which classes of audit events
+	  should be logged for which system users.</para>
 
 	<para>The following is the defaults currently placed in
 	  the <filename>audit_user</filename> file:</para>
@@ -459,7 +482,7 @@
 	  other auditing for the <username>audit</username>
 	  user.  While event auditing does not require a special
 	  user exist, some configurations, specifically environments
-	  making use of <acronym>MAC</acronym> may require it.</para>
+	  making use of <acronym>MAC</acronym>, may require it.</para>
       </sect3>
     </sect2>
   </sect1>
@@ -467,16 +490,17 @@
   <sect1 id="audit-administration">
     <title>Event Audit Administration</title>
 
-    <para>Events from the <command>auditd</command> daemon cannot
+    <para>Events written by the kernel audit subsystem cannot
       be altered or read in plain text.  Data is stored and accessed
-      in a method similar to that of &man.ktrace.1; and &man.kdump.1,
+      in a method similar to that of &man.ktrace.1; and &man.kdump.1;,
       that is, they may only be viewed by dumping them using the
-      <command>praudit</command> or <command>auditreduce</command>
-      utilities.</para>
+      <command>praudit</command> command; audit trails may be reduced
+      using the <command>auditreduce</command> command, which selects
+      records from an audit trail based on properties of interest, such
+      as the user, time of the event, and type of operation.</para>
 
-    <para>There are two utilities because of different requirements.
-      For example, the <command>praudit</command> will dump the entire
-      contents of a specified audit log in plain text.  To dump an
+    <para>For example, the <command>praudit</command> utility will dump the
+      entire contents of a specified audit log in plain text.  To dump an
       audit log in its entirety, use:</para>
 
     <screen>&prompt.root; <userinput>praudit /var/audit/AUDITFILE</userinput></screen>
@@ -488,7 +512,7 @@
       command, where <username>trhodes</username> is the user of
       choice:</para>
 
-    <screen>&prompt.root; <userinput>auditreduce -e trhodes /var/audit/AUDITFILE</userinput></screen>
+    <screen>&prompt.root; <userinput>auditreduce -e trhodes /var/audit/AUDITFILE | praudit</userinput></screen>
 
     <para>This will select all audit records produced by the user
       <username>trhodes</username> stored in the
@@ -501,13 +525,17 @@
     <sect2>
       <title>Rotating Audit Log Files</title>
 
-      <para>Manually rotating audit log files will cause great
-	havoc within the system.  Therefore, adding a line to
-	&man.newsyslog.conf.5; will provide no usefulness.  So how
-	are the logs to be rotated?  Sending the appropriate flag
-	to the <command>audit</command> utility will shut down
-	event auditing and safely rotate.  The following command
-	should handle everything for an administrator:</para>
+      <para>Because of log reliability requirements, audit trails
+	are written to only by the kernel, and managed only by
+	<command>auditd</command>.  Administrators should not
+	attempt to use &man.newsyslog.conf.5; or other tools to
+	directly rotate audit logs.  Instead, the <command>audit</command>
+	management tool should be used to shut down auditing,
+	reconfigure the audit system, and perform log rotation.
+	The following command causes the audit daemon to create a
+	new audit log and signal the kernel to switch to using the
+	new log.  The old log will be terminated and renamed, at
+	which point it may then be manipulated by the administrator.</para>
 
       <screen>&prompt.root; <userinput>audit -n</userinput></screen>
 

==== //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/book.sgml#3 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/book.sgml,v 1.163 2005/12/18 17:02:57 blackend Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/book.sgml,v 1.164 2006/02/03 20:25:58 brueffer Exp $
 -->
 
 <!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -46,6 +46,7 @@
 <!ENTITY % chap.index "IGNORE">
 <!ENTITY % chap.freebsd-glossary "IGNORE">
 <!ENTITY % chap.mac "IGNORE">
+<!ENTITY % chap.audit "IGNORE">
 
 <!ENTITY % pgpkeys SYSTEM "../../../share/pgpkeys/pgpkeys.ent"> %pgpkeys;
 ]>
@@ -70,6 +71,7 @@
       <year>2003</year>
       <year>2004</year>
       <year>2005</year>
+      <year>2006</year>
       <holder>The FreeBSD Documentation Project</holder>
     </copyright>
 
@@ -261,6 +263,7 @@
     <![ %chap.users;                    [ &chap.users;                ]]>
     <![ %chap.security;                 [ &chap.security;             ]]>
     <![ %chap.mac;			[ &chap.mac;		      ]]>
+    <![ %chap.audit;			[ &chap.audit;		      ]]>
     <![ %chap.disks;                    [ &chap.disks;                ]]>
     <![ %chap.geom;			[ &chap.geom;		      ]]>
     <![ %chap.vinum;                    [ &chap.vinum;                ]]>

==== //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/chapters.ent#2 (text+ko) ====

@@ -6,7 +6,7 @@
    
      Chapters should be listed in the order in which they are referenced.
  
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/chapters.ent,v 1.32 2005/08/06 03:22:18 trhodes Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/chapters.ent,v 1.33 2006/02/03 20:25:59 brueffer Exp $
 -->
 
 <!ENTITY chap.preface			SYSTEM "preface/preface.sgml">
@@ -31,6 +31,7 @@
 <!ENTITY chap.users			SYSTEM "users/chapter.sgml">
 <!ENTITY chap.security			SYSTEM "security/chapter.sgml">
 <!ENTITY chap.mac			SYSTEM "mac/chapter.sgml">
+<!ENTITY chap.audit			SYSTEM "audit/chapter.sgml">
 <!ENTITY chap.disks			SYSTEM "disks/chapter.sgml">
 <!ENTITY chap.geom			SYSTEM "geom/chapter.sgml">
 <!ENTITY chap.vinum			SYSTEM "vinum/chapter.sgml">

==== //depot/projects/superpages/doc/share/sgml/man-refs.ent#5 (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.365 2005/12/31 16:46:44 brueffer Exp $
+     $FreeBSD: doc/share/sgml/man-refs.ent,v 1.367 2006/02/04 21:43:38 brueffer Exp $
 -->
 
 <!ENTITY man...1 "<citerefentry/<refentrytitle/[/<manvolnum/1//">
@@ -46,6 +46,7 @@
 <!ENTITY man.at.1 "<citerefentry/<refentrytitle/at/<manvolnum/1//">
 <!ENTITY man.atq.1 "<citerefentry/<refentrytitle/atq/<manvolnum/1//">
 <!ENTITY man.atrm.1 "<citerefentry/<refentrytitle/atrm/<manvolnum/1//">
+<!ENTITY man.auditreduce.1 "<citerefentry/<refentrytitle/auditreduce/<manvolnum/1//">
 <!ENTITY man.awk.1 "<citerefentry/<refentrytitle/awk/<manvolnum/1//">
 <!ENTITY man.b64decode.1 "<citerefentry/<refentrytitle/b64decode/<manvolnum/1//">
 <!ENTITY man.b64encode.1 "<citerefentry/<refentrytitle/b64encode/<manvolnum/1//">
@@ -493,6 +494,7 @@
 <!ENTITY man.portlint.1 "<citerefentry vendor='ports'/<refentrytitle/portlint/<manvolnum/1//">
 <!ENTITY man.portupgrade.1 "<citerefentry vendor='ports'/<refentrytitle/portupgrade/<manvolnum/1//">
 <!ENTITY man.pr.1 "<citerefentry/<refentrytitle/pr/<manvolnum/1//">
+<!ENTITY man.praudit.1 "<citerefentry/<refentrytitle/praudit/<manvolnum/1//">
 <!ENTITY man.printenv.1 "<citerefentry/<refentrytitle/printenv/<manvolnum/1//">
 <!ENTITY man.printf.1 "<citerefentry/<refentrytitle/printf/<manvolnum/1//">
 <!ENTITY man.ps.1 "<citerefentry/<refentrytitle/ps/<manvolnum/1//">
@@ -1208,6 +1210,12 @@
 <!ENTITY man.attroff.3 "<citerefentry/<refentrytitle/attroff/<manvolnum/3//">
 <!ENTITY man.attron.3 "<citerefentry/<refentrytitle/attron/<manvolnum/3//">
 <!ENTITY man.attrset.3 "<citerefentry/<refentrytitle/attrset/<manvolnum/3//">
+<!ENTITY man.au.class.3 "<citerefentry/<refentrytitle/au_class/<manvolnum/3//">
+<!ENTITY man.au.mask.3 "<citerefentry/<refentrytitle/au_mask/<manvolnum/3//">
+<!ENTITY man.au.notify.3 "<citerefentry/<refentrytitle/au_notify/<manvolnum/3//">
+<!ENTITY man.au.stream.3 "<citerefentry/<refentrytitle/au_stream/<manvolnum/3//">
+<!ENTITY man.au.token.3 "<citerefentry/<refentrytitle/au_token/<manvolnum/3//">
+<!ENTITY man.au.user.3 "<citerefentry/<refentrytitle/au_user/<manvolnum/3//">
 <!ENTITY man.auth.3 "<citerefentry/<refentrytitle/auth/<manvolnum/3//">
 <!ENTITY man.auth.cat.3 "<citerefentry/<refentrytitle/auth_cat/<manvolnum/3//">
 <!ENTITY man.auth.checknologin.3 "<citerefentry/<refentrytitle/auth_checknologin/<manvolnum/3//">
@@ -2088,6 +2096,7 @@
 <!ENTITY man.libarchive.3 "<citerefentry/<refentrytitle/libarchive/<manvolnum/3//">
 <!ENTITY man.libautofs.3 "<citerefentry/<refentrytitle/libautofs/<manvolnum/3//">
 <!ENTITY man.libbsdxml.3 "<citerefentry/<refentrytitle/libbsdxml/<manvolnum/3//">
+<!ENTITY man.libbsm.3 "<citerefentry/<refentrytitle/libbsm/<manvolnum/3//">
 <!ENTITY man.libdisk.3 "<citerefentry/<refentrytitle/libdisk/<manvolnum/3//">
 <!ENTITY man.libgeom.3 "<citerefentry/<refentrytitle/libgeom/<manvolnum/3//">
 <!ENTITY man.libmp.3 "<citerefentry/<refentrytitle/libmp/<manvolnum/3//">
@@ -3243,6 +3252,7 @@
 <!ENTITY man.ccd.4 "<citerefentry/<refentrytitle/ccd/<manvolnum/4//">
 <!ENTITY man.cd.4 "<citerefentry/<refentrytitle/cd/<manvolnum/4//">
 <!ENTITY man.cdce.4 "<citerefentry/<refentrytitle/cdce/<manvolnum/4//">
+<!ENTITY man.ce.4 "<citerefentry/<refentrytitle/ce/<manvolnum/4//">
 <!ENTITY man.central.4 "<citerefentry/<refentrytitle/central/<manvolnum/4//">
 <!ENTITY man.ch.4 "<citerefentry/<refentrytitle/ch/<manvolnum/4//">
 <!ENTITY man.clkbrd.4 "<citerefentry/<refentrytitle/clkbrd/<manvolnum/4//">
@@ -3700,6 +3710,12 @@
 <!ENTITY man.aliases.5 "<citerefentry/<refentrytitle/aliases/<manvolnum/5//">
 <!ENTITY man.amd.conf.5 "<citerefentry/<refentrytitle/amd.conf/<manvolnum/5//">
 <!ENTITY man.ar.5 "<citerefentry/<refentrytitle/ar/<manvolnum/5//">
+<!ENTITY man.audit.class.5 "<citerefentry/<refentrytitle/audit_class/<manvolnum/5//">
+<!ENTITY man.audit.control.5 "<citerefentry/<refentrytitle/audit_control/<manvolnum/5//">
+<!ENTITY man.audit.event.5 "<citerefentry/<refentrytitle/audit_event/<manvolnum/5//">
+<!ENTITY man.audit.log.5 "<citerefentry/<refentrytitle/audit.log/<manvolnum/5//">
+<!ENTITY man.audit.user.5 "<citerefentry/<refentrytitle/audit_user/<manvolnum/5//">
+<!ENTITY man.audit.warn.5 "<citerefentry/<refentrytitle/audit_warn/<manvolnum/5//">
 <!ENTITY man.auth.conf.5 "<citerefentry/<refentrytitle/auth.conf/<manvolnum/5//">
 <!ENTITY man.bootparams.5 "<citerefentry/<refentrytitle/bootparams/<manvolnum/5//">
 <!ENTITY man.bootptab.5 "<citerefentry/<refentrytitle/bootptab/<manvolnum/5//">
@@ -3975,6 +3991,8 @@
 <!ENTITY man.atmarpd.8 "<citerefentry/<refentrytitle/atmarpd/<manvolnum/8//">
 <!ENTITY man.atmconfig.8 "<citerefentry/<refentrytitle/atmconfig/<manvolnum/8//">
 <!ENTITY man.atrun.8 "<citerefentry/<refentrytitle/atrun/<manvolnum/8//">
+<!ENTITY man.audit.8 "<citerefentry/<refentrytitle/audit/<manvolnum/8//">
+<!ENTITY man.auditd.8 "<citerefentry/<refentrytitle/auditd/<manvolnum/8//">
 <!ENTITY man.authpf.8 "<citerefentry/<refentrytitle/authpf/<manvolnum/8//">
 <!ENTITY man.badsect.8 "<citerefentry/<refentrytitle/badsect/<manvolnum/8//">
 <!ENTITY man.bcmfw.8 "<citerefentry/<refentrytitle/bcmfw/<manvolnum/8//">
@@ -4990,6 +5008,7 @@
 <!ENTITY man.untimeout.9 "<citerefentry/<refentrytitle/untimeout/<manvolnum/9//">
 <!ENTITY man.updatepri.9 "<citerefentry/<refentrytitle/updatepri/<manvolnum/9//">
 <!ENTITY man.uprintf.9 "<citerefentry/<refentrytitle/uprintf/<manvolnum/9//">
+<!ENTITY man.usbdi.9 "<citerefentry/<refentrytitle/usbdi/<manvolnum/9//">
 <!ENTITY man.useracc.9 "<citerefentry/<refentrytitle/useracc/<manvolnum/9//">
 <!ENTITY man.vaccess.9 "<citerefentry/<refentrytitle/vaccess/<manvolnum/9//">
 <!ENTITY man.vaccess.acl.posix1e.9 "<citerefentry/<refentrytitle/vaccess_acl_posix1e/<manvolnum/9//">

==== //depot/projects/superpages/src/ObsoleteFiles.inc#5 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.26 2006/01/18 18:48:42 netchild Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.27 2006/02/04 08:07:00 avatar Exp $
 #
 # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
 # directories (OLD_DIRS) which should get removed at an update. Recently
@@ -297,10 +297,11 @@
 # 200308XX
 OLD_FILES+=usr/sbin/amldb
 OLD_FILES+=usr/share/man/man8/amldb.8.gz
+# 200307XX
+OLD_FILES+=sbin/mount_nwfs
+OLD_FILES+=sbin/mount_portalfs
+OLD_FILES+=sbin/mount_smbfs
 # 200306XX
-OLD_FILES+=bin/mount_nwfs
-OLD_FILES+=bin/mount_portalfs
-OLD_FILES+=bin/mount_smbfs
 OLD_FILES+=usr/sbin/dev_mkdb
 OLD_FILES+=usr/share/man/man8/dev_mkdb.8.gz
 # 200304XX

==== //depot/projects/superpages/src/bin/sh/error.c#2 (text+ko) ====

@@ -36,7 +36,7 @@
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/error.c,v 1.25 2004/04/06 20:06:51 markm Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/error.c,v 1.26 2006/02/04 14:37:50 schweikh Exp $");
 
 /*
  * Errors and exceptions.
@@ -118,7 +118,7 @@
 	 * This doesn't seem to be needed, since main() emits a newline.
 	 */
 #if 0
-	if (tcgetpgrp(0) == getpid())	
+	if (tcgetpgrp(0) == getpid())
 		write(STDERR_FILENO, "\n", 1);
 #endif
 	if (rootshell && iflag)

==== //depot/projects/superpages/src/bin/sh/eval.c#3 (text+ko) ====

@@ -36,7 +36,7 @@
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.49 2005/12/04 18:44:21 stefanf Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.50 2006/02/04 14:37:50 schweikh Exp $");
 
 #include <paths.h>
 #include <signal.h>
@@ -671,15 +671,15 @@
 		for (sp = varlist.list ; sp ; sp = sp->next)
 			if (strncmp(sp->text, PATH, sizeof(PATH) - 1) == 0) {
 				path = sp->text + sizeof(PATH) - 1;
-				/* 
+				/*
 				 * On `PATH=... command`, we need to make
 				 * sure that the command isn't using the
 				 * non-updated hash table of the outer PATH
-				 * setting and we need to make sure that 
+				 * setting and we need to make sure that
 				 * the hash table isn't filled with items
 				 * from the temporary setting.
 				 *
-				 * It would be better to forbit using and 
+				 * It would be better to forbit using and
 				 * updating the table while this command
 				 * runs, by the command finding mechanism
 				 * is heavily integrated with hash handling,

==== //depot/projects/superpages/src/bin/sh/expand.c#2 (text+ko) ====

@@ -36,7 +36,7 @@
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.48 2005/09/06 19:30:00 rse Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.49 2006/02/04 14:37:50 schweikh Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
@@ -100,7 +100,7 @@
 STATIC int varisset(char *, int);
 STATIC void varvalue(char *, int, int);
 STATIC void recordregion(int, int, int);
-STATIC void removerecordregions(int); 
+STATIC void removerecordregions(int);
 STATIC void ifsbreakup(char *, struct arglist *);
 STATIC void expandmeta(struct strlist *, int);
 STATIC void expmeta(char *, char *);
@@ -309,7 +309,7 @@
 }
 
 
-STATIC void 
+STATIC void
 removerecordregions(int endoff)
 {
 	if (ifslastp == NULL)
@@ -332,7 +332,7 @@
 		}
 		return;
 	}
-	
+
 	ifslastp = &ifsfirst;
 	while (ifslastp->next && ifslastp->next->begoff < endoff)
 		ifslastp=ifslastp->next;
@@ -576,7 +576,7 @@
 			}
 			loc--;
 			if ((varflags & VSQUOTE) && loc > startp &&
-			    *(loc - 1) == CTLESC) { 
+			    *(loc - 1) == CTLESC) {
 				for (q = startp; q < loc; q++)
 					if (*q == CTLESC)
 						q++;
@@ -750,9 +750,9 @@
 		if (!set) {
 			if (subevalvar(p, var, 0, subtype, startloc, varflags)) {
 				varflags &= ~VSNUL;
-				/* 
-				 * Remove any recorded regions beyond 
-				 * start of variable 
+				/*
+				 * Remove any recorded regions beyond
+				 * start of variable
 				 */
 				removerecordregions(startloc);
 				goto again;
@@ -972,7 +972,7 @@
 		do {
 			p = string + ifsp->begoff;
 			nulonly = ifsp->nulonly;
-			ifs = nulonly ? nullstr : 
+			ifs = nulonly ? nullstr :
 				( ifsset() ? ifsval() : " \t\n" );
 			ifsspc = 0;
 			while (p < string + ifsp->endoff) {

==== //depot/projects/superpages/src/bin/sh/jobs.c#3 (text+ko) ====

@@ -36,7 +36,7 @@
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/jobs.c,v 1.70 2005/12/14 17:26:29 maxim Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/jobs.c,v 1.71 2006/02/04 14:37:50 schweikh Exp $");
 
 #include <fcntl.h>
 #include <signal.h>
@@ -353,7 +353,7 @@
 				    WEXITSTATUS(ps->status));
 		} else {
 #if JOBS
-			if (WIFSTOPPED(ps->status)) 
+			if (WIFSTOPPED(ps->status))
 				i = WSTOPSIG(ps->status);
 			else
 #endif
@@ -787,7 +787,7 @@
 			    ! fd0_redirected_p ()) {
 				close(0);
 				if (open(_PATH_DEVNULL, O_RDONLY) != 0)
-					error("Can't open %s: %s", 
+					error("Can't open %s: %s",
 					    _PATH_DEVNULL, strerror(errno));
 			}
 		}

==== //depot/projects/superpages/src/bin/sh/main.c#2 (text+ko) ====

@@ -42,7 +42,7 @@
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/main.c,v 1.26 2004/04/06 20:06:51 markm Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/main.c,v 1.27 2006/02/04 14:47:19 schweikh Exp $");
 
 #include <stdio.h>
 #include <signal.h>
@@ -155,6 +155,8 @@
 	procargs(argc, argv);
 	if (getpwd() == NULL && iflag)
 		out2str("sh: cannot determine working directory\n");
+	if (getpwd() != NULL)
+		setvar ("PWD", getpwd(), VEXPORT);
 	if (argv[0] && argv[0][0] == '-') {
 		state = 1;
 		read_profile("/etc/profile");

==== //depot/projects/superpages/src/bin/sh/miscbltin.c#3 (text+ko) ====

@@ -36,7 +36,7 @@
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/miscbltin.c,v 1.34 2005/10/28 10:45:19 stefanf Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/miscbltin.c,v 1.35 2006/02/04 14:37:50 schweikh Exp $");
 
 /*
  * Miscellaneous builtins.
@@ -401,7 +401,7 @@
 		}
 	}
 	if (all) {
-		for (l = limits; l->name; l++) { 
+		for (l = limits; l->name; l++) {
 			char optbuf[40];
 			if (getrlimit(l->cmd, &limit) < 0)
 				error("can't get limit: %s", strerror(errno));

==== //depot/projects/superpages/src/bin/sh/var.c#2 (text+ko) ====

@@ -36,7 +36,7 @@
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/var.c,v 1.29 2005/09/09 21:03:34 stefanf Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/var.c,v 1.30 2006/02/04 14:38:37 schweikh Exp $");
 
 #include <unistd.h>
 #include <stdlib.h>
@@ -124,7 +124,7 @@
 STATIC int localevar(char *);
 
 /*
- * Initialize the varable symbol tables and import the environment
+ * Initialize the variable symbol tables and import the environment.
  */
 
 #ifdef mkinit
@@ -208,7 +208,7 @@
 }
 
 /*
- * Set the value of a variable.  The flags argument is tored with the
+ * Set the value of a variable.  The flags argument is stored with the
  * flags of the variable.  If val is NULL, the variable is unset.
  */
 


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