Merge the following from the English version:
1.24 -> 1.28 share/sgml/trademarks.ent
This commit is contained in:
parent
73030ed781
commit
00b6821e41
Notes:
svn2git
2020-12-08 03:00:23 +00:00
svn path=/head/; revision=24990
1 changed files with 2 additions and 3 deletions
|
@ -9,7 +9,7 @@
|
||||||
Please keep this file sorted.
|
Please keep this file sorted.
|
||||||
|
|
||||||
$FreeBSD$
|
$FreeBSD$
|
||||||
Original revision: 1.24
|
Original revision: 1.28
|
||||||
-->
|
-->
|
||||||
|
|
||||||
<!ENTITY tm-attrib.3com "<para>3Com および HomeConnect は
|
<!ENTITY tm-attrib.3com "<para>3Com および HomeConnect は
|
||||||
|
@ -75,8 +75,7 @@
|
||||||
Seiko Epson Corporation の登録商標です。</para>">
|
Seiko Epson Corporation の登録商標です。</para>">
|
||||||
|
|
||||||
<!ENTITY tm-attrib.freebsd "<para>FreeBSD は
|
<!ENTITY tm-attrib.freebsd "<para>FreeBSD は
|
||||||
Wind River Systems, Inc. の登録商標です。
|
The FreeBSD Foundation の登録商標です。</para>">
|
||||||
これは近いうちに変わる見込みです。</para>">
|
|
||||||
|
|
||||||
<!-- http://www.heidelberg.com/hq/eng/small_print/trademarks.asp -->
|
<!-- http://www.heidelberg.com/hq/eng/small_print/trademarks.asp -->
|
||||||
<!ENTITY tm-attrib.heidelberger "<para>Heidelberg, Helvetica,
|
<!ENTITY tm-attrib.heidelberger "<para>Heidelberg, Helvetica,
|
||||||
|
|
Loading…
Reference in a new issue