PERFORCE change 125476 for review

Christopher Davis loafier at FreeBSD.org
Mon Aug 20 18:59:27 PDT 2007


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

Change 125476 by loafier at chrisdsoc on 2007/08/21 01:58:53

	integrate

Affected files ...

.. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#5 integrate
.. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/rc-scripting/article.sgml#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#3 integrate
.. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/config/chapter.sgml#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/disks/chapter.sgml#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml#6 integrate
.. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#3 integrate
.. //depot/projects/soc2007/loafier_busalloc/doc/hu_HU.ISO8859-2/articles/Makefile#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/doc/hu_HU.ISO8859-2/articles/explaining-bsd/Makefile#1 branch
.. //depot/projects/soc2007/loafier_busalloc/doc/hu_HU.ISO8859-2/articles/explaining-bsd/article.sgml#1 branch
.. //depot/projects/soc2007/loafier_busalloc/doc/mn_MN.UTF-8/books/handbook/bibliography/chapter.sgml#3 integrate
.. //depot/projects/soc2007/loafier_busalloc/doc/mn_MN.UTF-8/books/handbook/install/chapter.sgml#5 integrate
.. //depot/projects/soc2007/loafier_busalloc/doc/mn_MN.UTF-8/share/sgml/trademarks.ent#3 integrate
.. //depot/projects/soc2007/loafier_busalloc/doc/share/sgml/freebsd.ent#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/doc/share/sgml/man-refs.ent#5 integrate
.. //depot/projects/soc2007/loafier_busalloc/doc/share/sgml/trademarks.ent#3 integrate
.. //depot/projects/soc2007/loafier_busalloc/doc/zh_TW.Big5/books/handbook/install/chapter.sgml#3 integrate
.. //depot/projects/soc2007/loafier_busalloc/ports/MOVED#6 integrate
.. //depot/projects/soc2007/loafier_busalloc/ports/Mk/bsd.sites.mk#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/ports/Tools/scripts/README#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/ports/Tools/scripts/neededlibs.sh#1 branch
.. //depot/projects/soc2007/loafier_busalloc/ports/Tools/scripts/resolveportsfromlibs.sh#1 branch
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/gcc/BASE-VER#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/gcc/ChangeLog#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/gcc/DATESTAMP#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/gcc/Makefile.in#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/gcc/calls.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/gcc/combine.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/gcc/config/arm/arm.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/gcc/config/arm/cirrus.md#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/gcc/config/i386/i386.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/gcc/config/i386/i386.h#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/gcc/config/i386/i386.md#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/gcc/config/i386/sse.md#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/gcc/config/mips/iris6.h#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/gcc/config/rs6000/predicates.md#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/gcc/config/rs6000/rs6000.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/gcc/config/soft-fp/double.h#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/gcc/config/soft-fp/extended.h#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/gcc/config/soft-fp/floatundidf.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/gcc/config/soft-fp/floatundisf.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/gcc/config/soft-fp/floatunsidf.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/gcc/config/soft-fp/floatunsisf.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/gcc/config/soft-fp/op-2.h#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/gcc/config/soft-fp/op-4.h#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/gcc/config/soft-fp/op-common.h#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/gcc/config/soft-fp/quad.h#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/gcc/config/sparc/sparc.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/gcc/cp/ChangeLog#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/gcc/cp/call.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/gcc/cp/class.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/gcc/cp/cp-tree.h#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/gcc/cp/decl.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/gcc/cp/decl2.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/gcc/cp/init.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/gcc/cp/parser.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/gcc/cp/pt.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/gcc/cp/semantics.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/gcc/cp/typeck.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/gcc/cp/typeck2.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/gcc/doc/cpp.1#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/gcc/doc/gcc.1#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/gcc/doc/gcov.1#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/gcc/dwarf2out.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/gcc/except.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/gcc/fold-const.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/gcc/function.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/gcc/gimplify.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/gcc/gthr-posix.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/gcc/gthr-posix.h#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/gcc/loop-iv.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/gcc/objc/ChangeLog#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/gcc/omp-low.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/gcc/pointer-set.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/gcc/pointer-set.h#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/gcc/reload.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/gcc/tree-if-conv.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/gcc/tree-ssa-loop-niter.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/gcc/tree-ssa-operands.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/gcc/tree-ssa-structalias.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/gcc/tree-vrp.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/gcc/version.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/gcclibs/include/ChangeLog#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/gcclibs/libcpp/ChangeLog#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/gcclibs/libdecnumber/ChangeLog#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/gcclibs/libgomp/ChangeLog#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/gcclibs/libgomp/config/posix/lock.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/gcclibs/libgomp/sections.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/gcclibs/libiberty/ChangeLog#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/gcclibs/libmudflap/ChangeLog#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/gcclibs/libssp/ChangeLog#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/less/main.c#3 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/libobjc/ChangeLog#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/libstdc++/ChangeLog#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/libstdc++/acinclude.m4#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/libstdc++/config.h.in#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/libstdc++/configure#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/libstdc++/include/Makefile.am#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/libstdc++/include/Makefile.in#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/libstdc++/include/bits/ostream.tcc#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/libstdc++/include/bits/ostream_insert.h#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/libstdc++/include/ext/throw_allocator.h#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/libstdc++/include/std/std_fstream.h#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/libstdc++/libsupc++/exception#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/libstdc++/libsupc++/new#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/contrib/libstdc++/libsupc++/typeinfo#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/etc/etc.arm/ttys#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/etc/namedb/named.conf#3 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/etc/rc.d/Makefile#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/etc/rc.d/lockd#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/etc/rc.d/nfslocking#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/etc/rc.d/statd#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/gnu/lib/libgcc/Makefile#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/gnu/lib/libstdc++/Makefile#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/lib/libarchive/archive_read_support_format_tar.c#3 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/lib/libarchive/archive_write_disk.c#3 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/lib/libarchive/test/test_read_format_gtar_sparse.c#3 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/lib/libarchive/test/test_write_disk_perms.c#3 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/release/Makefile#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/release/doc/Makefile#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/release/doc/en_US.ISO8859-1/Makefile#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/release/doc/en_US.ISO8859-1/hardware/article.sgml#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/release/doc/en_US.ISO8859-1/hardware/common/artheader.sgml#2 delete
.. //depot/projects/soc2007/loafier_busalloc/src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#2 delete
.. //depot/projects/soc2007/loafier_busalloc/src/release/doc/en_US.ISO8859-1/hardware/common/hw.ent#2 delete
.. //depot/projects/soc2007/loafier_busalloc/src/release/doc/en_US.ISO8859-1/hardware/common/intro.sgml#2 delete
.. //depot/projects/soc2007/loafier_busalloc/src/release/doc/en_US.ISO8859-1/installation/Makefile#2 delete
.. //depot/projects/soc2007/loafier_busalloc/src/release/doc/en_US.ISO8859-1/installation/Makefile.inc#2 delete
.. //depot/projects/soc2007/loafier_busalloc/src/release/doc/en_US.ISO8859-1/installation/amd64/Makefile#2 delete
.. //depot/projects/soc2007/loafier_busalloc/src/release/doc/en_US.ISO8859-1/installation/amd64/article.sgml#2 delete
.. //depot/projects/soc2007/loafier_busalloc/src/release/doc/en_US.ISO8859-1/installation/common/abstract.sgml#2 delete
.. //depot/projects/soc2007/loafier_busalloc/src/release/doc/en_US.ISO8859-1/installation/common/artheader.sgml#2 delete
.. //depot/projects/soc2007/loafier_busalloc/src/release/doc/en_US.ISO8859-1/installation/common/install.ent#2 delete
.. //depot/projects/soc2007/loafier_busalloc/src/release/doc/en_US.ISO8859-1/installation/common/install.sgml#2 delete
.. //depot/projects/soc2007/loafier_busalloc/src/release/doc/en_US.ISO8859-1/installation/common/layout.sgml#2 delete
.. //depot/projects/soc2007/loafier_busalloc/src/release/doc/en_US.ISO8859-1/installation/common/trouble.sgml#2 delete
.. //depot/projects/soc2007/loafier_busalloc/src/release/doc/en_US.ISO8859-1/installation/common/upgrade.sgml#2 delete
.. //depot/projects/soc2007/loafier_busalloc/src/release/doc/en_US.ISO8859-1/installation/i386/Makefile#2 delete
.. //depot/projects/soc2007/loafier_busalloc/src/release/doc/en_US.ISO8859-1/installation/i386/article.sgml#2 delete
.. //depot/projects/soc2007/loafier_busalloc/src/release/doc/en_US.ISO8859-1/installation/ia64/Makefile#2 delete
.. //depot/projects/soc2007/loafier_busalloc/src/release/doc/en_US.ISO8859-1/installation/ia64/article.sgml#2 delete
.. //depot/projects/soc2007/loafier_busalloc/src/release/doc/en_US.ISO8859-1/installation/pc98/Makefile#2 delete
.. //depot/projects/soc2007/loafier_busalloc/src/release/doc/en_US.ISO8859-1/installation/pc98/article.sgml#2 delete
.. //depot/projects/soc2007/loafier_busalloc/src/release/doc/en_US.ISO8859-1/installation/powerpc/Makefile#2 delete
.. //depot/projects/soc2007/loafier_busalloc/src/release/doc/en_US.ISO8859-1/installation/powerpc/article.sgml#2 delete
.. //depot/projects/soc2007/loafier_busalloc/src/release/doc/en_US.ISO8859-1/installation/sparc64/Makefile#2 delete
.. //depot/projects/soc2007/loafier_busalloc/src/release/doc/en_US.ISO8859-1/installation/sparc64/article.sgml#2 delete
.. //depot/projects/soc2007/loafier_busalloc/src/release/doc/en_US.ISO8859-1/installation/sparc64/install.sgml#2 delete
.. //depot/projects/soc2007/loafier_busalloc/src/release/doc/en_US.ISO8859-1/readme/article.sgml#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#6 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/release/doc/share/examples/Makefile.relnotesng#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/release/doc/share/misc/dev.archlist.txt#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/release/doc/share/sgml/release.ent#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sbin/atacontrol/atacontrol.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sbin/reboot/boot_i386.8#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sbin/tunefs/tunefs.8#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/share/man/man4/mfi.4#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/share/man/man4/ng_fec.4#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/share/man/man5/Makefile#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/share/man/man5/boot.config.5#1 branch
.. //depot/projects/soc2007/loafier_busalloc/src/share/mk/sys.mk#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/amd64/conf/NOTES#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/amd64/include/specialreg.h#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/arm/arm/busdma_machdep.c#3 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/boot/arm/at91/boot2/boot2.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/compat/freebsd32/freebsd32_proto.h#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/compat/freebsd32/freebsd32_syscall.h#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/compat/freebsd32/freebsd32_syscalls.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/compat/freebsd32/freebsd32_sysent.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/compat/freebsd32/syscalls.master#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/compat/opensolaris/sys/proc.h#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/conf/NOTES#5 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/conf/files.amd64#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/conf/files.i386#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/dev/ata/ata-raid.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/dev/coretemp/coretemp.c#1 branch
.. //depot/projects/soc2007/loafier_busalloc/src/sys/dev/cxgb/common/cxgb_t3_hw.c#3 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/dev/cxgb/cxgb_adapter.h#4 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/dev/cxgb/cxgb_ioctl.h#3 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/dev/cxgb/cxgb_l2t.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/dev/cxgb/cxgb_l2t.h#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/dev/cxgb/cxgb_main.c#4 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/dev/cxgb/cxgb_offload.c#4 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/dev/cxgb/cxgb_offload.h#3 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/dev/cxgb/cxgb_sge.c#4 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/dev/dcons/dcons_os.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/dev/ichwd/ichwd.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/dev/ichwd/ichwd.h#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/dev/mfi/mfi.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/dev/mfi/mfi_disk.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/dev/mfi/mfi_pci.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/dev/mfi/mfireg.h#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/dev/mfi/mfivar.h#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/dev/mpt/mpt.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/dev/mpt/mpt.h#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/dev/mpt/mpt_cam.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/dev/re/if_re.c#5 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/dev/usb/ehci.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/fs/msdosfs/msdosfs_vfsops.c#4 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/fs/tmpfs/tmpfs_vnops.c#4 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#3 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/i386/conf/NOTES#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/i386/include/specialreg.h#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/kern/init_sysent.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/kern/kern_cpu.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/kern/kern_switch.c#4 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/kern/kern_thr.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/kern/sched_ule.c#5 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/kern/syscalls.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/kern/syscalls.master#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/kern/systrace_args.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/kern/vfs_aio.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/kern/vfs_mount.c#4 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/kern/vfs_subr.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/modules/Makefile#4 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/modules/coretemp/Makefile#1 branch
.. //depot/projects/soc2007/loafier_busalloc/src/sys/modules/netgraph/bluetooth/Makefile#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/net/bridgestp.c#3 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/netgraph/bluetooth/drivers/h4/TODO#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/netgraph/bluetooth/drivers/h4/ng_h4_prse.h#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/netgraph/bluetooth/drivers/h4/ng_h4_var.h#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/netgraph/ng_base.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/netinet/sctp_asconf.c#4 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/netinet/sctp_input.c#5 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/netinet/sctp_output.c#4 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/netinet/sctp_pcb.c#4 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/netinet/sctp_timer.c#4 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/netinet/sctp_usrreq.c#5 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/netinet/sctputil.c#5 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/netinet/tcp_subr.c#4 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/powerpc/include/intr_machdep.h#3 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/powerpc/include/md_var.h#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/powerpc/include/openpicvar.h#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/powerpc/powermac/hrowpic.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/powerpc/powermac/hrowpicvar.h#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/powerpc/powermac/openpic_macio.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/powerpc/powerpc/autoconf.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/powerpc/powerpc/interrupt.c#3 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/powerpc/powerpc/intr_machdep.c#3 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/powerpc/powerpc/nexus.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/powerpc/powerpc/openpic.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/powerpc/powerpc/pic_if.m#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/powerpc/psim/openpic_iobus.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/sys/ata.h#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/sys/syscall.h#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/sys/syscall.mk#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/sys/sysproto.h#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/sys/thr.h#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/vm/device_pager.c#3 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/vm/phys_pager.c#3 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/vm/vm_map.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/vm/vm_map.h#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/sys/vm/vm_mmap.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/usr.sbin/freebsd-update/freebsd-update.sh#3 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/usr.sbin/rpc.statd/file.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/src/usr.sbin/sysinstall/menus.c#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/www/en/gnome/news.xml#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/www/en/relnotes.sgml#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/www/ru/Makefile#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/www/share/sgml/commercial.consult.xml#2 integrate
.. //depot/projects/soc2007/loafier_busalloc/www/share/sgml/commercial.isp.xml#3 integrate
.. //depot/projects/soc2007/loafier_busalloc/www/share/sgml/commercial.software.xml#2 integrate

