These changes make the file pass iconv -f UTF-8 test and also permit the
file to be edited/saved by nvi without truncating the file.


git-svn-id: svn+ssh://svn.freebsd.org/doc/head@45894 c2e8774f-c49f-e111-b436-862b2bbc8956