PERFORCE change 118053 for review

Paolo Pisati piso at FreeBSD.org
Fri Apr 13 20:43:19 UTC 2007 

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

Change 118053 by piso at piso_newluxor on 2007/04/13 20:42:39

	IFC at 118052

Affected files ...

.. //depot/projects/soc2005/libalias/ObsoleteFiles.inc#20 integrate
.. //depot/projects/soc2005/libalias/contrib/libreadline/FREEBSD-upgrade#3 integrate
.. //depot/projects/soc2005/libalias/contrib/libreadline/display.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/opensolaris/cmd/zdb/zdb.8#2 integrate
.. //depot/projects/soc2005/libalias/contrib/opensolaris/cmd/zfs/zfs.8#2 integrate
.. //depot/projects/soc2005/libalias/contrib/opensolaris/cmd/zfs/zfs_main.c#2 integrate
.. //depot/projects/soc2005/libalias/contrib/opensolaris/cmd/zpool/zpool.8#2 integrate
.. //depot/projects/soc2005/libalias/contrib/opensolaris/cmd/ztest/ztest.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/opensolaris/lib/libzfs/common/libzfs.h#3 integrate
.. //depot/projects/soc2005/libalias/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#2 integrate
.. //depot/projects/soc2005/libalias/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#3 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/FREEBSD-upgrade#3 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/KNOWNBUGS#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/PGPKEYS#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/RELEASE_NOTES#3 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/cf/README#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/cf/cf/knecht.mc#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/cf/cf/submit.cf#3 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/cf/feature/access_db.m4#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/cf/feature/badmx.m4#1 branch
.. //depot/projects/soc2005/libalias/contrib/sendmail/cf/feature/block_bad_helo.m4#1 branch
.. //depot/projects/soc2005/libalias/contrib/sendmail/cf/feature/dnsbl.m4#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/cf/feature/enhdnsbl.m4#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/cf/feature/require_rdns.m4#1 branch
.. //depot/projects/soc2005/libalias/contrib/sendmail/cf/m4/proto.m4#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/cf/m4/version.m4#3 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/cf/mailer/smtp.m4#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/contrib/cidrexpand#3 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/contrib/qtool.pl#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/doc/op/op.me#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/editmap/Makefile.m4#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/include/libmilter/mfapi.h#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/include/libmilter/mfdef.h#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/include/libmilter/milter.h#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/include/sm/conf.h#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/include/sm/errstring.h#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/include/sm/heap.h#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/include/sm/ldap.h#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/include/sm/misc.h#1 branch
.. //depot/projects/soc2005/libalias/contrib/sendmail/include/sm/os/sm_os_qnx.h#1 branch
.. //depot/projects/soc2005/libalias/contrib/sendmail/include/sm/sendmail.h#1 branch
.. //depot/projects/soc2005/libalias/contrib/sendmail/include/sm/tailq.h#1 branch
.. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/Makefile#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/Makefile.m4#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/README#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/comm.c#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/docs/api.html#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/docs/design.html#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/docs/index.html#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/docs/installation.html#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/docs/other.html#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/docs/overview.html#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/docs/sample.html#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/docs/smfi_addheader.html#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/docs/smfi_addrcpt.html#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/docs/smfi_addrcpt_par.html#1 branch
.. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/docs/smfi_chgfrom.html#1 branch
.. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/docs/smfi_chgheader.html#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/docs/smfi_delrcpt.html#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/docs/smfi_getpriv.html#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/docs/smfi_getsymval.html#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/docs/smfi_insheader.html#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/docs/smfi_main.html#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/docs/smfi_opensocket.html#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/docs/smfi_progress.html#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/docs/smfi_quarantine.html#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/docs/smfi_register.html#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/docs/smfi_replacebody.html#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/docs/smfi_setbacklog.html#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/docs/smfi_setconn.html#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/docs/smfi_setdbg.html#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/docs/smfi_setmlreply.html#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/docs/smfi_setpriv.html#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/docs/smfi_setreply.html#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/docs/smfi_setsymlist.html#1 branch
.. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/docs/smfi_settimeout.html#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/docs/smfi_stop.html#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/docs/smfi_version.html#1 branch
.. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/docs/xxfi_abort.html#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/docs/xxfi_body.html#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/docs/xxfi_close.html#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/docs/xxfi_connect.html#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/docs/xxfi_data.html#1 branch
.. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/docs/xxfi_envfrom.html#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/docs/xxfi_envrcpt.html#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/docs/xxfi_eoh.html#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/docs/xxfi_eom.html#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/docs/xxfi_header.html#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/docs/xxfi_helo.html#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/docs/xxfi_negotiate.html#1 branch
.. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/docs/xxfi_unknown.html#1 branch
.. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/engine.c#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/example.c#1 branch
.. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/handler.c#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/libmilter.h#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/listener.c#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/main.c#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/monitor.c#1 branch
.. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/smfi.c#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/libmilter/worker.c#1 branch
.. //depot/projects/soc2005/libalias/contrib/sendmail/libsm/Makefile#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/libsm/Makefile.m4#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/libsm/config.c#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/libsm/exc.c#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/libsm/exc.html#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/libsm/findfp.c#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/libsm/flags.c#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/libsm/ldap.c#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/libsm/local.h#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/libsm/memstat.c#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/libsm/snprintf.c#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/libsm/t-memstat.c#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/libsm/t-qic.c#1 branch
.. //depot/projects/soc2005/libalias/contrib/sendmail/libsm/t-sem.c#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/libsm/util.c#1 branch
.. //depot/projects/soc2005/libalias/contrib/sendmail/libsm/vfscanf.c#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/libsmdb/Makefile.m4#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/libsmutil/Makefile.m4#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/mail.local/Makefile.m4#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/mail.local/mail.local.c#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/mailstats/Makefile.m4#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/makemap/Makefile.m4#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/praliases/Makefile.m4#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/rmail/Makefile.m4#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/smrsh/Makefile.m4#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/src/Makefile#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/src/Makefile.m4#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/src/README#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/src/TRACEFLAGS#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/src/TUNING#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/src/alias.c#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/src/arpadate.c#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/src/collect.c#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/src/conf.c#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/src/conf.h#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/src/control.c#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/src/daemon.c#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/src/daemon.h#1 branch
.. //depot/projects/soc2005/libalias/contrib/sendmail/src/deliver.c#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/src/domain.c#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/src/envelope.c#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/src/err.c#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/src/headers.c#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/src/helpfile#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/src/macro.c#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/src/mailq.1#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/src/main.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/src/map.c#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/src/map.h#1 branch
.. //depot/projects/soc2005/libalias/contrib/sendmail/src/mci.c#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/src/milter.c#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/src/mime.c#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/src/parseaddr.c#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/src/queue.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/src/ratectrl.c#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/src/readcf.c#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/src/recipient.c#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/src/sasl.c#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/src/savemail.c#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/src/sendmail.h#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/src/sm_resolve.c#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/src/srvrsmtp.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/src/stab.c#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/src/stats.c#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/src/timers.c#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/src/tls.c#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/src/udb.c#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/src/usersmtp.c#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/src/util.c#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/src/version.c#3 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/test/Makefile#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/vacation/Makefile.m4#2 integrate
.. //depot/projects/soc2005/libalias/contrib/sendmail/vacation/vacation.c#2 integrate
.. //depot/projects/soc2005/libalias/etc/defaults/rc.conf#14 integrate
.. //depot/projects/soc2005/libalias/etc/mtree/BSD.root.dist#3 integrate
.. //depot/projects/soc2005/libalias/etc/rc.d/FILESYSTEMS#2 integrate
.. //depot/projects/soc2005/libalias/etc/rc.d/Makefile#8 integrate
.. //depot/projects/soc2005/libalias/etc/rc.d/NETWORKING#2 integrate
.. //depot/projects/soc2005/libalias/etc/rc.d/hostid#1 branch
.. //depot/projects/soc2005/libalias/etc/rc.d/ipfilter#5 integrate
.. //depot/projects/soc2005/libalias/etc/rc.d/ipsec#3 integrate
.. //depot/projects/soc2005/libalias/etc/rc.d/kldxref#3 integrate
.. //depot/projects/soc2005/libalias/etc/rc.d/mountcritremote#4 integrate
.. //depot/projects/soc2005/libalias/etc/rc.d/mountd#3 integrate
.. //depot/projects/soc2005/libalias/etc/rc.d/netoptions#2 integrate
.. //depot/projects/soc2005/libalias/etc/rc.d/pf#4 integrate
.. //depot/projects/soc2005/libalias/etc/rc.d/pflog#4 integrate
.. //depot/projects/soc2005/libalias/etc/rc.d/pfsync#4 integrate
.. //depot/projects/soc2005/libalias/etc/rc.d/zfs#2 integrate
.. //depot/projects/soc2005/libalias/etc/services#2 integrate
.. //depot/projects/soc2005/libalias/include/Makefile#8 integrate
.. //depot/projects/soc2005/libalias/include/rpc/Makefile#2 integrate
.. //depot/projects/soc2005/libalias/include/rpc/types.h#2 delete
.. //depot/projects/soc2005/libalias/lib/libarchive/Makefile#6 integrate
.. //depot/projects/soc2005/libalias/lib/libarchive/archive_platform.h#5 integrate
.. //depot/projects/soc2005/libalias/lib/libarchive/archive_read_support_format_tar.c#8 integrate
.. //depot/projects/soc2005/libalias/lib/libarchive/archive_write_disk.c#2 integrate
.. //depot/projects/soc2005/libalias/lib/libc/gen/Symbol.map#4 integrate
.. //depot/projects/soc2005/libalias/lib/libc/gen/sysctl.3#3 integrate
.. //depot/projects/soc2005/libalias/lib/libc/i386/Symbol.map#2 integrate
.. //depot/projects/soc2005/libalias/lib/libc/stdlib/strtol.3#3 integrate
.. //depot/projects/soc2005/libalias/lib/libc/sys/ptrace.2#4 integrate
.. //depot/projects/soc2005/libalias/lib/libmilter/Makefile#2 integrate
.. //depot/projects/soc2005/libalias/lib/libpmc/libpmc.c#2 integrate
.. //depot/projects/soc2005/libalias/lib/libpmc/pmc.3#3 integrate
.. //depot/projects/soc2005/libalias/lib/libsm/Makefile#2 integrate
.. //depot/projects/soc2005/libalias/libexec/rtld-elf/Makefile#3 integrate
.. //depot/projects/soc2005/libalias/libexec/rtld-elf/Symbol.map#2 integrate
.. //depot/projects/soc2005/libalias/libexec/rtld-elf/Versions.def#2 integrate
.. //depot/projects/soc2005/libalias/release/Makefile.inc.docports#2 integrate
.. //depot/projects/soc2005/libalias/release/doc/en_US.ISO8859-1/relnotes/article.sgml#6 integrate
.. //depot/projects/soc2005/libalias/sbin/ifconfig/Makefile#2 integrate
.. //depot/projects/soc2005/libalias/sbin/ifconfig/ifconfig.8#12 integrate
.. //depot/projects/soc2005/libalias/sbin/ifconfig/iftrunk.c#1 branch
.. //depot/projects/soc2005/libalias/share/man/man4/Makefile#11 integrate
.. //depot/projects/soc2005/libalias/share/man/man4/trunk.4#1 branch
.. //depot/projects/soc2005/libalias/share/man/man5/rc.conf.5#12 integrate
.. //depot/projects/soc2005/libalias/share/man/man9/hash.9#4 integrate
.. //depot/projects/soc2005/libalias/share/misc/committers-ports.dot#2 integrate
.. //depot/projects/soc2005/libalias/share/misc/committers-src.dot#2 integrate
.. //depot/projects/soc2005/libalias/sys/amd64/amd64/pmap.c#10 integrate
.. //depot/projects/soc2005/libalias/sys/amd64/conf/GENERIC#9 integrate
.. //depot/projects/soc2005/libalias/sys/boot/forth/loader.conf#10 integrate
.. //depot/projects/soc2005/libalias/sys/cam/scsi/scsi_sg.c#3 integrate
.. //depot/projects/soc2005/libalias/sys/cam/scsi/scsi_sg.h#2 integrate
.. //depot/projects/soc2005/libalias/sys/compat/linux/linux_ioctl.h#3 integrate
.. //depot/projects/soc2005/libalias/sys/compat/opensolaris/kern/opensolaris_kmem.c#2 integrate
.. //depot/projects/soc2005/libalias/sys/compat/opensolaris/kern/opensolaris_string.c#2 integrate
.. //depot/projects/soc2005/libalias/sys/compat/opensolaris/sys/kmem.h#2 integrate
.. //depot/projects/soc2005/libalias/sys/compat/opensolaris/sys/string.h#2 integrate
.. //depot/projects/soc2005/libalias/sys/conf/NOTES#21 integrate
.. //depot/projects/soc2005/libalias/sys/conf/files#26 integrate
.. //depot/projects/soc2005/libalias/sys/conf/files.ia64#4 integrate
.. //depot/projects/soc2005/libalias/sys/contrib/dev/acpica/utmisc.c#3 integrate
.. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/common/atomic/amd64/atomic.S#2 integrate
.. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/common/atomic/i386/atomic.S#2 integrate
.. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/dnlc.c#2 integrate
.. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#2 integrate
.. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#2 integrate
.. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#3 integrate
.. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#2 integrate
.. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#2 integrate
.. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#2 integrate
.. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#3 integrate
.. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#2 integrate
.. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/zap.c#2 integrate
.. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#2 integrate
.. //depot/projects/soc2005/libalias/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#2 integrate
.. //depot/projects/soc2005/libalias/sys/dev/ath/ah_osdep.c#2 integrate
.. //depot/projects/soc2005/libalias/sys/dev/cxgb/cxgb_main.c#2 integrate
.. //depot/projects/soc2005/libalias/sys/dev/cxgb/cxgb_sge.c#3 integrate
.. //depot/projects/soc2005/libalias/sys/dev/cxgb/sys/mvec.h#2 integrate
.. //depot/projects/soc2005/libalias/sys/dev/cxgb/sys/uipc_mvec.c#2 integrate
.. //depot/projects/soc2005/libalias/sys/dev/mii/brgphy.c#10 integrate
.. //depot/projects/soc2005/libalias/sys/dev/mii/miidevs#8 integrate
.. //depot/projects/soc2005/libalias/sys/dev/msk/if_msk.c#6 integrate
.. //depot/projects/soc2005/libalias/sys/dev/usb/usbdevs#9 integrate
.. //depot/projects/soc2005/libalias/sys/fs/pseudofs/pseudofs.c#3 integrate
.. //depot/projects/soc2005/libalias/sys/fs/pseudofs/pseudofs.h#3 integrate
.. //depot/projects/soc2005/libalias/sys/fs/pseudofs/pseudofs_fileno.c#2 integrate
.. //depot/projects/soc2005/libalias/sys/fs/pseudofs/pseudofs_internal.h#2 integrate
.. //depot/projects/soc2005/libalias/sys/fs/pseudofs/pseudofs_vncache.c#4 integrate
.. //depot/projects/soc2005/libalias/sys/geom/vinum/geom_vinum.h#2 integrate
.. //depot/projects/soc2005/libalias/sys/geom/vinum/geom_vinum_rm.c#2 integrate
.. //depot/projects/soc2005/libalias/sys/geom/vinum/geom_vinum_share.c#2 integrate
.. //depot/projects/soc2005/libalias/sys/geom/vinum/geom_vinum_subr.c#2 integrate
.. //depot/projects/soc2005/libalias/sys/i386/conf/GENERIC#8 integrate
.. //depot/projects/soc2005/libalias/sys/i386/i386/mp_machdep.c#7 integrate
.. //depot/projects/soc2005/libalias/sys/i386/i386/pmap.c#8 integrate
.. //depot/projects/soc2005/libalias/sys/i386/include/pmap.h#5 integrate
.. //depot/projects/soc2005/libalias/sys/ia64/conf/GENERIC#7 integrate
.. //depot/projects/soc2005/libalias/sys/kern/kern_jail.c#7 integrate
.. //depot/projects/soc2005/libalias/sys/kern/kern_mib.c#2 integrate
.. //depot/projects/soc2005/libalias/sys/kern/uipc_mqueue.c#5 integrate
.. //depot/projects/soc2005/libalias/sys/kern/vfs_mount.c#13 integrate
.. //depot/projects/soc2005/libalias/sys/kern/vfs_subr.c#11 integrate
.. //depot/projects/soc2005/libalias/sys/libkern/index.c#2 integrate
.. //depot/projects/soc2005/libalias/sys/libkern/rindex.c#2 integrate
.. //depot/projects/soc2005/libalias/sys/modules/Makefile#14 integrate
.. //depot/projects/soc2005/libalias/sys/modules/dpt/Makefile#2 integrate
.. //depot/projects/soc2005/libalias/sys/modules/if_trunk/Makefile#1 branch
.. //depot/projects/soc2005/libalias/sys/modules/libalias/libalias/Makefile#12 integrate
.. //depot/projects/soc2005/libalias/sys/net/ieee8023ad_lacp.c#1 branch
.. //depot/projects/soc2005/libalias/sys/net/ieee8023ad_lacp.h#1 branch
.. //depot/projects/soc2005/libalias/sys/net/if.c#7 integrate
.. //depot/projects/soc2005/libalias/sys/net/if_ethersubr.c#10 integrate
.. //depot/projects/soc2005/libalias/sys/net/if_trunk.c#1 branch
.. //depot/projects/soc2005/libalias/sys/net/if_trunk.h#1 branch
.. //depot/projects/soc2005/libalias/sys/net/if_var.h#5 integrate
.. //depot/projects/soc2005/libalias/sys/netinet/in_pcb.c#8 integrate
.. //depot/projects/soc2005/libalias/sys/netinet/tcp_input.c#11 integrate
.. //depot/projects/soc2005/libalias/sys/netinet/tcp_output.c#7 integrate
.. //depot/projects/soc2005/libalias/sys/netinet/tcp_sack.c#3 integrate
.. //depot/projects/soc2005/libalias/sys/netinet/tcp_subr.c#11 integrate
.. //depot/projects/soc2005/libalias/sys/netinet/tcp_syncache.c#8 integrate
.. //depot/projects/soc2005/libalias/sys/netinet/tcp_timer.c#5 integrate
.. //depot/projects/soc2005/libalias/sys/netinet/tcp_timer.h#6 integrate
.. //depot/projects/soc2005/libalias/sys/netinet/tcp_usrreq.c#7 integrate
.. //depot/projects/soc2005/libalias/sys/netinet/tcp_var.h#6 integrate
.. //depot/projects/soc2005/libalias/sys/netinet6/ipsec.c#6 integrate
.. //depot/projects/soc2005/libalias/sys/netipsec/ipsec_osdep.h#4 integrate
.. //depot/projects/soc2005/libalias/sys/pc98/conf/GENERIC#7 integrate
.. //depot/projects/soc2005/libalias/sys/powerpc/conf/GENERIC#10 integrate
.. //depot/projects/soc2005/libalias/sys/rpc/types.h#1 branch
.. //depot/projects/soc2005/libalias/sys/security/audit/audit.c#9 integrate
.. //depot/projects/soc2005/libalias/sys/security/audit/audit.h#5 integrate
.. //depot/projects/soc2005/libalias/sys/security/audit/audit_arg.c#8 integrate
.. //depot/projects/soc2005/libalias/sys/security/audit/audit_bsm.c#9 integrate
.. //depot/projects/soc2005/libalias/sys/security/audit/audit_bsm_token.c#6 integrate
.. //depot/projects/soc2005/libalias/sys/security/audit/audit_private.h#5 integrate
.. //depot/projects/soc2005/libalias/sys/security/audit/audit_syscalls.c#9 integrate
.. //depot/projects/soc2005/libalias/sys/sparc64/conf/GENERIC#7 integrate
.. //depot/projects/soc2005/libalias/sys/sun4v/conf/GENERIC#6 integrate
.. //depot/projects/soc2005/libalias/sys/sys/eventhandler.h#4 integrate
.. //depot/projects/soc2005/libalias/sys/sys/hash.h#2 integrate
.. //depot/projects/soc2005/libalias/sys/sys/kernel.h#5 integrate
.. //depot/projects/soc2005/libalias/sys/sys/libkern.h#5 integrate
.. //depot/projects/soc2005/libalias/sys/sys/mbuf.h#10 integrate
.. //depot/projects/soc2005/libalias/sys/sys/mutex.h#6 integrate
.. //depot/projects/soc2005/libalias/sys/sys/priv.h#4 integrate
.. //depot/projects/soc2005/libalias/sys/sys/proc.h#11 integrate
.. //depot/projects/soc2005/libalias/sys/sys/sysctl.h#6 integrate
.. //depot/projects/soc2005/libalias/sys/ufs/ffs/ffs_snapshot.c#7 integrate
.. //depot/projects/soc2005/libalias/sys/ufs/ffs/ffs_softdep.c#6 integrate
.. //depot/projects/soc2005/libalias/sys/vm/phys_pager.c#4 integrate
.. //depot/projects/soc2005/libalias/tools/regression/netinet/ipblock/Makefile#2 delete
.. //depot/projects/soc2005/libalias/tools/regression/netinet/ipblock/ipblock.c#2 delete
.. //depot/projects/soc2005/libalias/tools/regression/netinet/ipsockopt/ipsockopt.c#3 integrate
.. //depot/projects/soc2005/libalias/tools/tools/net80211/wesside/wesside/Makefile#2 integrate
.. //depot/projects/soc2005/libalias/tools/tools/net80211/wesside/wesside/aircrack-ptw-lib.c#1 branch
.. //depot/projects/soc2005/libalias/tools/tools/net80211/wesside/wesside/aircrack-ptw-lib.h#1 branch
.. //depot/projects/soc2005/libalias/tools/tools/net80211/wesside/wesside/wesside.c#2 integrate
.. //depot/projects/soc2005/libalias/usr.bin/finger/extern.h#2 integrate
.. //depot/projects/soc2005/libalias/usr.bin/finger/finger.1#2 integrate
.. //depot/projects/soc2005/libalias/usr.bin/finger/finger.c#2 integrate
.. //depot/projects/soc2005/libalias/usr.bin/finger/net.c#2 integrate
.. //depot/projects/soc2005/libalias/usr.bin/gcore/elfcore.c#2 integrate
.. //depot/projects/soc2005/libalias/usr.bin/kdump/kdump.c#5 integrate
.. //depot/projects/soc2005/libalias/usr.bin/kdump/kdump_subr.h#3 integrate
.. //depot/projects/soc2005/libalias/usr.bin/kdump/mksubr#6 integrate
.. //depot/projects/soc2005/libalias/usr.bin/make/parse.c#4 integrate
.. //depot/projects/soc2005/libalias/usr.bin/netstat/mcast.c#4 integrate
.. //depot/projects/soc2005/libalias/usr.bin/tar/Makefile#3 integrate
.. //depot/projects/soc2005/libalias/usr.bin/tar/bsdtar_platform.h#4 integrate
.. //depot/projects/soc2005/libalias/usr.bin/tar/write.c#7 integrate
.. //depot/projects/soc2005/libalias/usr.bin/touch/touch.1#2 integrate
.. //depot/projects/soc2005/libalias/usr.bin/touch/touch.c#2 integrate
.. //depot/projects/soc2005/libalias/usr.bin/truss/Makefile#2 integrate
.. //depot/projects/soc2005/libalias/usr.bin/truss/amd64-fbsd.c#2 integrate
.. //depot/projects/soc2005/libalias/usr.bin/truss/extern.h#2 integrate
.. //depot/projects/soc2005/libalias/usr.bin/truss/i386-fbsd.c#3 integrate
.. //depot/projects/soc2005/libalias/usr.bin/truss/i386-linux.c#2 integrate
.. //depot/projects/soc2005/libalias/usr.bin/truss/ia64-fbsd.c#2 integrate
.. //depot/projects/soc2005/libalias/usr.bin/truss/main.c#2 integrate
.. //depot/projects/soc2005/libalias/usr.bin/truss/powerpc-fbsd.c#2 integrate
.. //depot/projects/soc2005/libalias/usr.bin/truss/setup.c#2 integrate
.. //depot/projects/soc2005/libalias/usr.bin/truss/sparc64-fbsd.c#2 integrate
.. //depot/projects/soc2005/libalias/usr.bin/truss/syscall.h#2 integrate
.. //depot/projects/soc2005/libalias/usr.bin/truss/syscalls.c#2 integrate
.. //depot/projects/soc2005/libalias/usr.bin/truss/truss.1#4 integrate
.. //depot/projects/soc2005/libalias/usr.bin/truss/truss.h#2 integrate
.. //depot/projects/soc2005/libalias/usr.bin/uuidgen/Makefile#2 integrate
.. //depot/projects/soc2005/libalias/usr.sbin/adduser/adduser.conf.5#2 integrate
.. //depot/projects/soc2005/libalias/usr.sbin/adduser/adduser.sh#3 integrate
.. //depot/projects/soc2005/libalias/usr.sbin/ifmcstat/Makefile#3 integrate
.. //depot/projects/soc2005/libalias/usr.sbin/ifmcstat/ifmcstat.8#3 integrate
.. //depot/projects/soc2005/libalias/usr.sbin/ifmcstat/ifmcstat.c#3 integrate
.. //depot/projects/soc2005/libalias/usr.sbin/mountd/mountd.c#7 integrate
.. //depot/projects/soc2005/libalias/usr.sbin/rpc.lockd/lockd_lock.c#5 integrate
.. //depot/projects/soc2005/libalias/usr.sbin/sendmail/Makefile#3 integrate