Differences ...

==== //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#5 (text+ko) ====

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.720 2007/08/10 14:34:12 cognet Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.721 2007/08/19 14:58:36 gabor Exp $ -->
 <!--
 	NOTE TO COMMITTERS: Contributors lists are sorted in alphabetical
 	order by first name.
@@ -7623,6 +7623,11 @@
     </listitem>
 
     <listitem>
+      <para>Pontus Stenetorp
+	<email>ninjin at kth.se</email></para>
+    </listitem>
+
+    <listitem>
       <para>Powerdog Industries
 	<email>kevin.ruddy at powerdog.com</email></para>
     </listitem>

==== //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/articles/rc-scripting/article.sgml#2 (text+ko) ====

@@ -25,7 +25,7 @@
       <holder>The FreeBSD Project</holder>
     </copyright>
 
-    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/rc-scripting/article.sgml,v 1.10 2007/03/04 13:33:06 yar Exp $</pubdate>
+    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/rc-scripting/article.sgml,v 1.13 2007/08/16 13:08:42 yar Exp $</pubdate>
 
     <legalnotice id="trademarks" role="trademarks">
       &tm-attrib.freebsd;
@@ -1096,8 +1096,21 @@
       </callout>
 
       <callout arearefs="rcng-hookup-keyword">
-	<para><anchor id="keywords">There are several keywords used
-	  in &os;:</para>
+	<para><anchor id="keywords">As we remember from the above text,
+	  &man.rcorder.8; keywords can be used to select or leave
+	  out some scripts.  Namely any &man.rcorder.8; consumer
+	  can specify through <option>-k</option> and <option>-s</option>
+	  options which keywords are on the <quote>keep list</quote> and
+	  <quote>skip list</quote>, respectively.  From all the
+	  files to be dependency sorted, &man.rcorder.8; will pick
+	  only those having a keyword from the keep list (unless empty)
+	  and not having a keyword from the skip list.</para>
+
+	<para>In &os;, &man.rcorder.8; is used by
+	  <filename>/etc/rc</filename> and
+	  <filename>/etc/rc.shutdown</filename>.  These two scripts
+	  define the standard list of &os; <filename>rc.d</filename>
+	  keywords and their meanings as follows:</para>
 
 	<variablelist>
 	  <varlistentry>
