svn commit: r254256 - in projects/camlock: . bin/pkill cddl/contrib/opensolaris/cmd/ztest cddl/contrib/opensolaris/lib/libdtrace/common contrib/bmake contrib/nvi contrib/nvi/build contrib/nvi/catal...

Mon Aug 12 19:50:12 UTC 2013

Author: mav
Date: Mon Aug 12 19:50:08 2013
New Revision: 254256
URL: http://svnweb.freebsd.org/changeset/base/254256

Log:
  MFC @ r254255

Added:
  projects/camlock/contrib/nvi/catalog/zh_CN.GB2312.base
     - copied unchanged from r254255, head/contrib/nvi/catalog/zh_CN.GB2312.base
  projects/camlock/contrib/nvi/catalog/zh_CN.GB2312.owner
     - copied unchanged from r254255, head/contrib/nvi/catalog/zh_CN.GB2312.owner
  projects/camlock/contrib/nvi/cl/extern.h
     - copied unchanged from r254255, head/contrib/nvi/cl/extern.h
  projects/camlock/contrib/nvi/common/conv.c
     - copied unchanged from r254255, head/contrib/nvi/common/conv.c
  projects/camlock/contrib/nvi/common/conv.h
     - copied unchanged from r254255, head/contrib/nvi/common/conv.h
  projects/camlock/contrib/nvi/common/encoding.c
     - copied unchanged from r254255, head/contrib/nvi/common/encoding.c
  projects/camlock/contrib/nvi/common/extern.h
     - copied unchanged from r254255, head/contrib/nvi/common/extern.h
  projects/camlock/contrib/nvi/common/multibyte.h
     - copied unchanged from r254255, head/contrib/nvi/common/multibyte.h
  projects/camlock/contrib/nvi/common/options_def.h
     - copied unchanged from r254255, head/contrib/nvi/common/options_def.h
  projects/camlock/contrib/nvi/ex/ex_def.h
     - copied unchanged from r254255, head/contrib/nvi/ex/ex_def.h
  projects/camlock/contrib/nvi/ex/extern.h
     - copied unchanged from r254255, head/contrib/nvi/ex/extern.h
  projects/camlock/contrib/nvi/regex/
     - copied from r254255, head/contrib/nvi/regex/
  projects/camlock/contrib/nvi/vi/extern.h
     - copied unchanged from r254255, head/contrib/nvi/vi/extern.h
  projects/camlock/share/man/man9/vm_page_busy.9
     - copied unchanged from r254255, head/share/man/man9/vm_page_busy.9
  projects/camlock/sys/contrib/dev/iwn/iwlwifi-6000g2a-18.168.6.1.fw.uu
     - copied unchanged from r254255, head/sys/contrib/dev/iwn/iwlwifi-6000g2a-18.168.6.1.fw.uu
  projects/camlock/sys/contrib/dev/iwn/iwnwifi-2030-18.168.6.1.fw.uu
     - copied unchanged from r254255, head/sys/contrib/dev/iwn/iwnwifi-2030-18.168.6.1.fw.uu
  projects/camlock/sys/dev/random/random_adaptors.c
     - copied unchanged from r254255, head/sys/dev/random/random_adaptors.c
  projects/camlock/sys/dev/random/random_adaptors.h
     - copied unchanged from r254255, head/sys/dev/random/random_adaptors.h
  projects/camlock/sys/modules/iwnfw/iwn2030/
     - copied from r254255, head/sys/modules/iwnfw/iwn2030/
  projects/camlock/tools/regression/lib/libc/stdio/test-mkostemp.c
     - copied unchanged from r254255, head/tools/regression/lib/libc/stdio/test-mkostemp.c
  projects/camlock/tools/tools/usbtest/
     - copied from r254255, head/tools/tools/usbtest/
  projects/camlock/usr.bin/vi/catalog/
     - copied from r254255, head/usr.bin/vi/catalog/
Deleted:
  projects/camlock/contrib/nvi/FAQ
  projects/camlock/contrib/nvi/LAYOUT
  projects/camlock/contrib/nvi/build/
  projects/camlock/contrib/nvi/catalog/dutch
  projects/camlock/contrib/nvi/catalog/dutch.check
  projects/camlock/contrib/nvi/catalog/english
  projects/camlock/contrib/nvi/catalog/english.base
  projects/camlock/contrib/nvi/catalog/english.check
  projects/camlock/contrib/nvi/catalog/french
  projects/camlock/contrib/nvi/catalog/french.check
  projects/camlock/contrib/nvi/catalog/german
  projects/camlock/contrib/nvi/catalog/german.check
  projects/camlock/contrib/nvi/catalog/polish
  projects/camlock/contrib/nvi/catalog/polish.check
  projects/camlock/contrib/nvi/catalog/ru_RU.KOI8-R
  projects/camlock/contrib/nvi/catalog/ru_RU.KOI8-R.check
  projects/camlock/contrib/nvi/catalog/spanish
  projects/camlock/contrib/nvi/catalog/spanish.check
  projects/camlock/contrib/nvi/catalog/swedish
  projects/camlock/contrib/nvi/catalog/swedish.check
  projects/camlock/contrib/nvi/catalog/uk_UA.KOI8-U
  projects/camlock/contrib/nvi/cl/cl_bsd.c
  projects/camlock/contrib/nvi/clib/
  projects/camlock/contrib/nvi/common/api.c
  projects/camlock/contrib/nvi/ex/ex_perl.c
  projects/camlock/contrib/nvi/ex/ex_tcl.c
  projects/camlock/contrib/nvi/include/
  projects/camlock/contrib/nvi/ip/
  projects/camlock/contrib/nvi/ip_cl/
  projects/camlock/contrib/nvi/perl_api/
  projects/camlock/contrib/nvi/perl_scripts/
  projects/camlock/contrib/nvi/tcl_api/
  projects/camlock/contrib/nvi/tcl_scripts/
  projects/camlock/contrib/nvi/tk/
  projects/camlock/share/man/man9/vm_page_io.9
  projects/camlock/share/man/man9/vm_page_sleep_if_busy.9
  projects/camlock/share/man/man9/vm_page_wakeup.9
  projects/camlock/sys/contrib/dev/iwn/iwlwifi-6000g2a-17.168.5.3.fw.uu
  projects/camlock/usr.bin/vi/port.h