Differences ...

==== //depot/projects/soc2005/libalias/ObsoleteFiles.inc#20 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.77 2007/03/28 07:49:57 delphij Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.78 2007/04/09 19:16:48 pjd Exp $
 #
 # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
 # directories (OLD_DIRS) which should get removed at an update. Recently
@@ -14,6 +14,8 @@
 # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
 #
 
+# 20070409: uuidgen moved to /bin/
+OLD_FILES+=usr/bin/uuidgen
 # 20070328: bzip2 1.0.4
 OLD_FILES+=usr/share/info/bzip2.info.gz
 # 20070303: libarchive 2.0

==== //depot/projects/soc2005/libalias/contrib/libreadline/FREEBSD-upgrade#3 (text+ko) ====

@@ -1,6 +1,7 @@
-# $FreeBSD: src/contrib/libreadline/FREEBSD-upgrade,v 1.9 2006/12/31 09:50:44 ache Exp $
+# $FreeBSD: src/contrib/libreadline/FREEBSD-upgrade,v 1.10 2007/04/12 14:45:25 ache Exp $
 #
 # Official patch 001 imported as v5_2_p1
+# Official patch 002 imported as v5_2_p2
 #
 
 rm doc/*.dvi doc/*.html doc/*.ps doc/*.0 doc/*.info doc/*.tex doc/texi2* doc/*.pdf

==== //depot/projects/soc2005/libalias/contrib/libreadline/display.c#3 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD: src/contrib/libreadline/display.c,v 1.12 2006/12/31 09:47:34 ache Exp $ */
+/* $FreeBSD: src/contrib/libreadline/display.c,v 1.13 2007/04/12 14:45:25 ache Exp $ */
 /* display.c -- readline redisplay facility. */
 
 /* Copyright (C) 1987-2006 Free Software Foundation, Inc.
@@ -562,6 +562,17 @@
       wrap_offset = prompt_invis_chars_first_line = 0;
     }
 
+#if defined (HANDLE_MULTIBYTE)
+#define CHECK_INV_LBREAKS() \
+      do { \
+	if (newlines >= (inv_lbsize - 2)) \
+	  { \
+	    inv_lbsize *= 2; \
+	    inv_lbreaks = (int *)xrealloc (inv_lbreaks, inv_lbsize * sizeof (int)); \
+	    _rl_wrapped_line = (int *)xrealloc (_rl_wrapped_line, inv_lbsize * sizeof (int)); \
+	  } \
+      } while (0)
+#else
 #define CHECK_INV_LBREAKS() \
       do { \
 	if (newlines >= (inv_lbsize - 2)) \
@@ -570,6 +581,7 @@
 	    inv_lbreaks = (int *)xrealloc (inv_lbreaks, inv_lbsize * sizeof (int)); \
 	  } \
       } while (0)
+#endif /* HANDLE_MULTIBYTE */
 
 #if defined (HANDLE_MULTIBYTE)	  
 #define CHECK_LPOS() \

