svn commit: r202189 - in user/ed/utmpx: etc/rc.d games/fortune/datfiles lib/libc/gen lib/libc/net lib/libc/sys lib/libelf lib/libpmc sbin/fsck_ffs sbin/ifconfig share/man/man3 share/man/man4 sys/am...

Wed Jan 13 17:45:40 UTC 2010

Author: ed
Date: Wed Jan 13 17:45:39 2010
New Revision: 202189
URL: http://svn.freebsd.org/changeset/base/202189

Log:
  Merge HEAD, so I can cherry pick my changes that need to go in to HEAD.

Added:
  user/ed/utmpx/share/man/man4/uhso.4
     - copied unchanged from r202188, head/share/man/man4/uhso.4
  user/ed/utmpx/sys/dev/usb/net/uhso.c
     - copied unchanged from r202188, head/sys/dev/usb/net/uhso.c
  user/ed/utmpx/sys/modules/usb/uhso/
     - copied from r202188, head/sys/modules/usb/uhso/
  user/ed/utmpx/usr.sbin/uhsoctl/
     - copied from r202188, head/usr.sbin/uhsoctl/
Modified:
  user/ed/utmpx/games/fortune/datfiles/freebsd-tips
  user/ed/utmpx/lib/libc/gen/Makefile.inc
  user/ed/utmpx/lib/libc/gen/sem_init.3
  user/ed/utmpx/lib/libc/gen/sem_new.c
  user/ed/utmpx/lib/libc/gen/sem_open.3
  user/ed/utmpx/lib/libc/net/sctp_bindx.3
  user/ed/utmpx/lib/libc/net/sctp_connectx.3
  user/ed/utmpx/lib/libc/net/sctp_getaddrlen.3
  user/ed/utmpx/lib/libc/net/sctp_getassocid.3
  user/ed/utmpx/lib/libc/net/sctp_getpaddrs.3
  user/ed/utmpx/lib/libc/net/sctp_opt_info.3
  user/ed/utmpx/lib/libc/net/sctp_recvmsg.3
  user/ed/utmpx/lib/libc/net/sctp_send.3
  user/ed/utmpx/lib/libc/net/sctp_sendmsg.3
  user/ed/utmpx/lib/libc/sys/sctp_generic_recvmsg.2
  user/ed/utmpx/lib/libc/sys/sctp_generic_sendmsg.2
  user/ed/utmpx/lib/libc/sys/sctp_peeloff.2
  user/ed/utmpx/lib/libelf/elf.3
  user/ed/utmpx/lib/libpmc/libpmc.c
  user/ed/utmpx/sbin/fsck_ffs/pass2.c
  user/ed/utmpx/sbin/ifconfig/ifieee80211.c
  user/ed/utmpx/share/man/man3/pthread_affinity_np.3
  user/ed/utmpx/share/man/man3/pthread_attr_affinity_np.3
  user/ed/utmpx/share/man/man4/Makefile
  user/ed/utmpx/share/man/man4/ath.4
  user/ed/utmpx/share/man/man4/cpufreq.4
  user/ed/utmpx/share/man/man4/snd_hda.4
  user/ed/utmpx/share/man/man4/vge.4
  user/ed/utmpx/sys/amd64/amd64/local_apic.c
  user/ed/utmpx/sys/boot/forth/loader.conf
  user/ed/utmpx/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
  user/ed/utmpx/sys/compat/linux/linux_file.c
  user/ed/utmpx/sys/compat/linux/linux_misc.c
  user/ed/utmpx/sys/compat/linux/linux_uid16.c
  user/ed/utmpx/sys/compat/svr4/svr4_misc.c
  user/ed/utmpx/sys/conf/NOTES
  user/ed/utmpx/sys/conf/files
  user/ed/utmpx/sys/dev/aic7xxx/aic79xx_pci.c
  user/ed/utmpx/sys/dev/ath/ath_hal/ar5210/ar5210_reset.c
  user/ed/utmpx/sys/dev/ath/if_ath.c
  user/ed/utmpx/sys/dev/ct/ct_isa.c
  user/ed/utmpx/sys/dev/mly/mly.c
  user/ed/utmpx/sys/dev/mxge/eth_z8e.h
  user/ed/utmpx/sys/dev/mxge/ethp_z8e.h
  user/ed/utmpx/sys/dev/mxge/if_mxge.c
  user/ed/utmpx/sys/dev/mxge/rss_eth_z8e.h
  user/ed/utmpx/sys/dev/mxge/rss_ethp_z8e.h
  user/ed/utmpx/sys/dev/sound/pci/hda/hdac.c
  user/ed/utmpx/sys/dev/sound/pci/hda/hdac_private.h
  user/ed/utmpx/sys/dev/sound/pcm/dsp.c
  user/ed/utmpx/sys/dev/sound/pcm/mixer.c
  user/ed/utmpx/sys/dev/usb/usbdevs
  user/ed/utmpx/sys/fs/tmpfs/tmpfs.h
  user/ed/utmpx/sys/fs/tmpfs/tmpfs_vfsops.c
  user/ed/utmpx/sys/i386/i386/local_apic.c
  user/ed/utmpx/sys/i386/ibcs2/ibcs2_misc.c
  user/ed/utmpx/sys/kern/kern_jail.c
  user/ed/utmpx/sys/kern/kern_mib.c
  user/ed/utmpx/sys/kern/kern_prot.c
  user/ed/utmpx/sys/kern/subr_param.c
  user/ed/utmpx/sys/kern/vfs_syscalls.c
  user/ed/utmpx/sys/mips/conf/AR71XX   (contents, props changed)
  user/ed/utmpx/sys/mips/conf/MALTA64   (contents, props changed)
  user/ed/utmpx/sys/mips/conf/SWARM   (contents, props changed)
  user/ed/utmpx/sys/mips/rmi/ehcireg.h   (contents, props changed)
  user/ed/utmpx/sys/mips/rmi/ehcivar.h   (contents, props changed)
  user/ed/utmpx/sys/mips/rmi/pcibus.c   (contents, props changed)
  user/ed/utmpx/sys/mips/rmi/pcibus.h   (contents, props changed)
  user/ed/utmpx/sys/mips/rmi/uart_bus_xlr_iodi.c   (contents, props changed)
  user/ed/utmpx/sys/mips/rmi/xlr_i2c.c   (contents, props changed)
  user/ed/utmpx/sys/mips/rmi/xls_ehci.c   (contents, props changed)
  user/ed/utmpx/sys/modules/usb/Makefile
  user/ed/utmpx/sys/net80211/ieee80211_mesh.c
  user/ed/utmpx/sys/net80211/ieee80211_mesh.h
  user/ed/utmpx/sys/rpc/authunix_prot.c
  user/ed/utmpx/sys/security/audit/audit_arg.c
  user/ed/utmpx/sys/sys/syscallsubr.h
  user/ed/utmpx/sys/sys/systm.h
  user/ed/utmpx/sys/ufs/ffs/ffs_alloc.c
  user/ed/utmpx/sys/ufs/ffs/fs.h
  user/ed/utmpx/sys/ufs/ufs/ufs_lookup.c
  user/ed/utmpx/tools/tools/ath/athdecode/main.c
  user/ed/utmpx/usr.sbin/Makefile