Modified:
  projects/camlock/Makefile.inc1
  projects/camlock/bin/pkill/pkill.1
  projects/camlock/bin/pkill/pkill.c
  projects/camlock/cddl/contrib/opensolaris/cmd/ztest/ztest.c
  projects/camlock/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c
  projects/camlock/contrib/bmake/parse.c
  projects/camlock/contrib/nvi/LICENSE
  projects/camlock/contrib/nvi/README
  projects/camlock/contrib/nvi/catalog/Makefile
  projects/camlock/contrib/nvi/catalog/README
  projects/camlock/contrib/nvi/catalog/dump.c
  projects/camlock/contrib/nvi/catalog/dutch.base   (contents, props changed)
  projects/camlock/contrib/nvi/catalog/french.base   (contents, props changed)
  projects/camlock/contrib/nvi/catalog/german.base   (contents, props changed)
  projects/camlock/contrib/nvi/catalog/german.owner
  projects/camlock/contrib/nvi/catalog/polish.base   (contents, props changed)
  projects/camlock/contrib/nvi/catalog/ru_RU.KOI8-R.base   (contents, props changed)
  projects/camlock/contrib/nvi/catalog/ru_RU.KOI8-R.owner
  projects/camlock/contrib/nvi/catalog/spanish.base   (contents, props changed)
  projects/camlock/contrib/nvi/catalog/swedish.base   (contents, props changed)
  projects/camlock/contrib/nvi/catalog/uk_UA.KOI8-U.base   (contents, props changed)
  projects/camlock/contrib/nvi/cl/README.signal
  projects/camlock/contrib/nvi/cl/cl.h
  projects/camlock/contrib/nvi/cl/cl_funcs.c
  projects/camlock/contrib/nvi/cl/cl_main.c
  projects/camlock/contrib/nvi/cl/cl_read.c
  projects/camlock/contrib/nvi/cl/cl_screen.c
  projects/camlock/contrib/nvi/cl/cl_term.c
  projects/camlock/contrib/nvi/common/args.h
  projects/camlock/contrib/nvi/common/common.h
  projects/camlock/contrib/nvi/common/cut.c
  projects/camlock/contrib/nvi/common/cut.h
  projects/camlock/contrib/nvi/common/delete.c
  projects/camlock/contrib/nvi/common/exf.c
  projects/camlock/contrib/nvi/common/exf.h
  projects/camlock/contrib/nvi/common/gs.h
  projects/camlock/contrib/nvi/common/key.c
  projects/camlock/contrib/nvi/common/key.h
  projects/camlock/contrib/nvi/common/line.c
  projects/camlock/contrib/nvi/common/log.c
  projects/camlock/contrib/nvi/common/main.c
  projects/camlock/contrib/nvi/common/mark.c
  projects/camlock/contrib/nvi/common/mark.h
  projects/camlock/contrib/nvi/common/mem.h
  projects/camlock/contrib/nvi/common/msg.c
  projects/camlock/contrib/nvi/common/msg.h
  projects/camlock/contrib/nvi/common/options.c
  projects/camlock/contrib/nvi/common/options.h
  projects/camlock/contrib/nvi/common/options_f.c
  projects/camlock/contrib/nvi/common/put.c
  projects/camlock/contrib/nvi/common/recover.c
  projects/camlock/contrib/nvi/common/screen.c
  projects/camlock/contrib/nvi/common/screen.h
  projects/camlock/contrib/nvi/common/search.c
  projects/camlock/contrib/nvi/common/seq.c
  projects/camlock/contrib/nvi/common/seq.h
  projects/camlock/contrib/nvi/common/util.c
  projects/camlock/contrib/nvi/common/util.h
  projects/camlock/contrib/nvi/docs/USD.doc/vi.man/vi.1
  projects/camlock/contrib/nvi/ex/ex.c
  projects/camlock/contrib/nvi/ex/ex.h
  projects/camlock/contrib/nvi/ex/ex_abbrev.c
  projects/camlock/contrib/nvi/ex/ex_append.c
  projects/camlock/contrib/nvi/ex/ex_args.c
  projects/camlock/contrib/nvi/ex/ex_argv.c
  projects/camlock/contrib/nvi/ex/ex_at.c
  projects/camlock/contrib/nvi/ex/ex_bang.c
  projects/camlock/contrib/nvi/ex/ex_cd.c
  projects/camlock/contrib/nvi/ex/ex_cmd.c
  projects/camlock/contrib/nvi/ex/ex_cscope.c
  projects/camlock/contrib/nvi/ex/ex_delete.c
  projects/camlock/contrib/nvi/ex/ex_display.c
  projects/camlock/contrib/nvi/ex/ex_edit.c
  projects/camlock/contrib/nvi/ex/ex_equal.c
  projects/camlock/contrib/nvi/ex/ex_file.c
  projects/camlock/contrib/nvi/ex/ex_filter.c
  projects/camlock/contrib/nvi/ex/ex_global.c
  projects/camlock/contrib/nvi/ex/ex_init.c
  projects/camlock/contrib/nvi/ex/ex_join.c
  projects/camlock/contrib/nvi/ex/ex_map.c
  projects/camlock/contrib/nvi/ex/ex_mark.c
  projects/camlock/contrib/nvi/ex/ex_mkexrc.c
  projects/camlock/contrib/nvi/ex/ex_move.c
  projects/camlock/contrib/nvi/ex/ex_open.c
  projects/camlock/contrib/nvi/ex/ex_preserve.c
  projects/camlock/contrib/nvi/ex/ex_print.c
  projects/camlock/contrib/nvi/ex/ex_put.c
  projects/camlock/contrib/nvi/ex/ex_quit.c
  projects/camlock/contrib/nvi/ex/ex_read.c
  projects/camlock/contrib/nvi/ex/ex_screen.c
  projects/camlock/contrib/nvi/ex/ex_script.c
  projects/camlock/contrib/nvi/ex/ex_set.c
  projects/camlock/contrib/nvi/ex/ex_shell.c
  projects/camlock/contrib/nvi/ex/ex_shift.c
  projects/camlock/contrib/nvi/ex/ex_source.c
  projects/camlock/contrib/nvi/ex/ex_stop.c
  projects/camlock/contrib/nvi/ex/ex_subst.c
  projects/camlock/contrib/nvi/ex/ex_tag.c
  projects/camlock/contrib/nvi/ex/ex_txt.c
  projects/camlock/contrib/nvi/ex/ex_undo.c
  projects/camlock/contrib/nvi/ex/ex_usage.c
  projects/camlock/contrib/nvi/ex/ex_util.c
  projects/camlock/contrib/nvi/ex/ex_version.c
  projects/camlock/contrib/nvi/ex/ex_visual.c
  projects/camlock/contrib/nvi/ex/ex_write.c
  projects/camlock/contrib/nvi/ex/ex_yank.c
  projects/camlock/contrib/nvi/ex/ex_z.c
  projects/camlock/contrib/nvi/ex/script.h
  projects/camlock/contrib/nvi/ex/tag.h
  projects/camlock/contrib/nvi/ex/version.h
  projects/camlock/contrib/nvi/vi/getc.c
  projects/camlock/contrib/nvi/vi/v_at.c
  projects/camlock/contrib/nvi/vi/v_ch.c
  projects/camlock/contrib/nvi/vi/v_cmd.c
  projects/camlock/contrib/nvi/vi/v_delete.c
  projects/camlock/contrib/nvi/vi/v_ex.c
  projects/camlock/contrib/nvi/vi/v_increment.c
  projects/camlock/contrib/nvi/vi/v_init.c
  projects/camlock/contrib/nvi/vi/v_itxt.c
  projects/camlock/contrib/nvi/vi/v_left.c
  projects/camlock/contrib/nvi/vi/v_mark.c
  projects/camlock/contrib/nvi/vi/v_match.c
  projects/camlock/contrib/nvi/vi/v_paragraph.c
  projects/camlock/contrib/nvi/vi/v_put.c
  projects/camlock/contrib/nvi/vi/v_redraw.c
  projects/camlock/contrib/nvi/vi/v_replace.c
  projects/camlock/contrib/nvi/vi/v_right.c
  projects/camlock/contrib/nvi/vi/v_screen.c
  projects/camlock/contrib/nvi/vi/v_scroll.c
  projects/camlock/contrib/nvi/vi/v_search.c
  projects/camlock/contrib/nvi/vi/v_section.c
  projects/camlock/contrib/nvi/vi/v_sentence.c
  projects/camlock/contrib/nvi/vi/v_status.c
  projects/camlock/contrib/nvi/vi/v_txt.c
  projects/camlock/contrib/nvi/vi/v_ulcase.c
  projects/camlock/contrib/nvi/vi/v_undo.c
  projects/camlock/contrib/nvi/vi/v_util.c
  projects/camlock/contrib/nvi/vi/v_word.c
  projects/camlock/contrib/nvi/vi/v_xchar.c
  projects/camlock/contrib/nvi/vi/v_yank.c
  projects/camlock/contrib/nvi/vi/v_z.c
  projects/camlock/contrib/nvi/vi/v_zexit.c
  projects/camlock/contrib/nvi/vi/vi.c
  projects/camlock/contrib/nvi/vi/vi.h
  projects/camlock/contrib/nvi/vi/vs_line.c
  projects/camlock/contrib/nvi/vi/vs_msg.c
  projects/camlock/contrib/nvi/vi/vs_refresh.c
  projects/camlock/contrib/nvi/vi/vs_relative.c
  projects/camlock/contrib/nvi/vi/vs_smap.c
  projects/camlock/contrib/nvi/vi/vs_split.c
  projects/camlock/contrib/ofed/libsdp/src/linux/sdp_inet.h
  projects/camlock/contrib/ofed/management/infiniband-diags/src/sminfo.c
  projects/camlock/contrib/ofed/management/opensm/opensm/osm_console.c
  projects/camlock/contrib/ofed/management/opensm/opensm/osm_subnet.c
  projects/camlock/contrib/sendmail/include/sm/os/sm_os_freebsd.h
  projects/camlock/contrib/wpa/src/drivers/driver_wired.c
  projects/camlock/crypto/openssl/ssl/s3_cbc.c
  projects/camlock/etc/namedb/named.conf
  projects/camlock/gnu/usr.bin/grep/grep.c
  projects/camlock/gnu/usr.bin/groff/tmac/mdoc.local
  projects/camlock/include/stdlib.h
  projects/camlock/lib/libc/db/hash/hash.c
  projects/camlock/lib/libc/gen/fnmatch.c
  projects/camlock/lib/libc/iconv/citrus_iconv.c
  projects/camlock/lib/libc/stdio/Makefile.inc
  projects/camlock/lib/libc/stdio/Symbol.map
  projects/camlock/lib/libc/stdio/mktemp.3
  projects/camlock/lib/libc/stdio/mktemp.c
  projects/camlock/lib/libproc/proc_sym.c
  projects/camlock/share/man/man4/random.4
  projects/camlock/share/man/man4/rsu.4
  projects/camlock/share/man/man7/release.7
  projects/camlock/share/man/man9/Makefile
  projects/camlock/share/man/man9/VOP_GETPAGES.9
  projects/camlock/share/man/man9/mutex.9
  projects/camlock/share/man/man9/vm_page_alloc.9
  projects/camlock/sys/amd64/amd64/minidump_machdep.c
  projects/camlock/sys/amd64/amd64/pmap.c
  projects/camlock/sys/amd64/conf/GENERIC
  projects/camlock/sys/amd64/include/pmap.h
  projects/camlock/sys/arm/arm/bus_space_generic.c
  projects/camlock/sys/arm/arm/busdma_machdep-v6.c
  projects/camlock/sys/arm/arm/pmap-v6.c
  projects/camlock/sys/arm/arm/pmap.c
  projects/camlock/sys/arm/s3c2xx0/s3c2xx0_space.c
  projects/camlock/sys/boot/common/part.c
  projects/camlock/sys/boot/ficl/loader.c
  projects/camlock/sys/boot/forth/beastie.4th
  projects/camlock/sys/boot/forth/color.4th
  projects/camlock/sys/boot/forth/color.4th.8
  projects/camlock/sys/boot/forth/loader.conf.5
  projects/camlock/sys/boot/forth/menu.4th
  projects/camlock/sys/boot/forth/menu.4th.8
  projects/camlock/sys/boot/forth/menu.rc
  projects/camlock/sys/boot/forth/version.4th.8
  projects/camlock/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c
  projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c
  projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c
  projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
  projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c
  projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_scan.h
  projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h
  projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h
  projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c
  projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c
  projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_debug.c
  projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
  projects/camlock/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h
  projects/camlock/sys/conf/files
  projects/camlock/sys/conf/newvers.sh
  projects/camlock/sys/dev/agp/agp.c
  projects/camlock/sys/dev/bge/if_bge.c
  projects/camlock/sys/dev/bge/if_bgereg.h
  projects/camlock/sys/dev/cpuctl/cpuctl.c
  projects/camlock/sys/dev/drm2/i915/i915_gem.c
  projects/camlock/sys/dev/drm2/ttm/ttm_bo_vm.c
  projects/camlock/sys/dev/drm2/ttm/ttm_page_alloc.c
  projects/camlock/sys/dev/drm2/ttm/ttm_tt.c
  projects/camlock/sys/dev/iwn/if_iwn.c
  projects/camlock/sys/dev/iwn/if_iwnvar.h
  projects/camlock/sys/dev/md/md.c
  projects/camlock/sys/dev/mps/mps.c
  projects/camlock/sys/dev/mps/mps_sas.c
  projects/camlock/sys/dev/mps/mps_sas.h
  projects/camlock/sys/dev/mps/mps_sas_lsi.c
  projects/camlock/sys/dev/mps/mpsvar.h
  projects/camlock/sys/dev/pci/fixup_pci.c
  projects/camlock/sys/dev/random/ivy.c
  projects/camlock/sys/dev/random/nehemiah.c
  projects/camlock/sys/dev/random/probe.c
  projects/camlock/sys/dev/random/randomdev.c
  projects/camlock/sys/dev/random/randomdev.h
  projects/camlock/sys/dev/random/randomdev_soft.c
  projects/camlock/sys/dev/random/randomdev_soft.h
  projects/camlock/sys/dev/random/yarrow.c
  projects/camlock/sys/dev/usb/controller/ehci.c
  projects/camlock/sys/dev/usb/usb_compat_linux.c
  projects/camlock/sys/dev/usb/usb_hub.c
  projects/camlock/sys/dev/usb/usb_ioctl.h
  projects/camlock/sys/dev/usb/usb_request.c
  projects/camlock/sys/dev/virtio/balloon/virtio_balloon.c
  projects/camlock/sys/fs/ext2fs/ext2_hash.c
  projects/camlock/sys/fs/fuse/fuse_vnops.c
  projects/camlock/sys/fs/tmpfs/tmpfs_subr.c
  projects/camlock/sys/fs/tmpfs/tmpfs_vnops.c
  projects/camlock/sys/geom/mirror/g_mirror.c
  projects/camlock/sys/geom/part/g_part_gpt.c
  projects/camlock/sys/i386/conf/GENERIC
  projects/camlock/sys/i386/i386/pmap.c
  projects/camlock/sys/i386/xen/pmap.c
  projects/camlock/sys/ia64/conf/GENERIC
  projects/camlock/sys/ia64/ia64/pmap.c
  projects/camlock/sys/kern/init_main.c
  projects/camlock/sys/kern/kern_event.c
  projects/camlock/sys/kern/kern_exec.c
  projects/camlock/sys/kern/kern_malloc.c
  projects/camlock/sys/kern/kern_mutex.c
  projects/camlock/sys/kern/kern_synch.c
  projects/camlock/sys/kern/kern_sysctl.c
  projects/camlock/sys/kern/subr_bus.c
  projects/camlock/sys/kern/subr_uio.c
  projects/camlock/sys/kern/subr_witness.c
  projects/camlock/sys/kern/uipc_shm.c
  projects/camlock/sys/kern/uipc_syscalls.c
  projects/camlock/sys/kern/vfs_acl.c
  projects/camlock/sys/kern/vfs_bio.c
  projects/camlock/sys/kern/vfs_cluster.c
  projects/camlock/sys/mips/atheros/ar71xx_gpio.c
  projects/camlock/sys/mips/mips/pmap.c
  projects/camlock/sys/modules/iwnfw/Makefile
  projects/camlock/sys/modules/iwnfw/iwn6000g2a/Makefile
  projects/camlock/sys/net80211/ieee80211.c
  projects/camlock/sys/net80211/ieee80211_freebsd.c
  projects/camlock/sys/net80211/ieee80211_freebsd.h
  projects/camlock/sys/net80211/ieee80211_hostap.c
  projects/camlock/sys/net80211/ieee80211_hwmp.c
  projects/camlock/sys/net80211/ieee80211_mesh.c
  projects/camlock/sys/net80211/ieee80211_output.c
  projects/camlock/sys/net80211/ieee80211_power.c
  projects/camlock/sys/net80211/ieee80211_proto.c
  projects/camlock/sys/net80211/ieee80211_proto.h
  projects/camlock/sys/net80211/ieee80211_superg.c
  projects/camlock/sys/net80211/ieee80211_var.h
  projects/camlock/sys/net80211/ieee80211_wds.c
  projects/camlock/sys/netinet/sctp.h
  projects/camlock/sys/netinet/sctp_indata.c
  projects/camlock/sys/netinet/sctp_output.c
  projects/camlock/sys/netinet/sctp_pcb.h
  projects/camlock/sys/ofed/include/linux/bitops.h
  projects/camlock/sys/ofed/include/linux/page.h
  projects/camlock/sys/ofed/include/linux/sysfs.h
  projects/camlock/sys/ofed/include/rdma/sdp_socket.h
  projects/camlock/sys/powerpc/aim/mmu_oea.c
  projects/camlock/sys/powerpc/aim/mmu_oea64.c
  projects/camlock/sys/powerpc/booke/pmap.c
  projects/camlock/sys/powerpc/conf/GENERIC
  projects/camlock/sys/powerpc/conf/GENERIC64
  projects/camlock/sys/sparc64/conf/GENERIC
  projects/camlock/sys/sparc64/sparc64/genassym.c
  projects/camlock/sys/sparc64/sparc64/pmap.c
  projects/camlock/sys/sys/event.h
  projects/camlock/sys/sys/param.h
  projects/camlock/sys/sys/proc.h
  projects/camlock/sys/sys/socket.h
  projects/camlock/sys/sys/wait.h
  projects/camlock/sys/vm/_vm_radix.h
  projects/camlock/sys/vm/device_pager.c
  projects/camlock/sys/vm/memguard.c
  projects/camlock/sys/vm/phys_pager.c
  projects/camlock/sys/vm/sg_pager.c
  projects/camlock/sys/vm/swap_pager.c
  projects/camlock/sys/vm/uma_core.c
  projects/camlock/sys/vm/uma_int.h
  projects/camlock/sys/vm/vm_fault.c
  projects/camlock/sys/vm/vm_glue.c
  projects/camlock/sys/vm/vm_object.c
  projects/camlock/sys/vm/vm_object.h
  projects/camlock/sys/vm/vm_page.c
  projects/camlock/sys/vm/vm_page.h
  projects/camlock/sys/vm/vm_pageout.c
  projects/camlock/sys/vm/vm_param.h
  projects/camlock/sys/vm/vm_phys.c
  projects/camlock/sys/vm/vm_phys.h
  projects/camlock/sys/vm/vm_radix.c
  projects/camlock/sys/vm/vm_radix.h
  projects/camlock/sys/vm/vm_zeroidle.c
  projects/camlock/sys/vm/vnode_pager.c
  projects/camlock/sys/x86/acpica/srat.c
  projects/camlock/tools/regression/lib/libc/gen/test-fnmatch.c
  projects/camlock/tools/regression/lib/libc/stdio/Makefile
  projects/camlock/tools/tools/sysdoc/sysdoc.sh
  projects/camlock/tools/tools/sysdoc/tunables.mdoc
  projects/camlock/usr.bin/bmake/Makefile
  projects/camlock/usr.bin/su/su.1
  projects/camlock/usr.bin/vi/Makefile
  projects/camlock/usr.bin/vi/config.h
  projects/camlock/usr.bin/vi/pathnames.h
  projects/camlock/usr.sbin/watchdogd/watchdogd.c