==== //depot/projects/soc2005/libalias/contrib/opensolaris/cmd/zdb/zdb.8#2 (text+ko) ====

@@ -28,7 +28,6 @@
 .fi
 
 .SH DESCRIPTION
-
 .LP
 The \fBzdb\fR command is used by support engineers to diagnose failures and gather statistics. Since the \fBZFS\fR file system is always consistent on disk and is self-repairing, \fBzdb\fR should only be run under the direction by a support engineer.
 .LP
@@ -36,7 +35,6 @@
 .LP
 Any options supported by this command are internal to Sun and subject to change at any time.
 .SH EXIT STATUS
-
 .LP
 The following exit values are returned:
 .sp
@@ -73,7 +71,6 @@
 .RE
 
 .SH ATTRIBUTES
-
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -92,6 +89,5 @@
 .TE
 
 .SH SEE ALSO
-
 .LP
 \fBzfs\fR(1M), \fBzpool\fR(1M), \fBattributes\fR(5)

==== //depot/projects/soc2005/libalias/contrib/opensolaris/cmd/zfs/zfs.8#2 (text+ko) ====

@@ -26,103 +26,127 @@
 .nf
 \fBzfs\fR [\fB-?\fR]
 .fi
+
 .LP
 .nf
 \fBzfs\fR \fBcreate\fR [[\fB-o\fR property=\fIvalue\fR]]... \fIfilesystem\fR
 .fi