Directory Properties:
  user/ed/utmpx/   (props changed)
  user/ed/utmpx/contrib/one-true-awk/   (props changed)
  user/ed/utmpx/etc/rc.d/static_arp   (props changed)
  user/ed/utmpx/sys/conf/ldscript.mips.mips64   (props changed)
  user/ed/utmpx/sys/conf/ldscript.mips.octeon1.32   (props changed)
  user/ed/utmpx/sys/conf/ldscript.mips.octeon1.64   (props changed)
  user/ed/utmpx/sys/conf/ldscript.mips.octeon1.n32   (props changed)
  user/ed/utmpx/sys/dev/cfe/cfe_env.c   (props changed)
  user/ed/utmpx/sys/dev/flash/mx25l.c   (props changed)
  user/ed/utmpx/sys/dev/flash/mx25lreg.h   (props changed)
  user/ed/utmpx/sys/dev/siba/siba/   (props changed)
  user/ed/utmpx/sys/dev/siba/siba_cc.c   (props changed)
  user/ed/utmpx/sys/mips/adm5120/adm5120_machdep.c   (props changed)
  user/ed/utmpx/sys/mips/adm5120/adm5120reg.h   (props changed)
  user/ed/utmpx/sys/mips/adm5120/admpci.c   (props changed)
  user/ed/utmpx/sys/mips/adm5120/console.c   (props changed)
  user/ed/utmpx/sys/mips/adm5120/files.adm5120   (props changed)
  user/ed/utmpx/sys/mips/adm5120/if_admsw.c   (props changed)
  user/ed/utmpx/sys/mips/adm5120/if_admswreg.h   (props changed)
  user/ed/utmpx/sys/mips/adm5120/if_admswvar.h   (props changed)
  user/ed/utmpx/sys/mips/adm5120/obio.c   (props changed)
  user/ed/utmpx/sys/mips/adm5120/obiovar.h   (props changed)
  user/ed/utmpx/sys/mips/adm5120/std.adm5120   (props changed)
  user/ed/utmpx/sys/mips/adm5120/uart_bus_adm5120.c   (props changed)
  user/ed/utmpx/sys/mips/adm5120/uart_cpu_adm5120.c   (props changed)
  user/ed/utmpx/sys/mips/adm5120/uart_dev_adm5120.c   (props changed)
  user/ed/utmpx/sys/mips/adm5120/uart_dev_adm5120.h   (props changed)
  user/ed/utmpx/sys/mips/alchemy/   (props changed)
  user/ed/utmpx/sys/mips/alchemy/files.alchemy   (props changed)
  user/ed/utmpx/sys/mips/alchemy/std.alchemy   (props changed)
  user/ed/utmpx/sys/mips/atheros/   (props changed)
  user/ed/utmpx/sys/mips/atheros/apb.c   (props changed)
  user/ed/utmpx/sys/mips/atheros/apbvar.h   (props changed)
  user/ed/utmpx/sys/mips/atheros/ar71xx_bus_space_reversed.c   (props changed)
  user/ed/utmpx/sys/mips/atheros/ar71xx_bus_space_reversed.h   (props changed)
  user/ed/utmpx/sys/mips/atheros/ar71xx_ehci.c   (props changed)
  user/ed/utmpx/sys/mips/atheros/ar71xx_machdep.c   (props changed)
  user/ed/utmpx/sys/mips/atheros/ar71xx_ohci.c   (props changed)
  user/ed/utmpx/sys/mips/atheros/ar71xx_pci.c   (props changed)
  user/ed/utmpx/sys/mips/atheros/ar71xx_pci_bus_space.c   (props changed)
  user/ed/utmpx/sys/mips/atheros/ar71xx_pci_bus_space.h   (props changed)
  user/ed/utmpx/sys/mips/atheros/ar71xx_spi.c   (props changed)
  user/ed/utmpx/sys/mips/atheros/ar71xx_wdog.c   (props changed)
  user/ed/utmpx/sys/mips/atheros/ar71xxreg.h   (props changed)
  user/ed/utmpx/sys/mips/atheros/files.ar71xx   (props changed)
  user/ed/utmpx/sys/mips/atheros/if_arge.c   (props changed)
  user/ed/utmpx/sys/mips/atheros/if_argevar.h   (props changed)
  user/ed/utmpx/sys/mips/atheros/uart_bus_ar71xx.c   (props changed)
  user/ed/utmpx/sys/mips/atheros/uart_cpu_ar71xx.c   (props changed)
  user/ed/utmpx/sys/mips/cavium/   (props changed)
  user/ed/utmpx/sys/mips/cavium/files.octeon1   (props changed)
  user/ed/utmpx/sys/mips/cavium/std.octeon1   (props changed)
  user/ed/utmpx/sys/mips/conf/.cvsignore   (props changed)
  user/ed/utmpx/sys/mips/conf/ADM5120   (props changed)
  user/ed/utmpx/sys/mips/conf/ADM5120.hints   (props changed)
  user/ed/utmpx/sys/mips/conf/ALCHEMY   (props changed)
  user/ed/utmpx/sys/mips/conf/AR71XX.hints   (props changed)
  user/ed/utmpx/sys/mips/conf/DEFAULTS   (props changed)
  user/ed/utmpx/sys/mips/conf/IDT   (props changed)
  user/ed/utmpx/sys/mips/conf/IDT.hints   (props changed)
  user/ed/utmpx/sys/mips/conf/MALTA   (props changed)
  user/ed/utmpx/sys/mips/conf/MALTA.hints   (props changed)
  user/ed/utmpx/sys/mips/conf/OCTEON1   (props changed)
  user/ed/utmpx/sys/mips/conf/OCTEON1-32   (props changed)
  user/ed/utmpx/sys/mips/conf/OCTEON1.hints   (props changed)
  user/ed/utmpx/sys/mips/conf/QEMU   (props changed)
  user/ed/utmpx/sys/mips/conf/SENTRY5   (props changed)
  user/ed/utmpx/sys/mips/conf/SENTRY5.hints   (props changed)
  user/ed/utmpx/sys/mips/conf/SWARM.hints   (props changed)
  user/ed/utmpx/sys/mips/conf/XLR   (props changed)
  user/ed/utmpx/sys/mips/idt/files.idt   (props changed)
  user/ed/utmpx/sys/mips/idt/idt_machdep.c   (props changed)
  user/ed/utmpx/sys/mips/idt/idtpci.c   (props changed)
  user/ed/utmpx/sys/mips/idt/idtreg.h   (props changed)
  user/ed/utmpx/sys/mips/idt/if_kr.c   (props changed)
  user/ed/utmpx/sys/mips/idt/if_krreg.h   (props changed)
  user/ed/utmpx/sys/mips/idt/obio.c   (props changed)
  user/ed/utmpx/sys/mips/idt/obiovar.h   (props changed)
  user/ed/utmpx/sys/mips/idt/std.idt   (props changed)
  user/ed/utmpx/sys/mips/idt/uart_bus_rc32434.c   (props changed)
  user/ed/utmpx/sys/mips/idt/uart_cpu_rc32434.c   (props changed)
  user/ed/utmpx/sys/mips/include/_align.h   (props changed)
  user/ed/utmpx/sys/mips/include/_bus.h   (props changed)
  user/ed/utmpx/sys/mips/include/_bus_octeon.h   (props changed)
  user/ed/utmpx/sys/mips/include/_inttypes.h   (props changed)
  user/ed/utmpx/sys/mips/include/_limits.h   (props changed)
  user/ed/utmpx/sys/mips/include/_stdint.h   (props changed)
  user/ed/utmpx/sys/mips/include/_types.h   (props changed)
  user/ed/utmpx/sys/mips/include/archtype.h   (props changed)
  user/ed/utmpx/sys/mips/include/asm.h   (props changed)
  user/ed/utmpx/sys/mips/include/asmacros.h   (props changed)
  user/ed/utmpx/sys/mips/include/atomic.h   (props changed)
  user/ed/utmpx/sys/mips/include/bootinfo.h   (props changed)
  user/ed/utmpx/sys/mips/include/bswap.h   (props changed)
  user/ed/utmpx/sys/mips/include/bus.h   (props changed)
  user/ed/utmpx/sys/mips/include/bus_dma.h   (props changed)
  user/ed/utmpx/sys/mips/include/cache.h   (props changed)
  user/ed/utmpx/sys/mips/include/cache_mipsNN.h   (props changed)
  user/ed/utmpx/sys/mips/include/cache_r4k.h   (props changed)
  user/ed/utmpx/sys/mips/include/cdefs.h   (props changed)
  user/ed/utmpx/sys/mips/include/clock.h   (props changed)
  user/ed/utmpx/sys/mips/include/clockvar.h   (props changed)
  user/ed/utmpx/sys/mips/include/cpu.h   (props changed)
  user/ed/utmpx/sys/mips/include/cpufunc.h   (props changed)
  user/ed/utmpx/sys/mips/include/cpuinfo.h   (props changed)
  user/ed/utmpx/sys/mips/include/cpuregs.h   (props changed)
  user/ed/utmpx/sys/mips/include/cputypes.h   (props changed)
  user/ed/utmpx/sys/mips/include/db_machdep.h   (props changed)
  user/ed/utmpx/sys/mips/include/defs.h   (props changed)
  user/ed/utmpx/sys/mips/include/elf.h   (props changed)
  user/ed/utmpx/sys/mips/include/endian.h   (props changed)
  user/ed/utmpx/sys/mips/include/exec.h   (props changed)
  user/ed/utmpx/sys/mips/include/float.h   (props changed)
  user/ed/utmpx/sys/mips/include/floatingpoint.h   (props changed)
  user/ed/utmpx/sys/mips/include/fls64.h   (props changed)
  user/ed/utmpx/sys/mips/include/fpu.h   (props changed)
  user/ed/utmpx/sys/mips/include/frame.h   (props changed)
  user/ed/utmpx/sys/mips/include/gdb_machdep.h   (props changed)
  user/ed/utmpx/sys/mips/include/hwfunc.h   (props changed)
  user/ed/utmpx/sys/mips/include/ieee.h   (props changed)
  user/ed/utmpx/sys/mips/include/ieeefp.h   (props changed)
  user/ed/utmpx/sys/mips/include/in_cksum.h   (props changed)
  user/ed/utmpx/sys/mips/include/intr_machdep.h   (props changed)
  user/ed/utmpx/sys/mips/include/iodev.h   (props changed)
  user/ed/utmpx/sys/mips/include/kdb.h   (props changed)
  user/ed/utmpx/sys/mips/include/limits.h   (props changed)
  user/ed/utmpx/sys/mips/include/locore.h   (props changed)
  user/ed/utmpx/sys/mips/include/md_var.h   (props changed)
  user/ed/utmpx/sys/mips/include/memdev.h   (props changed)
  user/ed/utmpx/sys/mips/include/metadata.h   (props changed)
  user/ed/utmpx/sys/mips/include/minidump.h   (props changed)
  user/ed/utmpx/sys/mips/include/mips_opcode.h   (props changed)
  user/ed/utmpx/sys/mips/include/mp_watchdog.h   (props changed)
  user/ed/utmpx/sys/mips/include/mutex.h   (props changed)
  user/ed/utmpx/sys/mips/include/param.h   (props changed)
  user/ed/utmpx/sys/mips/include/pcb.h   (props changed)
  user/ed/utmpx/sys/mips/include/pci_cfgreg.h   (props changed)
  user/ed/utmpx/sys/mips/include/pcpu.h   (props changed)
  user/ed/utmpx/sys/mips/include/pmap.h   (props changed)
  user/ed/utmpx/sys/mips/include/pmc_mdep.h   (props changed)
  user/ed/utmpx/sys/mips/include/ppireg.h   (props changed)
  user/ed/utmpx/sys/mips/include/proc.h   (props changed)
  user/ed/utmpx/sys/mips/include/profile.h   (props changed)
  user/ed/utmpx/sys/mips/include/psl.h   (props changed)
  user/ed/utmpx/sys/mips/include/pte.h   (props changed)
  user/ed/utmpx/sys/mips/include/ptrace.h   (props changed)
  user/ed/utmpx/sys/mips/include/queue.h   (props changed)
  user/ed/utmpx/sys/mips/include/reg.h   (props changed)
  user/ed/utmpx/sys/mips/include/regdef.h   (props changed)
  user/ed/utmpx/sys/mips/include/regnum.h   (props changed)
  user/ed/utmpx/sys/mips/include/reloc.h   (props changed)
  user/ed/utmpx/sys/mips/include/resource.h   (props changed)
  user/ed/utmpx/sys/mips/include/rm7000.h   (props changed)
  user/ed/utmpx/sys/mips/include/runq.h   (props changed)
  user/ed/utmpx/sys/mips/include/segments.h   (props changed)
  user/ed/utmpx/sys/mips/include/setjmp.h   (props changed)
  user/ed/utmpx/sys/mips/include/sf_buf.h   (props changed)
  user/ed/utmpx/sys/mips/include/sigframe.h   (props changed)
  user/ed/utmpx/sys/mips/include/signal.h   (props changed)
  user/ed/utmpx/sys/mips/include/smp.h   (props changed)
  user/ed/utmpx/sys/mips/include/stdarg.h   (props changed)
  user/ed/utmpx/sys/mips/include/sysarch.h   (props changed)
  user/ed/utmpx/sys/mips/include/timerreg.h   (props changed)
  user/ed/utmpx/sys/mips/include/trap.h   (props changed)
  user/ed/utmpx/sys/mips/include/ucontext.h   (props changed)
  user/ed/utmpx/sys/mips/include/varargs.h   (props changed)
  user/ed/utmpx/sys/mips/include/vmparam.h   (props changed)
  user/ed/utmpx/sys/mips/malta/files.malta   (props changed)
  user/ed/utmpx/sys/mips/malta/gt.c   (props changed)
  user/ed/utmpx/sys/mips/malta/gt_pci.c   (props changed)
  user/ed/utmpx/sys/mips/malta/gtreg.h   (props changed)
  user/ed/utmpx/sys/mips/malta/gtvar.h   (props changed)
  user/ed/utmpx/sys/mips/malta/malta_machdep.c   (props changed)
  user/ed/utmpx/sys/mips/malta/maltareg.h   (props changed)
  user/ed/utmpx/sys/mips/malta/obio.c   (props changed)
  user/ed/utmpx/sys/mips/malta/obiovar.h   (props changed)
  user/ed/utmpx/sys/mips/malta/std.malta   (props changed)
  user/ed/utmpx/sys/mips/malta/uart_bus_maltausart.c   (props changed)
  user/ed/utmpx/sys/mips/malta/uart_cpu_maltausart.c   (props changed)
  user/ed/utmpx/sys/mips/malta/yamon.c   (props changed)
  user/ed/utmpx/sys/mips/malta/yamon.h   (props changed)
  user/ed/utmpx/sys/mips/mips/autoconf.c   (props changed)
  user/ed/utmpx/sys/mips/mips/bus_space_generic.c   (props changed)
  user/ed/utmpx/sys/mips/mips/busdma_machdep.c   (props changed)
  user/ed/utmpx/sys/mips/mips/cache.c   (props changed)
  user/ed/utmpx/sys/mips/mips/cache_mipsNN.c   (props changed)
  user/ed/utmpx/sys/mips/mips/copystr.S   (props changed)
  user/ed/utmpx/sys/mips/mips/cpu.c   (props changed)
  user/ed/utmpx/sys/mips/mips/db_disasm.c   (props changed)
  user/ed/utmpx/sys/mips/mips/db_interface.c   (props changed)
  user/ed/utmpx/sys/mips/mips/db_trace.c   (props changed)
  user/ed/utmpx/sys/mips/mips/dump_machdep.c   (props changed)
  user/ed/utmpx/sys/mips/mips/elf64_machdep.c   (props changed)
  user/ed/utmpx/sys/mips/mips/elf_machdep.c   (props changed)
  user/ed/utmpx/sys/mips/mips/elf_trampoline.c   (props changed)
  user/ed/utmpx/sys/mips/mips/exception.S   (props changed)
  user/ed/utmpx/sys/mips/mips/fp.S   (props changed)
  user/ed/utmpx/sys/mips/mips/gdb_machdep.c   (props changed)
  user/ed/utmpx/sys/mips/mips/genassym.c   (props changed)
  user/ed/utmpx/sys/mips/mips/in_cksum.c   (props changed)
  user/ed/utmpx/sys/mips/mips/inckern.S   (props changed)
  user/ed/utmpx/sys/mips/mips/intr_machdep.c   (props changed)
  user/ed/utmpx/sys/mips/mips/locore.S   (props changed)
  user/ed/utmpx/sys/mips/mips/machdep.c   (props changed)
  user/ed/utmpx/sys/mips/mips/mainbus.c   (props changed)
  user/ed/utmpx/sys/mips/mips/mem.c   (props changed)
  user/ed/utmpx/sys/mips/mips/mp_machdep.c   (props changed)
  user/ed/utmpx/sys/mips/mips/nexus.c   (props changed)
  user/ed/utmpx/sys/mips/mips/pm_machdep.c   (props changed)
  user/ed/utmpx/sys/mips/mips/pmap.c   (props changed)
  user/ed/utmpx/sys/mips/mips/psraccess.S   (props changed)
  user/ed/utmpx/sys/mips/mips/ptrace_machdep.c   (props changed)
  user/ed/utmpx/sys/mips/mips/stack_machdep.c   (props changed)
  user/ed/utmpx/sys/mips/mips/support.S   (props changed)
  user/ed/utmpx/sys/mips/mips/swtch.S   (props changed)
  user/ed/utmpx/sys/mips/mips/sys_machdep.c   (props changed)
  user/ed/utmpx/sys/mips/mips/tick.c   (props changed)
  user/ed/utmpx/sys/mips/mips/tlb.S   (props changed)
  user/ed/utmpx/sys/mips/mips/trap.c   (props changed)
  user/ed/utmpx/sys/mips/mips/uio_machdep.c   (props changed)
  user/ed/utmpx/sys/mips/mips/vm_machdep.c   (props changed)
  user/ed/utmpx/sys/mips/rmi/   (props changed)
  user/ed/utmpx/sys/mips/rmi/Makefile.msgring   (props changed)
  user/ed/utmpx/sys/mips/rmi/board.c   (props changed)
  user/ed/utmpx/sys/mips/rmi/board.h   (props changed)
  user/ed/utmpx/sys/mips/rmi/bus_space_rmi.c   (props changed)
  user/ed/utmpx/sys/mips/rmi/clock.c   (props changed)
  user/ed/utmpx/sys/mips/rmi/clock.h   (props changed)
  user/ed/utmpx/sys/mips/rmi/debug.h   (props changed)
  user/ed/utmpx/sys/mips/rmi/dev/   (props changed)
  user/ed/utmpx/sys/mips/rmi/dev/sec/desc.h   (props changed)
  user/ed/utmpx/sys/mips/rmi/dev/sec/rmilib.c   (props changed)
  user/ed/utmpx/sys/mips/rmi/dev/sec/rmilib.h   (props changed)
  user/ed/utmpx/sys/mips/rmi/dev/sec/rmisec.c   (props changed)
  user/ed/utmpx/sys/mips/rmi/dev/sec/stats.h   (props changed)
  user/ed/utmpx/sys/mips/rmi/dev/xlr/atx_cpld.h   (props changed)
  user/ed/utmpx/sys/mips/rmi/dev/xlr/rge.c   (props changed)
  user/ed/utmpx/sys/mips/rmi/dev/xlr/rge.h   (props changed)
  user/ed/utmpx/sys/mips/rmi/dev/xlr/xgmac_mdio.h   (props changed)
  user/ed/utmpx/sys/mips/rmi/files.xlr   (props changed)
  user/ed/utmpx/sys/mips/rmi/interrupt.h   (props changed)
  user/ed/utmpx/sys/mips/rmi/intr_machdep.c   (props changed)
  user/ed/utmpx/sys/mips/rmi/iodi.c   (props changed)
  user/ed/utmpx/sys/mips/rmi/iomap.h   (props changed)
  user/ed/utmpx/sys/mips/rmi/msgring.c   (props changed)
  user/ed/utmpx/sys/mips/rmi/msgring.cfg   (props changed)
  user/ed/utmpx/sys/mips/rmi/msgring.h   (props changed)
  user/ed/utmpx/sys/mips/rmi/msgring_xls.c   (props changed)
  user/ed/utmpx/sys/mips/rmi/msgring_xls.cfg   (props changed)
  user/ed/utmpx/sys/mips/rmi/on_chip.c   (props changed)
  user/ed/utmpx/sys/mips/rmi/perfmon.h   (props changed)
  user/ed/utmpx/sys/mips/rmi/perfmon_kern.c   (props changed)
  user/ed/utmpx/sys/mips/rmi/perfmon_percpu.c   (props changed)
  user/ed/utmpx/sys/mips/rmi/perfmon_utils.h   (props changed)
  user/ed/utmpx/sys/mips/rmi/perfmon_xlrconfig.h   (props changed)
  user/ed/utmpx/sys/mips/rmi/pic.h   (props changed)
  user/ed/utmpx/sys/mips/rmi/rmi_mips_exts.h   (props changed)
  user/ed/utmpx/sys/mips/rmi/rootfs_list.txt   (props changed)
  user/ed/utmpx/sys/mips/rmi/shared_structs.h   (props changed)
  user/ed/utmpx/sys/mips/rmi/shared_structs_func.h   (props changed)
  user/ed/utmpx/sys/mips/rmi/shared_structs_offsets.h   (props changed)
  user/ed/utmpx/sys/mips/rmi/std.xlr   (props changed)
  user/ed/utmpx/sys/mips/rmi/tick.c   (props changed)
  user/ed/utmpx/sys/mips/rmi/uart_cpu_mips_xlr.c   (props changed)
  user/ed/utmpx/sys/mips/rmi/xlr_boot1_console.c   (props changed)
  user/ed/utmpx/sys/mips/rmi/xlr_csum_nocopy.S   (props changed)
  user/ed/utmpx/sys/mips/rmi/xlr_machdep.c   (props changed)
  user/ed/utmpx/sys/mips/rmi/xlr_pci.c   (props changed)
  user/ed/utmpx/sys/mips/rmi/xlrconfig.h   (props changed)
  user/ed/utmpx/sys/mips/sentry5/files.sentry5   (props changed)
  user/ed/utmpx/sys/mips/sentry5/obio.c   (props changed)
  user/ed/utmpx/sys/mips/sentry5/obiovar.h   (props changed)
  user/ed/utmpx/sys/mips/sentry5/s5_machdep.c   (props changed)
  user/ed/utmpx/sys/mips/sentry5/s5reg.h   (props changed)
  user/ed/utmpx/sys/mips/sentry5/uart_bus_sbusart.c   (props changed)
  user/ed/utmpx/sys/mips/sentry5/uart_cpu_sbusart.c   (props changed)
  user/ed/utmpx/sys/mips/sibyte/   (props changed)
  user/ed/utmpx/sys/mips/sibyte/files.sibyte   (props changed)