Directory Properties:
  projects/camlock/   (props changed)
  projects/camlock/cddl/   (props changed)
  projects/camlock/cddl/contrib/opensolaris/   (props changed)
  projects/camlock/contrib/bmake/   (props changed)
  projects/camlock/contrib/nvi/   (props changed)
  projects/camlock/contrib/sendmail/   (props changed)
  projects/camlock/contrib/wpa/   (props changed)
  projects/camlock/crypto/openssl/   (props changed)
  projects/camlock/lib/libc/   (props changed)
  projects/camlock/share/man/man4/   (props changed)
  projects/camlock/sys/   (props changed)
  projects/camlock/sys/boot/   (props changed)
  projects/camlock/sys/cddl/contrib/opensolaris/   (props changed)
  projects/camlock/sys/conf/   (props changed)

Modified: projects/camlock/Makefile.inc1
==============================================================================

--- projects/camlock/Makefile.inc1	Mon Aug 12 19:43:48 2013	(r254255)
+++ projects/camlock/Makefile.inc1	Mon Aug 12 19:50:08 2013	(r254256)
@@ -1331,7 +1331,8 @@ build-tools: .MAKE
     usr.bin/awk \
     lib/libmagic \
     usr.bin/mkesdb_static \
-    usr.bin/mkcsmapper_static
+    usr.bin/mkcsmapper_static \
+    usr.bin/vi/catalog
 	${_+_}@${ECHODIR} "===> ${_tool} (obj,build-tools)"; \
 		cd ${.CURDIR}/${_tool} && \
 		${MAKE} DIRPRFX=${_tool}/ obj && \

