PERFORCE change 78764 for review

Peter Wemm peter at FreeBSD.org
Tue Jun 21 17:04:12 GMT 2005 

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

Change 78764 by peter at peter_daintree on 2005/06/21 17:03:14

	IFC @78761

Affected files ...

.. //depot/projects/hammer/Makefile#32 integrate
.. //depot/projects/hammer/Makefile.inc1#95 integrate
.. //depot/projects/hammer/contrib/amd/amd/amd.8#5 integrate
.. //depot/projects/hammer/contrib/amd/amq/amq.8#5 integrate
.. //depot/projects/hammer/contrib/amd/amq/pawd.1#4 integrate
.. //depot/projects/hammer/contrib/amd/fixmount/fixmount.8#6 integrate
.. //depot/projects/hammer/contrib/amd/fsinfo/fsinfo.8#7 integrate
.. //depot/projects/hammer/contrib/amd/hlfsd/hlfsd.8#6 integrate
.. //depot/projects/hammer/contrib/amd/mk-amd-map/mk-amd-map.8#4 integrate
.. //depot/projects/hammer/contrib/amd/scripts/amd.conf.5#6 integrate
.. //depot/projects/hammer/contrib/amd/wire-test/wire-test.8#4 integrate
.. //depot/projects/hammer/contrib/com_err/compile_et.1#2 integrate
.. //depot/projects/hammer/contrib/openpam/CREDITS#7 integrate
.. //depot/projects/hammer/contrib/openpam/HISTORY#9 integrate
.. //depot/projects/hammer/contrib/openpam/MANIFEST#7 integrate
.. //depot/projects/hammer/contrib/openpam/Makefile.am#3 integrate
.. //depot/projects/hammer/contrib/openpam/Makefile.in#4 integrate
.. //depot/projects/hammer/contrib/openpam/RELNOTES#9 integrate
.. //depot/projects/hammer/contrib/openpam/aclocal.m4#3 integrate
.. //depot/projects/hammer/contrib/openpam/autogen.sh#2 integrate
.. //depot/projects/hammer/contrib/openpam/bin/Makefile.am#2 integrate
.. //depot/projects/hammer/contrib/openpam/bin/Makefile.in#3 integrate
.. //depot/projects/hammer/contrib/openpam/bin/su/Makefile.am#2 integrate
.. //depot/projects/hammer/contrib/openpam/bin/su/Makefile.in#3 integrate
.. //depot/projects/hammer/contrib/openpam/configure#4 integrate
.. //depot/projects/hammer/contrib/openpam/doc/Makefile.am#2 integrate
.. //depot/projects/hammer/contrib/openpam/doc/Makefile.in#3 integrate
.. //depot/projects/hammer/contrib/openpam/doc/man/Makefile.am#3 integrate
.. //depot/projects/hammer/contrib/openpam/doc/man/Makefile.in#3 integrate
.. //depot/projects/hammer/contrib/openpam/doc/man/openpam.3#9 integrate
.. //depot/projects/hammer/contrib/openpam/doc/man/openpam_borrow_cred.3#9 integrate
.. //depot/projects/hammer/contrib/openpam/doc/man/openpam_free_data.3#9 integrate
.. //depot/projects/hammer/contrib/openpam/doc/man/openpam_free_envlist.3#2 integrate
.. //depot/projects/hammer/contrib/openpam/doc/man/openpam_get_option.3#9 integrate
.. //depot/projects/hammer/contrib/openpam/doc/man/openpam_log.3#9 integrate
.. //depot/projects/hammer/contrib/openpam/doc/man/openpam_nullconv.3#9 integrate
.. //depot/projects/hammer/contrib/openpam/doc/man/openpam_readline.3#5 integrate
.. //depot/projects/hammer/contrib/openpam/doc/man/openpam_restore_cred.3#9 integrate
.. //depot/projects/hammer/contrib/openpam/doc/man/openpam_set_option.3#9 integrate
.. //depot/projects/hammer/contrib/openpam/doc/man/openpam_ttyconv.3#9 integrate
.. //depot/projects/hammer/contrib/openpam/doc/man/pam.3#9 integrate
.. //depot/projects/hammer/contrib/openpam/doc/man/pam.conf.5#1 branch
.. //depot/projects/hammer/contrib/openpam/doc/man/pam_acct_mgmt.3#9 integrate
.. //depot/projects/hammer/contrib/openpam/doc/man/pam_authenticate.3#9 integrate
.. //depot/projects/hammer/contrib/openpam/doc/man/pam_chauthtok.3#9 integrate
.. //depot/projects/hammer/contrib/openpam/doc/man/pam_close_session.3#9 integrate
.. //depot/projects/hammer/contrib/openpam/doc/man/pam_conv.3#5 integrate
.. //depot/projects/hammer/contrib/openpam/doc/man/pam_end.3#9 integrate
.. //depot/projects/hammer/contrib/openpam/doc/man/pam_error.3#9 integrate
.. //depot/projects/hammer/contrib/openpam/doc/man/pam_get_authtok.3#9 integrate
.. //depot/projects/hammer/contrib/openpam/doc/man/pam_get_data.3#9 integrate
.. //depot/projects/hammer/contrib/openpam/doc/man/pam_get_item.3#9 integrate
.. //depot/projects/hammer/contrib/openpam/doc/man/pam_get_user.3#9 integrate
.. //depot/projects/hammer/contrib/openpam/doc/man/pam_getenv.3#9 integrate
.. //depot/projects/hammer/contrib/openpam/doc/man/pam_getenvlist.3#9 integrate
.. //depot/projects/hammer/contrib/openpam/doc/man/pam_info.3#9 integrate
.. //depot/projects/hammer/contrib/openpam/doc/man/pam_open_session.3#9 integrate
.. //depot/projects/hammer/contrib/openpam/doc/man/pam_prompt.3#9 integrate
.. //depot/projects/hammer/contrib/openpam/doc/man/pam_putenv.3#9 integrate
.. //depot/projects/hammer/contrib/openpam/doc/man/pam_set_data.3#9 integrate
.. //depot/projects/hammer/contrib/openpam/doc/man/pam_set_item.3#9 integrate
.. //depot/projects/hammer/contrib/openpam/doc/man/pam_setcred.3#9 integrate
.. //depot/projects/hammer/contrib/openpam/doc/man/pam_setenv.3#9 integrate
.. //depot/projects/hammer/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#9 integrate
.. //depot/projects/hammer/contrib/openpam/doc/man/pam_sm_authenticate.3#9 integrate
.. //depot/projects/hammer/contrib/openpam/doc/man/pam_sm_chauthtok.3#9 integrate
.. //depot/projects/hammer/contrib/openpam/doc/man/pam_sm_close_session.3#9 integrate
.. //depot/projects/hammer/contrib/openpam/doc/man/pam_sm_open_session.3#9 integrate
.. //depot/projects/hammer/contrib/openpam/doc/man/pam_sm_setcred.3#9 integrate
.. //depot/projects/hammer/contrib/openpam/doc/man/pam_start.3#9 integrate
.. //depot/projects/hammer/contrib/openpam/doc/man/pam_strerror.3#9 integrate
.. //depot/projects/hammer/contrib/openpam/doc/man/pam_verror.3#9 integrate
.. //depot/projects/hammer/contrib/openpam/doc/man/pam_vinfo.3#9 integrate
.. //depot/projects/hammer/contrib/openpam/doc/man/pam_vprompt.3#9 integrate
.. //depot/projects/hammer/contrib/openpam/include/Makefile.am#2 integrate
.. //depot/projects/hammer/contrib/openpam/include/Makefile.in#3 integrate
.. //depot/projects/hammer/contrib/openpam/include/security/Makefile.am#2 integrate
.. //depot/projects/hammer/contrib/openpam/include/security/Makefile.in#3 integrate
.. //depot/projects/hammer/contrib/openpam/include/security/openpam_version.h#8 integrate
.. //depot/projects/hammer/contrib/openpam/lib/Makefile.am#3 integrate
.. //depot/projects/hammer/contrib/openpam/lib/Makefile.in#3 integrate
.. //depot/projects/hammer/contrib/openpam/lib/openpam_dynamic.c#5 integrate
.. //depot/projects/hammer/contrib/openpam/lib/openpam_load.c#6 integrate
.. //depot/projects/hammer/contrib/openpam/lib/openpam_readline.c#2 integrate
.. //depot/projects/hammer/contrib/openpam/lib/openpam_ttyconv.c#11 integrate
.. //depot/projects/hammer/contrib/openpam/ltmain.sh#4 integrate
.. //depot/projects/hammer/contrib/openpam/misc/gendoc.pl#7 integrate
.. //depot/projects/hammer/contrib/openpam/modules/Makefile.am#2 integrate
.. //depot/projects/hammer/contrib/openpam/modules/Makefile.in#3 integrate
.. //depot/projects/hammer/contrib/openpam/modules/pam_deny/Makefile.am#2 integrate
.. //depot/projects/hammer/contrib/openpam/modules/pam_deny/Makefile.in#3 integrate
.. //depot/projects/hammer/contrib/openpam/modules/pam_deny/pam_deny.c#5 integrate
.. //depot/projects/hammer/contrib/openpam/modules/pam_permit/Makefile.am#2 integrate
.. //depot/projects/hammer/contrib/openpam/modules/pam_permit/Makefile.in#3 integrate
.. //depot/projects/hammer/contrib/openpam/modules/pam_unix/Makefile.am#2 integrate
.. //depot/projects/hammer/contrib/openpam/modules/pam_unix/Makefile.in#3 integrate
.. //depot/projects/hammer/contrib/pnpinfo/pnpinfo.8#2 integrate
.. //depot/projects/hammer/etc/mtree/BSD.x11-4.dist#10 integrate
.. //depot/projects/hammer/etc/pccard_ether#14 integrate
.. //depot/projects/hammer/etc/rc.d/ipfilter#19 integrate
.. //depot/projects/hammer/gnu/usr.bin/groff/tmac/mdoc.local#21 integrate
.. //depot/projects/hammer/gnu/usr.bin/send-pr/send-pr.1#6 integrate
.. //depot/projects/hammer/lib/libarchive/libarchive-formats.5#7 integrate
.. //depot/projects/hammer/lib/libarchive/tar.5#10 integrate
.. //depot/projects/hammer/lib/libautofs/libautofs.3#4 integrate
.. //depot/projects/hammer/lib/libc/gen/sysctl.3#9 integrate
.. //depot/projects/hammer/lib/libc/gen/ttyname.3#5 integrate
.. //depot/projects/hammer/lib/libc/net/gai_strerror.3#3 integrate
.. //depot/projects/hammer/lib/libc/net/getaddrinfo.3#12 integrate
.. //depot/projects/hammer/lib/libc/net/getnameinfo.3#11 integrate
.. //depot/projects/hammer/lib/libc/net/getnetent.3#6 integrate
.. //depot/projects/hammer/lib/libc/net/inet6_rth_space.3#8 integrate
.. //depot/projects/hammer/lib/libc/nls/catgets.3#3 integrate
.. //depot/projects/hammer/lib/libc/sys/send.2#12 integrate
.. //depot/projects/hammer/lib/libmd/sha.3#7 integrate
.. //depot/projects/hammer/lib/libmd/sha256.3#2 integrate
.. //depot/projects/hammer/lib/libpam/Makefile.inc#8 integrate
.. //depot/projects/hammer/lib/libpam/libpam/Makefile#16 integrate
.. //depot/projects/hammer/lib/libpam/modules/pam_exec/pam_exec.8#5 integrate
.. //depot/projects/hammer/lib/libsdp/sdp.3#7 integrate
.. //depot/projects/hammer/lib/libthr/libthr.3#2 integrate
.. //depot/projects/hammer/lib/msun/man/fenv.3#4 integrate
.. //depot/projects/hammer/lib/msun/man/ieee.3#10 integrate
.. //depot/projects/hammer/lib/msun/man/lround.3#3 integrate
.. //depot/projects/hammer/lib/msun/man/math.3#12 integrate
.. //depot/projects/hammer/lib/msun/man/round.3#5 integrate
.. //depot/projects/hammer/lib/msun/man/trunc.3#3 integrate
.. //depot/projects/hammer/release/Makefile#73 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#17 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/installation/common/trouble.sgml#10 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#99 integrate
.. //depot/projects/hammer/release/scripts/lib32-make.sh#1 branch
.. //depot/projects/hammer/sbin/Makefile#37 integrate
.. //depot/projects/hammer/sbin/ifconfig/af_inet.c#2 integrate
.. //depot/projects/hammer/sbin/ifconfig/af_inet6.c#3 integrate
.. //depot/projects/hammer/sbin/ifconfig/ifieee80211.c#11 integrate
.. //depot/projects/hammer/sbin/mount/mount.8#17 integrate
.. //depot/projects/hammer/sbin/savecore/savecore.c#11 integrate
.. //depot/projects/hammer/share/man/man1/builtin.1#4 integrate
.. //depot/projects/hammer/share/man/man3/pthread_atfork.3#2 integrate
.. //depot/projects/hammer/share/man/man4/acpi.4#35 integrate
.. //depot/projects/hammer/share/man/man4/carp.4#5 integrate
.. //depot/projects/hammer/share/man/man4/cdce.4#3 integrate
.. //depot/projects/hammer/share/man/man4/cpufreq.4#7 integrate
.. //depot/projects/hammer/share/man/man4/ed.4#8 integrate
.. //depot/projects/hammer/share/man/man4/geom.4#8 integrate
.. //depot/projects/hammer/share/man/man4/hwpmc.4#4 integrate
.. //depot/projects/hammer/share/man/man4/icmp6.4#5 integrate
.. //depot/projects/hammer/share/man/man4/if_bridge.4#2 integrate
.. //depot/projects/hammer/share/man/man4/ipw.4#3 integrate
.. //depot/projects/hammer/share/man/man4/iwi.4#4 integrate
.. //depot/projects/hammer/share/man/man4/man4.i386/acpi_fujitsu.4#2 integrate
.. //depot/projects/hammer/share/man/man4/man4.i386/mcd.4#6 integrate
.. //depot/projects/hammer/share/man/man4/man4.i386/pnp.4#3 integrate
.. //depot/projects/hammer/share/man/man4/man4.i386/smapi.4#2 integrate
.. //depot/projects/hammer/share/man/man4/ng_ccatm.4#3 integrate
.. //depot/projects/hammer/share/man/man4/ng_nat.4#2 integrate
.. //depot/projects/hammer/share/man/man4/ng_netflow.4#9 integrate
.. //depot/projects/hammer/share/man/man4/ng_source.4#8 integrate
.. //depot/projects/hammer/share/man/man4/ng_tcpmss.4#2 integrate
.. //depot/projects/hammer/share/man/man4/nve.4#2 integrate
.. //depot/projects/hammer/share/man/man4/ral.4#2 integrate
.. //depot/projects/hammer/share/man/man4/sched_4bsd.4#2 integrate
.. //depot/projects/hammer/share/man/man4/sched_ule.4#2 integrate
.. //depot/projects/hammer/share/man/man4/snd_emu10k1.4#5 integrate
.. //depot/projects/hammer/share/man/man4/snd_maestro3.4#4 integrate
.. //depot/projects/hammer/share/man/man4/snd_via8233.4#2 integrate
.. //depot/projects/hammer/share/man/man4/unix.4#5 integrate
.. //depot/projects/hammer/share/man/man4/ural.4#2 integrate
.. //depot/projects/hammer/share/man/man4/witness.4#6 integrate
.. //depot/projects/hammer/share/man/man4/wlan_tkip.4#4 integrate
.. //depot/projects/hammer/share/man/man5/autofs.5#3 integrate
.. //depot/projects/hammer/share/man/man5/devfs.conf.5#2 integrate
.. //depot/projects/hammer/share/man/man5/devfs.rules.5#2 integrate
.. //depot/projects/hammer/share/man/man5/elf.5#9 integrate
.. //depot/projects/hammer/share/man/man7/release.7#27 integrate
.. //depot/projects/hammer/share/man/man9/MUTEX_PROFILING.9#6 integrate
.. //depot/projects/hammer/share/man/man9/VFS_SYNC.9#7 integrate
.. //depot/projects/hammer/share/man/man9/VFS_VGET.9#9 integrate
.. //depot/projects/hammer/share/man/man9/VOP_GETPAGES.9#7 integrate
.. //depot/projects/hammer/share/man/man9/alloc_unr.9#2 integrate
.. //depot/projects/hammer/share/man/man9/bus_dma.9#16 integrate
.. //depot/projects/hammer/share/man/man9/devclass_get_drivers.9#3 integrate
.. //depot/projects/hammer/share/man/man9/device_find_child.9#4 integrate
.. //depot/projects/hammer/share/man/man9/ifnet.9#20 integrate
.. //depot/projects/hammer/share/man/man9/kthread.9#5 integrate
.. //depot/projects/hammer/share/man/man9/ktr.9#7 integrate
.. //depot/projects/hammer/share/man/man9/mbuf.9#21 integrate
.. //depot/projects/hammer/share/man/man9/pci.9#6 integrate
.. //depot/projects/hammer/share/man/man9/pmap.9#6 integrate
.. //depot/projects/hammer/share/man/man9/rman.9#5 integrate
.. //depot/projects/hammer/share/man/man9/taskqueue.9#12 integrate
.. //depot/projects/hammer/share/man/man9/time.9#8 integrate
.. //depot/projects/hammer/share/man/man9/timeout.9#10 integrate
.. //depot/projects/hammer/share/man/man9/vfs_suser.9#3 integrate
.. //depot/projects/hammer/sys/alpha/conf/.cvsignore#1 branch
.. //depot/projects/hammer/sys/amd64/conf/.cvsignore#1 branch
.. //depot/projects/hammer/sys/arm/arm/pmap.c#22 integrate
.. //depot/projects/hammer/sys/arm/arm/trap.c#12 integrate
.. //depot/projects/hammer/sys/arm/conf/.cvsignore#1 branch
.. //depot/projects/hammer/sys/conf/NOTES#93 integrate
.. //depot/projects/hammer/sys/conf/files#115 integrate
.. //depot/projects/hammer/sys/conf/files.i386#61 integrate
.. //depot/projects/hammer/sys/conf/files.pc98#47 integrate
.. //depot/projects/hammer/sys/conf/options#77 integrate
.. //depot/projects/hammer/sys/conf/options.i386#36 integrate
.. //depot/projects/hammer/sys/dev/acpi_support/acpi_ibm.c#5 integrate
.. //depot/projects/hammer/sys/dev/ed/if_ed.c#29 integrate
.. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_amd.c#5 integrate
.. //depot/projects/hammer/sys/dev/uart/uart_cpu_alpha.c#8 integrate
.. //depot/projects/hammer/sys/gnu/ext2fs/COPYRIGHT.INFO#2 delete
.. //depot/projects/hammer/sys/gnu/ext2fs/ext2_alloc.c#6 delete
.. //depot/projects/hammer/sys/gnu/ext2fs/ext2_balloc.c#5 delete
.. //depot/projects/hammer/sys/gnu/ext2fs/ext2_bitops.h#3 delete
.. //depot/projects/hammer/sys/gnu/ext2fs/ext2_bmap.c#9 delete
.. //depot/projects/hammer/sys/gnu/ext2fs/ext2_extern.h#8 delete
.. //depot/projects/hammer/sys/gnu/ext2fs/ext2_fs.h#4 delete
.. //depot/projects/hammer/sys/gnu/ext2fs/ext2_fs_sb.h#4 delete
.. //depot/projects/hammer/sys/gnu/ext2fs/ext2_inode.c#14 delete
.. //depot/projects/hammer/sys/gnu/ext2fs/ext2_inode_cnv.c#4 delete
.. //depot/projects/hammer/sys/gnu/ext2fs/ext2_linux_balloc.c#7 delete
.. //depot/projects/hammer/sys/gnu/ext2fs/ext2_linux_ialloc.c#5 delete
.. //depot/projects/hammer/sys/gnu/ext2fs/ext2_lookup.c#13 delete
.. //depot/projects/hammer/sys/gnu/ext2fs/ext2_mount.h#8 delete
.. //depot/projects/hammer/sys/gnu/ext2fs/ext2_readwrite.c#7 delete
.. //depot/projects/hammer/sys/gnu/ext2fs/ext2_subr.c#6 delete
.. //depot/projects/hammer/sys/gnu/ext2fs/ext2_vfsops.c#30 delete
.. //depot/projects/hammer/sys/gnu/ext2fs/ext2_vnops.c#26 delete
.. //depot/projects/hammer/sys/gnu/ext2fs/fs.h#7 delete
.. //depot/projects/hammer/sys/gnu/ext2fs/i386-bitops.h#3 delete
.. //depot/projects/hammer/sys/gnu/ext2fs/inode.h#7 delete
.. //depot/projects/hammer/sys/gnu/ext2fs/sparc64-bitops.h#3 delete
.. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_alloc.c#2 integrate
.. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_balloc.c#2 integrate
.. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_bmap.c#2 integrate
.. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_fs.h#2 integrate
.. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_fs_sb.h#2 integrate
.. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_inode.c#2 integrate
.. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_inode_cnv.c#2 integrate
.. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_linux_balloc.c#2 integrate
.. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_linux_ialloc.c#2 integrate
.. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_lookup.c#2 integrate
.. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_subr.c#2 integrate
.. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_vfsops.c#2 integrate
.. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_vnops.c#2 integrate
.. //depot/projects/hammer/sys/gnu/fs/ext2fs/i386-bitops.h#2 integrate
.. //depot/projects/hammer/sys/gnu/fs/ext2fs/sparc64-bitops.h#2 integrate
.. //depot/projects/hammer/sys/gnu/fs/reiserfs/README#1 branch
.. //depot/projects/hammer/sys/gnu/fs/reiserfs/reiserfs_fs.h#1 branch
.. //depot/projects/hammer/sys/gnu/fs/reiserfs/reiserfs_fs_i.h#1 branch
.. //depot/projects/hammer/sys/gnu/fs/reiserfs/reiserfs_fs_sb.h#1 branch
.. //depot/projects/hammer/sys/gnu/fs/reiserfs/reiserfs_hashes.c#1 branch
.. //depot/projects/hammer/sys/gnu/fs/reiserfs/reiserfs_inode.c#1 branch
.. //depot/projects/hammer/sys/gnu/fs/reiserfs/reiserfs_item_ops.c#1 branch
.. //depot/projects/hammer/sys/gnu/fs/reiserfs/reiserfs_mount.h#1 branch
.. //depot/projects/hammer/sys/gnu/fs/reiserfs/reiserfs_namei.c#1 branch
.. //depot/projects/hammer/sys/gnu/fs/reiserfs/reiserfs_prints.c#1 branch
.. //depot/projects/hammer/sys/gnu/fs/reiserfs/reiserfs_stree.c#1 branch
.. //depot/projects/hammer/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#1 branch
.. //depot/projects/hammer/sys/gnu/fs/reiserfs/reiserfs_vnops.c#1 branch
.. //depot/projects/hammer/sys/gnu/reiserfs/README#2 delete
.. //depot/projects/hammer/sys/gnu/reiserfs/reiserfs_fs.h#2 delete
.. //depot/projects/hammer/sys/gnu/reiserfs/reiserfs_fs_i.h#2 delete
.. //depot/projects/hammer/sys/gnu/reiserfs/reiserfs_fs_sb.h#2 delete
.. //depot/projects/hammer/sys/gnu/reiserfs/reiserfs_hashes.c#2 delete
.. //depot/projects/hammer/sys/gnu/reiserfs/reiserfs_inode.c#2 delete
.. //depot/projects/hammer/sys/gnu/reiserfs/reiserfs_item_ops.c#2 delete
.. //depot/projects/hammer/sys/gnu/reiserfs/reiserfs_mount.h#2 delete
.. //depot/projects/hammer/sys/gnu/reiserfs/reiserfs_namei.c#2 delete
.. //depot/projects/hammer/sys/gnu/reiserfs/reiserfs_prints.c#2 delete
.. //depot/projects/hammer/sys/gnu/reiserfs/reiserfs_stree.c#2 delete
.. //depot/projects/hammer/sys/gnu/reiserfs/reiserfs_vfsops.c#2 delete
.. //depot/projects/hammer/sys/gnu/reiserfs/reiserfs_vnops.c#2 delete
.. //depot/projects/hammer/sys/i386/conf/.cvsignore#1 branch
.. //depot/projects/hammer/sys/i386/conf/NOTES#71 integrate
.. //depot/projects/hammer/sys/i4b/driver/i4b_ipr.c#15 integrate
.. //depot/projects/hammer/sys/i4b/driver/i4b_isppp.c#13 integrate
.. //depot/projects/hammer/sys/ia64/conf/.cvsignore#1 branch
.. //depot/projects/hammer/sys/kern/imgact_shell.c#11 integrate
.. //depot/projects/hammer/sys/kern/kern_intr.c#37 integrate
.. //depot/projects/hammer/sys/kern/kern_malloc.c#24 integrate
.. //depot/projects/hammer/sys/kern/subr_disk.c#15 integrate
.. //depot/projects/hammer/sys/kern/vfs_bio.c#56 integrate
.. //depot/projects/hammer/sys/kern/vfs_cache.c#15 integrate
.. //depot/projects/hammer/sys/kern/vfs_default.c#41 integrate
.. //depot/projects/hammer/sys/kern/vfs_subr.c#85 integrate
.. //depot/projects/hammer/sys/modules/Makefile#79 integrate
.. //depot/projects/hammer/sys/modules/ext2fs/Makefile#3 integrate
.. //depot/projects/hammer/sys/modules/libalias/Makefile#2 integrate
.. //depot/projects/hammer/sys/modules/reiserfs/Makefile#2 integrate
.. //depot/projects/hammer/sys/net/if.c#48 integrate
.. //depot/projects/hammer/sys/netinet/in_gif.c#12 integrate
.. //depot/projects/hammer/sys/netinet/ip_fw2.c#58 integrate
.. //depot/projects/hammer/sys/netinet/libalias/alias_util.c#3 integrate
.. //depot/projects/hammer/sys/netinet6/in6_gif.c#9 integrate
.. //depot/projects/hammer/sys/nfsclient/nfs_bio.c#35 integrate
.. //depot/projects/hammer/sys/pc98/conf/.cvsignore#1 branch
.. //depot/projects/hammer/sys/pc98/conf/NOTES#45 integrate
.. //depot/projects/hammer/sys/powerpc/conf/.cvsignore#1 branch
.. //depot/projects/hammer/sys/sparc64/conf/.cvsignore#1 branch
.. //depot/projects/hammer/sys/vm/uma_int.h#17 integrate
.. //depot/projects/hammer/tools/regression/usr.bin/env/Makefile#1 branch
.. //depot/projects/hammer/tools/regression/usr.bin/env/regress-env.rgdata#1 branch
.. //depot/projects/hammer/tools/regression/usr.bin/env/regress-sb.rb#1 branch
.. //depot/projects/hammer/usr.bin/env/Makefile#3 integrate
.. //depot/projects/hammer/usr.bin/env/env.1#6 integrate
.. //depot/projects/hammer/usr.bin/env/env.c#3 integrate
.. //depot/projects/hammer/usr.bin/env/envopts.c#1 branch
.. //depot/projects/hammer/usr.bin/env/envopts.h#1 branch
.. //depot/projects/hammer/usr.bin/truss/syscalls.c#18 integrate
.. //depot/projects/hammer/usr.sbin/ndiscvt/ndiscvt.8#6 integrate
.. //depot/projects/hammer/usr.sbin/ndiscvt/ndisgen.8#2 integrate
.. //depot/projects/hammer/usr.sbin/powerd/powerd.8#3 integrate
.. //depot/projects/hammer/usr.sbin/pwd_mkdb/pwd_mkdb.c#10 integrate
.. //depot/projects/hammer/usr.sbin/sysinstall/dist.c#21 integrate
.. //depot/projects/hammer/usr.sbin/sysinstall/dist.h#9 integrate
.. //depot/projects/hammer/usr.sbin/sysinstall/menus.c#34 integrate
.. //depot/projects/hammer/usr.sbin/sysinstall/sysinstall.8#11 integrate
.. //depot/projects/hammer/usr.sbin/wpa/hostapd/Makefile#2 integrate
.. //depot/projects/hammer/usr.sbin/wpa/hostapd/hostapd.1#2 delete
.. //depot/projects/hammer/usr.sbin/wpa/hostapd/hostapd.8#1 branch
.. //depot/projects/hammer/usr.sbin/wpa/hostapd/hostapd.conf.5#1 branch
.. //depot/projects/hammer/usr.sbin/wpa/hostapd_cli/Makefile#2 integrate
.. //depot/projects/hammer/usr.sbin/wpa/hostapd_cli/hostapd_cli.1#2 delete
.. //depot/projects/hammer/usr.sbin/wpa/hostapd_cli/hostapd_cli.8#1 branch
.. //depot/projects/hammer/usr.sbin/wpa/wpa_cli/Makefile#2 integrate
.. //depot/projects/hammer/usr.sbin/wpa/wpa_cli/wpa_cli.1#2 delete
.. //depot/projects/hammer/usr.sbin/wpa/wpa_cli/wpa_cli.8#1 branch
.. //depot/projects/hammer/usr.sbin/wpa/wpa_supplicant/Makefile#2 integrate
.. //depot/projects/hammer/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.1#2 delete
.. //depot/projects/hammer/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.8#1 branch
.. //depot/projects/hammer/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5#2 integrate