Modified: user/ed/utmpx/games/fortune/datfiles/freebsd-tips
==============================================================================

--- user/ed/utmpx/games/fortune/datfiles/freebsd-tips	Wed Jan 13 17:29:55 2010	(r202188)
+++ user/ed/utmpx/games/fortune/datfiles/freebsd-tips	Wed Jan 13 17:45:39 2010	(r202189)
@@ -50,18 +50,6 @@ If you are in the C shell and have just 
 be able to run it unless you first type "rehash".
 		-- Dru <genesis at istar.ca>
 %
-If you are running xterm, the default TERM variable will be 'xterm'.  If you
-set this environment variable to 'xterm-color' instead, a lot of programs will
-use colors.  You can do this by
-
-	TERM=xterm-color; export TERM
-
-in Bourne-derived shells, and
-
-	setenv TERM xterm-color
-
-in csh-derived shells.
-%
 If you do not want to get beeps in X11 (X Windows), you can turn them off with
 
 	xset b off

Modified: user/ed/utmpx/lib/libc/gen/Makefile.inc
==============================================================================
--- user/ed/utmpx/lib/libc/gen/Makefile.inc	Wed Jan 13 17:29:55 2010	(r202188)
+++ user/ed/utmpx/lib/libc/gen/Makefile.inc	Wed Jan 13 17:45:39 2010	(r202189)
@@ -18,7 +18,7 @@ SRCS+=  __getosreldate.c __xuname.c \
 	gethostname.c getloadavg.c getlogin.c getmntinfo.c getnetgrent.c \
 	getosreldate.c getpagesize.c getpagesizes.c \
 	getpeereid.c getprogname.c getpwent.c getttyent.c \
