- Merge the following from the English version:

	r45900 -> r45992	head/ja_JP.eucJP/share/xml/trademarks.ent


git-svn-id: svn+ssh://svn.freebsd.org/doc/head@46012 c2e8774f-c49f-e111-b436-862b2bbc8956
- Merge the following from the English version:

	r43819 -> r45989	head/ja_JP.eucJP/htdocs/where.xml


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