Add trademark symbols and attributions:

- Add trademark tags as needed, generally on first use in each
   article.
 - Add an attribution to the legal section mentioning all trademarks
   referenced.
 - Always use correct case for trademarks.
This commit is contained in:
Simon L. B. Nielsen 2003-08-14 19:54:05 +00:00
parent da9d1a7aaf
commit a9e3afd078
Notes: svn2git 2020-12-08 03:00:23 +00:00
svn path=/head/; revision=17856
7 changed files with 95 additions and 23 deletions
en_US.ISO8859-1/articles
fbsd-from-scratch
filtering-bridges
fonts
formatting-media
hubs
pr-guidelines
problem-reports

View file

@ -3,6 +3,8 @@
%man;
<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
%freebsd;
<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
%trademarks;
<!ENTITY scratch.ap "<application>FreeBSD From Scratch</application>">
]>
@ -23,6 +25,12 @@
</copyright>
<pubdate>$FreeBSD$</pubdate>
<legalnotice id="trademarks" role="trademarks">
&tm-attrib.freebsd;
&tm-attrib.adobe;
&tm-attrib.general;
</legalnotice>
</articleinfo>
<abstract>
@ -389,7 +397,7 @@ Do you wish to delete what is left of /var/tmp/temproot.stage1? [no] <userinput>
<para>Other areas are prepared for configuration, but will not work
until stage two is completed. For example we have copied files to
configure printing and X11. Printing however is likely to need
applications not found in the base system, like PostScript
applications not found in the base system, like &postscript;
utilities. X11 will not run before we have compiled the server,
libraries and programs.</para>
</sect1>

View file

@ -1,6 +1,8 @@
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
%man;
<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
%trademarks;
]>
<article>
@ -19,6 +21,13 @@
<pubdate>$FreeBSD$</pubdate>
<legalnotice id="trademarks" role="trademarks">
&tm-attrib.freebsd;
&tm-attrib.3com;
&tm-attrib.intel;
&tm-attrib.general;
</legalnotice>
<abstract>
<para>Often it is useful to divide one physical network (like an
Ethernet) into two separate segments without having to create subnets,
@ -74,8 +83,8 @@
support the promiscuous mode for both reception and transmission, since
they must be able to send Ethernet packets with any address, not just
their own. Moreover, to have a good throughput, the cards should be PCI
bus mastering cards. The best choices are still the Intel EtherExpress
Pro, followed by the 3Com 3c9xx series. To simplify the firewall
bus mastering cards. The best choices are still the Intel &etherexpress;
Pro, followed by the &t3com; 3c9xx series. To simplify the firewall
configuration it may be useful to have two cards of different
manufacturers (using different drivers) in order to distinguish clearly
which interface is connected to the router and which to the inner

View file