-	getutxent.c getusershell.c getvfsbyname.c glob.c \
+	getusershell.c getutxent.c getvfsbyname.c glob.c \
 	initgroups.c isatty.c isinf.c isnan.c jrand48.c lcong48.c \
 	lockf.c lrand48.c mrand48.c nftw.c nice.c \
 	nlist.c nrand48.c opendir.c \

Modified: user/ed/utmpx/lib/libc/gen/sem_init.3
==============================================================================
--- user/ed/utmpx/lib/libc/gen/sem_init.3	Wed Jan 13 17:29:55 2010	(r202188)
+++ user/ed/utmpx/lib/libc/gen/sem_init.3	Wed Jan 13 17:45:39 2010	(r202189)
@@ -27,7 +27,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd January 7, 2010
+.Dd January 9, 2010
 .Dt SEM_INIT 3
 .Os
 .Sh NAME
@@ -52,7 +52,7 @@ A non-zero value for
 specifies a shared semaphore that can be used by multiple processes,
 the semaphore should be located in shared memory region (see
 .Xr mmap 2 ,
-.Xr shm_open 2 , 
+.Xr shm_open 2 ,
 and
 .Xr shmget 2 ) ,
 any process having read and write access to address

Modified: user/ed/utmpx/lib/libc/gen/sem_new.c
==============================================================================
--- user/ed/utmpx/lib/libc/gen/sem_new.c	Wed Jan 13 17:29:55 2010	(r202188)
+++ user/ed/utmpx/lib/libc/gen/sem_new.c	Wed Jan 13 17:45:39 2010	(r202189)
@@ -147,13 +147,13 @@ _sem_open(const char *name, int flags, .
 
 	if (name[0] != '/') {
 		errno = EINVAL;
-		return (NULL);
+		return (SEM_FAILED);
 	}
 	name++;
 
 	if (flags & ~(O_CREAT|O_EXCL)) {
 		errno = EINVAL;
-		return (NULL);
+		return (SEM_FAILED);
 	}
 
 	_pthread_once(&once, sem_module_init);
@@ -275,6 +275,7 @@ _sem_close(sem_t *sem)
 		return (0);
 	}
 	_pthread_mutex_unlock(&sem_llock);
+	errno = EINVAL;
 	return (-1);
 }
 

Modified: user/ed/utmpx/lib/libc/gen/sem_open.3
==============================================================================
--- user/ed/utmpx/lib/libc/gen/sem_open.3	Wed Jan 13 17:29:55 2010	(r202188)
+++ user/ed/utmpx/lib/libc/gen/sem_open.3	Wed Jan 13 17:45:39 2010	(r202189)
@@ -27,7 +27,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd January 15, 2003
+.Dd January 9, 2010
 .Dt SEM_OPEN 3
 .Os
 .Sh NAME
@@ -61,8 +61,8 @@ and
 This implementation places strict requirements on the value of
 .Fa name :
 it must begin with a slash
-.Pq Ql / ,
-contain no other slash characters.
+.Pq Ql /
+and contain no other slash characters.
 .Pp
 The following bits may be set in the
 .Fa oflag

Modified: user/ed/utmpx/lib/libc/net/sctp_bindx.3
==============================================================================
--- user/ed/utmpx/lib/libc/net/sctp_bindx.3	Wed Jan 13 17:29:55 2010	(r202188)
+++ user/ed/utmpx/lib/libc/net/sctp_bindx.3	Wed Jan 13 17:45:39 2010	(r202189)
@@ -90,7 +90,7 @@ The call returns 0 on success and -1 upo
 .Sh ERRORS
 The
 .Fn sctp_bindx
-can return the following errors.
+function can return the following errors:
 .Bl -tag -width Er
 .It Bq Er EINVAL
 This value is returned if the

Modified: user/ed/utmpx/lib/libc/net/sctp_connectx.3
==============================================================================
--- user/ed/utmpx/lib/libc/net/sctp_connectx.3	Wed Jan 13 17:29:55 2010	(r202188)
+++ user/ed/utmpx/lib/libc/net/sctp_connectx.3	Wed Jan 13 17:45:39 2010	(r202189)
@@ -44,7 +44,7 @@
 .In sys/socket.h
 .In netinet/sctp.h
 .Ft int
-.Fn sctp_connectx "int s" "struct sockaddr *" "int addrcnt" "sctp_assoc_t *"
+.Fn sctp_connectx "int sd" "struct sockaddr *addrs" "int addrcnt" "sctp_assoc_t *id"
 .Sh DESCRIPTION
 The
 .Fn sctp_connectx
@@ -75,7 +75,7 @@ the extra addresses sent in the
 call will be silently discarded from the association.
 On
 successful completion the provided
-.Fa "sctp_assoc_t *"
+.Fa id
 will be
 filled in with the association identification of the newly
 forming association.
@@ -84,7 +84,7 @@ The call returns 0 on success and -1 upo
 .Sh ERRORS
 The
 .Fn sctp_connectx
-can return the following errors.
+function can return the following errors:
 .Bl -tag -width Er
 .It Bq Er EINVAL
 An address listed has an invalid family or no

Modified: user/ed/utmpx/lib/libc/net/sctp_getaddrlen.3
==============================================================================
--- user/ed/utmpx/lib/libc/net/sctp_getaddrlen.3	Wed Jan 13 17:29:55 2010	(r202188)
+++ user/ed/utmpx/lib/libc/net/sctp_getaddrlen.3	Wed Jan 13 17:45:39 2010	(r202189)
@@ -76,7 +76,7 @@ system expects for the specific address 
 .Sh ERRORS
 The
 .Fn sctp_getaddrlen