@@ -1127,10 +1140,43 @@
 	    <term><literal>shutdown</literal></term>
 
 	    <listitem>
-	      <para>The script wants to be run during system
-		shutdown.  Without the keyword listed,
-		<filename>/etc/rc.shutdown</filename> would ignore
-		it for faster shutdown.</para>
+	      <para>This keyword is to be listed
+		<emphasis>explicitly</emphasis> if the service needs
+		to be stopped before system shutdown.</para>
+
+	      <note>
+		<para>When the system is going to shut down,
+		  <filename>/etc/rc.shutdown</filename> runs.  It
+		  assumes that most <filename>rc.d</filename> scripts
+		  have nothing to do at that time.  Therefore
+		  <filename>/etc/rc.shutdown</filename>
+		  selectively invokes <filename>rc.d</filename>
+		  scripts with the <literal>shutdown</literal>
+		  keyword, effectively ignoring the
+		  rest of the scripts.  For even faster shutdown,
+		  <filename>/etc/rc.shutdown</filename> passes
+		  the <option>faststop</option> command to the scripts
+		  it runs so that they skip preliminary checks, e.g.,
+		  the pidfile check.  As dependent services should be
+		  stopped before their prerequisites,
+		  <filename>/etc/rc.shutdown</filename> runs the scripts
+		  in reverse dependency order.</para>
+
+		<para>If writing a real
+		  <filename>rc.d</filename> script, you should
+		  consider whether it is relevant at system shutdown
+		  time.  E.g., if your script does its work in
+		  response to the <option>start</option> command
+		  only, then you need not include this keyword.
+		  However, if your script manages a service, it is
+		  probably a good idea to stop it before the system
+		  proceeds to the final stage of its shutdown
+		  sequence described in &man.halt.8;.  In particular,
+		  a service should be stopped explicitly if it needs
+		  considerable time or special actions to shut down
+		  cleanly.  A typical example of such a service is
+		  a database engine.</para>
+	      </note>
 	    </listitem>
 	  </varlistentry>
 	</variablelist>

