- Merge the following from the English version:

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


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