-function can return the following errors.
+function can return the following errors:
 .Bl -tag -width Er
 .It Bq Er EINVAL
 The address family specified does NOT exist.

Modified: user/ed/utmpx/lib/libc/net/sctp_getassocid.3
==============================================================================
--- user/ed/utmpx/lib/libc/net/sctp_getassocid.3	Wed Jan 13 17:29:55 2010	(r202188)
+++ user/ed/utmpx/lib/libc/net/sctp_getassocid.3	Wed Jan 13 17:45:39 2010	(r202189)
@@ -58,7 +58,7 @@ The call returns the association id upon
 .Sh ERRORS
 The
 .Fn sctp_getassocid
-function can return the following errors.
+function can return the following errors:
 .Bl -tag -width Er
 .It Bq Er ENOENT
 The address does not have an association setup to it.

Modified: user/ed/utmpx/lib/libc/net/sctp_getpaddrs.3
==============================================================================
--- user/ed/utmpx/lib/libc/net/sctp_getpaddrs.3	Wed Jan 13 17:29:55 2010	(r202188)
+++ user/ed/utmpx/lib/libc/net/sctp_getpaddrs.3	Wed Jan 13 17:45:39 2010	(r202189)
@@ -33,7 +33,7 @@
 .\" $FreeBSD$
 .\"
 .Dd December 15, 2006
-.Dt SCTP_GETPADDR 3
+.Dt SCTP_GETPADDRS 3
 .Os
 .Sh NAME
 .Nm sctp_getpaddrs ,
@@ -64,7 +64,7 @@ array of socket addresses returned in th
 .Fa addrs
 upon success.
 .Pp
-After the caller is through the function
+After the caller is finished, the function
 .Fn sctp_freepaddrs
 or
 .Fn sctp_freeladdrs
@@ -76,7 +76,7 @@ the number of addresses returned in
 .Fa addrs
 upon success.
 .Sh ERRORS
-The functions can return the following errors.
+The functions can return the following errors:
 .Bl -tag -width Er
 .It Bq Er EINVAL
 An address listed has an invalid family or no

Modified: user/ed/utmpx/lib/libc/net/sctp_opt_info.3
==============================================================================
--- user/ed/utmpx/lib/libc/net/sctp_opt_info.3	Wed Jan 13 17:29:55 2010	(r202188)
+++ user/ed/utmpx/lib/libc/net/sctp_opt_info.3	Wed Jan 13 17:45:39 2010	(r202189)
@@ -45,7 +45,7 @@
 .In sys/socket.h
 .In netinet/sctp.h
 .Ft int
-.Fn sctp_opt_info "int s" "sctp_assoc_t" "int opt" "void *arg" "socklen_t *size"
+.Fn sctp_opt_info "int sd" "sctp_assoc_t id" "int opt" "void *arg" "socklen_t *size"
 .Sh DESCRIPTION
 The
 .Fn sctp_opt_info
@@ -90,7 +90,7 @@ socket options.
 .Sh ERRORS
 The
 .Fn sctp_opt_info
-function can return the following errors.
+function can return the following errors:
 .Bl -tag -width Er
 .It Bq Er EINVAL
 The argument

Modified: user/ed/utmpx/lib/libc/net/sctp_recvmsg.3
==============================================================================
--- user/ed/utmpx/lib/libc/net/sctp_recvmsg.3	Wed Jan 13 17:29:55 2010	(r202188)
+++ user/ed/utmpx/lib/libc/net/sctp_recvmsg.3	Wed Jan 13 17:45:39 2010	(r202189)
@@ -160,7 +160,7 @@ struct sctp_sndrcvinfo {
 .Pp
 The
 .Fa sinfo->sinfo_ppid
-is an opaque 32 bit value that is passed transparently
+field is an opaque 32 bit value that is passed transparently
 through the stack from the peer endpoint. 
 Note that the stack passes this value without regard to byte
 order.
@@ -180,12 +180,13 @@ as soon as possible.
 When this flag is absent the message
 was delivered in order within the stream it was received.
 .Pp
+The
 .Fa sinfo->sinfo_stream
-is the SCTP stream that the message was received on. 
+field is the SCTP stream that the message was received on. 
 Streams in SCTP are reliable (or partially reliable) flows of ordered
 messages.
 .Pp
-The 
+The
 .Fa sinfo->sinfo_context
 field is used only if the local application set an association level
 context with the
@@ -197,7 +198,7 @@ association. 
 .Pp
 The
 .Fa sinfo->sinfo_ssn
-will hold the stream sequence number assigned
+field will hold the stream sequence number assigned
 by the peer endpoint if the message is
 .Em not
 unordered.
@@ -205,7 +206,7 @@ For unordered messages this field holds 
 .Pp
 The
 .Fa sinfo->sinfo_tsn
-holds a transport sequence number (TSN) that was assigned
+field holds a transport sequence number (TSN) that was assigned
 to this message by the peer endpoint.
 For messages that fit in or less
 than the path MTU this will be the only TSN assigned.
@@ -215,12 +216,12 @@ message.
 .Pp
 The
 .Fa sinfo->sinfo_cumtsn
-holds the current cumulative acknowledgment point of
+field holds the current cumulative acknowledgment point of
 the transport association.
 Note that this may be larger
 or smaller than the TSN assigned to the message itself.
 .Pp
-The 
+The
 .Fa sinfo->sinfo_assoc_id
 is the unique association identification that was assigned
 to the association.
@@ -232,10 +233,10 @@ setting various socket options on the sp
 (see 
 .Xr sctp 4 ) .
 .Pp
-The 
+The
 .Fa sinfo->info_timetolive
 field is not used by 
-.Fa sctp_recvmsg .
+.Fn sctp_recvmsg .
 .Sh RETURN VALUES
 The call returns the number of characters sent, or -1
 if an error occurred.

Modified: user/ed/utmpx/lib/libc/net/sctp_send.3
==============================================================================
--- user/ed/utmpx/lib/libc/net/sctp_send.3	Wed Jan 13 17:29:55 2010	(r202188)
+++ user/ed/utmpx/lib/libc/net/sctp_send.3	Wed Jan 13 17:45:39 2010	(r202189)
@@ -294,7 +294,7 @@ if an error occurred.
 The
 .Fn sctp_send
 system call
-fail if:
+fails if:
 .Bl -tag -width Er
 .It Bq Er EBADF
 An invalid descriptor was specified.

Modified: user/ed/utmpx/lib/libc/net/sctp_sendmsg.3
==============================================================================
--- user/ed/utmpx/lib/libc/net/sctp_sendmsg.3	Wed Jan 13 17:29:55 2010	(r202188)
+++ user/ed/utmpx/lib/libc/net/sctp_sendmsg.3	Wed Jan 13 17:45:39 2010	(r202189)
@@ -271,7 +271,7 @@ if an error occurred.
 The
 .Fn sctp_sendmsg
 system call
-fail if:
+fails if:
 .Bl -tag -width Er
 .It Bq Er EBADF
 An invalid descriptor was specified.
@@ -324,7 +324,7 @@ is not connected and is a one-to-one sty
 .Xr sendmsg 3 ,
 .Xr sctp 4
 .Sh BUGS
-Because in the one-to-many style socket the
+Because in the one-to-many style socket
 .Fn sctp_sendmsg 
 or
 .Fn sctp_sendmsgx

Modified: user/ed/utmpx/lib/libc/sys/sctp_generic_recvmsg.2
==============================================================================
--- user/ed/utmpx/lib/libc/sys/sctp_generic_recvmsg.2	Wed Jan 13 17:29:55 2010	(r202188)
+++ user/ed/utmpx/lib/libc/sys/sctp_generic_recvmsg.2	Wed Jan 13 17:45:39 2010	(r202189)
@@ -36,7 +36,7 @@
 .Os
 .Sh NAME
 .Nm sctp_generic_recvmsg
-.Nd receive data from a peer.
+.Nd receive data from a peer
 .Sh LIBRARY
 .Lb libc
 .Sh SYNOPSIS
@@ -46,16 +46,20 @@
 .Ft int
 .Fn sctp_generic_recvmsg "int s" "struct iovec *iov" "int iovlen" "struct sockaddr *from" "socklen_t *fromlen" "struct sctp_sndrcvinfo *sinfo" "int *msgflags"
 .Sh DESCRIPTION
-The
 .Fn sctp_generic_recvmsg
-is the true system calls used by the
-.Fn sctp_recvmsg
-function call. This call is more efficient since it is a
-true system calls but it is specific to FreeBSD and
-can be expected NOT to be present on any other Operating
-System. For detailed useage please see either the
-.Fn sctp_recvmsg 
-function call. 
+is the true system call used by the
+.Xr sctp_recvmsg 3
+function call.
+This call is more efficient since it is a
+true system call but it is specific to
+.Fx
+and can be expected
+.Em not
+to be present on any other operating
+system.
+For detailed usage please see the
+.Xr sctp_recvmsg 3
+function call.
 .Sh RETURN VALUES
 The call returns the number of bytes read on success and -1 upon failure.
 .Sh ERRORS

Modified: user/ed/utmpx/lib/libc/sys/sctp_generic_sendmsg.2
==============================================================================
--- user/ed/utmpx/lib/libc/sys/sctp_generic_sendmsg.2	Wed Jan 13 17:29:55 2010	(r202188)
+++ user/ed/utmpx/lib/libc/sys/sctp_generic_sendmsg.2	Wed Jan 13 17:45:39 2010	(r202189)
@@ -37,7 +37,7 @@
 .Sh NAME
 .Nm sctp_generic_sendmsg
 .Nm sctp_generic_sendmsg_iov
-.Nd send data to a peer.
+.Nd send data to a peer
 .Sh LIBRARY
 .Lb libc
 .Sh SYNOPSIS
@@ -49,21 +49,25 @@
 .Ft int
 .Fn sctp_generic_sendmsg_iov "int s" "struct iovec *iov" "int iovlen" "struct sockaddr *to" "struct sctp_sndrcvinfo *sinfo" "int flags"
 .Sh DESCRIPTION
-The
 .Fn sctp_generic_sendmsg
 and
 .Fn sctp_generic_sendmsg_iov
 are the true system calls used by the
-.Fn sctp_sendmsg
+.Xr sctp_sendmsg 3
 and 
-.Fn sctp_send
-function calls. These are more efficient since they are
-true system calls but they are specific to FreeBSD and
-can be expected NOT to be present on any other Operating
-System. For detailed useage please see either the
-.Fn sctp_send
+.Xr sctp_send 3
+function calls.
+These are more efficient since they are
+true system calls but they are specific to
+.Fx
+and can be expected
+.Em not
+to be present on any other operating
+system.
+For detailed usage please see either the
+.Xr sctp_send 3
 or
-.Fn sctp_sendmsg
+.Xr sctp_sendmsg 3
 function calls. 
 .Sh RETURN VALUES
 The call returns the number of bytes written on success and -1 upon failure.

Modified: user/ed/utmpx/lib/libc/sys/sctp_peeloff.2
==============================================================================
--- user/ed/utmpx/lib/libc/sys/sctp_peeloff.2	Wed Jan 13 17:29:55 2010	(r202188)
+++ user/ed/utmpx/lib/libc/sys/sctp_peeloff.2	Wed Jan 13 17:45:39 2010	(r202189)
@@ -36,7 +36,7 @@
 .Os
 .Sh NAME
 .Nm sctp_peeloff
-.Nd detach an association from a one-to-many socket to its on fd
+.Nd detach an association from a one-to-many socket to its own fd
 .Sh LIBRARY
 .Lb libc
 .Sh SYNOPSIS
@@ -58,7 +58,7 @@ upon success.
 .Sh ERRORS
 The
 .Fn sctp_peeloff
-can return the following errors.
+system call can return the following errors:
 .Bl -tag -width Er
 .It Bq Er ENOTCONN
 The 

Modified: user/ed/utmpx/lib/libelf/elf.3
==============================================================================
--- user/ed/utmpx/lib/libelf/elf.3	Wed Jan 13 17:29:55 2010	(r202188)
+++ user/ed/utmpx/lib/libelf/elf.3	Wed Jan 13 17:45:39 2010	(r202189)
@@ -379,7 +379,6 @@ See
 .It Dv SHT_SUNW_move Ta Dv ELF_T_MOVE Ta ELF move records.
 .It Dv SHT_SUNW_syminfo Ta Dv ELF_T_SYMINFO Ta Additional symbol flags.
 .El
-.TE
 .Ss Functional Grouping
 This section contains a brief overview of the available functionality
 in the ELF library.

Modified: user/ed/utmpx/lib/libpmc/libpmc.c
==============================================================================
--- user/ed/utmpx/lib/libpmc/libpmc.c	Wed Jan 13 17:29:55 2010	(r202188)
+++ user/ed/utmpx/lib/libpmc/libpmc.c	Wed Jan 13 17:45:39 2010	(r202189)
@@ -2543,6 +2543,7 @@ pmc_init(void)
 		break;
 	case PMC_CPU_INTEL_CORE:
 		PMC_MDEP_INIT(core);
+		pmc_class_table[n] = &core_class_table_descr;
 		break;
 	case PMC_CPU_INTEL_CORE2:
 	case PMC_CPU_INTEL_CORE2EXTREME:

Modified: user/ed/utmpx/sbin/fsck_ffs/pass2.c
==============================================================================
--- user/ed/utmpx/sbin/fsck_ffs/pass2.c	Wed Jan 13 17:29:55 2010	(r202188)
+++ user/ed/utmpx/sbin/fsck_ffs/pass2.c	Wed Jan 13 17:45:39 2010	(r202189)
@@ -36,12 +36,14 @@ static const char sccsid[] = "@(#)pass2.
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
+#include <sys/sysctl.h>
 
 #include <ufs/ufs/dinode.h>
 #include <ufs/ufs/dir.h>
 #include <ufs/ffs/fs.h>
 
 #include <err.h>
+#include <errno.h>
 #include <stdint.h>
 #include <string.h>
 
@@ -49,6 +51,8 @@ __FBSDID("$FreeBSD$");
 
 #define MINDIRSIZE	(sizeof (struct dirtemplate))
 
+static int fix_extraneous(struct inoinfo *, struct inodesc *);
+static int deleteentry(struct inodesc *);
 static int blksort(const void *, const void *);
 static int pass2check(struct inodesc *);
 
@@ -212,9 +216,48 @@ pass2(void)
 			inoinfo(inp->i_parent)->ino_linkcnt--;
 			continue;
 		}