==== //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#3 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml,v 1.398 2007/08/02 08:21:53 blackend Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml,v 1.399 2007/08/19 18:33:27 blackend Exp $
 -->
 
 <chapter id="advanced-networking">
@@ -2771,6 +2771,91 @@
 	  the full <hostid role="netmask">/24</hostid> address range
 	  can be allocated without subnetting.</para>
       </sect3>
+
+      <sect3>
+	<title>SNMP Monitoring</title>
+
+	<para>The bridge interface and STP parameters can be monitored
+	  via the SNMP daemon which is included in the &os; base
+	  system.  The exported bridge MIBs conform to the IETF
+	  standards so any SNMP client or monitoring package can be
+	  used to retrieve the data.</para>
+
+	<para>On the bridge machine uncomment the
+	  <literal>begemotSnmpdModulePath."bridge" =
+	  "/usr/lib/snmp_bridge.so"</literal> line from
+	  <filename>/etc/snmp.config</filename> and start the
+	  <application>bsnmpd</application> daemon. Other
+	  configuration such as community names and access lists may
+	  need to be modified.  See &man.bsnmpd.1; and
+	  &man.snmp.bridge.3; for more information.</para>
+
+	<para>The following examples use the
+	  <application>Net-SNMP</application> software (<filename
+	  role="package">net-mgmt/net-snmp</filename>) to query a
+	  bridge, the <filename
+	  role="package">net-mgmt/bsnmptools</filename> port can also
+	  be used.  From the SNMP client host add to
+	  <filename>$HOME/.snmp/snmp.conf</filename> the following
+	  lines to import the bridge MIB definitions in to
+	  <application>Net-SNMP</application>:</para>
+
+	<programlisting>mibdirs +/usr/share/snmp/mibs
+mibs +BRIDGE-MIB:RSTP-MIB:BEGEMOT-MIB:BEGEMOT-BRIDGE-MIB</programlisting>
+
+	<para>To monitor a single bridge via the IETF BRIDGE-MIB
+	  (RFC4188) do</para>
+
+	<screen>&prompt.user; <userinput>snmpwalk -v 2c -c public bridge1.example.com mib-2.dot1dBridge</userinput>
+BRIDGE-MIB::dot1dBaseBridgeAddress.0 = STRING: 66:fb:9b:6e:5c:44
+BRIDGE-MIB::dot1dBaseNumPorts.0 = INTEGER: 1 ports
+BRIDGE-MIB::dot1dStpTimeSinceTopologyChange.0 = Timeticks: (189959) 0:31:39.59 centi-seconds
+BRIDGE-MIB::dot1dStpTopChanges.0 = Counter32: 2
+BRIDGE-MIB::dot1dStpDesignatedRoot.0 = Hex-STRING: 80 00 00 01 02 4B D4 50
+...
+BRIDGE-MIB::dot1dStpPortState.3 = INTEGER: forwarding(5)
+BRIDGE-MIB::dot1dStpPortEnable.3 = INTEGER: enabled(1)
+BRIDGE-MIB::dot1dStpPortPathCost.3 = INTEGER: 200000
+BRIDGE-MIB::dot1dStpPortDesignatedRoot.3 = Hex-STRING: 80 00 00 01 02 4B D4 50
+BRIDGE-MIB::dot1dStpPortDesignatedCost.3 = INTEGER: 0
+BRIDGE-MIB::dot1dStpPortDesignatedBridge.3 = Hex-STRING: 80 00 00 01 02 4B D4 50
+BRIDGE-MIB::dot1dStpPortDesignatedPort.3 = Hex-STRING: 03 80
+BRIDGE-MIB::dot1dStpPortForwardTransitions.3 = Counter32: 1
+RSTP-MIB::dot1dStpVersion.0 = INTEGER: rstp(2)</screen>
+
+	<para>The <literal>dot1dStpTopChanges.0</literal> value is two
+	  which means that the STP bridge topology has changed twice,
+	  a topology change means that one or more links in the
+	  network have changed or failed and a new tree has been
+	  calculated.  The
+	  <literal>dot1dStpTimeSinceTopologyChange.0</literal> value
+	  will show when this happened.</para>
+
+	<para>To monitor multiple bridge interfaces one may use the
+	  private BEGEMOT-BRIDGE-MIB:</para>
+
+	<screen>&prompt.user; <userinput>snmpwalk -v 2c -c public bridge1.example.com</userinput>
+enterprises.fokus.begemot.begemotBridge
+BEGEMOT-BRIDGE-MIB::begemotBridgeBaseName."bridge0" = STRING: bridge0
+BEGEMOT-BRIDGE-MIB::begemotBridgeBaseName."bridge2" = STRING: bridge2
+BEGEMOT-BRIDGE-MIB::begemotBridgeBaseAddress."bridge0" = STRING: e:ce:3b:5a:9e:13
+BEGEMOT-BRIDGE-MIB::begemotBridgeBaseAddress."bridge2" = STRING: 12:5e:4d:74:d:fc
+BEGEMOT-BRIDGE-MIB::begemotBridgeBaseNumPorts."bridge0" = INTEGER: 1
+BEGEMOT-BRIDGE-MIB::begemotBridgeBaseNumPorts."bridge2" = INTEGER: 1
+...
+BEGEMOT-BRIDGE-MIB::begemotBridgeStpTimeSinceTopologyChange."bridge0" = Timeticks: (116927) 0:19:29.27 centi-seconds
+BEGEMOT-BRIDGE-MIB::begemotBridgeStpTimeSinceTopologyChange."bridge2" = Timeticks: (82773) 0:13:47.73 centi-seconds
+BEGEMOT-BRIDGE-MIB::begemotBridgeStpTopChanges."bridge0" = Counter32: 1
+BEGEMOT-BRIDGE-MIB::begemotBridgeStpTopChanges."bridge2" = Counter32: 1
+BEGEMOT-BRIDGE-MIB::begemotBridgeStpDesignatedRoot."bridge0" = Hex-STRING: 80 00 00 40 95 30 5E 31
+BEGEMOT-BRIDGE-MIB::begemotBridgeStpDesignatedRoot."bridge2" = Hex-STRING: 80 00 00 50 8B B8 C6 A9</screen>
+
+	<para>To change the bridge interface being monitored via the
+	  <literal>mib-2.dot1dBridge</literal> subtree do:</para>
+
+	<screen>&prompt.user; <userinput>snmpset -v 2c -c private bridge1.example.com</userinput>
+BEGEMOT-BRIDGE-MIB::begemotBridgeDefaultBridgeIf.0 s bridge2</screen>
+      </sect3>
     </sect2>
   </sect1>
 

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

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/config/chapter.sgml,v 1.226 2007/04/07 20:21:09 njl Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/config/chapter.sgml,v 1.227 2007/08/17 12:54:31 blackend Exp $
 -->
 
 <chapter id="config-tuning">