Modified: projects/camlock/bin/pkill/pkill.1
==============================================================================
--- projects/camlock/bin/pkill/pkill.1	Mon Aug 12 19:43:48 2013	(r254255)
+++ projects/camlock/bin/pkill/pkill.1	Mon Aug 12 19:50:08 2013	(r254256)
@@ -29,7 +29,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd February 11, 2010
+.Dd August 9, 2013
 .Dt PKILL 1
 .Os
 .Sh NAME
@@ -44,6 +44,7 @@
 .Op Fl N Ar system
 .Op Fl P Ar ppid
 .Op Fl U Ar uid
+.Op Fl c Ar class
 .Op Fl d Ar delim
 .Op Fl g Ar pgrp
 .Op Fl j Ar jid
@@ -60,6 +61,7 @@
 .Op Fl N Ar system
 .Op Fl P Ar ppid
 .Op Fl U Ar uid
+.Op Fl c Ar class
 .Op Fl g Ar pgrp
 .Op Fl j Ar jid
 .Op Fl s Ar sid
@@ -130,6 +132,9 @@ or
 process and all of its ancestors are excluded (unless
 .Fl v
 is used).
+.It Fl c Ar class
+Restrict matches to processes running with specified login class
+.Ar class .
 .It Fl f
 Match against full argument lists.
 The default is to match against process names.

Modified: projects/camlock/bin/pkill/pkill.c
==============================================================================
--- projects/camlock/bin/pkill/pkill.c	Mon Aug 12 19:43:48 2013	(r254255)
+++ projects/camlock/bin/pkill/pkill.c	Mon Aug 12 19:50:08 2013	(r254256)
@@ -79,12 +79,14 @@ enum listtype {
 	LT_TTY,
 	LT_PGRP,
 	LT_JID,
-	LT_SID
+	LT_SID,
+	LT_CLASS
 };
 
 struct list {
 	SLIST_ENTRY(list) li_chain;
 	long	li_number;
+	char	*li_name;
 };
 
 SLIST_HEAD(listhead, list);
@@ -116,6 +118,7 @@ static struct listhead ppidlist = SLIST_
 static struct listhead tdevlist = SLIST_HEAD_INITIALIZER(tdevlist);
 static struct listhead sidlist = SLIST_HEAD_INITIALIZER(sidlist);
 static struct listhead jidlist = SLIST_HEAD_INITIALIZER(jidlist);
+static struct listhead classlist = SLIST_HEAD_INITIALIZER(classlist);
 
 static void	usage(void) __attribute__((__noreturn__));
 static int	killact(const struct kinfo_proc *);
@@ -179,7 +182,7 @@ main(int argc, char **argv)
 	execf = NULL;
 	coref = _PATH_DEVNULL;
 
-	while ((ch = getopt(argc, argv, "DF:G:ILM:N:P:SU:ad:fg:ij:lnoqs:t:u:vx")) != -1)
+	while ((ch = getopt(argc, argv, "DF:G:ILM:N:P:SU:ac:d:fg:ij:lnoqs:t:u:vx")) != -1)
 		switch (ch) {
 		case 'D':
 			debug_opt++;
@@ -222,6 +225,10 @@ main(int argc, char **argv)
 		case 'a':
 			ancestors++;
 			break;
+		case 'c':
+			makelist(&classlist, LT_CLASS, optarg);
+			criteria = 1;
+			break;
 		case 'd':
 			if (!pgrep)
 				usage();
@@ -469,6 +476,20 @@ main(int argc, char **argv)
 			continue;
 		}
 
+		SLIST_FOREACH(li, &classlist, li_chain) {
+			/*
+			 * We skip P_SYSTEM processes to match ps(1) output.
+			 */
+			if ((kp->ki_flag & P_SYSTEM) == 0 &&
+			    kp->ki_loginclass != NULL &&
+			    strcmp(kp->ki_loginclass, li->li_name) == 0)
+				break;
+		}
+		if (SLIST_FIRST(&classlist) != NULL && li == NULL) {
+			selected[i] = 0;
+			continue;
+		}
+
 		if (argc == 0)
 			selected[i] = 1;
 	}
@@ -562,9 +583,9 @@ usage(void)
 
 	fprintf(stderr,
 		"usage: %s %s [-F pidfile] [-G gid] [-M core] [-N system]\n"
-		"             [-P ppid] [-U uid] [-g pgrp] [-j jid] [-s sid]\n"
-		"             [-t tty] [-u euid] pattern ...\n", getprogname(),
-		ustr);
+		"             [-P ppid] [-U uid] [-c class] [-g pgrp] [-j jid]\n"
+		"             [-s sid] [-t tty] [-u euid] pattern ...\n",
+		getprogname(), ustr);
 
 	exit(STATUS_BADUSAGE);
 }