-		fileerror(inp->i_parent, inp->i_number,
-		    "BAD INODE NUMBER FOR '..'");
-		if (reply("FIX") == 0)
+		/*
+		 * Here we have:
+		 *    inp->i_number is directory with bad ".." in it.
+		 *    inp->i_dotdot is current value of "..".
+		 *    inp->i_parent is directory to which ".." should point.
+		 */
+		getpathname(pathbuf, inp->i_parent, inp->i_number);
+		printf("BAD INODE NUMBER FOR '..' in DIR I=%d (%s)\n",
+		    inp->i_number, pathbuf);
+		getpathname(pathbuf, inp->i_dotdot, inp->i_dotdot);
+		printf("CURRENTLY POINTS TO I=%d (%s), ", inp->i_dotdot,
+		    pathbuf);
+		getpathname(pathbuf, inp->i_parent, inp->i_parent);
+		printf("SHOULD POINT TO I=%d (%s)", inp->i_parent, pathbuf);
+		if (cursnapshot != 0) {
+			/*
+			 * We need to:
+			 *    setcwd(inp->i_number);
+			 *    setdotdot(inp->i_dotdot, inp->i_parent);
+			 */
+			cmd.value = inp->i_number;
+			if (sysctlbyname("vfs.ffs.setcwd", 0, 0,
+			    &cmd, sizeof cmd) == -1) {
+				/* kernel lacks support for these functions */
+				printf(" (IGNORED)\n");
+				continue;
+			}
+			cmd.value = inp->i_dotdot; /* verify same value */
+			cmd.size = inp->i_parent;  /* new parent */
+			if (sysctlbyname("vfs.ffs.setdotdot", 0, 0,
+			    &cmd, sizeof cmd) == -1) {
+				printf(" (FIX FAILED: %s)\n", strerror(errno));
+				continue;
+			}
+			printf(" (FIXED)\n");
+			inoinfo(inp->i_parent)->ino_linkcnt--;
+			inp->i_dotdot = inp->i_parent;
+			continue;
+		}
+		if (preen)
+			printf(" (FIXED)\n");
+		else if (reply("FIX") == 0)
 			continue;
 		inoinfo(inp->i_dotdot)->ino_linkcnt++;
 		inoinfo(inp->i_parent)->ino_linkcnt--;
@@ -236,8 +279,6 @@ pass2check(struct inodesc *idesc)
 	union dinode *dp;
 	const char *errmsg;
 	struct direct proto;
-	char namebuf[MAXPATHLEN + 1];
-	char pathbuf[MAXPATHLEN + 1];
 
 	/*
 	 * check for "."
@@ -416,27 +457,12 @@ again:
 
 		case DFOUND:
 			inp = getinoinfo(dirp->d_ino);
-			if (inp->i_parent != 0 && idesc->id_entryno > 2) {
-				getpathname(pathbuf, idesc->id_number,
-				    idesc->id_number);
-				getpathname(namebuf, dirp->d_ino, dirp->d_ino);
-				pwarn("%s%s%s %s %s\n", pathbuf,
-				    (strcmp(pathbuf, "/") == 0 ? "" : "/"),
-				    dirp->d_name,
-				    "IS AN EXTRANEOUS HARD LINK TO DIRECTORY",
-				    namebuf);
-				if (cursnapshot != 0)
-					break;
-				if (preen) {
-					printf(" (REMOVED)\n");
-					n = 1;
-					break;
-				}
-				if ((n = reply("REMOVE")) == 1)
+			if (idesc->id_entryno > 2) {
+				if (inp->i_parent == 0)
+					inp->i_parent = idesc->id_number;
+				else if ((n = fix_extraneous(inp, idesc)) == 1)
 					break;
 			}
-			if (idesc->id_entryno > 2)
-				inp->i_parent = idesc->id_number;
 			/* FALLTHROUGH */
 
 		case FSTATE:
@@ -462,6 +488,143 @@ again:
 	return (ret|KEEPON|ALTERED);
 }
 
