Move non-committers email address entities (re, faq, etc.) into

own entities file (teams.ent)
This commit is contained in:
Alexey Zelkin 2002-02-06 17:05:51 +00:00
parent ab7f169ea3
commit 9b6ca7453f
Notes: svn2git 2020-12-08 03:00:23 +00:00
svn path=/head/; revision=12103
11 changed files with 47 additions and 12 deletions

View file

@ -3,6 +3,8 @@
%man;
<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
%freebsd;
<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN">
%teams;
<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
%authors;
<!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//DE">

View file

@ -8,6 +8,9 @@
<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
%authors;
<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN">
%teams;
<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN">
%mailing-lists;
]>
@ -522,11 +525,11 @@
</itemizedlist>
<para>You will almost certainly get a conflict because
of the <literal>$Id: article.sgml,v 1.93 2002-01-28 21:59:59 jim Exp $</literal> (or in FreeBSD's case,
of the <literal>$Id: article.sgml,v 1.94 2002-02-06 17:05:45 phantom 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.93 2002-01-28 21:59:59 jim Exp $</literal> line, leaving the original
<literal>$Id: article.sgml,v 1.93 2002-01-28 21:59:59 jim Exp $</literal> line intact).</para>
the second <literal>$Id: article.sgml,v 1.94 2002-02-06 17:05:45 phantom Exp $</literal> line, leaving the original
<literal>$Id: article.sgml,v 1.94 2002-02-06 17:05:45 phantom Exp $</literal> line intact).</para>
</listitem>
<listitem>

View file

@ -3,6 +3,8 @@
%man;
<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
%authors;
<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN">
%teams;
<!ENTITY % not.published "IGNORE">
]>

View file

@ -5,6 +5,8 @@
%freebsd;
<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
%authors;
<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN">
%teams;
<!ENTITY % bookinfo PUBLIC "-//FreeBSD//ENTITIES DocBook BookInfo Entities//EN">
%bookinfo;

View file

@ -194,8 +194,6 @@
<!ENTITY a.erich "Eric L. Hernes <email>erich@FreeBSD.org</email>">
<!ENTITY a.faq "FAQ Maintainer <email>faq@FreeBSD.org</email>">
<!ENTITY a.fenner "Bill Fenner <email>fenner@FreeBSD.org</email>">
<!ENTITY a.fjoe "Max Khon <email>fjoe@FreeBSD.org</email>">
@ -532,8 +530,6 @@
<!ENTITY a.pst "Paul Traina <email>pst@FreeBSD.org</email>">
<!ENTITY a.re "Release Engineering Team <email>re@FreeBSD.org</email>">
<!ENTITY a.reg "Jeremy Lea <email>reg@FreeBSD.org</email>">
<!ENTITY a.rgrimes "Rodney Grimes <email>rgrimes@FreeBSD.org</email>">
@ -700,6 +696,3 @@
<!ENTITY a.znerd "Ernst de Haan <email>znerd@FreeBSD.org</email>">
<!ENTITY a.security-officer "Security Officers Team <email>security-officer@FreeBSD.org</email>">
<!ENTITY a.portmgr "Ports Management Team <email>portmgr@FreeBSD.org</email>">

View file

@ -0,0 +1,25 @@
<!--
Names and email address of teams of people working on specified
tasks. Usally they're just mail aliases set up at hub.FreeBSD.org
Use these entities when referencing appropriate teams.
Please keep this list in alphabetical order by entity names.
IMPORTANT: If you delete names from this file you *must* ensure that
all references to them have been removed from the handbook's
translations. If they haven't then you *will* break the
builds for the other languages, and we will poke fun of you
in public.
$FreeBSD$
-->
<!ENTITY a.faq "FAQ Maintainer <email>faq@FreeBSD.org</email>">
<!ENTITY a.portmgr "Ports Management Team <email>portmgr@FreeBSD.org</email>">
<!ENTITY a.re "Release Engineering Team <email>re@FreeBSD.org</email>">
<!ENTITY a.security-officer "Security Officers Team <email>security-officer@FreeBSD.org</email>">

View file

@ -2,7 +2,7 @@
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
$FreeBSD: doc/fr_FR.ISO8859-1/books/faq/book.sgml,v 1.6 2001/07/13 15:55:58 nik Exp $
$FreeBSD$
Original revision: n.nn
-->
@ -13,6 +13,7 @@
<!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//FR"> %translators;
<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"> %authors;
<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN"> %teams;
<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//FR"> %mailing-lists;
<!ENTITY % includes SYSTEM "includes.sgml"> %includes;

View file

@ -2,7 +2,7 @@
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
$FreeBSD: doc/fr_FR.ISO8859-1/books/handbook/book.sgml,v 1.4 2001/07/13 15:56:00 nik Exp $
$FreeBSD$
Original revision: n.nn
-->
@ -21,6 +21,7 @@
<!ENTITY % chapters SYSTEM "chapters.ent"> %chapters;
<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"> %authors;
<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN"> %teams;
<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//FR"> %mailing-lists;
<!ENTITY rel.current CDATA "2.2.8">
<!-- We need the followings until the translation is completed -->

View file

@ -8,6 +8,8 @@
%ja-authors;
<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
%authors;
<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN">
%teams;
<!ENTITY % bookinfo PUBLIC "-//FreeBSD//ENTITIES DocBook BookInfo Entities//EN">
%bookinfo;

View file

@ -12,6 +12,7 @@
<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
%freebsd;
<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"> %authors;
<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN"> %teams;
<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//RU"> %mailing-lists;
<!ENTITY % bookinfo PUBLIC "-//FreeBSD//ENTITIES DocBook BookInfo Entities//RU">
%bookinfo;

View file

@ -46,6 +46,9 @@ PUBLIC "-//FreeBSD//ENTITIES DocBook BookInfo Entities//EN"
PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
"../../en_US.ISO8859-1/share/sgml/authors.ent"
PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN"
"../../en_US.ISO8859-1/share/sgml/teams.ent"
PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN"
"../../en_US.ISO8859-1/share/sgml/newsgroups.ent"