os/doc
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Add trademark attribution for CVSup.

Browse source
This commit is contained in:
Simon L. B. Nielsen 2003-12-24 00:26:41 +00:00
parent d12ff3f311
commit 4071843a8a
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=19282
9 changed files with 15 additions and 3 deletions
en_US.ISO8859-1
articles
committers-guide
article.sgml
contributors
article.sgml
cvsup-advanced
article.sgml
hubs
article.sgml
java-tomcat
article.sgml
problem-reports
article.sgml
releng
article.sgml
books/handbook
book.sgml
share/sgml
trademarks.ent

7
en_US.ISO8859-1/articles/committers-guide/article.sgml
View file

@ -41,6 +41,7 @@
<legalnotice id="trademarks" role="trademarks">
&tm-attrib.freebsd;
&tm-attrib.cvsup;
&tm-attrib.ibm;
&tm-attrib.intel;
&tm-attrib.sparc;
@ -676,11 +677,11 @@ alias scvs env CVS_RSH=ssh cvs -d <replaceable>user</replaceable>@ncvs.freebsd.o
</itemizedlist>
<para>You will almost certainly get a conflict because
of the <literal>$Id: article.sgml,v 1.175 2003-11-22 01:34:19 peter Exp $</literal> (or in FreeBSD's case,
of the <literal>$Id: article.sgml,v 1.176 2003-12-24 00:26:39 simon Exp $</literal> (or in FreeBSD's case,
<literal>$<!-- stop expansion -->FreeBSD<!-- stop expansion -->$</literal>)
lines, so you will have to edit the file to resolve the conflict
(remove the marker lines and the second <literal>$Id: article.sgml,v 1.175 2003-11-22 01:34:19 peter Exp $</literal> line,
leaving the original <literal>$Id: article.sgml,v 1.175 2003-11-22 01:34:19 peter Exp $</literal> line intact).</para>
(remove the marker lines and the second <literal>$Id: article.sgml,v 1.176 2003-12-24 00:26:39 simon Exp $</literal> line,
leaving the original <literal>$Id: article.sgml,v 1.176 2003-12-24 00:26:39 simon Exp $</literal> line intact).</para>
</listitem>
<listitem>

1
en_US.ISO8859-1/articles/contributors/article.sgml
View file

@ -26,6 +26,7 @@
<legalnotice id="trademarks" role="trademarks">
&tm-attrib.freebsd;
&tm-attrib.cvsup;
&tm-attrib.sun;
&tm-attrib.general;
</legalnotice>

1
en_US.ISO8859-1/articles/cvsup-advanced/article.sgml
View file

@ -29,6 +29,7 @@
<legalnotice id="trademarks" role="trademarks">
&tm-attrib.freebsd;
&tm-attrib.cvsup;
&tm-attrib.general;
</legalnotice>

1
en_US.ISO8859-1/articles/hubs/article.sgml
View file

@ -49,6 +49,7 @@
<legalnotice id="trademarks" role="trademarks">
&tm-attrib.freebsd;
&tm-attrib.cvsup;
&tm-attrib.general;
</legalnotice>

1
en_US.ISO8859-1/articles/java-tomcat/article.sgml
View file

@ -87,6 +87,7 @@
<legalnotice id="trademarks" role="trademarks">
&tm-attrib.freebsd;
&tm-attrib.cvsup;
&tm-attrib.linux;
&tm-attrib.microsoft;
&tm-attrib.sun;

1
en_US.ISO8859-1/articles/problem-reports/article.sgml
View file

@ -15,6 +15,7 @@
<legalnotice id="trademarks" role="trademarks">
&tm-attrib.freebsd;
&tm-attrib.cvsup;
&tm-attrib.ibm;
&tm-attrib.intel;
&tm-attrib.sparc;

1
en_US.ISO8859-1/articles/releng/article.sgml
View file

@ -52,6 +52,7 @@
<legalnotice id="trademarks" role="trademarks">
&tm-attrib.freebsd;
&tm-attrib.cvsup;
&tm-attrib.intel;
&tm-attrib.xfree86;
&tm-attrib.general;

1
en_US.ISO8859-1/books/handbook/book.sgml
View file

@ -92,6 +92,7 @@
&tm-attrib.apple;
&tm-attrib.corel;
&tm-attrib.creative;
&tm-attrib.cvsup;
&tm-attrib.heidelberger;
&tm-attrib.ibm;
&tm-attrib.ieee;

4
share/sgml/trademarks.ent
View file

@ -92,6 +92,10 @@
countries.</para>">
<!ENTITY soundblaster "<trademark class='registered'>SoundBlaster</trademark>">
<!-- http://www.cvsup.org/ -->
<!ENTITY tm-attrib.cvsup "<para>CVSup is a registered trademark of
John D. Polstra.</para>">
<!-- http://www.dell.com/us/en/gen/misc/policy_007_policy.htm -->
<!ENTITY tm-attrib.dell "<para>Dell, Dell Precision, Latitude,
Optiplex, PowerEdge are trademarks or registered trademarks of Dell