@ -5,6 +5,8 @@
%freebsd;
<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
%man;
<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
%trademarks;
]>
<!-- Recently, I wanted to figure out how to use some additional fonts that
@ -51,6 +53,16 @@
<pubdate>Wed Aug 7, 1996</pubdate>
<legalnotice id="trademarks" role="trademarks">
&tm-attrib.freebsd;
&tm-attrib.adobe;
&tm-attrib.apple;
&tm-attrib.linux;
&tm-attrib.microsoft;
&tm-attrib.opengroup;
&tm-attrib.general;
</legalnotice>
<abstract>
<para>This document contains a description of the various font
files that may be used with FreeBSD and the syscons driver,
@ -82,7 +94,7 @@
<term><filename>.pfa</filename>, <filename>.pfb</filename></term>
<listitem>
<para>Postscript type 1 fonts. The
<para>&postscript; type 1 fonts. The
<filename>.pfa</filename> is the
<emphasis>A</emphasis>scii form and
<filename>.pfb</filename> the <emphasis>B</emphasis>inary
@ -111,7 +123,7 @@
<term><filename>.ttf</filename></term>
<listitem>
<para>A TrueType font</para>
<para>A &truetype; font</para>
</listitem>
</varlistentry>
@ -133,8 +145,8 @@
</varlistentry>
</variablelist>
<para>The <filename>.fot</filename> file is used by Windows as
sort of a symbolic link to the actual TrueType font
<para>The <filename>.fot</filename> file is used by &windows; as
sort of a symbolic link to the actual &truetype; font
(<filename>.ttf</filename>) file. The <filename>.fon</filename>
font files are also used by Windows. I know of no way to use
this font format with FreeBSD.</para>
@ -218,7 +230,7 @@
this suffix are not all the same format; specifically, the
<filename>.fnt</filename> files used by syscons under FreeBSD
may not be the same format as a <filename>.fnt</filename> file
one encounters in the MS-DOS/Windows environment. I have not
one encounters in the &ms-dos;/&windows; environment. I have not
made any attempt at using other <filename>.fnt</filename> files
other than those provided with FreeBSD.</para>
</sect1>
@ -526,7 +538,7 @@ GS&gt;<userinput>quit</userinput></screen>
<para>Now that the new font can be used by both X11 and
Ghostscript, how can one use the new font with groff? First of
all, since we are dealing with type 1 postscript fonts, the
all, since we are dealing with type 1 &postscript; fonts, the
groff device that is applicable is the <emphasis>ps</emphasis>
device. A font file must be created for each font that groff
can use. A groff font name is just a file in
@ -569,7 +581,7 @@ We need to convert them to &unix; style ^J delimited lines</lineannotation>
SHOWBOAT.</para>
<para>If ghostscript is used to drive the printers on the system,
then nothing more needs to be done. However, if true postscript
then nothing more needs to be done. However, if true PostScript
printers are used, then the font must be down loaded to the
printer in order for the font to be used (unless the printer
happens to have the showboat font built in or on an accessible
@ -647,7 +659,7 @@ EOF</userinput>
</sect1>
<sect1>
<title>Converting TrueType fonts to a groff/postscript format for
<title>Converting TrueType fonts to a groff/PostScript format for
groff</title>
<para>This potentially requires a bit of work, simply because it
@ -659,13 +671,13 @@ EOF</userinput>
<term><command>ttf2pf</command></term>
<listitem>
<para>TrueType to postscript conversion utilities. This
<para>TrueType to PostScript conversion utilities. This
allows conversion of a TrueType font to an ascii font
metric (<filename>.afm</filename>) file.</para>
<para>Currently available at <ulink
url="http://sunsite.icm.edu.pl/pub/GUST/contrib/BachoTeX98/ttf2pf/"></ulink>.
Note: These files are postscript programs and must be
Note: These files are PostScript programs and must be
downloaded to disk by holding down the
<keycap>Shift</keycap> key when clicking on the link.
Otherwise, your browser may try to launch
@ -753,7 +765,7 @@ EOF</userinput>
generated from the TrueType font file name.</para>
<para>This also produces a <filename>.pfa</filename> file, the
ascii postscript font metrics file
ascii PostScript font metrics file
(<filename>.pfb</filename> is for the binary form). This
will not be needed, but could (I think) be useful for a
fontserver.</para>
@ -781,7 +793,7 @@ Converting 3of9.ttf to A.pfa and B.afm.
</listitem>
<listitem>
<para>Create the groff postscript file:</para>
<para>Create the groff PostScript file:</para>
<para>Change directories to
<filename>/usr/share/groff_font/devps</filename> so as to
@ -954,7 +966,7 @@ Converting 3of9.ttf to A.pfa and B.afm.
<listitem>
<para>How to generate the groff character mapping files for
postscript fonts with non-standard character names?</para>
PostScript fonts with non-standard character names?</para>
</listitem>
<listitem>

View file

@ -1,6 +1,13 @@
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
%authors;
<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
%freebsd;
<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
%trademarks;
<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
%man;
]>
@ -27,6 +34,13 @@
<pubdate>March 1997</pubdate>
<legalnotice id="trademarks" role="trademarks">
&tm-attrib.freebsd;
&tm-attrib.iomega;
&tm-attrib.opengroup;
&tm-attrib.general;
</legalnotice>
<abstract>
<para>This document describes how to slice, partition, and
format hard disk drives and similar media for use with
@ -93,7 +107,7 @@
<sect2>
<title>Definitions</title>
<para>Unix disk management over the centuries has invented many
<para>&unix; disk management over the centuries has invented many
new definitions for old words. The following glossary covers
the definitions used in this document and (hopefully) for
FreeBSD in general.</para>
@ -117,7 +131,7 @@ now. -->
<listitem>
<para>disk: Hard disks, CDROMs, magneto-optical devices and
Zip/Jazz removable media are example of storage devices
&iomegazip;/&jaz; removable media are example of storage devices
commonly used today. The basic principle of the way these
work is that one or more spinning disks spin by a motor,
while a head, moving on a radial path close to the disks,