@@ -2391,13 +2391,13 @@
 
         <para>To see the current number of vnodes in use:</para>
 
-        <programlisting>&prompt.root; sysctl vfs.numvnodes
-vfs.numvnodes: 91349</programlisting>
+        <screen>&prompt.root; <userinput>sysctl vfs.numvnodes</userinput>
+vfs.numvnodes: 91349</screen>
 
         <para>To see the maximum vnodes:</para>
 
-        <programlisting>&prompt.root; sysctl kern.maxvnodes
-kern.maxvnodes: 100000</programlisting>
+        <screen>&prompt.root; <userinput>sysctl kern.maxvnodes</userinput>
+kern.maxvnodes: 100000</screen>
 
         <para>If the current vnode usage is near the maximum, increasing
           <varname>kern.maxvnodes</varname> by a value of 1,000 is

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

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/disks/chapter.sgml,v 1.274 2007/06/15 12:41:54 den Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/disks/chapter.sgml,v 1.275 2007/08/20 16:48:01 blackend Exp $
 -->
 
 <chapter id="disks">
@@ -3748,8 +3748,8 @@
 	  provided.  Arguments for this script can be passed via
 	  &man.rc.conf.5;, for example:</para>
 
-	<screen>gbde_autoattach_all="YES"
-gbde_devices="ad4s1c"</screen>
+	<programlisting>gbde_autoattach_all="YES"
+gbde_devices="ad4s1c"</programlisting>
 
 	<para>This will require that the <application>gbde</application>
 	  passphrase be entered at boot time.  After typing the correct
@@ -3805,7 +3805,7 @@
 
       <para>A new cryptographic GEOM class is available as of &os; 6.0 -
 	<command>geli</command>.  It is currently being developed by
-	&a.pjd;.  <command>Geli</command> is different to
+	&a.pjd;.  The <command>geli</command> utility is different to
 	<command>gbde</command>; it offers different features and uses
 	a different scheme for doing cryptographic work.</para>
 
@@ -3851,9 +3851,7 @@
 
       <para>The next steps will describe how to enable support for
 	<command>geli</command> in the &os; kernel and will explain how
-	to create a new <command>geli</command> encryption provider.  At
-	the end it will be demonstrated how to create an encrypted swap
-	partition using features provided by <command>geli</command>.</para>
+	to create and use a <command>geli</command> encryption provider.</para>
 
       <para>In order to use <command>geli</command>, you must be running
 	&os; 6.0-RELEASE or later.  Super-user privileges will be
@@ -3861,14 +3859,13 @@
 
       <procedure>
 	<step>
-	  <title>Adding <command>geli</command> Support to the Kernel
-	    Configuration File</title>
+	  <title>Adding <command>geli</command> Support to the Kernel</title>
 
 	  <para>Add the following lines to the kernel configuration
 	    file:</para>
 
-	  <screen>options GEOM_ELI
-device crypto</screen>
+	  <programlisting>options GEOM_ELI
+device crypto</programlisting>
 
 	  <para>Rebuild the kernel as described in <xref
 	    linkend="kernelconfig">.</para>
@@ -3877,7 +3874,7 @@
 	    be loaded at boot time.  Add the following line to the
 	    <filename>/boot/loader.conf</filename>:</para>
 
-	  <para><literal>geom_eli_load="YES"</literal></para>
+	  <programlisting>geom_eli_load="YES"</programlisting>
 
 	  <para>&man.geli.8; should now be supported by the kernel.</para>
 	</step>