Differences ...

==== //depot/projects/hammer/Makefile#32 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile,v 1.318 2005/03/02 12:33:22 harti Exp $
+# $FreeBSD: src/Makefile,v 1.319 2005/06/16 18:16:12 ru Exp $
 #
 # The user-driven targets are:
 #
@@ -71,7 +71,7 @@
 	obj objlink regress rerelease tags toolchain update \
 	_worldtmp _legacy _bootstrap-tools _cleanobj _obj \
 	_build-tools _cross-tools _includes _libraries _depend \
-	build32 install32
+	build32 distribute32 install32
 
 BITGTS=	files includes
 BITGTS:=${BITGTS} ${BITGTS:S/^/build/} ${BITGTS:S/^/install/}

==== //depot/projects/hammer/Makefile.inc1#95 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile.inc1,v 1.497 2005/06/06 09:39:46 ru Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.498 2005/06/16 18:16:12 ru Exp $
 #
 # Make command line options:
 #	-DNO_DYNAMICROOT do not link /bin and /sbin dynamically
@@ -437,14 +437,18 @@
 	    PROG=ld-elf32.so.1 ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t}
 .endfor
 
-install32:
-	mkdir -p ${DESTDIR}/usr/lib32	# XXX add to mtree
-	cd ${.CURDIR}/lib; ${LIB32MAKE} install
-	cd ${.CURDIR}/gnu/lib; ${LIB32MAKE} install
+distribute32 install32:
+.if make(distribute32)
+	mkdir -p ${DISTDIR}/${DISTRIBUTION}/usr/lib32	# XXX add to mtree
+.else
+	mkdir -p ${DESTDIR}/usr/lib32			# XXX add to mtree
+.endif
+	cd ${.CURDIR}/lib; ${LIB32MAKE} ${.TARGET:S/32$//}
+	cd ${.CURDIR}/gnu/lib; ${LIB32MAKE} ${.TARGET:S/32$//}
 .if !defined(NO_CRYPT)
-	cd ${.CURDIR}/secure/lib; ${LIB32MAKE} install
+	cd ${.CURDIR}/secure/lib; ${LIB32MAKE} ${.TARGET:S/32$//}
 .endif
-	cd ${.CURDIR}/libexec/rtld-elf; PROG=ld-elf32.so.1 ${LIB32MAKE} install
+	cd ${.CURDIR}/libexec/rtld-elf; PROG=ld-elf32.so.1 ${LIB32MAKE} ${.TARGET:S/32$//}
 .endif
 
 
@@ -552,6 +556,9 @@
 	@echo ">>> Distributing everything"
 	@echo "--------------------------------------------------------------"
 	${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 distribute
+.if ${TARGET_ARCH} == "amd64" && !defined(NO_LIB32)
+	${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 distribute32 DISTRIBUTION=lib32
+.endif
 
 distribution:
 	cd ${.CURDIR}/etc; ${CROSSENV} PATH=${TMPPATH} ${MAKE} distribution

==== //depot/projects/hammer/contrib/amd/amd/amd.8#5 (text+ko) ====

@@ -39,7 +39,7 @@
 .\"	%W% (Berkeley) %G%
 .\"
 .\" $Id: amd.8,v 1.4.2.5 2004/01/06 03:15:16 ezk Exp $
-.\" $FreeBSD: src/contrib/amd/amd/amd.8,v 1.19 2004/07/06 13:16:44 mbr Exp $
+.\" $FreeBSD: src/contrib/amd/amd/amd.8,v 1.20 2005/06/16 20:21:01 ru Exp $
 .\"
 .Dd April 19, 1994
 .Dt AMD 8
@@ -50,7 +50,7 @@
 .Sh SYNOPSIS
 .Nm amd
 .Fl H
-.Nm amd 
+.Nm amd
 .Op Fl F Ar conf_file
 .Nm amd
 .Op Fl nprvHS
@@ -83,7 +83,8 @@
 .Sh DESCRIPTION
 .Nm Amd
 is a daemon that automatically mounts file systems whenever a file or directory
-within that file system is accessed.  File systems are automatically unmounted
+within that file system is accessed.
+File systems are automatically unmounted
 when they appear to be quiescent.
 .Pp
 .Nm Amd
@@ -96,17 +97,19 @@
 .Nm amd ,
 which uses the map defined by
 .Ar mapname
-to determine how to resolve the lookup.  Generally, this will be a host name,
+to determine how to resolve the lookup.
+Generally, this will be a host name,
 some file system information and some mount options for the given file system.
 .Pp
 In the first form depicted above,
 .Nm amd
-will print a short help string.  In the second form, if no options are
+will print a short help string.
+In the second form, if no options are
 specified, or if the
 .Fl F
-is used, 
-.Nm amd 
-will read configuration parameters from the file 
+is used,
+.Nm amd
+will read configuration parameters from the file
 .Ar conf_file
 which defaults to
 .Pa /etc/amd.conf .
@@ -121,12 +124,15 @@
 Specify a
 .Ar duration ,
 in seconds, that a looked up name remains
-cached when not in use.  The default is 5 minutes.
+cached when not in use.
+The default is 5 minutes.
 .It Fl d Ar domain
-Specify the local domain name.  If this option is not
+Specify the local domain name.
+If this option is not
 given the domain name is determined from the hostname.
 .It Fl k Ar kernel-arch
-Specifies the kernel architecture.  This is used solely
+Specifies the kernel architecture.
+This is used solely
 to set the ${karch} selector.
 .It Fl l Ar logfile
 Specify a logfile in which to record mount and unmount events.
@@ -136,31 +142,32 @@
 .Em syslog ,
 the log messages will be sent to the system log daemon by
 .Xr syslog 3 .
-The default syslog facility used is LOG_DAEMON.  
+The default syslog facility used is LOG_DAEMON.
 If you wish to change it, append its name to the log file name,
 delimited by a single colon.
-For example, if 
+For example, if
 .Ar logfile
 is the string
 .Dq Li syslog:local7
 then
 .Nm amd
-will log messages via 
+will log messages via
 .Xr syslog 3
 using the LOG_LOCAL7 facility (if it exists on the system).
 .It Fl n
 Normalize hostnames.
 The name referred to by ${rhost} is normalized relative to the
-host database before being used.  The effect is to translate
+host database before being used.
+The effect is to translate
 aliases into ``official'' names.
 .It Fl o Ar op_sys_ver
 Override the compiled-in version number of the operating system.
-Useful when the built in version is not desired for backward 
+Useful when the built in version is not desired for backward
 compatibility reasons.
-For example, if the build in version is 
-.Dq 2.5.1 , 
+For example, if the build in version is
+.Dq 2.5.1 ,
 you can override it to
-.Dq 5.5.1 , 
+.Dq 5.5.1 ,
 and use older maps that were written with the latter in mind.
 .It Fl p
 Print
@@ -172,7 +179,8 @@
 Restart existing mounts.
 .Nm Amd
 will scan the mount file table to determine which file systems
-are currently mounted.  Whenever one of these would have
+are currently mounted.
+Whenever one of these would have
 been auto-mounted,
 .Nm amd
 .Em inherits
@@ -182,25 +190,33 @@
 .Ar interval ,
 in tenths of a second, between
 .Tn NFS/RPC
-retries (for UDP only).  The default
-is 0.8 seconds.  The second value alters the retransmit counter, which
-defaults to 11 retransmissions.  Both of these values are used by the kernel
-to communicate with amd.  Useful defaults are supplied if either or both
+retries (for UDP only).
+The default
+is 0.8 seconds.
+The second value alters the retransmit counter, which
+defaults to 11 retransmissions.
+Both of these values are used by the kernel
+to communicate with amd.
+Useful defaults are supplied if either or both
 values are missing.
 .Pp
 Amd relies on the kernel RPC retransmit mechanism to trigger mount retries.
-The values of these parameters change the overall retry interval.  Too long
+The values of these parameters change the overall retry interval.
+Too long
 an interval gives poor interactive response; too short an interval causes
 excessive retries.
 .It Fl v
-Version.  Displays version and configuration information on standard error.
+Version.
+Displays version and configuration information on standard error.
 .It Fl w Ar interval
 Specify an
 .Ar interval ,
 in seconds, between attempts to dismount file systems that have exceeded their
-cached times.  The default is 2 minutes.
+cached times.
+The default is 2 minutes.
 .It Fl x Ar options
-Specify run-time logging options.  The options are a comma separated list
+Specify run-time logging options.
+The options are a comma separated list
 chosen from: fatal, error, user, warn, info, map, stats, all.
 .It Fl y Ar domain
 Specify an alternative
@@ -215,10 +231,12 @@
 .It Fl C Ar cluster-name
 Specify an alternative HP-UX cluster name to use.
 .It Fl D Ar option
-Select from a variety of debug options.  Prefixing an
+Select from a variety of debug options.
+Prefixing an
 option with the string
 .Em no
-reverses the effect of that option.  Options are cumulative.
+reverses the effect of that option.
+Options are cumulative.
 The most useful option is
 .Ar all .
 .Pp
@@ -232,40 +250,47 @@
 .It Fl F Ar conf_file
 Specify an
 .Nm amd
-configuration file to use.  See
+configuration file to use.
+See
 .Xr amd.conf 5
-for description of this file's format.  This configuration file is used to
-specify any options in lieu of typing many of them on the command line.  The
+for description of this file's format.
+This configuration file is used to
+specify any options in lieu of typing many of them on the command line.
+The
 .Nm amd.conf
 file includes directives for every command line option amd has,
 and many more that are only available via the configuration file
-facility.  The configuration file specified by this option is 
+facility.
+The configuration file specified by this option is
 processed after all other options have been processed, regardless
 of the actual location of this option on the command line.
 .It Fl H
 Print help and usage string.
 .It Fl O Ar op_sys_name
-Override the compiled-in name of the operating system.  
+Override the compiled-in name of the operating system.
 Useful when the built in name is not desired for backward
 compatibility reasons.
 For example, if the build in name is
-.Dq sunos5 , 
+.Dq sunos5 ,
 you can override it to
 .Dq sos5
 and use older maps which were written with the latter in mind.
 .It Fl S
 Do not lock the running executable pages of
 .Nm amd
-into memory.  To improve
+into memory.
+To improve
 .Nm amd's
-performance, systems that support the 
+performance, systems that support the
 .Xr plock 3
 call, could lock the
 .Nm amd
-process into memory.  This way there is less chance the operating system will
+process into memory.
+This way there is less chance the operating system will
 schedule, page out, and swap the
 .Nm amd
-process as needed.  This tends to improve
+process as needed.
+This tends to improve
 .Nm amd's
 performance, at the cost of reserving the memory used by the
 .Nm amd
@@ -277,7 +302,7 @@
 .It Fl T Ar tag
 Specify a tag to use with
 .Xr amd.conf 5 .
-All Map entries tagged with tag will be processed.   
+All Map entries tagged with tag will be processed.
 Map entries that are not tagged are always processed.
 Map entries that are tagged with a tag other than
 .Ar tag
@@ -331,6 +356,11 @@
 .Re
 .Pp
 .Pa http://www.cs.columbia.edu/~ezk/am-utils/
+.Sh HISTORY
+The
+.Nm amd
+utility first appeared in
+.Bx 4.4 .
 .Sh AUTHORS
 .An Jan-Simon Pendry Aq jsp at doc.ic.ac.uk ,
 Department of Computing, Imperial College, London, UK.
@@ -340,10 +370,5 @@
 New York, USA.
 .Pp
 Other authors and contributors to am-utils are listed in the
-.Pa AUTHORS 
+.Pa AUTHORS
 file distributed with am-utils.
-.Sh HISTORY
-The
-.Nm amd
-utility first appeared in
-.Bx 4.4 .

==== //depot/projects/hammer/contrib/amd/amq/amq.8#5 (text+ko) ====

@@ -39,7 +39,7 @@
 .\"	%W% (Berkeley) %G%
 .\"
 .\" $Id: amq.8,v 1.3.2.8 2004/01/06 03:15:16 ezk Exp $
-.\" $FreeBSD: src/contrib/amd/amq/amq.8,v 1.11 2004/07/06 13:16:44 mbr Exp $
+.\" $FreeBSD: src/contrib/amd/amq/amq.8,v 1.12 2005/06/16 20:21:02 ru Exp $
 .\"
 .Dd March 16, 1991
 .Dt AMQ 8
@@ -81,17 +81,19 @@
 .It Fl h Ar hostname
 Query alternate host
 .Ar hostname .
-By default the local host is used.  In an
+By default the local host is used.
+In an
 .Tn HP-UX
 cluster, the root server is queried by default, since
 that is the system on which the automounter is normally run.
 .It Fl l Ar log_file
 Tell amd to use
 .Ar log_file
-as the log file name. 
+as the log file name.
 For security reasons, this must be the same log file which
 .Nm amd
-used when started.  This option is therefore only useful to 
+used when started.
+This option is therefore only useful to
 refresh
 .Nm amd Ns \'s
 open file handle on the log file, so that it can be rotated and compressed via
@@ -102,10 +104,11 @@
 which occurred while mounting.
 .It Fl p
 Return the process ID of the remote or locally running
-.Nm amd .  
+.Nm amd .
 Useful when you need to send a signal to the local
 .Nm amd
-process, and would rather not have to search through the process table.  This
+process, and would rather not have to search through the process table.
+This
 option is used in the
 .Pa ctl-amd
 script.
@@ -113,51 +116,54 @@
 Request the automounter to provide system-wide mount statistics.
 .It Fl u
 Request the automounter to unmount the named file systems
-instead of providing information about them.  Unmounts are requested,
-not forced.  They merely cause the mounted file system to timeout,
+instead of providing information about them.
+Unmounts are requested,
+not forced.
+They merely cause the mounted file system to timeout,
 which will be picked up by
 .Nm amd Ns \'s
 main scheduler thus causing the normal timeout action to be taken.
 .It Fl v
-Request the automounter to provide version information.  This is a subset
+Request the automounter to provide version information.
+This is a subset
 of the information provided by
 .Nm amd Ns \'s Fl v
 option.
 .It Fl x Ar log_options
-Ask the automounter to use the logging options specified in 
+Ask the automounter to use the logging options specified in
 .Ar log_options
 from now on.
 .It Fl D Ar log_options
-Ask the automounter to use the debugging options specified in 
+Ask the automounter to use the debugging options specified in
 .Ar debug_options
 from now on.
 .It Fl M
-Pass a mount map entry to 
+Pass a mount map entry to
 .Nm amd
 and wait for it to be evaluated, possibly causing a mount.
-This option is highly insecure.  
+This option is highly insecure.
 By default,
 .Nm amd
-and 
+and
 .Nm amq
 do not support it.
 It is necessary to configure
 .Nm am-utils
-with 
+with
 .Ar --enable-amq-mount
 to enable this option.
 .It Fl P Ar program_number
-Contact an alternate running 
-.Nm amd 
+Contact an alternate running
+.Nm amd
 that had registered itself on a different RPC
-.Ar program_number 
-and apply all other operations to that instance of the automounter.  
-This is useful when running multiple copies of 
-.Nm amd , 
-and need to manage each one separately.  
-If not specified, 
+.Ar program_number
+and apply all other operations to that instance of the automounter.
+This is useful when running multiple copies of
+.Nm amd ,
+and need to manage each one separately.
+If not specified,
 .Nm amq
-will use the default program number for 
+will use the default program number for
 .Nm amd ,
 300019.
 For security reasons, the only alternate program numbers
@@ -166,14 +172,14 @@
 .It Fl T
 Contact
 .Nm amd
-using the TCP transport only.  
-Normally 
+using the TCP transport only.
+Normally
 .Nm amq
 will try TCP, and if that fails, will try UDP.
 .It Fl U
-Contact 
+Contact
 .Nm amd
-using UDP (connectionless) transport only. 
+using UDP (connectionless) transport only.
 Normally
 .Nm amq
 will try TCP, and if that fails, will try UDP.
@@ -195,6 +201,10 @@
 .Sh SEE ALSO
 .Xr amd.conf 5 ,
 .Xr amd 8
+.Sh HISTORY
+.Nm Amq
+first appeared in
+.Bx 4.4 .
 .Sh AUTHORS
 .An Jan-Simon Pendry Aq jsp at doc.ic.ac.uk ,
 Department of Computing, Imperial College, London, UK.
@@ -202,13 +212,9 @@
 .An Erez Zadok Aq ezk at cs.columbia.edu ,
 Department of Computer Science, Columbia University, New York, USA.
 .Pp
-.An Other authors and contributors to 
+.An Other authors and contributors to
 .Nm am-utils
 are listed in the
-.Nm AUTHORS 
+.Nm AUTHORS
 file distributed with
 .Nm am-utils .
-.Sh HISTORY
-.Nm Amq
-first appeared in
-.Bx 4.4 .

==== //depot/projects/hammer/contrib/amd/amq/pawd.1#4 (text+ko) ====

@@ -39,7 +39,7 @@
 .\"	%W% (Berkeley) %G%
 .\"
 .\" $Id: pawd.1,v 1.3.2.4 2004/01/06 03:15:16 ezk Exp $
-.\" $FreeBSD: src/contrib/amd/amq/pawd.1,v 1.6 2004/07/06 13:16:44 mbr Exp $
+.\" $FreeBSD: src/contrib/amd/amq/pawd.1,v 1.7 2005/06/16 20:21:02 ru Exp $
 .\"
 .Dd January 6, 1998
 .Dt PAWD 1
@@ -54,17 +54,20 @@
 .Nm
 is used to print the current working directory, adjusted to reflect proper
 paths that can be reused to go through the automounter for the shortest
-possible path.  In particular, the path printed back does not include any
+possible path.
+In particular, the path printed back does not include any
 of
 .Nm Amd Ns \'s
-local mount points.  Using them is unsafe, because
+local mount points.
+Using them is unsafe, because
 .Nm Amd
 may unmount managed file systems from the mount points, and thus including
 them in paths may not always find the files within.
 .Pp
 Without any arguments,
 .Nm
-will print the automounter adjusted current working directory.  With any
+will print the automounter adjusted current working directory.
+With any
 number of arguments, it will print the adjusted
 .Ar path
 of each one of the
@@ -72,7 +75,7 @@
 .Sh SEE ALSO
 .Xr pwd 1 ,
 .Xr amd 8 ,
-.Xr amq 8 
+.Xr amq 8
 .Sh HISTORY
 The
 .Nm

==== //depot/projects/hammer/contrib/amd/fixmount/fixmount.8#6 (text+ko) ====

@@ -39,7 +39,7 @@
 .\"	%W% (Berkeley) %G%
 .\"
 .\" $Id: fixmount.8,v 1.3.2.6 2004/01/06 03:15:23 ezk Exp $
-.\" $FreeBSD: src/contrib/amd/fixmount/fixmount.8,v 1.11 2005/02/13 22:25:10 ru Exp $
+.\" $FreeBSD: src/contrib/amd/fixmount/fixmount.8,v 1.12 2005/06/16 20:21:02 ru Exp $
 .\"
 .Dd February 26, 1993
 .Dt FIXMOUNT 8
@@ -55,12 +55,13 @@
 \&...
 .Sh DESCRIPTION
 .Nm
-is a variant of 
+is a variant of
 .Xr showmount 8
 that can delete bogus mount entries in remote
 .Xr mountd 8
-daemons.  The actions specified by the options are performed for each
-.Ar host 
+daemons.
+The actions specified by the options are performed for each
+.Ar host
 in turn.
 .Sh OPTIONS
 .Bl -tag -width Ds
@@ -76,18 +77,22 @@
 The actuality of mounts is verified using the entries in
 .Pa /etc/mtab .
 .It Fl v
-Verify remote mounts.  Similar to
+Verify remote mounts.
+Similar to
 .Fl r
 except that only a notification message is printed for each bogus entry
-found.  The remote mount table is not changed.
+found.
+The remote mount table is not changed.
 .It Fl A
 Issues a command to the remote mountd declaring that
 .Em all
-of its file systems have been unmounted.  This should be used with caution, as
+of its file systems have been unmounted.
+This should be used with caution, as
 it removes all remote mount entries pertaining to the local system, whether or
 not any file systems are still mounted locally.
 .It Fl v
-Be quiet.  Suppresses error messages due to timeouts and
+Be quiet.
+Suppresses error messages due to timeouts and
 .Dq Program not Registered ,
 i.e., due to remote hosts not supporting RPC or not running
 .Nm mountd .
@@ -118,6 +123,24 @@
 .Xr rmtab 5 ,
 .Xr mountd 8 ,
 .Xr showmount 8
+.Sh HISTORY
+The
+.Nm
+utility appeared in
+.Fx 3.0 .
+.Sh AUTHORS
+.An Jan-Simon Pendry Aq jsp at doc.ic.ac.uk ,
+Department of Computing, Imperial College, London, UK.
+.Pp
+.An Erez Zadok Aq ezk at cs.columbia.edu ,
+Department of Computer Science, Columbia University, New York, USA.
+.Pp
+.An Other authors and contributors to
+.Nm am-utils
+are listed in the
+.Nm AUTHORS
+file distributed with
+.Nm am-utils .
 .Sh BUGS
 No attempt is made to verify the information in
 .Pa /etc/mtab
@@ -126,14 +149,14 @@
 Since swap file mounts are not recorded in
 .Pa /etc/mtab ,
 a heuristic specific to SunOS is used to determine whether such a mount
-is actual (replacing the string 
-.Ql swap 
-with 
+is actual (replacing the string
+.Ql swap
+with
 .Ql root
 and verifying the resulting path).
 .Pp
 Symbolic links on the server will cause the path in the remote entry to differ
-from the one in 
+from the one in
 .Pa /etc/mtab .
 To catch those cases, a file system is also deemed mounted if its
 .Em local
@@ -146,10 +169,11 @@
 .Pa /usr/share
 as well this will be handled correctly.
 .Pp
-There is no way to clear a stale entry in a remote 
-.Nm mountd 
-after the local hostname (or whatever reverse name resolution 
-returns for it) has been changed.  To take care of these cases,
+There is no way to clear a stale entry in a remote

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

More information about the p4-projects mailing list