+
 .LP
 .nf
 \fBzfs\fR \fBcreate\fR [\fB-s\fR] [\fB-b\fR \fIblocksize\fR] [[\fB-o\fR property=\fIvalue\fR]]... \fB-V\fR \fIsize\fR \fIvolume\fR
 .fi
+
 .LP
 .nf
 \fBzfs\fR \fBdestroy\fR [\fB-rRf\fR] \fIfilesystem\fR|\fIvolume\fR|\fIsnapshot\fR
 .fi
+
 .LP
 .nf
 \fBzfs\fR \fBclone\fR \fIsnapshot\fR \fIfilesystem\fR|\fIvolume\fR
 .fi
+
 .LP
 .nf
 \fBzfs\fR \fBpromote\fR \fIfilesystem\fR
 .fi
+
 .LP
 .nf
 \fBzfs\fR \fBrename\fR \fIfilesystem\fR|\fIvolume\fR|\fIsnapshot\fR 
     [\fIfilesystem\fR|\fIvolume\fR|\fIsnapshot\fR]
 .fi
+
 .LP
 .nf
 \fBzfs\fR \fBsnapshot\fR [\fB-r\fR] \fIfilesystem at name\fR|\fIvolume at name\fR
 .fi
+
 .LP
 .nf
 \fBzfs\fR \fBrollback\fR [\fB-rRf\fR] \fIsnapshot\fR
 .fi