@@ -3943,7 +3940,7 @@
 &prompt.root; <userinput>mount /dev/da2.eli /private</userinput></screen>
 
 	<para>The encrypted file system should be visible to &man.df.1;
-	  and be available for use now.</para>
+	  and be available for use now:</para>
 
 	  <screen>&prompt.root; <userinput>df -H</userinput>
 Filesystem     Size   Used  Avail Capacity  Mounted on
@@ -3981,8 +3978,8 @@
 	  An example of configuring <command>geli</command> through
 	  &man.rc.conf.5; follows:</para>
 
-	<screen>geli_devices="da2"
-geli_da2_flags="-p -k /root/da2.key"</screen>
+	<programlisting>geli_devices="da2"
+geli_da2_flags="-p -k /root/da2.key"</programlisting>
 
 	<para>This will configure <filename>/dev/da2</filename> as a
 	  <command>geli</command> provider of which the Master Key file
@@ -4067,10 +4064,10 @@
 	<literal>.bde</literal> suffix should be added to the device in the
 	respective <filename>/etc/fstab</filename> swap line:</para>
 
-      <screen>
+      <programlisting>
 # Device                Mountpoint      FStype  Options         Dump    Pass#
 /dev/ad0s1b.bde         none            swap    sw              0       0
-      </screen>
+      </programlisting>
 
       <para>For systems prior to &os; 6.0-RELEASE, the following line
 	in <filename>/etc/rc.conf</filename> is also needed:</para>
@@ -4086,10 +4083,10 @@
 	<literal>.eli</literal> suffix should be added to the device in the
 	respective <filename>/etc/fstab</filename> swap line:</para>
 
-      <screen>
+      <programlisting>
 # Device                Mountpoint      FStype  Options         Dump    Pass#
 /dev/ad0s1b.eli         none            swap    sw              0       0
-      </screen>
+      </programlisting>
 
       <para>&man.geli.8; uses the <acronym>AES</acronym> algorithm with
 	a key length of 256 bit by default.</para>

==== //depot/projects/soc2007/loafier_busalloc/doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml#6 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml,v 1.375 2007/08/11 13:59:20 blackend Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml,v 1.380 2007/08/12 13:09:23 blackend Exp $
 -->
 
 <chapter id="install">
@@ -104,9 +104,9 @@
 	linkend="install-floppies">.</para>
 
       <sect3>
-	<title>&i386; and pc98 Architectures</title>
+	<title>&os;/&arch.i386; and &os;/&arch.pc98;</title>
 
-	<para>Both &os;/&i386 and &os;/pc98 versions require a 486 or
+	<para>Both &os;/&arch.i386; and &os;/&arch.pc98; require a 486 or
 	  better processor and at least 24&nbsp;MB of RAM.  You will
 	  need at least 150&nbsp;MB of free hard drive space for the
 	  most minimal installation.</para>
@@ -119,11 +119,11 @@
       </sect3>
 
       <sect3>
-	<title>Alpha Architecture</title>
+	<title>&os;/&arch.alpha;</title>
 
 	<indexterm><primary>Alpha</primary></indexterm>
 
-	<para>To install &os;/alpha, you will need a supported
+	<para>To install &os;/&arch.alpha;, you will need a supported
 	  platform (see <xref linkend="install-hardware-supported">)
 	  and a dedicated disk for &os;.  It is not possible to share
 	  a disk with another operating system at this time.  This
@@ -140,14 +140,32 @@
 	  AlphaBIOS (or ARC) firmware and SRM.  In others it will be
 	  necessary to download new firmware from the vendor's Web
 	  site.</para>
+
+	<note>
+	  <para>Support for the Alpha was removed beginning with
+	    &os;&nbsp;7.0.  The
+	    &os;&nbsp;6.<replaceable>X</replaceable> series of
+	    releases is the last containing support for this
+	    architecture.</para>
+	</note>
+
       </sect3>
 
       <sect3>
-	<title>amd64 Architecture</title>
+	<title>&os;/&arch.amd64; Architecture</title>
+
+	<para>There are two classes of processors capable of running
+	  &os;/&arch.amd64;.  The first are AMD64 processors,
+	  including the &amd.athlon;64,
+	  &amd.athlon;64-FX, &amd.opteron; or better
+	  processors.</para>
 
-	<para>&os;/amd64 requires an &amd.athlon;64,
-	  &amd.athlon;64-FX, &amd.opteron; or better processor to
-	  run.</para>
+	<para>The second class of processors that can use
+	  &os;/&arch.amd64; includes those using the &intel; EM64T
+	  architecture.  Examples of these processors include the
+	  &intel;&nbsp;&core;&nbsp;2 Duo, Quad, and Extreme processor
+	  families and the &intel;&nbsp;&xeon; 3000, 5000, and 7000
+	  sequences of processors.</para>
 
 	<para>If you have a machine based on an nVidia nForce3
 	  Pro-150, you <emphasis>must</emphasis> use the BIOS setup to
@@ -158,13 +176,13 @@
       </sect3>
 
       <sect3>
-	<title>&sparc64; Architecture</title>
+	<title>&os;/&arch.sparc64;</title>
 
-	<para>To install &os;/&sparc64;, you will need a supported
+	<para>To install &os;/&arch.sparc64;, you will need a supported
 	  platform (see <xref
 	  linkend="install-hardware-supported">).</para>
 
-	<para>You will need a dedicated disk for &os;/&sparc64;.  It
+	<para>You will need a dedicated disk for &os;/&arch.sparc64;.  It
 	  is not possible to share a disk with another operating
 	  system at this time.</para>
       </sect3>
@@ -330,7 +348,7 @@
 	laid out on the disk, and how this affects you.</para>
 
       <sect3 id="install-where-i386">
-	<title>Disk Layouts for the &i386;</title>
+	<title>Disk Layouts for &os;/&arch.i386;</title>
 
       <para>A PC disk can be divided into discrete chunks.  These chunks are
 	called <firstterm>partitions</firstterm>. Since