+static int
+fix_extraneous(struct inoinfo *inp, struct inodesc *idesc)
+{
+	char *cp;
+	struct inodesc dotdesc;
+	char oldname[MAXPATHLEN + 1];
+	char newname[MAXPATHLEN + 1];
+	
+	/*
+	 * If we have not yet found "..", look it up now so we know
+	 * which inode the directory itself believes is its parent.
+	 */
+	if (inp->i_dotdot == 0) {
+		memset(&dotdesc, 0, sizeof(struct inodesc));
+		dotdesc.id_type = DATA;
+		dotdesc.id_number = idesc->id_dirp->d_ino;
+		dotdesc.id_func = findino;
+		dotdesc.id_name = strdup("..");
+		if ((ckinode(ginode(dotdesc.id_number), &dotdesc) & FOUND))
+			inp->i_dotdot = dotdesc.id_parent;
+	}
+	/*
+	 * We have the previously found old name (inp->i_parent) and the
+	 * just found new name (idesc->id_number). We have five cases:
+	 * 1)  ".." is missing - can remove either name, choose to delete
+	 *     new one and let fsck create ".." pointing to old name.
+	 * 2) Both new and old are in same directory, choose to delete
+	 *    the new name and let fsck fix ".." if it is wrong.
+	 * 3) ".." does not point to the new name, so delete it and let
+	 *    fsck fix ".." to point to the old one if it is wrong.
+	 * 4) ".." points to the old name only, so delete the new one.
+	 * 5) ".." points to the new name only, so delete the old one.
+	 *
+	 * For cases 1-4 we eliminate the new name;
+	 * for case 5 we eliminate the old name.
+	 */
+	if (inp->i_dotdot == 0 ||		    /* Case 1 */
+	    idesc->id_number == inp->i_parent ||    /* Case 2 */
+	    inp->i_dotdot != idesc->id_number ||    /* Case 3 */
+	    inp->i_dotdot == inp->i_parent) {	    /* Case 4 */
+		getpathname(newname, idesc->id_number, idesc->id_number);
+		if (strcmp(newname, "/") != 0)
+			strcat (newname, "/");
+		strcat(newname, idesc->id_dirp->d_name);
+		getpathname(oldname, inp->i_number, inp->i_number);
+		pwarn("%s IS AN EXTRANEOUS HARD LINK TO DIRECTORY %s",
+		    newname, oldname);
+		if (cursnapshot != 0) {
+			/*
+			 * We need to
+			 *    setcwd(idesc->id_number);
+			 *    unlink(idesc->id_dirp->d_name);
+			 */
+			cmd.value = idesc->id_number;
+			if (sysctlbyname("vfs.ffs.setcwd", 0, 0,
+			    &cmd, sizeof cmd) == -1) {
+				printf(" (IGNORED)\n");
+				return (0);
+			}
+			cmd.value = (intptr_t)idesc->id_dirp->d_name;
+			cmd.size = inp->i_number; /* verify same name */
+			if (sysctlbyname("vfs.ffs.unlink", 0, 0,
+			    &cmd, sizeof cmd) == -1) {
+				printf(" (UNLINK FAILED: %s)\n",
+				    strerror(errno));
+				return (0);
+			}
+			printf(" (REMOVED)\n");
+			return (0);
+		}
+		if (preen) {
+			printf(" (REMOVED)\n");
+			return (1);
+		}
+		return (reply("REMOVE"));
+	}
+	/*
+	 * None of the first four cases above, so must be case (5).
+	 * Eliminate the old name and make the new the name the parent.
+	 */
+	getpathname(oldname, inp->i_parent, inp->i_number);
+	getpathname(newname, inp->i_number, inp->i_number);
+	pwarn("%s IS AN EXTRANEOUS HARD LINK TO DIRECTORY %s", oldname,
+	    newname);
+	if (cursnapshot != 0) {
+		/*
+		 * We need to
+		 *    setcwd(inp->i_parent);
+		 *    unlink(last component of oldname pathname);
+		 */
+		cmd.value = inp->i_parent;
+		if (sysctlbyname("vfs.ffs.setcwd", 0, 0,
+		    &cmd, sizeof cmd) == -1) {
+			printf(" (IGNORED)\n");
+			return (0);
+		}
+		if ((cp = rindex(oldname, '/')) == NULL) {
+			printf(" (IGNORED)\n");
+			return (0);
+		}
+		cmd.value = (intptr_t)(cp + 1);
+		cmd.size = inp->i_number; /* verify same name */
+		if (sysctlbyname("vfs.ffs.unlink", 0, 0,
+		    &cmd, sizeof cmd) == -1) {
+			printf(" (UNLINK FAILED: %s)\n",
+			    strerror(errno));
+			return (0);
+		}
+		printf(" (REMOVED)\n");
+		inp->i_parent = idesc->id_number;  /* reparent to correct dir */
+		return (0);
+	}
+	if (!preen && !reply("REMOVE"))
+		return (0);
+	memset(&dotdesc, 0, sizeof(struct inodesc));
+	dotdesc.id_type = DATA;
+	dotdesc.id_number = inp->i_parent; /* directory in which name appears */
+	dotdesc.id_parent = inp->i_number; /* inode number in entry to delete */
+	dotdesc.id_func = deleteentry;
+	if ((ckinode(ginode(dotdesc.id_number), &dotdesc) & FOUND) && preen)
+		printf(" (REMOVED)\n");
+	inp->i_parent = idesc->id_number;  /* reparent to correct directory */
+	inoinfo(inp->i_number)->ino_linkcnt++; /* name gone, return reference */
+	return (0);
+}
+
+static int
+deleteentry(struct inodesc *idesc)
+{
+	struct direct *dirp = idesc->id_dirp;
+
+	if (idesc->id_entryno++ < 2 || dirp->d_ino != idesc->id_parent)
+		return (KEEPON);
+	dirp->d_ino = 0;
+	return (ALTERED|STOP|FOUND);
+}
+
 /*
  * Routine to sort disk blocks.
  */