+
 .LP
 .nf
 \fBzfs\fR \fBlist\fR [\fB-rH\fR] [\fB-o\fR \fIprop\fR[,\fIprop\fR] ]... [ \fB-t\fR \fItype\fR[,\fItype\fR]...]
     [ \fB-s\fR \fIprop\fR [\fB-s\fR \fIprop\fR]... [ \fB-S\fR \fIprop\fR [\fB-S\fR \fIprop\fR]... 
     [\fIfilesystem\fR|\fIvolume\fR|\fIsnapshot\fR|\fI/pathname\fR|.\fI/pathname\fR ...
 .fi
+
 .LP
 .nf
 \fBzfs\fR \fBset\fR \fIproperty\fR=\fIvalue\fR \fIfilesystem\fR|\fIvolume\fR ...
 .fi
+
 .LP
 .nf
 \fBzfs\fR \fBget\fR [\fB-rHp\fR] [\fB-o\fR \fIfield\fR[,\fIfield\fR]...] 
     [\fB-s\fR \fIsource\fR[,\fIsource\fR]...] \fIall\fR | \fIproperty\fR[,\fIproperty\fR]...
      \fIfilesystem\fR|\fIvolume\fR|\fIsnapshot\fR ...
 .fi
+
 .LP
 .nf
 \fBzfs\fR \fBinherit\fR [\fB-r\fR] \fIproperty\fR \fIfilesystem\fR|\fIvolume\fR... ...
 .fi
+
 .LP
 .nf
 \fBzfs\fR \fBmount\fR 
 .fi
+
 .LP
 .nf
 \fBzfs\fR \fBmount\fR [\fB-o \fIoptions\fR\fR] [\fB-O\fR] \fB-a\fR
 .fi
+
 .LP
 .nf
 \fBzfs\fR \fBmount\fR [\fB-o \fIoptions\fR\fR] [\fB-O\fR] \fIfilesystem\fR
 .fi
+
 .LP
 .nf
 \fBzfs\fR \fBunmount\fR [\fB-f\fR] \fB-a\fR
 .fi
+
 .LP
 .nf
 \fBzfs\fR \fBunmount\fR [\fB-f\fR] \fB\fIfilesystem\fR|\fImountpoint\fR\fR
 .fi
+
 .LP
 .nf
 \fBzfs\fR \fBshare\fR \fB-a\fR
 .fi
+
 .LP
 .nf
 \fBzfs\fR \fBshare\fR \fIfilesystem\fR
 .fi
+
 .LP
 .nf
 \fBzfs\fR \fBunshare\fR [\fB-f\fR] \fB-a\fR
 .fi
+
 .LP
 .nf
 \fBzfs\fR \fBunshare\fR [\fB-f\fR] \fB\fIfilesystem\fR|\fImountpoint\fR\fR
 .fi
+
 .LP
 .nf
 \fBzfs\fR \fBsend\fR [\fB-i\fR \fIsnapshot1\fR] \fB\fIsnapshot2\fR\fR
 .fi
+
 .LP
 .nf
 \fBzfs\fR \fBreceive\fR [\fB-vnF\fR ] \fIfilesystem\fR|\fIvolume\fR|\fIsnapshot\fR
 .fi
+
 .LP
 .nf
 \fBzfs\fR \fBreceive\fR [\fB-vnF\fR ] \fB-d\fR \fB\fIfilesystem\fR\fR
@@ -137,7 +161,6 @@
 .fi
 
 .SH DESCRIPTION
-
 .LP
 The \fBzfs\fR command configures \fBZFS\fR datasets within a \fBZFS\fR storage pool, as described in \fBzpool\fR(1M). A
 dataset is identified by a unique path within the \fBZFS\fR namespace. For example:
@@ -186,16 +209,14 @@
 A read-only version of a file system or volume at a given point in time. It is specified as \fIfilesystem at name\fR or \fIvolume at name\fR.
 .RE
 
-.SS ZFS File System Hierarchy
-
+.SS "ZFS File System Hierarchy"
 .LP
 A \fBZFS\fR storage pool is a logical collection of devices that provide space for datasets. A storage pool is also the root of the \fBZFS\fR file system hierarchy.
 .LP
 The root of the pool can be accessed as a file system, such as mounting and unmounting, taking snapshots, and setting properties. The physical storage characteristics, however, are managed by the \fBzpool\fR(1M) command.
 .LP
 See \fBzpool\fR(1M) for more information on creating and administering pools.
-.SS Snapshots
-
+.SS "Snapshots"
 .LP
 A snapshot is a read-only copy of a file system or volume. Snapshots can be created extremely quickly, and initially consume no additional space within the pool. As data within the active dataset changes, the snapshot consumes more data than would otherwise be shared with the active dataset.
 .LP
@@ -203,8 +224,7 @@
 .LP
 File system snapshots can be accessed under the ".zfs/snapshot" directory in the root of the file system. Snapshots are automatically mounted on demand and may be unmounted at regular intervals. The visibility of the ".zfs" directory can be controlled by the "snapdir"
 property.
-.SS Clones
-
+.SS "Clones"
 .LP
 A clone is a writable volume or file system whose initial contents are the same as another dataset. As with snapshots, creating a clone is nearly instantaneous, and initially consumes no additional space.
 .LP
@@ -213,8 +233,7 @@
 .LP
 The clone parent-child dependency relationship can be reversed by using the "\fBpromote\fR" subcommand. This causes the "origin" file system to become a clone of the specified file system, which makes it possible to destroy the file system that the clone
 was created from.
-.SS Mount Points
-
+.SS "Mount Points"
 .LP
 Creating a \fBZFS\fR file system is a simple operation, so the number of file systems per system will likely be numerous. To cope with this, \fBZFS\fR automatically manages mounting and unmounting file systems without the need to edit the \fB/etc/vfstab\fR file.
 All automatically managed file systems are mounted by \fBZFS\fR at boot time.
@@ -227,8 +246,7 @@
 .LP
 If needed, \fBZFS\fR file systems can also be managed with traditional tools (\fBmount\fR, \fBumount\fR, \fB/etc/vfstab\fR). If a file system's mount point is set to "legacy", \fBZFS\fR makes no attempt to manage
 the file system, and the administrator is responsible for mounting and unmounting the file system.
-.SS Zones
-
+.SS "Zones"
 .LP
 A \fBZFS\fR file system can be added to a non-global zone by using zonecfg's "\fBadd fs\fR" subcommand. A \fBZFS\fR file system that is added to a non-global zone must have its mountpoint property set to legacy.
 .LP
@@ -244,8 +262,7 @@
 After a dataset is delegated to a non-global zone, the "zoned" property is automatically set. A zoned file system cannot be mounted in the global zone, since the zone administrator might have to set the mount point to an unacceptable value.
 .LP
 The global administrator can forcibly clear the "zoned" property, though this should be done with extreme care. The global administrator should verify that all the mount points are acceptable before clearing the property.
-.SS Native Properties
-
+.SS "Native Properties"
 .LP
 Properties are divided into two types, native properties and user defined properties. Native properties either export internal statistics or control \fBZFS\fR behavior. In addition, native properties are either editable or read-only. User properties have no effect on \fBZFS\fR behavior,
 but you can use them to annotate datasets in a way that is meaningful in your environment. For more information about user properties, see the "User Properties" section.
@@ -507,11 +524,13 @@
 .ne 2
 .mk
 .na
-\fBcompression=\fIon\fR | \fIoff\fR | \fIlzjb\fR\fR
+\fBcompression=\fIon\fR | \fIoff\fR | \fIlzjb\fR | \fIgzip\fR | \fIgzip-N\fR\fR
 .ad
 .sp .6
 .RS 4n
-Controls the compression algorithm used for this dataset. There is currently only one algorithm, "\fIlzjb\fR", though this may change in future releases. The default value is "off".
+Controls the compression algorithm used for this dataset. The "lzjb" compression algorithm is optimized for performance while providing decent data compression. Setting compression to "on" uses the "lzjb" compression algorithm. The "gzip"
+compression algorithm uses the same compression as the \fBgzip\fR(1) command.  You can specify the "gzip" level by using the value "gzip-\fIN\fR",
+where \fIN\fR is an integer from 1 (fastest) to 9 (best compression ratio). Currently, "gzip" is equivalent to "gzip-6" (which is also the default for \fBgzip\fR(1)).
 .sp
 This property can also be referred to by its shortened column name "compress".
 .RE
@@ -655,10 +674,10 @@
 .ad
 .sp .6
 .RS 4n
-Controls the number of copies of data stored for this dataset.  These copies are in addition to any redundancy provided by the pool (for example, mirroring or raid-z).  The copies are stored on different disks if possible.  The space used by multiple copies is charged to the associated
-file and dataset, changing  the "used" property and counting against quotas and reservations.
+Controls the number of copies of data stored for this dataset. These copies are in addition to any redundancy provided by the pool, for example, mirroring or raid-z. The copies are stored on different disks, if possible. The space used by multiple copies is charged to the associated
+file and dataset, changing the "used" property and counting against quotas and reservations.
 .sp
-Changing this property only affects newly-written data. Therefore, it is recommended that this property be set at file system creation time, using the "\fB-o\fR copies=" option.
+Changing this property only affects newly-written data. Therefore, set this property at file system creation time by using the "\fB-o\fR copies=" option.
 .RE
 
 .sp
@@ -672,12 +691,10 @@
 Controls whether the dataset is managed from within a jail. The default value is "off".
 .RE
 
-.SS iscsioptions
-
+.SS "iscsioptions"
 .LP
 This read-only property, which is hidden, is used by the \fBiSCSI\fR target daemon to store persistent information, such as the \fBIQN\fR. It cannot be viewed or modified using the \fBzfs\fR command. The contents are not intended for external consumers.
-.SS Temporary Mount Point Properties
-
+.SS "Temporary Mount Point Properties"
 .LP
 When a file system is mounted, either through \fBmount\fR(1M) for legacy mounts or the "\fBzfs mount\fR" command for normal file systems,
 its mount options are set according to its properties. The correlation between properties and mount options is as follows:
@@ -697,8 +714,7 @@
 .LP
 In addition, these options can be set on a per-mount basis using the \fB-o\fR option, without affecting the property that is stored on disk. The values specified on the command line override the values stored in the dataset. The \fB-nosuid\fR option is an alias for "nodevices,nosetuid".
 These properties are reported as "temporary" by the "\fBzfs get\fR" command. If the properties are changed while the dataset is mounted, the new setting overrides any temporary settings.
-.SS User Properties
-
+.SS "User Properties"
 .LP
 In addition to the standard native properties, \fBZFS\fR supports arbitrary user properties. User properties have no effect on \fBZFS\fR behavior, but applications or administrators can use them to annotate datasets.
 .LP
@@ -711,8 +727,7 @@
 .LP
 The values of user properties are arbitrary strings, are always inherited, and are never validated. All of the commands that operate on properties ("zfs list", "zfs get", "zfs set", etc.) can be used to manipulate both native properties and user properties.
 Use the "\fBzfs inherit\fR" command to clear a user property . If the property is not defined in any parent dataset, it is removed entirely. Property values are limited to 1024 characters.
-.SS Volumes as Swap or Dump Devices
-
+.SS "Volumes as Swap or Dump Devices"
 .LP
 To set up a swap area, create a \fBZFS\fR volume of a specific size and then enable swap on that device. For more information, see the EXAMPLES section.
 .LP
@@ -720,7 +735,6 @@
 .LP
 Using a \fBZFS\fR volume as a dump device is not supported.
 .SH SUBCOMMANDS
-
 .LP
 All subcommands that modify state are logged persistently to the pool in their original form.
 .sp
@@ -1466,10 +1480,10 @@
 .SH EXAMPLES
 .LP
 \fBExample 1 \fRCreating a ZFS File System Hierarchy
-
 .LP
 The following commands create a file system named "\fBpool/home\fR" and a file system named "\fBpool/home/bob\fR". The mount point "\fB/export/home\fR" is set for the parent file system, and automatically inherited
 by the child file system.
+
 .sp
 .in +2
 .nf
@@ -1479,11 +1493,12 @@
 .fi
 .in -2
 .sp
+
 .LP
 \fBExample 2 \fRCreating a ZFS Snapshot
-
 .LP
 The following command creates a snapshot named "yesterday". This snapshot is mounted on demand in the ".zfs/snapshot" directory at the root of the "\fBpool/home/bob\fR" file system.
+
 .sp
 .in +2
 .nf
@@ -1491,12 +1506,13 @@
 .fi
 .in -2
 .sp
+
 .LP
 \fBExample 3 \fRTaking and destroying multiple snapshots
-
 .LP
 The following command creates snapshots named "\fByesterday\fR" of "\fBpool/home\fR" and all of its descendant file systems. Each snapshot is mounted on demand in the ".zfs/snapshot" directory at the root of its file system. The
 second command destroys the newly created snapshots.
+
 .sp
 .in +2
 .nf
@@ -1505,11 +1521,12 @@
 .fi
 .in -2
 .sp
+
 .LP
 \fBExample 4 \fRTurning Off Compression
-
 .LP
 The following commands turn compression off for all file systems under "\fBpool/home\fR", but explicitly turns it on for "\fBpool/home/anne\fR".
+
 .sp
 .in +2
 .nf
@@ -1518,11 +1535,12 @@
 .fi
 .in -2
 .sp
+
 .LP
 \fBExample 5 \fRListing ZFS Datasets
-
 .LP
 The following command lists all active file systems and volumes in the system.
+
 .sp
 .in +2
 .nf
@@ -1538,11 +1556,12 @@
 .fi
 .in -2
 .sp
+
 .LP
 \fBExample 6 \fRSetting a Quota on a ZFS File System
-
 .LP
 The following command sets a quota of 50 gbytes for "\fBpool/home/bob\fR".
+
 .sp
 .in +2
 .nf
@@ -1550,11 +1569,12 @@
 .fi
 .in -2
 .sp
+
 .LP
 \fBExample 7 \fRListing ZFS Properties
-
 .LP
 The following command lists all properties for "\fBpool/home/bob\fR".
+
 .sp
 .in +2
 .nf
@@ -1596,6 +1616,7 @@
 
 .LP
 The following command gets a single property value.
+
 .sp
 .in +2
 .nf
@@ -1607,6 +1628,7 @@
 
 .LP
 The following command lists all properties with local settings for "\fBpool/home/bob\fR".
+
 .sp
 .in +2
 .nf
@@ -1618,11 +1640,12 @@
 .fi
 .in -2
 .sp
+
 .LP
 \fBExample 8 \fRRolling Back a ZFS File System
-
 .LP
 The following command reverts the contents of "\fBpool/home/anne\fR" to the snapshot named "\fByesterday\fR", deleting all intermediate snapshots.
+
 .sp
 .in +2
 .nf
@@ -1630,11 +1653,12 @@
 .fi
 .in -2
 .sp
+
 .LP
 \fBExample 9 \fRCreating a ZFS Clone
-
 .LP
 The following command creates a writable file system whose initial contents are the same as "\fBpool/home/bob at yesterday\fR".
+
 .sp
 .in +2
 .nf
@@ -1642,11 +1666,12 @@
 .fi
 .in -2
 .sp
+
 .LP
 \fBExample 10 \fRPromoting a ZFS Clone
-
 .LP
 The following commands illustrate how to test out changes to a file system, and then replace the original file system with the changed one, using clones, clone promotion, and renaming:
+
 .sp
 .in +2
 .nf
@@ -1664,11 +1689,12 @@
 .fi
 .in -2
 .sp
+
 .LP
 \fBExample 11 \fRInheriting ZFS Properties
-
 .LP
 The following command causes "\fBpool/home/bob\fR" and "\fBpool/home/anne\fR" to inherit the "checksum" property from their parent.
+
 .sp
 .in +2
 .nf
@@ -1676,12 +1702,13 @@
 .fi
 .in -2
 .sp
+
 .LP
 \fBExample 12 \fRRemotely Replicating ZFS Data
-
 .LP
 The following commands send a full stream and then an incremental stream to a remote machine, restoring them into "\fBpoolB/received/fs\fR at a" and "\fBpoolB/received/fs at b\fR", respectively. "\fBpoolB\fR" must contain
 the file system "\fBpoolB/received\fR", and must not initially contain "\fBpoolB/received/fs\fR".
+
 .sp
 .in +2
 .nf
@@ -1692,12 +1719,13 @@
 .fi
 .in -2
 .sp
+
 .LP
 \fBExample 13 \fRUsing the  zfs receive -d Option
-
 .LP
 The following command sends a full stream of "\fBpoolA/fsA/fsB at snap\fR" to a remote machine, receiving it into "\fBpoolB/received/fsA/fsB at snap\fR". The "\fBfsA/fsB at snap\fR" portion of the received snapshot's name
 is determined from the name of the sent snapshot. "\fBpoolB\fR" must contain the file system "\fBpoolB/received\fR".  If  "\fBpoolB/received/fsA\fR" does not exist, it will be created as an empty file system.
+
 .sp
 .in +2
 .nf
@@ -1707,11 +1735,12 @@
 .fi
 .in -2
 .sp
+
 .LP
 \fBExample 14 \fRCreating a ZFS volume as a Swap Device
-
 .LP
 The following example shows how to create a 5-Gbyte ZFS volume and then add the volume as a swap device.
+
 .sp
 .in +2
 .nf
@@ -1720,11 +1749,12 @@
 .fi
 .in -2
 .sp
+
 .LP
 \fBExample 15 \fRSetting User Properties
-
 .LP
 The following example sets the user defined "com.example:department" property for a dataset.
+
 .sp
 .in +2
 .nf
@@ -1732,11 +1762,12 @@
 .fi
 .in -2
 .sp
+
 .LP
 \fBExample 16 \fRCreating a ZFS Volume as a iSCSI Target Device
-
 .LP
 The following example shows how to create a \fBZFS\fR volume as an \fBiSCSI\fR target. 
+
 .sp
 .in +2
 .nf
@@ -1754,7 +1785,6 @@
 .LP
 After the \fBiSCSI\fR target is created, set up the \fBiSCSI\fR initiator. For more information about the Solaris \fBiSCSI\fR initiator, see the Solaris Administration Guide: Devices and File Systems.
 .SH EXIT STATUS
-
 .LP
 The following exit values are returned:
 .sp
@@ -1791,7 +1821,6 @@
 .RE

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

More information about the p4-projects mailing list