@@ -686,7 +704,7 @@
 	    with the architecture and the version number
 	    which you want to install, respectively.
 	    For example, the boot floppy images for
-	    &os;&nbsp;&rel.current;-RELEASE for &i386; are available
+	    &os;/&arch.i386;&nbsp;&rel.current;-RELEASE are available
 	    from <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/&rel.current;-RELEASE/floppies/"></ulink>.</para>
 
 	  <para>The floppy images have a <filename>.flp</filename> extension.
@@ -3143,264 +3161,6 @@
 	post-installation configuration.</para>
     </sect2>
 
-    <sect2 id="network-services">
-      <sect2info>
-        <authorgroup>
-          <author>
-            <firstname>Tom</firstname>
-            <surname>Rhodes</surname>
-            <contrib>Contributed by </contrib>
-          </author>
-        </authorgroup>
-      </sect2info>
-      <title>Configure Additional Network Services</title>
-
-      <para>Configuring network services can be a daunting
-	task for new users if they lack previous
-	knowledge in this area.  Networking, including the Internet,
-	is critical to all modern operating systems including &os;;
-	as a result, it is very useful to have some understanding
-	&os;'s extensive networking capabilities.  Doing this
-	during the installation will ensure users have some
-	understanding of the various services available to them.</para>
-
-      <para>Network services are programs that accept input from
-	anywhere on the network.  Every effort is made to make sure
-	these programs will not do anything <quote>harmful</quote>.
-	Unfortunately, programmers are not perfect and through time
-	there have been cases where bugs in network services have been
-	exploited by attackers to do bad things.  It is important that
-	you only enable the network services you know that you need.  If
-	in doubt it is best if you do not enable a network service until
-	you find out that you do need it.  You can always enable it
-	later by re-running <application>sysinstall</application> or by
-	using the features provided by the
-	<filename>/etc/rc.conf</filename> file.</para>
-
-      <para>Selecting the <guimenu>Networking</guimenu> option will display
-	a menu similar to the one below:</para>
-
-      <figure id="network-configuration">
-	<title>Network Configuration Upper-level</title>
-
-	<mediaobject>
-	  <imageobject>
-	    <imagedata fileref="install/net-config-menu1" format="PNG">
-	  </imageobject>
-	</mediaobject>
-      </figure>
-
-      <para>The first option, <guimenuitem>Interfaces</guimenuitem>, was previously covered during
-	the <xref linkend="inst-network-dev">, thus this option can
-	safely be ignored.</para>
-
-      <para>Selecting the <guimenuitem>AMD</guimenuitem> option adds
-	support for the <acronym>BSD</acronym> automatic mount utility.
-	This is usually used in conjunction with the
-	<acronym>NFS</acronym> protocol (see below)
-	for automatically mounting remote file systems.
-	No special configuration is required here.</para>
-
-      <para>Next in line is the <guimenuitem>AMD Flags</guimenuitem>
-	option.  When selected, a menu will pop up for you
-	to enter specific <acronym>AMD</acronym> flags.
-	The menu already contains a set of default options:</para>
-
-      <screen>-a /.amd_mnt -l syslog /host /etc/amd.map /net /etc/amd.map</screen>
-
-      <para>The <option>-a</option> option sets the default mount
-	location which is specified here as
-	<filename>/.amd_mnt</filename>.  The <option>-l</option>
-	option specifies the default <filename>log</filename> file;
-	however, when <literal>syslogd</literal> is used all log
-	activity will be sent to the system log daemon.  The
-	<filename class="directory">/host</filename> directory is used
-	to mount an exported file system from a remote
-	host, while <filename class="directory">/net</filename>
-	directory is used to mount an exported file system from an
-	<acronym>IP</acronym> address.  The
-	<filename>/etc/amd.map</filename> file defines the default
-	options for <acronym>AMD</acronym> exports.</para>
-
-      <indexterm>
-	<primary>FTP</primary>
-	<secondary>anonymous</secondary>
-      </indexterm>
-
-      <para>The <guimenuitem>Anon FTP</guimenuitem> option permits anonymous
-	<acronym>FTP</acronym> connections.  Select this option to
-	make this machine an anonymous <acronym>FTP</acronym> server.
-	Be aware of the security risks involved with this option.
-	Another menu will be displayed to explain the security risks
-	and configuration in depth.</para>
-
-      <para>The <guimenuitem>Gateway</guimenuitem> configuration menu will set
-	the machine up to be a gateway as explained previously.  This
-	can be used to unset the <guimenuitem>Gateway</guimenuitem> option if you accidentally
-	selected it during the installation process.</para>
-
-      <para>The <guimenuitem>Inetd</guimenuitem> option can be used to configure
-	or completely disable the &man.inetd.8; daemon as discussed
-	above.</para>
-
-      <para>The <guimenuitem>Mail</guimenuitem> option is used to configure the system's
-	default <acronym>MTA</acronym> or Mail Transfer Agent.
-	Selecting this option will bring up the following menu:</para>
-
-      <figure id="mta-selection">
-	<title>Select a default MTA</title>
-
-	<mediaobject>
-	  <imageobject>
-	    <imagedata fileref="install/mta-main" format="PNG">
-	  </imageobject>
-	</mediaobject>
-      </figure>
-
-      <para>Here you are offered a choice as to which
-	<acronym>MTA</acronym> to install
-	and set as the default.  An <acronym>MTA</acronym> is nothing
-	more than a mail server which delivers email to users on the
-	system or the Internet.</para>
-
-      <para>Selecting <guimenuitem>Sendmail</guimenuitem> will install
-	the popular <application>sendmail</application> server which
-	is the &os; default.  The <guimenuitem>Sendmail local</guimenuitem> option
-	will set <application>sendmail</application> to be the default
-	<acronym>MTA</acronym>, but disable its ability to receive
-	incoming email from the Internet.  The other options here,
-	<guimenuitem>Postfix</guimenuitem> and
-	<guimenuitem>Exim</guimenuitem> act similar to
-	<guimenuitem>Sendmail</guimenuitem>.  They both deliver
-	email; however, some users prefer these alternatives to the
-	<application>sendmail</application>
-	<acronym>MTA</acronym>.</para>
-
-      <para>After selecting an <acronym>MTA</acronym>, or choosing
-	not to select an MTA, the network configuration menu will appear
-	with the next option being <guimenuitem>NFS client</guimenuitem>.</para>
-
-      <para>The <guimenuitem>NFS client</guimenuitem> option will
-	configure the system to communicate with a server via
-	<acronym>NFS</acronym>.  An <acronym>NFS</acronym> server
-	makes file systems available to other machines on the
-	network via the <acronym>NFS</acronym> protocol.  If this is
-	a stand-alone machine, this option can remain unselected.
-	The system may require more configuration later; see
-	<xref linkend="network-nfs"> for more
-	information about client and server configuration.</para>
-
-      <para>Below that option is the <guimenuitem>NFS server</guimenuitem>
-	option, permitting you to set the system up as an
-	<acronym>NFS</acronym> server.  This adds the required
-	information to start up the <acronym>RPC</acronym> remote
-	procedure call services.  <acronym>RPC</acronym> is used to
-	coordinate connections between hosts and programs.</para>
-
-      <para>Next in line is the <guimenuitem>Ntpdate</guimenuitem> option,
-	which deals with time synchronization.  When selected, a menu
-	like the one below shows up:</para>
-
-      <figure id="Ntpdate-config">
-	<title>Ntpdate Configuration</title>
-
-	<mediaobject>
-	  <imageobject>
-	    <imagedata fileref="install/ntp-config" format="PNG">
-	  </imageobject>
-	</mediaobject>
-      </figure>
-
-      <para>From this menu, select the server which is the closest
-	to your location.  Selecting a close one will make the time
-	synchronization more accurate as a server further from your
-	location may have more connection latency.</para>
-
-      <para>The next option is the <acronym>PCNFSD</acronym> selection.
-	This option will install the
-	<filename role="package">net/pcnfsd</filename> package from
-	the Ports Collection.  This is a useful utility which provides
-	<acronym>NFS</acronym> authentication services for systems which
-	are unable to provide their own, such as Microsoft's
-	&ms-dos; operating system.</para>
-
-      <para>Now you must scroll down a bit to see the other
-	options:</para>
-
-      <figure id="Network-configuration-cont">
-	<title>Network Configuration Lower-level</title>
-
-	<mediaobject>
-	  <imageobject>
-	    <imagedata fileref="install/net-config-menu2" format="PNG">
-	  </imageobject>
-	</mediaobject>
-      </figure>
-
-      <para>The &man.rpcbind.8;, &man.rpc.statd.8;, and
-	&man.rpc.lockd.8; utilities are all used for Remote Procedure
-	Calls (<acronym>RPC</acronym>).
-	The <command>rpcbind</command> utility manages communication
-	between <acronym>NFS</acronym> servers and clients, and is
-	required for <acronym>NFS</acronym> servers to operate
-	correctly.  The <application>rpc.statd</application> daemon interacts
-	with the <application>rpc.statd</application> daemon on other hosts to
-	provide status monitoring.  The reported status is usually held
-	in the <filename>/var/db/statd.status</filename> file.  The
-	next option listed here is the <guimenuitem>rpc.lockd</guimenuitem>
-	option, which, when selected, will provide file locking
-	services.  This is usually used with
-	<application>rpc.statd</application> to monitor what hosts are
-	requesting locks and how frequently they request them.
-	While these last two options are marvelous for debugging, they
-	are not required for <acronym>NFS</acronym> servers and clients
-	to operate correctly.</para>
-
-      <para>As you progress down the list the next item here is
-	<guimenuitem>Routed</guimenuitem>, which is the routing daemon.  The
-	&man.routed.8; utility manages network routing tables,
-	discovers multicast routers, and supplies a copy of the routing
-	tables to any physically connected host on the network upon
-	request.  This is mainly used for machines which act as a
-	gateway for the local network.  When selected, a menu will be
-	presented requesting the default location of the utility.
-	The default location is already defined for you and can be
-	selected with the <keycap>Enter</keycap> key.  You will then
-	be presented with yet another menu, this time asking for the
-	flags you wish to pass on to <application>routed</application>.  The
-	default is <option>-q</option> and it should already appear
-	on the screen.</para>
-
-      <para>Next in line is the <guimenuitem>Rwhod</guimenuitem> option which,
-	when selected, will start the &man.rwhod.8; daemon
-	during system initialization.  The <command>rwhod</command>
-	utility broadcasts system messages across the network
-	periodically, or collects them when in <quote>consumer</quote>
-	mode.  More information can be found in the &man.ruptime.1; and
-	&man.rwho.1; manual pages.</para>
-
-      <para>The next to the last option in the list is for the
-	&man.sshd.8; daemon.  This is the secure shell server for
-	<application>OpenSSH</application> and it is highly recommended
-	over the standard <application>telnet</application> and
-	<acronym>FTP</acronym> servers.  The <application>sshd</application>
-	server is used to create a secure connection from one host to
-	another by using encrypted connections.</para>
-
-      <para>Finally there is the <guimenuitem>TCP Extensions</guimenuitem>
-	option.  This enables the <acronym>TCP</acronym> Extensions
-	defined in <acronym>RFC</acronym>&nbsp;1323 and
-	<acronym>RFC</acronym>&nbsp;1644.  While on many hosts this can
-	speed up connections, it can also cause some connections to be
-	dropped.  It is not recommended for servers, but may be
-	beneficial for stand alone machines.</para>
-
-      <para>Now that you have configured the network services, you can
-	scroll up to the very top item which is <guimenuitem>Exit</guimenuitem>
-	and continue on to the next configuration section.</para>
-
-    </sect2>
-

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


More information about the p4-projects mailing list