Modified: user/ed/utmpx/sbin/ifconfig/ifieee80211.c
==============================================================================
--- user/ed/utmpx/sbin/ifconfig/ifieee80211.c	Wed Jan 13 17:29:55 2010	(r202188)
+++ user/ed/utmpx/sbin/ifconfig/ifieee80211.c	Wed Jan 13 17:45:39 2010	(r202189)
@@ -3429,9 +3429,9 @@ get_chaninfo(const struct ieee80211_chan
 	else if (IEEE80211_IS_CHAN_B(c))
 		strlcat(buf, " 11b", bsize);
 	if (IEEE80211_IS_CHAN_HALF(c))
-		strlcat(buf, "/10Mhz", bsize);
+		strlcat(buf, "/10MHz", bsize);
 	if (IEEE80211_IS_CHAN_QUARTER(c))
-		strlcat(buf, "/5Mhz", bsize);
+		strlcat(buf, "/5MHz", bsize);
 	if (IEEE80211_IS_CHAN_TURBO(c))
 		strlcat(buf, " Turbo", bsize);
 	if (precise) {
@@ -3453,7 +3453,7 @@ print_chaninfo(const struct ieee80211_ch
 {
 	char buf[14];
 
-	printf("Channel %3u : %u%c Mhz%-14.14s",
+	printf("Channel %3u : %u%c MHz%-14.14s",
 		ieee80211_mhz2ieee(c->ic_freq, c->ic_flags), c->ic_freq,
 		IEEE80211_IS_CHAN_PASSIVE(c) ? '*' : ' ',
 		get_chaninfo(c, verb, buf, sizeof(buf)));
@@ -3562,7 +3562,7 @@ list_channels(int s, int allchans)
 static void
 print_txpow(const struct ieee80211_channel *c)
 {
-	printf("Channel %3u : %u Mhz %3.1f reg %2d  ",
+	printf("Channel %3u : %u MHz %3.1f reg %2d  ",
 	    c->ic_ieee, c->ic_freq,
 	    c->ic_maxpower/2., c->ic_maxregpower);
 }
@@ -4244,7 +4244,7 @@ ieee80211_status(int s)
 	c = getcurchan(s);
 	if (c->ic_freq != IEEE80211_CHAN_ANY) {
 		char buf[14];
-		printf(" channel %d (%u Mhz%s)", c->ic_ieee, c->ic_freq,
+		printf(" channel %d (%u MHz%s)", c->ic_ieee, c->ic_freq,
 			get_chaninfo(c, 1, buf, sizeof(buf)));
 	} else if (verbose)
 		printf(" channel UNDEF");

Modified: user/ed/utmpx/share/man/man3/pthread_affinity_np.3
==============================================================================
--- user/ed/utmpx/share/man/man3/pthread_affinity_np.3	Wed Jan 13 17:29:55 2010	(r202188)
+++ user/ed/utmpx/share/man/man3/pthread_affinity_np.3	Wed Jan 13 17:45:39 2010	(r202189)
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd January 8, 2010
+.Dd January 12, 2010
 .Dt PTHREAD_AFFINITY_NP 3
 .Os
 .Sh NAME
@@ -44,17 +44,17 @@
 .Fn pthread_getaffinity_np
 and
 .Fn pthread_setaffinity_np
-allow the manipulation of sets of CPUs available to specified thread.
+allow the manipulation of sets of CPUs available to the specified thread.
 .Pp
 Masks of type
 .Ft cpuset_t
 are composed using the
-.Xr CPU_SET 2
+.Xr CPU_SET 3
 macros.
 The kernel tolerates large sets as long as all CPUs specified
 in the set exist.
 Sets smaller than the kernel uses generate an error on calls to
-.Fn  pthread_getaffinity_np
+.Fn pthread_getaffinity_np
 even if the result set would fit within the user supplied set.
 Calls to
 .Fn pthread_setaffinity_np
@@ -75,14 +75,13 @@ retrieves the
 mask from the thread specified by
 .Fa td ,
 and stores it in the space provided by
-.Fa cpumaskp .
+.Fa cpusetp .
 .Pp
 .Fn pthread_setaffinity_np
 attempts to set the mask for the thread specified by
 .Fa td
 to the value in
-.Fa cpumaskp .
-.Pp
+.Fa cpusetp .
 .Sh RETURN VALUES
 If successful, the
 .Fn pthread_getaffinity_np
@@ -105,7 +104,7 @@ call would leave a thread without a vali
 does not overlap with the thread's anonymous mask.
 .It Bq Er EFAULT
 The
-.Fa cpumaskp
+.Fa cpusetp
 pointer passed was invalid.
 .It Bq Er ESRCH
 The thread specified by the
@@ -127,7 +126,7 @@ operation.
 .Xr CPU_SET 3 ,
 .Xr pthread 3 ,
 .Xr pthread_attr_get_affinity_np 3 ,
-.Xr pthread_attr_set_affinity_np 3 .
+.Xr pthread_attr_set_affinity_np 3
 .Sh STANDARDS
 The
 .Nm pthread_getaffinity_np

Modified: user/ed/utmpx/share/man/man3/pthread_attr_affinity_np.3
==============================================================================
--- user/ed/utmpx/share/man/man3/pthread_attr_affinity_np.3	Wed Jan 13 17:29:55 2010	(r202188)
+++ user/ed/utmpx/share/man/man3/pthread_attr_affinity_np.3	Wed Jan 13 17:45:39 2010	(r202189)
@@ -31,7 +31,7 @@
 .Sh NAME
 .Nm pthread_attr_getaffinity_np ,
 .Nm pthread_attr_setaffinity_np
-.Nd manage CPU affinity in thread attribute object
+.Nd manage CPU affinity in thread attribute objects
 .Sh LIBRARY
 .Lb libpthread
 .Sh SYNOPSIS
@@ -41,20 +41,21 @@
 .Ft int
 .Fn pthread_attr_setaffinity_np "pthread_attr_t *pattr" "size_t cpusetsize" "const cpuset_t *cpusetp"
 .Sh DESCRIPTION
+The
 .Fn pthread_attr_getaffinity_np
 and
 .Fn pthread_attr_setaffinity_np
-allow the manipulation of sets of CPUs available to specified thread attribute object.
+functions allow the manipulation of sets of CPUs available to the specified thread attribute object.
 .Pp
 Masks of type
 .Ft cpuset_t
 are composed using the
-.Xr CPU_SET 2
+.Xr CPU_SET 3
 macros.
 The kernel tolerates large sets as long as all CPUs specified
 in the set exist.
 Sets smaller than the kernel uses generate an error on calls to
-.Fn  pthread_attr_getaffinity_np
+.Fn pthread_attr_getaffinity_np
 even if the result set would fit within the user supplied set.
 Calls to
 .Fn pthread_attr_setaffinity_np
@@ -75,14 +76,13 @@ retrieves the
 mask from the thread attribute object specified by
 .Fa pattr ,
 and stores it in the space provided by
-.Fa cpumaskp .
+.Fa cpusetp .
 .Pp
 .Fn pthread_attr_setaffinity_np
-set the mask for the thread attribute object specified by
+sets the mask for the thread attribute object specified by
 .Fa pattr
 to the value in
-.Fa cpumaskp .
-.Pp
+.Fa cpusetp .
 .Sh RETURN VALUES
 If successful, the
 .Fn pthread_attr_getaffinity_np
@@ -101,7 +101,8 @@ functions will fail if:
 .It Bq Er EINVAL
 The
 .Fa pattr
-or the attribute specified by it is NULL.
+or the attribute specified by it is
+.Dv NULL .
 .El
 .Pp
 The
@@ -111,7 +112,8 @@ function will fail if:
 .It Bq Er EINVAL
 The
 .Fa pattr
-or the attribute specified by it is NULL.
+or the attribute specified by it is
+.Dv NULL .
 .It Bq Er ENOMEM
 Insufficient memory exists to store the cpuset mask.
 .El
@@ -122,7 +124,7 @@ Insufficient memory exists to store the 
 .Xr cpuset_setid 2 ,
 .Xr CPU_SET 3 ,
 .Xr pthread_get_affinity_np 3 ,
-.Xr pthread_set_affinity_np 3 .
+.Xr pthread_set_affinity_np 3
 .Sh STANDARDS
 The
 .Nm pthread_attr_getaffinity_np

Modified: user/ed/utmpx/share/man/man4/Makefile
==============================================================================
--- user/ed/utmpx/share/man/man4/Makefile	Wed Jan 13 17:29:55 2010	(r202188)
+++ user/ed/utmpx/share/man/man4/Makefile	Wed Jan 13 17:45:39 2010	(r202189)
@@ -424,6 +424,7 @@ MAN=	aac.4 \
 	ugen.4 \
 	uhci.4 \
 	uhid.4 \
+	uhso.4 \
 	uipaq.4 \
 	ukbd.4 \
 	ulpt.4 \

Modified: user/ed/utmpx/share/man/man4/ath.4
==============================================================================
--- user/ed/utmpx/share/man/man4/ath.4	Wed Jan 13 17:29:55 2010	(r202188)
+++ user/ed/utmpx/share/man/man4/ath.4	Wed Jan 13 17:45:39 2010	(r202189)
@@ -249,7 +249,7 @@ This should not happen.
 An invalid transmit rate was specified for an outgoing frame.
 The frame is discarded.
 This should not happen.
-.It "ath%d: ath_chan_set: unable to reset channel %u (%u Mhz)"
+.It "ath%d: ath_chan_set: unable to reset channel %u (%u MHz)"
 The Atheros Hardware Access Layer was unable to reset the hardware
 when switching channels during scanning.
 This should not happen.

Modified: user/ed/utmpx/share/man/man4/cpufreq.4
==============================================================================
--- user/ed/utmpx/share/man/man4/cpufreq.4	Wed Jan 13 17:29:55 2010	(r202188)
+++ user/ed/utmpx/share/man/man4/cpufreq.4	Wed Jan 13 17:45:39 2010	(r202189)
@@ -234,7 +234,7 @@ The driver should set unknown or irrelev
 All the following elements for each setting should be returned:
 .Bd -literal
 struct cf_setting {
-	int	freq;	/* CPU clock in Mhz or 100ths of a percent. */
+	int	freq;	/* CPU clock in MHz or 100ths of a percent. */
 	int	volts;	/* Voltage in mV. */
 	int	power;	/* Power consumed in mW. */
 	int	lat;	/* Transition latency in us. */

Modified: user/ed/utmpx/share/man/man4/snd_hda.4
==============================================================================
--- user/ed/utmpx/share/man/man4/snd_hda.4	Wed Jan 13 17:29:55 2010	(r202188)
+++ user/ed/utmpx/share/man/man4/snd_hda.4	Wed Jan 13 17:45:39 2010	(r202189)
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd November 13, 2009
+.Dd January 12, 2010
 .Dt SND_HDA 4
 .Os
 .Sh NAME
@@ -125,12 +125,14 @@ such as
 .Dq Li nofixedrate ,
 will do the opposite and takes precedence.
 Options can be separated by whitespace and commas.
+.Pp
 .Dq Li GPIO Ns s
 are a codec's General Purpose I/O pins which system integrators sometimes
 use to control external muters, amplifiers and so on.
 If you have no sound, or sound volume is not adequate, you may have to
 experiment a bit with the GPIO setup to find the optimal setup for your
 system.
+.Pp
 The
 .Dq Li ivref Ns Ar X
 and
@@ -178,6 +180,11 @@ A unique, per-association number used to
 particular association.
 Sequence numbers can be specified as numeric values from 0 to 15.
 .Pp
+For output assotiations sequence numbers encode speaker pairs positions:
+0 - Front, 1 - Center/LFE, 2 - Back, 3 - Front Wide Center, 4 - Side.
+Standard combinations are: (0) - Stereo; (0, 2), (0, 4) - Quadro;
+(0, 1, 2), (0, 1, 4) - 5.1; (0, 1, 2, 4) - 7.1.
+.Pp
 The sequence number 15 has a special meaning for output associations.
 Output pins with this number and device type
 .Dq Ar Headphones
@@ -639,6 +646,3 @@ to control external amplifiers. In some 
 GPIO bits may be needed to make sound work on specific device.
 .Pp
 HDMI and DisplayPort audio may also require support from video driver.
-.Pp
-Due to OSS limitation multichannel (not multidevice) playback is not
-supported.

Copied: user/ed/utmpx/share/man/man4/uhso.4 (from r202188, head/share/man/man4/uhso.4)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/ed/utmpx/share/man/man4/uhso.4	Wed Jan 13 17:45:39 2010	(r202189, copy of r202188, head/share/man/man4/uhso.4)
@@ -0,0 +1,115 @@
+.\" Copyright (c) 2009 Fredrik Lindberg
+.\" All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+.\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+.\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+.\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+.\" (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$

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