@@ -664,8 +685,10 @@ makelist(struct listhead *head, enum lis
 		SLIST_INSERT_HEAD(head, li, li_chain);
 		empty = 0;
 
-		li->li_number = (uid_t)strtol(sp, &ep, 0);
-		if (*ep == '\0') {
+		if (type != LT_CLASS)
+			li->li_number = (uid_t)strtol(sp, &ep, 0);
+
+		if (type != LT_CLASS && *ep == '\0') {
 			switch (type) {
 			case LT_PGRP:
 				if (li->li_number == 0)
@@ -750,6 +773,12 @@ foundtty:		if ((st.st_mode & S_IFCHR) ==
 				errx(STATUS_BADUSAGE,
 				     "Invalid jail ID `%s'", sp);
 			break;
+		case LT_CLASS:
+			li->li_number = -1;
+			li->li_name = strdup(sp);
+			if (li->li_name == NULL)
+				err(STATUS_ERROR, "Cannot allocate memory");
+			break;
 		default:
 			usage();
 		}

Modified: projects/camlock/cddl/contrib/opensolaris/cmd/ztest/ztest.c
==============================================================================
--- projects/camlock/cddl/contrib/opensolaris/cmd/ztest/ztest.c	Mon Aug 12 19:43:48 2013	(r254255)
+++ projects/camlock/cddl/contrib/opensolaris/cmd/ztest/ztest.c	Mon Aug 12 19:50:08 2013	(r254256)
@@ -20,7 +20,7 @@
  */
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2012 by Delphix. All rights reserved.
+ * Copyright (c) 2013 by Delphix. All rights reserved.
  * Copyright 2011 Nexenta Systems, Inc.  All rights reserved.
  * Copyright (c) 2012 Martin Matuska <mm at FreeBSD.org>.  All rights reserved.
  * Copyright (c) 2013 Steven Hartland. All rights reserved.
@@ -186,6 +186,7 @@ static const ztest_shared_opts_t ztest_o
 
 extern uint64_t metaslab_gang_bang;
 extern uint64_t metaslab_df_alloc_threshold;
+extern uint64_t zfs_deadman_synctime;
 
 static ztest_shared_opts_t *ztest_shared_opts;
 static ztest_shared_opts_t ztest_opts;
@@ -365,7 +366,7 @@ ztest_info_t ztest_info[] = {
 	{ ztest_fault_inject,			1,	&zopt_sometimes	},
 	{ ztest_ddt_repair,			1,	&zopt_sometimes	},
 	{ ztest_dmu_snapshot_hold,		1,	&zopt_sometimes	},
-	{ ztest_reguid,				1,	&zopt_sometimes },
+	{ ztest_reguid,				1,	&zopt_rarely	},
 	{ ztest_spa_rename,			1,	&zopt_rarely	},
 	{ ztest_scrub,				1,	&zopt_rarely	},
 	{ ztest_spa_upgrade,			1,	&zopt_rarely	},
@@ -768,6 +769,16 @@ ztest_kill(ztest_shared_t *zs)
 {
 	zs->zs_alloc = metaslab_class_get_alloc(spa_normal_class(ztest_spa));
 	zs->zs_space = metaslab_class_get_space(spa_normal_class(ztest_spa));
+
+	/*
+	 * Before we kill off ztest, make sure that the config is updated.
+	 * See comment above spa_config_sync().
+	 */
+	mutex_enter(&spa_namespace_lock);
+	spa_config_sync(ztest_spa, B_FALSE, B_FALSE);
+	mutex_exit(&spa_namespace_lock);
+
+	zfs_dbgmsg_print(FTAG);
 	(void) kill(getpid(), SIGKILL);
 }
 
@@ -2732,7 +2743,7 @@ ztest_vdev_attach_detach(ztest_ds_t *zd,
 	uint64_t leaf, top;
 	uint64_t ashift = ztest_get_ashift();
 	uint64_t oldguid, pguid;
-	size_t oldsize, newsize;
+	uint64_t oldsize, newsize;
 	char oldpath[MAXPATHLEN], newpath[MAXPATHLEN];
 	int replacing;
 	int oldvd_has_siblings = B_FALSE;
@@ -2891,8 +2902,8 @@ ztest_vdev_attach_detach(ztest_ds_t *zd,
 	if (error != expected_error && expected_error != EBUSY) {
 		fatal(0, "attach (%s %llu, %s %llu, %d) "
 		    "returned %d, expected %d",
-		    oldpath, (longlong_t)oldsize, newpath,
-		    (longlong_t)newsize, replacing, error, expected_error);
+		    oldpath, oldsize, newpath,
+		    newsize, replacing, error, expected_error);
 	}
 
 	VERIFY(mutex_unlock(&ztest_vdev_lock) == 0);
@@ -3606,6 +3617,9 @@ ztest_dmu_read_write(ztest_ds_t *zd, uin
 	else
 		dmu_tx_hold_write(tx, bigobj, bigoff, bigsize);
 
+	/* This accounts for setting the checksum/compression. */
+	dmu_tx_hold_bonus(tx, bigobj);
+
 	txg = ztest_tx_assign(tx, TXG_MIGHTWAIT, FTAG);
 	if (txg == 0) {
 		umem_free(packbuf, packsize);
@@ -4756,6 +4770,14 @@ ztest_fault_inject(ztest_ds_t *zd, uint6
 	ASSERT(leaves >= 1);
 
 	/*
+	 * Grab the name lock as reader. There are some operations
+	 * which don't like to have their vdevs changed while
+	 * they are in progress (i.e. spa_change_guid). Those
+	 * operations will have grabbed the name lock as writer.
+	 */
+	(void) rw_rdlock(&ztest_name_lock);
+
+	/*
 	 * We need SCL_STATE here because we're going to look at vd0->vdev_tsd.
 	 */
 	spa_config_enter(spa, SCL_STATE, FTAG, RW_READER);
@@ -4784,7 +4806,14 @@ ztest_fault_inject(ztest_ds_t *zd, uint6
 		if (vd0 != NULL && vd0->vdev_top->vdev_islog)
 			islog = B_TRUE;
 
-		if (vd0 != NULL && maxfaults != 1) {
+		/*
+		 * If the top-level vdev needs to be resilvered
+		 * then we only allow faults on the device that is
+		 * resilvering.
+		 */
+		if (vd0 != NULL && maxfaults != 1 &&
+		    (!vdev_resilver_needed(vd0->vdev_top, NULL, NULL) ||
+		    vd0->vdev_resilver_txg != 0)) {
 			/*
 			 * Make vd0 explicitly claim to be unreadable,
 			 * or unwriteable, or reach behind its back
@@ -4815,6 +4844,7 @@ ztest_fault_inject(ztest_ds_t *zd, uint6
 
 		if (sav->sav_count == 0) {
 			spa_config_exit(spa, SCL_STATE, FTAG);
+			(void) rw_unlock(&ztest_name_lock);
 			return;
 		}
 		vd0 = sav->sav_vdevs[ztest_random(sav->sav_count)];
@@ -4828,6 +4858,7 @@ ztest_fault_inject(ztest_ds_t *zd, uint6
 	}
 
 	spa_config_exit(spa, SCL_STATE, FTAG);
+	(void) rw_unlock(&ztest_name_lock);
 
 	/*
 	 * If we can tolerate two or more faults, or we're dealing
@@ -5293,16 +5324,33 @@ static void *
 ztest_deadman_thread(void *arg)
 {
 	ztest_shared_t *zs = arg;
-	int grace = 300;
-	hrtime_t delta;
-
-	delta = (zs->zs_thread_stop - zs->zs_thread_start) / NANOSEC + grace;
+	spa_t *spa = ztest_spa;
+	hrtime_t delta, total = 0;
 
-	(void) poll(NULL, 0, (int)(1000 * delta));
+	for (;;) {
+		delta = (zs->zs_thread_stop - zs->zs_thread_start) /
+		    NANOSEC + zfs_deadman_synctime;
 
-	fatal(0, "failed to complete within %d seconds of deadline", grace);
+		(void) poll(NULL, 0, (int)(1000 * delta));
 
-	return (NULL);
+		/*
+		 * If the pool is suspended then fail immediately. Otherwise,
+		 * check to see if the pool is making any progress. If
+		 * vdev_deadman() discovers that there hasn't been any recent
+		 * I/Os then it will end up aborting the tests.
+		 */
+		if (spa_suspended(spa)) {
+			fatal(0, "aborting test after %llu seconds because "
+			    "pool has transitioned to a suspended state.",
+			    zfs_deadman_synctime);
+			return (NULL);
+		}
+		vdev_deadman(spa->spa_root_vdev);
+
+		total += zfs_deadman_synctime;
+		(void) printf("ztest has been running for %lld seconds\n",
+		    total);
+	}
 }
 
 static void
@@ -5616,6 +5664,7 @@ ztest_run(ztest_shared_t *zs)
 
 	zs->zs_alloc = metaslab_class_get_alloc(spa_normal_class(spa));
 	zs->zs_space = metaslab_class_get_space(spa_normal_class(spa));
+	zfs_dbgmsg_print(FTAG);
 
 	umem_free(tid, ztest_opts.zo_threads * sizeof (thread_t));
 
@@ -6031,6 +6080,7 @@ main(int argc, char **argv)
 	(void) setvbuf(stdout, NULL, _IOLBF, 0);
 
 	dprintf_setup(&argc, argv);
+	zfs_deadman_synctime = 300;
 
 	ztest_fd_rand = open("/dev/urandom", O_RDONLY);
 	ASSERT3S(ztest_fd_rand, >=, 0);

Modified: projects/camlock/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c
==============================================================================
--- projects/camlock/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c	Mon Aug 12 19:43:48 2013	(r254255)
+++ projects/camlock/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c	Mon Aug 12 19:50:08 2013	(r254256)
@@ -1086,7 +1086,17 @@ dt_vopen(int version, int flags, int *er
 
 	dtfd = open("/dev/dtrace/dtrace", O_RDWR);
 	err = errno; /* save errno from opening dtfd */
-
+#if defined(__FreeBSD__)
+	/*
+	 * Automatically load the 'dtraceall' module if we couldn't open the
+	 * char device.
+	 */
+	if (err == ENOENT && modfind("dtraceall") < 0) {
+		kldload("dtraceall"); /* ignore the error */
+		dtfd = open("/dev/dtrace/dtrace", O_RDWR);
+		err = errno;
+	}
+#endif
 #if defined(sun)
 	ftfd = open("/dev/dtrace/provider/fasttrap", O_RDWR);
 #else

Modified: projects/camlock/contrib/bmake/parse.c
==============================================================================
--- projects/camlock/contrib/bmake/parse.c	Mon Aug 12 19:43:48 2013	(r254255)
+++ projects/camlock/contrib/bmake/parse.c	Mon Aug 12 19:50:08 2013	(r254256)
@@ -2582,6 +2582,16 @@ ParseGetLine(int flags, int *length)
 		if (cf->P_end == NULL)
 		    /* End of string (aka for loop) data */
 		    break;
+		/* see if there is more we can parse */
+		while (ptr++ < cf->P_end) {
+		    if ((ch = *ptr) == '\n') {
+			if (ptr > line && ptr[-1] == '\\')
+			    continue;
+			Parse_Error(PARSE_WARNING,
+			    "Zero byte read from file, skipping rest of line.");
+			break;
+		    }
+		}
 		if (cf->nextbuf != NULL) {
 		    /*
 		     * End of this buffer; return EOF and outer logic

Modified: projects/camlock/contrib/nvi/LICENSE
==============================================================================
--- projects/camlock/contrib/nvi/LICENSE	Mon Aug 12 19:43:48 2013	(r254255)
+++ projects/camlock/contrib/nvi/LICENSE	Mon Aug 12 19:50:08 2013	(r254256)
@@ -1,14 +1,19 @@
-The vi program is freely redistributable.  You are welcome to copy, modify
-and share it with others under the conditions listed in this file.  If any
-company (not any individual!) finds vi sufficiently useful that you would
-have purchased it, or if any company wishes to redistribute it, contributions
-to the authors would be appreciated.
-
 /*-
+ * $Id: LICENSE,v 8.18 2011/07/10 11:58:35 zy Exp $
+ */
+
+The following are the copyrights and redistribution conditions that apply
+to this copy of the Vi software.
+
+/*
  * Copyright (c) 1991, 1992, 1993, 1994
  *      The Regents of the University of California.  All rights reserved.
- *  Copyright (c) 1991, 1992, 1993, 1994, 1995, 1996
+ *  Copyright (c) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
  *	Keith Bostic.  All rights reserved.
+ *  Copyright (c) 1999, 2000
+ *	Sven Verdoolaege.  All rights reserved.
+ *  Copyright (c) 2011
+ *	Zhihao Yuan.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -18,11 +23,7 @@ to the authors would be appreciated.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

Modified: projects/camlock/contrib/nvi/README
==============================================================================
--- projects/camlock/contrib/nvi/README	Mon Aug 12 19:43:48 2013	(r254255)
+++ projects/camlock/contrib/nvi/README	Mon Aug 12 19:50:08 2013	(r254256)
@@ -1,31 +1,32 @@
-#	@(#)README	8.147 (Berkeley) 10/19/96
+#	$Id: README,v 9.0 2012/10/07 09:13:54 zy Exp $
 
-This is the README for nex/nvi, a freely redistributable implementation
-of the ex/vi text editors originally distributed as part of the Fourth
-Berkeley Software Distribution (4BSD), by the University of California,
-Berkeley.
-
-The source code for nex/nvi can be retrieved by using anonymous ftp to
-ftp.cs.berkeley.edu.  The file ucb/4bsd/nvi.tar.gz is the gzip'd archive,
-of version 1.71 of nex/nvi.  This version is believed to be stable and
-problem free.  The file ucb/4bsd/nvi-###.ALPHA.tar.gz is a gzip'd archive
-of the current alpha-test release of nex/nvi.  This version reflects the
-current development tree, and will be more likely to have problems.
-
-See the file:
-	build/README	for information on building nvi.
-	LAYOUT		for a description of where everything is.
-	LICENSE		for the copyright and redistribution terms.
-
-If you have any questions about nex/nvi, problems with it, or concerns
-about the conditions for redistribution, please contact me:
-
-	Keith Bostic		+1-508-287-4781
-	394 E. Riding Dr.	bostic at bostic.com
-	Carlisle, MA 01741
-	USA
+This is version 2.1.1 (2012-10-07) of nex/nvi, a reimplementation of the ex/vi
+text editors originally distributed as part of the Fourth Berkeley
+Software Distribution (4BSD), by the University of California, Berkeley.
+
+The directory layout is as follows:
+
+    LICENSE ....... Copyright, use and redistribution information.
+    README ........ This file.
+    build ......... Build directory.
+    catalog ....... Message catalogs; see catalog/README.
+    cl ............ Vi interface to the curses(3) library.
+    common ........ Code shared by ex and vi.
+    docs .......... Ex/vi documentation, both current and historic.
+    ex ............ Ex source code.
+    regex ......... Modified regex library with wide character support.
+    vi ............ Vi source code.
 
-Keith Bostic
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+
+o Nvi was written by Keith Bostic, and the last version is 1.79.  After that,
+
+	Sven Verdoolaege added the iconv support and the DB3 locking.
+
+	Jun-ichiro itojun Hagino developed the file encoding detection
+	techniques in his nvi-m17n.
+
+The following acknowledgments were written by Keith Bostic:
 
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 o This software is several years old and is the product of many folks' work.  
@@ -63,51 +64,3 @@ o From the original vi acknowledgements,
 o And...
 	The financial support of UUNET Communications Services is gratefully
 	acknowledged.
-
-=-=-=-=-=-=-=-=-=-=-=
-o Status:
-
-This software is in beta test, and it's pretty stable.  Almost all of the
-historic functionality in ex/vi is there, the only major missing pieces
-are open mode and the lisp edit option.
-
-Nvi is largely 8-bit clean.  This isn't difficult to fix, and was left in
-during initial development to keep things simple.  Wide character support
-will be integrated at the same time that it is made fully 8-bit clean.
-
-There aren't a lot of new features in nex/nvi, but there are a few things
-you might like.  The "Additional Features" section of the reference work
-(docs/USD.doc/vi.ref/vi.ref.txt, docs/USD.doc/vi.ref/vi.ref.ps) has more
-information.
-
-=-=-=-=-=-=-=-=-=-=-=
-o Debugging:
-
-Code fixes are greatly appreciated, of course, but if you can't provide
-them, please email me as much information as you can as to how I might
-reproduce the bug, and I'll try to fix it locally.  Stack traces of core
-dumps are only rarely helpful -- an example file with a set of keystrokes
-that causes the problem is almost invariably necessary.  I know it's
-annoying, but simply playing with the bug until you can reproduce it at
-will, with minimal keystrokes, is immensely helpful to me.
-
-Please include the following in the bug report;
-
-	o The version of nvi you're running (use :version to get it).
-	o The row/column dimensions of the screen (80 x 32).
-	o Unless you're confident that they're not part of the problem,
-	  your startup files (.exrc, .nexrc) and the environment variable
-	  (EXINIT, NEXINIT) values.  (Cutting and pasting the output
-	  of ":set all" is usually sufficient.)
-
-If you want to do your own debugging, recompile the program with DEBUG
-defined.  (Configuring with --enable-debug will do this for you.)  This
-turns on the additional command-line option -D, that takes either s or w
-as an argument.  The option -Ds causes nvi to ignore the EXINIT and
-.exrc files on startup, and -Dw causes nvi to print out the process id
-and wait for you to enter a <carriage-return> to continue.
-
-If you're running a memory checker (e.g. Purify) on nvi, you will first
-want to  recompile everything with "-DPURIFY" set in the CFLAGS.  This
-initializes allocated pages in the DB code, and free's allocated memory
-at the end of the nvi execution.

Modified: projects/camlock/contrib/nvi/catalog/Makefile
==============================================================================
--- projects/camlock/contrib/nvi/catalog/Makefile	Mon Aug 12 19:43:48 2013	(r254255)
+++ projects/camlock/contrib/nvi/catalog/Makefile	Mon Aug 12 19:50:08 2013	(r254256)
@@ -1,7 +1,8 @@
-#	@(#)Makefile	8.29 (Berkeley) 10/19/96
+#	$Id: Makefile,v 9.0 2012/10/19 15:13:11 zy Exp $
 
-CAT=	dutch english french german polish ru_SU.KOI8-R spanish swedish
-FILES=	../cl/*.c ../common/*.c ../ex/*.c ../tk/*.c ../vi/*.c
+CAT=	dutch english french german polish ru_RU.KOI8-R spanish swedish \
+	uk_UA.KOI8-U zh_CN.GB2312
+FILES=	../cl/*.c ../common/*.c ../ex/*.c ../vi/*.c
 
 all: dump ${CAT}
 
@@ -18,13 +19,10 @@ ${CAT}: english.base
 			print "DUPLICATE MESSAGE NUMBER " $$1;		\
 			exit 1;						\
 		}							\
-		for (; nline < $$1; ++nline)				\
-			print "";					\
 		print $0;						\
 	}' |								\
-	sed -e '1s/^/VI_MESSAGE_CATALOG/'				\
-	    -e '/"/s/^[^"]*"//'						\
-	    -e '1!s/"$$/X/' > $@;					\
+	sed -e '1s/^/$$set 1~$$quote "~/; 1y/~/\n/' |			\
+	gencat $@ /dev/stdin;						\
 	chmod 444 $@;							\
 	if grep DUPLICATE $@ > /dev/null; then				\
 		grep DUPLICATE $@;					\
@@ -34,7 +32,8 @@ ${CAT}: english.base
 	fi
 
 CHK=	dutch.check english.check french.check german.check \
-	polish.check ru_SU.KOI8-R.check spanish.check swedish.check
+	polish.check ru_RU.KOI8-R.check spanish.check swedish.check \
+	uk_UA.KOI8-U.check zh_CN.GB2312.check
 check: ${CHK}
 ${CHK}: ${CAT}
 	@echo "... $@";							\
@@ -63,19 +62,14 @@ ${CHK}: ${CAT}
 	echo "Duplicate messages, both id and message (this is okay):";	\
 	sed '/^$$/d' < $$f.base | sort | uniq -c |			\
 	awk '$$1 != 1 { print $$0 }' | sort -n;				\
-	echo =========================;					\
-	echo "Duplicate messages, just message (this is okay):";	\
-	sed '/^$$/d' < $$f | sort | uniq -c |				\
-	awk '$$1 != 1 { print $$0 }' | sort -n;				\
 	echo =========================) > $@
 
 english.base: dump ${FILES} #Makefile
 	./dump ${FILES} |\
 	sed -e '/|/!d' \
 	    -e 's/|/ "/' \
-	    -e 's/^"//' \
-	    -e 's/\\"/"/g' |\
-	sort -n > $@
+	    -e 's/^"//' |\
+	sort -nu > $@
 
 dump: dump.c
 	${CC} -O -o dump dump.c

Modified: projects/camlock/contrib/nvi/catalog/README
==============================================================================
--- projects/camlock/contrib/nvi/catalog/README	Mon Aug 12 19:43:48 2013	(r254255)
+++ projects/camlock/contrib/nvi/catalog/README	Mon Aug 12 19:50:08 2013	(r254256)
@@ -1,15 +1,9 @@
-#	@(#)README	8.4 (Berkeley) 11/22/94
+#	$Id: README,v 9.0 2012/10/19 17:06:15 zy Exp $
 
 Generally, all non-system error and informational messages in nvi are
 catalog messages, i.e. they can be tailored to a specific langauge.
-Command strings, usage strings, system errors and other "known text"
-are not.  It would certainly be possible to internationalize all the
-text strings in nvi, but it's unclear that it's the right thing to do.
-
-First, there's no portable way to do message catalogs.  The System V
-scheme is a reasonable choice, but none of the 4BSD derived systems
-support it.  So, catalogs are completely implemented within nvi, and
-don't require any library support.
+Command strings, usage strings, system errors and other 'known text'
+are not.
 
 Message catalogs in nvi are fairly simple.  Every catalog message
 consists of two parts -- an initial number followed by a pipe (`|')
@@ -33,19 +27,7 @@ For example:
 
 	msgq(sp, M_ERR, "002|Error: %d %x", arg1, arg2);
 
-is a format string that displays two arguments.  It is possible, however,
-to reorder the arguments or to not display all of them.  The convention
-nvi uses is the System V printf(3) convention, i.e. "%[0-9]*$" is the name
-of a specific, numbered argument.  For example:
-
-	msgq(sp, M_ERR, "002|Error: %2$d %1$x", arg1, arg2);
-
-displays the arguments in reverse order.
-
-If the system supports this convention in its library printf routines
-(as specified by the test #define NL_ARGMAX), nvi uses those routines.
-Otherwise, there is some serious magic going on in common/msg.c to make
-this all work.
+is a format string that displays two arguments.
 
 Arguments to the msgq function are required to contain ONLY printable
 characters.  No further translation is done by the msgq routine before
@@ -54,14 +36,16 @@ displaying the message on the screen.  F
 	msgq(sp, M_ERR, "003|File: %s", file_name);
 
 "file_name" must contain only printable characters.  The routine
-msg_print() returns a printable version of a string in allocated
-memory.  For example:
+msg_print() returns a printable version of a string; the third argument
+indicates whether the string needs to be freed.  For example:
 
 	char *p;
+	int nf;
 
-	p = msg_print(sp, file_name);
-	msgq(sp, M_ERR, M("003", "File: %s"), p);
-	FREE_SPACE(sp, p, 0);
+	p = msg_print(sp, file_name, &nf);
+	msgq(sp, M_ERR, "003|File: %s", p);
+	if (nf)
+		FREE_SPACE(sp, p, 0);
 
 makes sure that "file_name" is printable before calling the msgq
 routine.
@@ -71,63 +55,40 @@ routine.
 The message catalogs themselves are maintained in two files.  The first
 is the "base file" which contains two fields, a record number and the
 message itself.  All base files are named using the convention
-"vi_<language>.base", e.g. the English one is "vi_english.base".  For
+"<language>.base", e.g. the English one is "english.base".  For
 example:
 
-	002 "Unable to create temporary file"
-	003 "Warning: %s is not a regular file"
-	004 "%s already locked, session is read-only"
-	005 "%s: remove"
-	006 "%s: close"
-	007 "%s: remove"
-	008 "%s: remove"
-	009 "Read-only file, not written; use ! to override"
-	010 "Read-only file, not written"
-
-are the first few lines of the current vi_english.base file.  Note that
-message #1 is missing -- the first message of each catalog is a special
-one, so that nvi can recognize message catalog files.  It's added by the
-Makefile script that creates the second version of the message catalog.
-
-The second file is the file used by nvi to access messages, and is a list
-of the messages, one per line:
-
-	VI_MESSAGE_CATALOG
-	Unable to create temporary fileX
-	Warning: %s is not a regular fileX
-	%s already locked, session is read-onlyX
-	%s: removeX
-	%s: closeX
-	%s: removeX
-	%s: removeX
-	Read-only file, not written; use ! to overrideX
-	Read-only file, not writtenX
-
-Note that all messages have had a trailing 'X' character appended.  This
-is to provide nvi a place to store a trailing nul for the message so that
-C library routines that expect one won't be disappointed.
+	002 "Line length overflow"
+	003 "unable to delete line %lu"
+	004 "unable to append to line %lu"
+	005 "unable to insert at line %lu"
+	006 "unable to store line %lu"
+	007 "unable to get last line"
+
+are the first few lines of the current english.base file.
+
+Before this file being converted to the second file, the POSIX formatted
+message catalog file, by gencat(1), two lines:
+
+	$set 1
+	$quote "
+
+will be inserted before the base text to setup the set_id and the quote
+character.  So the double-quote needs to be escaped by a backslash to be
+included in a message; same as the backslash itself.
 
-These files are named for their language, e.g. "vi_english".  The second
-files are automatically created from the first files.
+These files are named for their language, e.g. "english".  However, a
+locale(1) name is also recommended.
 
 To create a new catalog for nvi:
 
-Copy the file vi_english.base to a file that you can modify , e.g.  "cp
-vi_english.base vi_german.base".  For each of the messages in the file,
-replace the message with the string that you want to use.  To find out
-what the arguments to a message are, I'm afraid you'll have to search
-the source code for the message number.  You can find them fairly quickly
-by doing:
-
-	cd ..; egrep '123\|' */*.[chys]
-
-I'm sorry that there's not an easier way, but I couldn't think of
-anything that wasn't a lot of work.
-
-If, for some reason, you don't have the file vi_english.base, or you
-have new sources for which you want to create a new base catalog, you
-can create it by running the command "make english" in the catalog
-directory.
+Copy the file english.base to a file that you can modify , e.g.  "cp
+english.base german.base".  For each of the messages in the file,
+replace the message with the string that you want to use.  If you have
+doubts about the meaning of a message, just email me.
+
+A latest english.base can be created from source by running the command
+"make english" in the catalog/ directory.
 
 Once you've translated all of the strings, then add your catalog to the
 "CAT=" line of the Makefile, and run the command "make catalog".  This
@@ -156,11 +117,11 @@ a single place.
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 To select a catalog when running nvi, set the "msgcat" option.  If the
 value of this option ends with a '/', it is treated as the name of a
-directory that contains a message catalog "vi_XXXX", where XXXX is the
-value of the LANG environmental variable, if it's set, or the value of
-the LC_MESSAGES environmental variable if it's not.  If neither of those
-environmental variables are set, or if the option doesn't end in a '/',
-the option is treated as the full path name of the message catalog to use.
+directory that contains a message catalog "$LC_MESSAGES", which is set
+through the LC_MESSAGES environment variable but returned by setlocale(3).
+Check the output of locale(1) to validate such a value.  If the option
+doesn't end in a '/', the option is treated as the full path name of the
+message catalog to use.
 
 If any messages are missing from the catalog, the backup text (English)
 is used instead.

Modified: projects/camlock/contrib/nvi/catalog/dump.c
==============================================================================
--- projects/camlock/contrib/nvi/catalog/dump.c	Mon Aug 12 19:43:48 2013	(r254255)
+++ projects/camlock/contrib/nvi/catalog/dump.c	Mon Aug 12 19:50:08 2013	(r254256)
@@ -105,10 +105,10 @@ main(argc, argv)
 	for (; *argv != NULL; ++argv) {
 		if ((fp = fopen(*argv, "r")) == NULL) {
 			perror(*argv);
-			exit (1);
+			return (1);
 		}
 		parse(fp);
 		(void)fclose(fp);
 	}
-	exit (0);
+	return (0);
 }

Modified: projects/camlock/contrib/nvi/catalog/dutch.base
==============================================================================
--- projects/camlock/contrib/nvi/catalog/dutch.base	Mon Aug 12 19:43:48 2013	(r254255)
+++ projects/camlock/contrib/nvi/catalog/dutch.base	Mon Aug 12 19:50:08 2013	(r254256)
@@ -43,8 +43,7 @@
 044 "De lisp optie is niet ondersteund"
 045 "messages niet uitgeschakeld: %s"
 046 "messages niet geactiveerd: %s"
-048 "De paragraph optie moet karakter paren bevatten"
-049 "De section optie moet karakter paren bevatten"
+047 "De %s optie moet karakter paren bevatten"
 053 "De standaard buffer is leeg"
 054 "Buffer %s is leeg"
 055 "Bestanden met newlines in de naam kunnen niet hersteld worden"
@@ -97,16 +96,16 @@
 103 "Ongeldig adres: het bestand is leeg"
 104 "Het %s commando staat het adres 0 niet toe"
 105 "Geen afkortingen om weer te geven"
-106 "Afkortingen moeten eindigen met een "woord" letter"
+106 "Afkortingen moeten eindigen met een \"woord\" letter"
 107 "Afkortingen mogen geen tabulaties of spaties bevatten"
 108 "Afkortingen mogen geen woord/niet-woord karakters mengen, behalve aan het einde"
-109 ""%s" is geen afkorting"
+109 "\"%s\" is geen afkorting"
 110 "Vi commando mislukt: gemappede toetsen genegeerd"
 111 "Dit is het laatste bestand"
 112 "Dit is het eerste bestand"
 113 "Dit is het eerste bestand"
 114 "lijst met bestanden is leeg"
-115 "Geen voorgaand commando om "!" te vervangen"
+115 "Geen voorgaand commando om \"!\" te vervangen"
 116 "Geen bestandsnaam voor %%"
 117 "Geen bestandsnaam voor #"
 118 "Fout: execl: %s"
@@ -119,14 +118,14 @@
 125 "%s/%s: niet gelezen: noch U noch root is de eigenaar"
 126 "%s/%s: niet gelezen: U bent niet de eigenaar"
 127 "%s/%s: niet gelezen: kan gewijzigd worden door andere gebruikers"
-128 "%s: niet gelezen: noch U noch root is de eigenaar""
+128 "%s: niet gelezen: noch U noch root is de eigenaar"
 129 "%s: niet gelezen: U bent niet de eigenaar"
 130 "%s: niet gelezen: kan gewijzigd worden door andere gebruikers"
 131 "Geen volgende regel om samen te voegen"
 132 "Geen input map entries"
 133 "Geen command map entries"
 134 "Het %s karakter kan niet ge-remapped worden"
-135 ""%s" is niet gemapped"
+135 "\"%s\" is niet gemapped"
 136 "Merk naam moet een enkel karakter zijn"
 137 "%s bestaat al, niet weggeschreven; gebruik ! om het te forceren"
 138 "Nieuw .exrc bestand: %s. "
@@ -296,7 +295,7 @@
 306 "Vi was niet geladen met een Perl interpreter"
 307 "Geen ex commando om uit te voeren"
 308 "Kies <CR> om commando uit te voeren, :q om te stoppen"
-309 "Gebruik "cscope help" voor uitleg"
+309 "Gebruik \"cscope help\" voor uitleg"
 310 "Nog geen cscope connectie aanwezig"
 311 "%s: onbekend zoek type: gebruik een van %s"
 312 "%d: onbekende cscope sessie"

Modified: projects/camlock/contrib/nvi/catalog/french.base
==============================================================================
--- projects/camlock/contrib/nvi/catalog/french.base	Mon Aug 12 19:43:48 2013	(r254255)
+++ projects/camlock/contrib/nvi/catalog/french.base	Mon Aug 12 19:50:08 2013	(r254256)
@@ -43,8 +43,7 @@
 044 "L'option lisp n'est pas implémentée"
 045 "Les messages ne sont pas désactivés : %s"
 046 "Les messages ne sont pas activés : %s"
-048 "L'option de paragraphe doit être en groupe de deux caractères"
-049 "L'option de section doit être en groupe de deux caractères"
+047 "L'option de %s doit être en groupe de deux caractères"
 053 "Le tampon par défaut est vide"
 054 "Le tampon %s est vide"
 055 "Les fichiers dont le nom contient des caractères de saut de ligne sont irrécupérables"
@@ -97,16 +96,16 @@
 103 "Adresse non valide : le fichier est vide"
 104 "La commande %s ne permet pas une adresse de 0"
 105 "Pas d'abréviations à afficher"
-106 "Les abréviations doivent finir par un caractère"mot"
+106 "Les abréviations doivent finir par un caractère \"mot\""
 107 "Les abréviations ne peuvent pas contenir de tabulations ni d'espaces"
 108 "Les abréviations ne peuvent pas contenir un mélange de caractères mot/non-mot, sauf à la fin"
-109 ""%s" n'est pas une abréviation"
+109 "\"%s\" n'est pas une abréviation"
 110 "La commande Vi a échoué : Les touches affectées ont été abandonnées"
 111 "Plus de fichiers à éditer"
 112 "Pas de fichiers précédents à éditer"
 113 "Pas de fichiers précédents à rembobiner"
 114 "Pas de liste de fichiers à afficher"
-115 "Pas de commande précédente à remplacer"!""
+115 "Pas de commande précédente à remplacer \"!\""
 116 "Pas de nom de fichier à substituer à %%"
 117 "Pas de nom de fichier à substituer à #"
 118 "Erreur : execl : %s"
@@ -126,7 +125,7 @@
 132 "Pas d'entrées de mappage d'entrée"
 133 "Pas d'entrées de mappage de commandes"
 134 "Le caractère %s ne peut pas être remappé"
-135 ""%s" n'est pas actuellement mappé"
+135 "\"%s\" n'est pas actuellement mappé"
 136 "Les noms de marque ne doivent avoir qu'un caractère"
 137 "%s existe, non enregistré; utiliser ! pour outrepasser"
 138 "Nouveau fichier exrc : %s"
@@ -200,7 +199,6 @@
 207 "La commande Q nécessite une interface terminal ex"
 208 "Pas de commande à répéter"
 209 "Le fichier est vide"
-209 "Le fichier est vide"
 210 "Vous ne pouvez pas utiliser %s comme commande de déplacement"
 211 "Déjà en mode commande"
 212 "Le curseur n'est pas dans un mot"
@@ -293,12 +291,11 @@
 302 "Vi n'a pas été chargé avec un interprétateur Tcl"
 303 "Ficher modifié depuis le dernier enregistrement."
 304 "L'expansion du shell a échoué"
-304 "L'expansion du shell a échoué"
 305 "Pas d'option d'édition %s spécifiée"
 306 "Vi n'a pas été chargé avec un interprétateur Perl"
 307 "Pas de commande ex à exécuter"
 308 "Entrez <CR> pour exécuter une commande, :q pour quitter"
-309 "Utiliser "cscope help" pour obtenir de l'aide"
+309 "Utiliser \"cscope help\" pour obtenir de l'aide"
 310 "Aucune connexion cscope n'est lancée"
 311 "%s : type de recherche inconnu : utiliser un des %s"
 312 "%d : Il n'existe pas de telle session cscope"

Modified: projects/camlock/contrib/nvi/catalog/german.base
==============================================================================
--- projects/camlock/contrib/nvi/catalog/german.base	Mon Aug 12 19:43:48 2013	(r254255)
+++ projects/camlock/contrib/nvi/catalog/german.base	Mon Aug 12 19:50:08 2013	(r254256)
@@ -1,67 +1,66 @@
-002 "Zeilenlaengen Ueberlauf"
-003 "kann Zeile %lu nicht loeschen"
-004 "kann an Zeile %lu nicht anfuegen"
-005 "kann in Zeile %lu nicht einfuegen"
+002 "Zeilenlängen-Überlauf"
+003 "kann Zeile %lu nicht löschen"
+004 "kann an Zeile %lu nicht anfügen"
+005 "kann in Zeile %lu nicht einfügen"
 006 "kann Zeile %lu nicht speichern"
 007 "kann letzte Zeile nicht lesen"
 008 "Fehler: kann Zeile %lu nicht wiederherstellen"
 009 "Protokolldatei"
-010 "Keine Protokollierung aktiv, rueckgaengig machen nicht moeglich"
-011 "Keine Aenderungen rueckgaengig zu machen"
-012 "Keine Protokollierung aktiv, rueckgaengig machen nicht moeglich"
-013 "Keine Protokollierung aktiv, Wiederholung von Aenderungen nicht moeglich"
-014 "Keine Aenderungen zu wiederholen"
+010 "Keine Protokollierung aktiv, Rückgängigmachen nicht möglich"
+011 "Keine Änderungen rückgängig zu machen"
+012 "Keine Protokollierung aktiv, Rückgängigmachen nicht möglich"
+013 "Keine Protokollierung aktiv, Wiederholung von Änderungen nicht möglich"
+014 "Keine Änderungen zu wiederholen"
 015 "%s/%d: Protokollschreibfehler"
-016 "Vi's Standardein- und ausgabe muss ein Terminal sein"
+016 "Vi's Standardein- und -ausgabe muß ein Terminal sein"
 017 "Marke %s: nicht gesetzt"
-018 "Marke %s: die Zeile wurde geloescht"
+018 "Marke %s: die Zeile wurde gelöscht"
 019 "Marke %s: Cursorposition existiert nicht mehr"
 020 "Fehler: "
 021 "neue Datei"
-022 "Name geaendert"
-023 "geaendert"
-024 "nicht geaendert"
-025 "NICHT GELOCKED"
+022 "Name geändert"
+023 "geändert"
+024 "nicht geändert"
+025 "NICHT GELOCKT"
 026 "nur zum Lesen"
 027 "Zeile %lu von %lu [%ld%%]"
 028 "leere Datei"
 029 "Zeile %lu"
 030 "Die Datei %s ist kein Meldungskatalog"
-031 "Setzen der Voreinstellung fuer %s Option nicht moeglich"
+031 "Setzen der Voreinstellung für %s Option nicht möglich"
 032 "Benutzung: %s"
 033 "set: keine %s Option: 'set all' zeigt alle Optionen mit Werten an"
 034 "set: der [no]%s Option kann kein Wert zugewiesen werden"
-035 "set: %s ist keine boolsche Option"
+035 "set: %s ist keine Boolsche Option"
 036 "set: %s Option: %s"
-037 "set: %s Option: %s: Wert Ueberlauf"
-038 "set: %s Option: %s ist eine ungueltige Zahl"
-039 "set: %s ist keine boolsche Option"
-040 "Anzeige hat zu wenig Spalten, weniger als %d"
-041 "Anzeige hat zu viele Spalten, mehr als %d"
-042 "Anzeige hat zu wenig Zeilen, weniger als %d"
-043 "Anzeige hat zu viele Zeilen, mehr als %d"
-044 "Die lisp Option ist nicht implementiert"
-045 "Messages nicht abgeschalten: %s"
-046 "Messages nicht eingeschalten: %s"
-048 "Die paragraph Option muss Gruppen zu zwei Zeichen enthalten"
-049 "Die section Option muss Gruppen zu zwei Zeichen enthalten"
+037 "set: %s Option: %s: Werte-Überlauf"
+038 "set: %s Option: %s ist eine ungültige Zahl"
+039 "set: %s ist keine Boolsche Option"
+040 "Bildschirm hat zu wenig Spalten, weniger als %d"
+041 "Bildschirm hat zu viele Spalten, mehr als %d"
+042 "Bildschirm hat zu wenig Zeilen, weniger als %d"
+043 "Bildschirm hat zu viele Zeilen, mehr als %d"
+044 "Die lisp-Option ist nicht implementiert"
+045 "Meldungen nicht abgeschaltet: %s"
+046 "Meldungen nicht eingeschaltet: %s"
+047 "Die %s-Option muß Gruppen zu zwei Zeichen enthalten"
 053 "Der Standardpuffer ist leer"
 054 "Puffer %s ist leer"
 055 "Dateien mit newlines im Namen sind nicht wiederherstellbar"
-056 "Aenderungen nicht wiederherstellbar falls die Editorsitzung schief geht"
-057 "kopiere Datei fuer Wiederherstellung ..."
+056 "Änderungen nicht wiederherstellbar, falls die Editorsitzung schiefgeht"
+057 "kopiere Datei für Wiederherstellung ..."
 058 "Rettungsmechanismus funktioniert nicht: %s"
-059 "Aenderungen nicht wiederherstellbar falls die Editorsitzung schief geht"
+059 "Änderungen nicht wiederherstellbar, falls die Editorsitzung schiefgeht"
 060 "Sicherung der Datei gescheitert: %s"
-061 "kopiere Datei fuer Wiederherstellung ..."
-062 "Informationen ueber den Benutzer mit id %u nicht gefunden"
-063 "Wiederherstellungsdatei kann nicht gesperrt werden"
-064 "Puffer der Wiederherstellungsdatei uebergelaufen"
+061 "kopiere Datei für Wiederherstellung ..."
+062 "Informationen über den Benutzer mit id %u nicht gefunden"
+063 "Wiederherstellungsdatei kann nicht gelockt werden"
+064 "Puffer der Wiederherstellungsdatei übergelaufen"
 065 "Wiederherstellungsdatei"
 066 "%s: Wiederherstellungsdatei hat falsches Format"
 067 "%s: Wiederherstellungsdatei hat falsches Format"

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