aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Pentchev <roam@FreeBSD.org>2002-03-15 07:46:22 +0000
committerPeter Pentchev <roam@FreeBSD.org>2002-03-15 07:46:22 +0000
commiteed41e97e657ef5aeaef7061ef01320e027f8095 (patch)
tree2027526fc978b41bb9c3e2c3a1df4723b04f4dee
parent1be0f7d03367b0e92849a5b3a53c428a975bd0e5 (diff)
downloaddoc-eed41e97e657ef5aeaef7061ef01320e027f8095.tar.gz
doc-eed41e97e657ef5aeaef7061ef01320e027f8095.zip
Convert the names, descriptions and e-mail addresses of FreeBSD
committers and mailing lists to &a.xxx; entities. Reviewed by: keramida Approved by: keramida, silence on -doc
Notes
Notes: svn path=/head/; revision=12471
-rw-r--r--en_US.ISO8859-1/books/arch-handbook/locking/chapter.sgml6
-rw-r--r--en_US.ISO8859-1/books/arch-handbook/sound/chapter.sgml2
-rw-r--r--en_US.ISO8859-1/books/developers-handbook/ipv6/chapter.sgml2
-rw-r--r--en_US.ISO8859-1/books/developers-handbook/l10n/chapter.sgml2
-rw-r--r--en_US.ISO8859-1/books/developers-handbook/locking/chapter.sgml6
-rw-r--r--en_US.ISO8859-1/books/developers-handbook/sound/chapter.sgml2
-rw-r--r--en_US.ISO8859-1/books/developers-handbook/x86/chapter.sgml3
-rw-r--r--en_US.ISO8859-1/books/faq/book.sgml14
-rw-r--r--en_US.ISO8859-1/books/fdp-primer/book.sgml4
-rw-r--r--en_US.ISO8859-1/books/fdp-primer/overview/chapter.sgml2
-rw-r--r--en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml6
-rw-r--r--en_US.ISO8859-1/books/fdp-primer/structure/chapter.sgml6
-rw-r--r--en_US.ISO8859-1/books/fdp-primer/tools/chapter.sgml4
-rw-r--r--en_US.ISO8859-1/books/fdp-primer/translations/chapter.sgml11
-rw-r--r--en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml4
-rw-r--r--en_US.ISO8859-1/books/handbook/book.sgml2
-rw-r--r--en_US.ISO8859-1/books/handbook/contrib/chapter.sgml4
-rw-r--r--en_US.ISO8859-1/books/handbook/eresources/chapter.sgml4
-rw-r--r--en_US.ISO8859-1/books/handbook/introduction/chapter.sgml2
-rw-r--r--en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml28
-rw-r--r--en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml6
-rw-r--r--en_US.ISO8859-1/books/handbook/ports/chapter.sgml2
22 files changed, 62 insertions, 60 deletions
diff --git a/en_US.ISO8859-1/books/arch-handbook/locking/chapter.sgml b/en_US.ISO8859-1/books/arch-handbook/locking/chapter.sgml
index 993d649ffc..00501a8d2f 100644
--- a/en_US.ISO8859-1/books/arch-handbook/locking/chapter.sgml
+++ b/en_US.ISO8859-1/books/arch-handbook/locking/chapter.sgml
@@ -2,15 +2,15 @@
The FreeBSD Documentation Project
The FreeBSD SMP Next Generation Project
- $FreeBSD: doc/en_US.ISO_8859-1/books/developers-handbook/locking/chapter.sgml,v 1.1 2000/11/29 04:15:17 jhb Exp $
+ $FreeBSD$
-->
<chapter id="locking">
<title>Locking Notes</title>
<para><emphasis>This chapter is maintained by the FreeBSD SMP Next
- Generation Project
- <email>freebsd-smp@FreeBSD.org</email>.</emphasis></para>
+ Generation Project. Please direct any comments or suggestions
+ to its &a.smp;.</emphasis></para>
<para>This document outlines the locking used in the FreeBSD kernel
diff --git a/en_US.ISO8859-1/books/arch-handbook/sound/chapter.sgml b/en_US.ISO8859-1/books/arch-handbook/sound/chapter.sgml
index 344dbe72b2..38f39f1e78 100644
--- a/en_US.ISO8859-1/books/arch-handbook/sound/chapter.sgml
+++ b/en_US.ISO8859-1/books/arch-handbook/sound/chapter.sgml
@@ -518,7 +518,7 @@
<function>channel_resetdone()</function>, and
<function>channel_notify()</function> are for special purposes
and should not be implemented in a driver without discussing
- it with the authorities (<email>cg@freebsd.org</email>).</para>
+ it with the authorities (&a.cg;).</para>
<para><function>channel_setdir()</function> is deprecated.</para>
</sect3>
diff --git a/en_US.ISO8859-1/books/developers-handbook/ipv6/chapter.sgml b/en_US.ISO8859-1/books/developers-handbook/ipv6/chapter.sgml
index 579f6600b4..377baa357b 100644
--- a/en_US.ISO8859-1/books/developers-handbook/ipv6/chapter.sgml
+++ b/en_US.ISO8859-1/books/developers-handbook/ipv6/chapter.sgml
@@ -1136,7 +1136,7 @@ FreeBSD 4.x configurable supported
<para>If any of the drivers do not support the requirements, then
the drivers can not be used for IPv6 and/or IPsec communication. If
you find any problem with your card using IPv6/IPsec, then, please
- report it to <email>freebsd-bugs@FreeBSD.org</email>.</para>
+ report it to the &a.bugs;.</para>
<para>(NOTE: In the past we required all PCMCIA drivers to have a
call to in6_ifattach(). We have no such requirement any more)</para>
diff --git a/en_US.ISO8859-1/books/developers-handbook/l10n/chapter.sgml b/en_US.ISO8859-1/books/developers-handbook/l10n/chapter.sgml
index 9a5209e93d..28193dbb7d 100644
--- a/en_US.ISO8859-1/books/developers-handbook/l10n/chapter.sgml
+++ b/en_US.ISO8859-1/books/developers-handbook/l10n/chapter.sgml
@@ -40,7 +40,7 @@
create applications that work in all the languages
out-of-the-box without dirty hacks.</para>
- <para>The mailing list <email>FreeBSD-I18N@FreeBSD.org</email>
+ <para>The &a.i18n;
has been established. If you are an I18N/L10N developer,
please send your comments, ideas, questions, and anything
you deem related to it. </para>
diff --git a/en_US.ISO8859-1/books/developers-handbook/locking/chapter.sgml b/en_US.ISO8859-1/books/developers-handbook/locking/chapter.sgml
index 993d649ffc..00501a8d2f 100644
--- a/en_US.ISO8859-1/books/developers-handbook/locking/chapter.sgml
+++ b/en_US.ISO8859-1/books/developers-handbook/locking/chapter.sgml
@@ -2,15 +2,15 @@
The FreeBSD Documentation Project
The FreeBSD SMP Next Generation Project
- $FreeBSD: doc/en_US.ISO_8859-1/books/developers-handbook/locking/chapter.sgml,v 1.1 2000/11/29 04:15:17 jhb Exp $
+ $FreeBSD$
-->
<chapter id="locking">
<title>Locking Notes</title>
<para><emphasis>This chapter is maintained by the FreeBSD SMP Next
- Generation Project
- <email>freebsd-smp@FreeBSD.org</email>.</emphasis></para>
+ Generation Project. Please direct any comments or suggestions
+ to its &a.smp;.</emphasis></para>
<para>This document outlines the locking used in the FreeBSD kernel
diff --git a/en_US.ISO8859-1/books/developers-handbook/sound/chapter.sgml b/en_US.ISO8859-1/books/developers-handbook/sound/chapter.sgml
index 344dbe72b2..38f39f1e78 100644
--- a/en_US.ISO8859-1/books/developers-handbook/sound/chapter.sgml
+++ b/en_US.ISO8859-1/books/developers-handbook/sound/chapter.sgml
@@ -518,7 +518,7 @@
<function>channel_resetdone()</function>, and
<function>channel_notify()</function> are for special purposes
and should not be implemented in a driver without discussing
- it with the authorities (<email>cg@freebsd.org</email>).</para>
+ it with the authorities (&a.cg;).</para>
<para><function>channel_setdir()</function> is deprecated.</para>
</sect3>
diff --git a/en_US.ISO8859-1/books/developers-handbook/x86/chapter.sgml b/en_US.ISO8859-1/books/developers-handbook/x86/chapter.sgml
index 1a813779e4..e7f77daa55 100644
--- a/en_US.ISO8859-1/books/developers-handbook/x86/chapter.sgml
+++ b/en_US.ISO8859-1/books/developers-handbook/x86/chapter.sgml
@@ -6457,8 +6457,7 @@ them and why.
<para>
This tutorial would never have been possible without the
help of many experienced FreeBSD programmers from the
-<ulink url="mailto:freebsd-hackers@FreeBSD.org">FreeBSD
-hackers</ulink> mailing list, many of whom have patiently
+&a.hackers;, many of whom have patiently
answered my questions, and pointed me in the right direction
in my attempts to explore the inner workings of Unix
system programming in general and FreeBSD in particular.
diff --git a/en_US.ISO8859-1/books/faq/book.sgml b/en_US.ISO8859-1/books/faq/book.sgml
index 780cba9026..a4ee72b385 100644
--- a/en_US.ISO8859-1/books/faq/book.sgml
+++ b/en_US.ISO8859-1/books/faq/book.sgml
@@ -2215,16 +2215,16 @@ disk wd2 at wdc1 drive 1 # change from wd3 to wd2</programlisting
<para>Yes. FreeBSD currently runs on both Intel x86 and
DEC (now Compaq) Alpha architectures. Interest has also
been expressed in a port of FreeBSD to the SPARC architecture,
- join the <email>freebsd-sparc@FreeBSD.org</email> <link
- linkend="mailing"> mailing list</link> if you are interested
+ join the &a.sparc;
+ if you are interested
in joining that project. Most recent additions to the list of
upcoming platforms are IA-64 and PowerPC, join the
- <email>freebsd-ia64@FreeBSD.org</email> and/or
- <email>freebsd-ppc@FreeBSD.org</email> <link
- linkend="mailing">mailing lists</link> for more information.
+ &a.ia64; and/or the
+ &a.ppc;
+ for more information.
For general discussion on new architectures, join
- the <email>freebsd-platforms@FreeBSD.org</email>
- <link linkend="mailing">mailing list</link>.</para>
+ the &a.platforms;.
+ </para>
<para>If your machine has a different architecture and you need
something right now, we suggest you look at <ulink
diff --git a/en_US.ISO8859-1/books/fdp-primer/book.sgml b/en_US.ISO8859-1/books/fdp-primer/book.sgml
index dccb76a192..db9a428c7f 100644
--- a/en_US.ISO8859-1/books/fdp-primer/book.sgml
+++ b/en_US.ISO8859-1/books/fdp-primer/book.sgml
@@ -32,6 +32,10 @@
<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
+%authors;
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN">
+%mailing-lists;
<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
%man;
diff --git a/en_US.ISO8859-1/books/fdp-primer/overview/chapter.sgml b/en_US.ISO8859-1/books/fdp-primer/overview/chapter.sgml
index 63ddde8fd9..eee48cb464 100644
--- a/en_US.ISO8859-1/books/fdp-primer/overview/chapter.sgml
+++ b/en_US.ISO8859-1/books/fdp-primer/overview/chapter.sgml
@@ -50,7 +50,7 @@
Every one is welcome to join the FDP. There is no minimum
membership requirement, no quota of documentation you need to
produce per month. All you need to do is subscribe to the
- <email>freebsd-doc@FreeBSD.org</email> mailing list.</para>
+ &a.doc;.</para>
<para>After you have finished reading this document you should:</para>
diff --git a/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml b/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml
index bf28973696..10333e1f79 100644
--- a/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml
+++ b/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml
@@ -47,8 +47,8 @@
that would just reiterate the documentation for each language. The aim of
this section is to list those elements more likely to be useful to you.
If you have a question about how best to markup a particular piece of
- content, please post it to the FreeBSD Documentation Project mailing list
- <email>freebsd-doc@FreeBSD.org</email>.</para>
+ content, please post it to the
+ &a.doc;.</para>
<note>
<title>Inline vs. block</title>
@@ -701,7 +701,7 @@
this particular project. Should anyone from any of the other *nix
camps (NetBSD, OpenBSD, Linux, &hellip;) be interested in
collaborating on a standard DocBook extension set, please get in
- touch with Nik Clayton <email>nik@FreeBSD.org</email>.</para>
+ touch with &a.nik;.</para>
</note>
<para>The FreeBSD extensions are not (currently) in the ports
diff --git a/en_US.ISO8859-1/books/fdp-primer/structure/chapter.sgml b/en_US.ISO8859-1/books/fdp-primer/structure/chapter.sgml
index 4f65641207..e1b1ecc319 100644
--- a/en_US.ISO8859-1/books/fdp-primer/structure/chapter.sgml
+++ b/en_US.ISO8859-1/books/fdp-primer/structure/chapter.sgml
@@ -27,7 +27,7 @@
ANY WAY OUT OF THE USE OF THIS DOCUMENTATION, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
- $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/structure/chapter.sgml,v 1.6 2001/06/11 01:16:47 ache Exp $
+ $FreeBSD$
-->
<chapter id="structure">
@@ -177,8 +177,8 @@
<para>The Handbook's organisation may change over time, and this
document may lag in detailing the organisational changes. If you
have any questions about how the Handbook is organised, please
- contact the FreeBSD Documentation Project,
- <email>freebsd-doc@FreeBSD.org</email>.</para>
+ contact the
+ &a.doc;.</para>
</note>
<sect4>
diff --git a/en_US.ISO8859-1/books/fdp-primer/tools/chapter.sgml b/en_US.ISO8859-1/books/fdp-primer/tools/chapter.sgml
index 4386ba3e16..112d625f2f 100644
--- a/en_US.ISO8859-1/books/fdp-primer/tools/chapter.sgml
+++ b/en_US.ISO8859-1/books/fdp-primer/tools/chapter.sgml
@@ -266,8 +266,8 @@
</variablelist>
<para>If anyone has recommendations for other software that is useful
- when manipulating SGML documents, please let Nik Clayton
- (<email>nik@FreeBSD.org</email>) know, so they can be added to this
+ when manipulating SGML documents, please let &a.nik;
+ know, so they can be added to this
list.</para>
</sect2>
</sect1>
diff --git a/en_US.ISO8859-1/books/fdp-primer/translations/chapter.sgml b/en_US.ISO8859-1/books/fdp-primer/translations/chapter.sgml
index 590ba9fc1f..2be0fd649b 100644
--- a/en_US.ISO8859-1/books/fdp-primer/translations/chapter.sgml
+++ b/en_US.ISO8859-1/books/fdp-primer/translations/chapter.sgml
@@ -42,8 +42,7 @@
Gr&uuml;nder <email>elwood@mc5sys.in-berlin.de</email> and translated back to
English by Bernd Warken <email>bwarken@mayn.de</email>.</para>
- <para>The FAQ maintainer is Nik Clayton
- <email>nik@FreeBSD.org</email>.</para>
+ <para>The FAQ maintainer is &a.nik;.</para>
<qandaset>
<qandaentry>
@@ -180,7 +179,7 @@
<para>If no one is listed on that page as translating for your
language, then send a message to
- <email>freebsd-doc@FreeBSD.org</email> in case someone else is
+ the &a.doc; in case someone else is
thinking of doing a translation, but has not announced it yet.</para>
</answer>
</qandaentry>
@@ -291,8 +290,8 @@
<para>Put <filename>swedish-docs.tar.gz</filename> somewhere. If you
do not have access to your own webspace (perhaps your ISP does not
- let you have any) then you can e-mail Nik Clayton
- <email>nik@FreeBSD.org</email>, and arrange to e-mail the files
+ let you have any) then you can e-mail
+ &a.nik;, and arrange to e-mail the files
when it is convenient.</para>
<para>Either way, you should use &man.send-pr.1; to submit a report
@@ -302,7 +301,7 @@
person committing it will be fluent in the language.</para>
<para>Someone (probably the Documentation Project Manager, currently
- Nik Clayton <email>nik@FreeBSD.org</email>) will then take your
+ &a.nik;) will then take your
translation and confirm that it builds. In particular, the
following things will be looked at:</para>
diff --git a/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml b/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml
index e2f7703ebc..702e26e9ea 100644
--- a/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml
@@ -1755,12 +1755,12 @@ Exports list on foobar:
<para>In case you are interested in adding support for a
different ISDN protocol, a currently unsupported ISDN PC card or
otherwise enhancing <application>isdn4bsd</application>, please
- get in touch with <email>hm@FreeBSD.org</email>.</para>
+ get in touch with &a.hm;.</para>
<para>For questions regarding the installation, configuration
and troubleshooting <application>isdn4bsd</application>, a
majordomo maintained mailing list is available. To join, send
- mail to <email>majordomo@FreeBSD.org</email> and specify:</para>
+ mail to &a.majordomo; and specify:</para>
<para><literal>subscribe freebsd-isdn</literal></para>
diff --git a/en_US.ISO8859-1/books/handbook/book.sgml b/en_US.ISO8859-1/books/handbook/book.sgml
index 6c5141df51..5db33b399d 100644
--- a/en_US.ISO8859-1/books/handbook/book.sgml
+++ b/en_US.ISO8859-1/books/handbook/book.sgml
@@ -17,6 +17,8 @@
<!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//EN"> %mailing-lists;
<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN"> %newsgroups;
<!ENTITY % not.published "INCLUDE">
diff --git a/en_US.ISO8859-1/books/handbook/contrib/chapter.sgml b/en_US.ISO8859-1/books/handbook/contrib/chapter.sgml
index 0f407f8723..11b96335df 100644
--- a/en_US.ISO8859-1/books/handbook/contrib/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/contrib/chapter.sgml
@@ -460,8 +460,8 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
<para>We can always use new mirror sites for FTP, WWW or
<command>cvsup</command>. If you would like to be such a mirror,
- please contact the FreeBSD project administrators
- <email>hubs@FreeBSD.org</email> for more information.</para>
+ please contact the
+ &a.hubs; for more information.</para>
</sect3>
</sect2>
</sect1>
diff --git a/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml b/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml
index b8a8fe8b29..e480839dbe 100644
--- a/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml
@@ -606,8 +606,8 @@ help
issues then your posting should contain technical discussion.
Ongoing irrelevant chatter or flaming only detracts from the value
of the mailing list for everyone on it and will not be tolerated.
- For free-form discussion on no particular topic, the freebsd-chat
- <email>freebsd-chat@FreeBSD.org</email> mailing list is freely
+ For free-form discussion on no particular topic, the &a.chat;
+ is freely
available and should be used instead.</para>
</listitem>
diff --git a/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml b/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml
index b8406e7c1a..016129ce9b 100644
--- a/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml
@@ -717,7 +717,7 @@
by the committers list is to use the &man.send-pr.1;
command, though if something appears to be jammed in the
system then you may also reach them by sending mail to
- <email>cvs-committers@FreeBSD.org</email>.</para>
+ the &a.committers;.</para>
</listitem>
</varlistentry>
diff --git a/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml b/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml
index 3738e8f71d..452f752f35 100644
--- a/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml
@@ -3112,7 +3112,7 @@ doc/zh_TW.Big5</screen>
<listitem>
<para>cvsup1.de.FreeBSD.org (maintainer
- <email>wosch@FreeBSD.org</email>)</para>
+ &a.wosch;)</para>
</listitem>
<listitem>
@@ -3132,7 +3132,7 @@ doc/zh_TW.Big5</screen>
<listitem>
<para>cvsup5.de.FreeBSD.org (maintainer
- <email>rse@FreeBSD.org</email>)</para>
+ &a.rse;)</para>
</listitem>
</itemizedlist>
</listitem>
@@ -3195,7 +3195,7 @@ doc/zh_TW.Big5</screen>
<listitem>
<para>cvsup2.jp.FreeBSD.org (maintainer
- <email>max@FreeBSD.org</email>)</para>
+ &a.max;)</para>
</listitem>
<listitem>
@@ -3417,12 +3417,12 @@ doc/zh_TW.Big5</screen>
<itemizedlist>
<listitem>
<para>cvsup.za.FreeBSD.org (maintainer
- <email>markm@FreeBSD.org</email>)</para>
+ &a.markm;)</para>
</listitem>
<listitem>
<para>cvsup2.za.FreeBSD.org (maintainer
- <email>markm@FreeBSD.org</email>)</para>
+ &a.markm;)</para>
</listitem>
</itemizedlist>
</listitem>
@@ -3435,12 +3435,12 @@ doc/zh_TW.Big5</screen>
<itemizedlist>
<listitem>
<para>cvsup.es.FreeBSD.org (maintainer
- <email>jesusr@FreeBSD.org</email>)</para>
+ &a.jesusr;)</para>
</listitem>
<listitem>
<para>cvsup2.es.FreeBSD.org (maintainer
- <email>jesusr@FreeBSD.org</email>)</para>
+ &a.jesusr;)</para>
</listitem>
<listitem>
@@ -3486,7 +3486,7 @@ doc/zh_TW.Big5</screen>
<listitem>
<para>cvsup3.tw.FreeBSD.org (maintainer
- <email>foxfair@FreeBSD.org</email>)</para>
+ &a.foxfair;)</para>
</listitem>
</itemizedlist>
@@ -3529,7 +3529,7 @@ doc/zh_TW.Big5</screen>
<listitem>
<para>cvsup2.uk.FreeBSD.org (maintainer
- <email>brian@FreeBSD.org</email>)</para>
+ &a.brian;)</para>
</listitem>
<listitem>
@@ -3563,7 +3563,7 @@ doc/zh_TW.Big5</screen>
<listitem>
<para>cvsup3.FreeBSD.org (maintainer
- <email>wollman@FreeBSD.org</email>), Massachusetts</para>
+ &a.wollman;), Massachusetts</para>
</listitem>
<listitem>
@@ -3578,7 +3578,7 @@ doc/zh_TW.Big5</screen>
<listitem>
<para>cvsup7.FreeBSD.org (maintainer
- <email>jdp@FreeBSD.org</email>), Washington state</para>
+ &a.jdp;), Washington state</para>
</listitem>
<listitem>
@@ -3589,12 +3589,12 @@ doc/zh_TW.Big5</screen>
<listitem>
<para>cvsup9.FreeBSD.org (maintainer
- <email>jdp@FreeBSD.org</email>), Minnesota</para>
+ &a.jdp;), Minnesota</para>
</listitem>
<listitem>
<para>cvsup10.FreeBSD.org (maintainer
- <email>jdp@FreeBSD.org</email>), California</para>
+ &a.jdp;), California</para>
</listitem>
<listitem>
@@ -3604,7 +3604,7 @@ doc/zh_TW.Big5</screen>
<listitem>
<para>cvsup12.FreeBSD.org (maintainer
- <email>will@FreeBSD.org</email>), Indiana</para>
+ &a.will;), Indiana</para>
</listitem>
<listitem>
diff --git a/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml b/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml
index b2a7eca918..1686bd9dfb 100644
--- a/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml
@@ -23,14 +23,12 @@
<title>Officers</title>
<sect2>
- <title>FreeBSD Security Officer
- <email>security-officer@FreeBSD.org</email></title>
+ <title>&a.security-officer;</title>
&pgpkey.security-officer;
</sect2>
<sect2>
- <title>FreeBSD core secretary
- <email>core-secretary@FreeBSD.org</email></title>
+ <title>&a.core-secretary;</title>
&pgpkey.core-secretary;
</sect2>
diff --git a/en_US.ISO8859-1/books/handbook/ports/chapter.sgml b/en_US.ISO8859-1/books/handbook/ports/chapter.sgml
index bf5c8048cf..5c682c3fa5 100644
--- a/en_US.ISO8859-1/books/handbook/ports/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/ports/chapter.sgml
@@ -200,7 +200,7 @@
</itemizedlist>
<para>To keep track of updated ports, subscribe to the
- <email>freebsd-ports@FreeBSD.org</email> mailing list.</para>
+ &a.ports;.</para>
<para>The remainder of this chapter will explain how to use packages and
ports to install and manage third party software on FreeBSD.</para>