View file

@ -7,6 +7,8 @@
%teams;
<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN">
%mailing-lists;
<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
%trademarks;
<!ENTITY % not.published "IGNORE">
]>
@ -44,6 +46,12 @@
</affiliation>
</author>
</authorgroup>
<legalnotice id="trademarks" role="trademarks">
&tm-attrib.freebsd;
&tm-attrib.general;
</legalnotice>
<abstract>
<para>An in-progress article on how to mirror FreeBSD, aimed at
hub administrators.</para>

View file

@ -8,6 +8,10 @@
%man;
<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN">
%mailing-lists;
<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
%freebsd;
<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
%trademarks;
<!ENTITY man.edit-pr.1 "<citerefentry/<refentrytitle/edit-pr/<manvolnum/1//">
<!ENTITY man.query-pr.1 "<citerefentry/<refentrytitle/query-pr/<manvolnum/1//">
]>
@ -19,6 +23,12 @@
<pubdate>$FreeBSD$</pubdate>
<legalnotice id="trademarks" role="trademarks">
&tm-attrib.freebsd;
&tm-attrib.opengroup;
&tm-attrib.general;
</legalnotice>
<abstract>
<para>These guidelines describe recommended handling practices
for FreeBSD Problem Reports (PRs). Whilst developed for the
@ -417,7 +427,7 @@ from the body of this PR to kern/12345</programlisting>
<para>After you locate the original PR and the misfiled
followups, use the <option>-F</option> option of
<command>query-pr</command> to save the full text of all the
relevant PRs in a Unix mailbox file, i.e.:</para>
relevant PRs in a &unix; mailbox file, i.e.:</para>
<screen>&prompt.user; <userinput>query-pr -F 52458 52474 &gt; mbox</userinput></screen>

View file

@ -3,6 +3,8 @@
%man;
<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN">
%mailing-lists;
<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
%trademarks;
]>
<article>
@ -11,6 +13,15 @@
<pubdate>$FreeBSD$</pubdate>
<legalnotice id="trademarks" role="trademarks">
&tm-attrib.freebsd;
&tm-attrib.ibm;
&tm-attrib.intel;
&tm-attrib.sparc;
&tm-attrib.sun;
&tm-attrib.general;
</legalnotice>
<abstract>
<para>This article describes how to best formulate and submit a
problem report to the FreeBSD Project.</para>
@ -528,7 +539,7 @@
<listitem>
<para><literal>i386:</literal> problems specific to the
i386 platform.</para>
&i386; platform.</para>
</listitem>
<listitem>
@ -537,7 +548,7 @@
</listitem>
<listitem>
<para><literal>java:</literal> problems related to Java&trade;.
<para><literal>java:</literal> problems related to &java;.
</para>
</listitem>
@ -559,12 +570,12 @@
<listitem>
<para><literal>powerpc:</literal> problems specific to the
PowerPC platform.</para>
&powerpc; platform.</para>
</listitem>
<listitem>
<para><literal>sparc64:</literal> problems specific to the
SPARC platform.</para>
&sparc64; platform.</para>
</listitem>
<listitem>