diff --git a/de_DE.ISO8859-1/share/xml/teams.ent b/de_DE.ISO8859-1/share/xml/teams.ent
index 5f87c2a09a..8d0b55fcb2 100644
--- a/de_DE.ISO8859-1/share/xml/teams.ent
+++ b/de_DE.ISO8859-1/share/xml/teams.ent
@@ -26,10 +26,6 @@
 
 <!ENTITY a.cvsadm "CVS Repository Meisters <email xmlns='http://docbook.org/ns/docbook'>cvsadm@FreeBSD.org</email>">
 
-<!ENTITY a.cvsup-master "CVSup Mirror Site Coordinator <email xmlns='http://docbook.org/ns/docbook'>cvsup-master@FreeBSD.org</email>">
-
-<!ENTITY a.dcvs "CVS doc Repository Meisters <email xmlns='http://docbook.org/ns/docbook'>dcvs@FreeBSD.org</email>">
-
 <!ENTITY a.doceng "Documentation Engineering Team <email xmlns='http://docbook.org/ns/docbook'>doceng@FreeBSD.org</email>">
 
 <!ENTITY a.donations "Donations Liaison Office <email xmlns='http://docbook.org/ns/docbook'>donations@FreeBSD.org</email>">
@@ -40,8 +36,6 @@
 
 <!ENTITY a.mirror-admin "FTP/WWW Mirror Site Coordinator <email xmlns='http://docbook.org/ns/docbook'>mirror-admin@FreeBSD.org</email>">
 
-<!ENTITY a.ncvs "CVS src Repository Meisters <email xmlns='http://docbook.org/ns/docbook'>ncvs@FreeBSD.org</email>">
-
 <!ENTITY a.perforce-admin "Perforce Repository Meisters <email xmlns='http://docbook.org/ns/docbook'>perforce-admin@FreeBSD.org</email>">
 
 <!ENTITY a.pcvs "CVS ports Repository Meisters <email xmlns='http://docbook.org/ns/docbook'>pcvs@FreeBSD.org</email>">
@@ -50,8 +44,6 @@
 
 <!ENTITY a.portmgr-secretary "Ports Management Team Secretary <email xmlns='http://docbook.org/ns/docbook'>portmgr-secretary@FreeBSD.org</email>">
 
-<!ENTITY a.projcvs "CVS Third-Party Projects Repository Meisters <email xmlns='http://docbook.org/ns/docbook'>projcvs@FreeBSD.org</email>">
-
 <!ENTITY a.re "Release Engineering Team <email xmlns='http://docbook.org/ns/docbook'>re@FreeBSD.org</email>">
 
 <!ENTITY a.security-officer "Security Officer Team <email xmlns='http://docbook.org/ns/docbook'>security-officer@FreeBSD.org</email>">
diff --git a/el_GR.ISO8859-7/share/xml/teams.ent b/el_GR.ISO8859-7/share/xml/teams.ent
index d234d8468b..cd2a90d6ac 100644
--- a/el_GR.ISO8859-7/share/xml/teams.ent
+++ b/el_GR.ISO8859-7/share/xml/teams.ent
@@ -32,10 +32,6 @@
 
 <!ENTITY a.cvsadm "������������ ��� CVS Repository <email xmlns='http://docbook.org/ns/docbook'>cvsadm@FreeBSD.org</email>">
 
-<!ENTITY a.cvsup-master "����������� ������������ CVSup <email xmlns='http://docbook.org/ns/docbook'>cvs@FreeBSD.org</email>">
-
-<!ENTITY a.dcvs "������������ ��� CVS doc Repository <email xmlns='http://docbook.org/ns/docbook'>dcvs@FreeBSD.org</email>">
-
 <!ENTITY a.doceng "����� �������������� ��� ����������� <email xmlns='http://docbook.org/ns/docbook'>doceng@FreeBSD.org</email>">
 
 <!ENTITY a.donations "����������� ������ <email xmlns='http://docbook.org/ns/docbook'>donations@FreeBSD.org</email>">
@@ -46,8 +42,6 @@
 
 <!ENTITY a.mirror-admin "����������� ������������ FTP/WWW <email xmlns='http://docbook.org/ns/docbook'>mirror-admin@FreeBSD.org</email>">
 
-<!ENTITY a.ncvs "������������ ��� CVS src Repository <email xmlns='http://docbook.org/ns/docbook'>ncvs@FreeBSD.org</email>">
-
 <!ENTITY a.perforce-admin "������������ ��� Perforce Repository <email xmlns='http://docbook.org/ns/docbook'>perforce-admin@FreeBSD.org</email>">
 
 <!ENTITY a.pcvs "������������ ��� CVS ports Repository <email xmlns='http://docbook.org/ns/docbook'>pcvs@FreeBSD.org</email>">
@@ -56,8 +50,6 @@
 
 <!ENTITY a.portmgr-secretary "���������� ������ ����������� ��� Ports <email xmlns='http://docbook.org/ns/docbook'>portmgr-secretary@FreeBSD.org</email>">
 
-<!ENTITY a.projcvs "������������ ��� CVS Third-Party Projects Repository <email xmlns='http://docbook.org/ns/docbook'>projcvs@FreeBSD.org</email>">
-
 <!ENTITY a.re "����� ��������� ��� �������� <email xmlns='http://docbook.org/ns/docbook'>re@FreeBSD.org</email>">
 
 <!ENTITY a.security-officer "����� ��������� <email xmlns='http://docbook.org/ns/docbook'>security-officer@FreeBSD.org</email>">
diff --git a/en_US.ISO8859-1/share/xml/teams.ent b/en_US.ISO8859-1/share/xml/teams.ent
index 85aa9b9c8f..1da57a6546 100644
--- a/en_US.ISO8859-1/share/xml/teams.ent
+++ b/en_US.ISO8859-1/share/xml/teams.ent
@@ -35,8 +35,6 @@
 
 <!ENTITY a.mirror-admin "FTP/WWW Mirror Site Coordinator <email xmlns='http://docbook.org/ns/docbook'>mirror-admin@FreeBSD.org</email>">
 
-<!ENTITY a.ncvs "CVS src Repository Meisters <email xmlns='http://docbook.org/ns/docbook'>ncvs@FreeBSD.org</email>">
-
 <!ENTITY a.pcvs "CVS ports Repository Meisters <email xmlns='http://docbook.org/ns/docbook'>pcvs@FreeBSD.org</email>">
 
 <!ENTITY a.portmgr "Ports Management Team <email xmlns='http://docbook.org/ns/docbook'>portmgr@FreeBSD.org</email>">
@@ -45,8 +43,6 @@
 
 <!ENTITY a.ports-secteam "Ports Security Team <email xmlns='http://docbook.org/ns/docbook'>ports-secteam@FreeBSD.org</email>">
 
-<!ENTITY a.projcvs "CVS Third-Party Projects Repository Meisters <email xmlns='http://docbook.org/ns/docbook'>projcvs@FreeBSD.org</email>">
-
 <!ENTITY a.re "Release Engineering Team <email xmlns='http://docbook.org/ns/docbook'>re@FreeBSD.org</email>">
 
 <!ENTITY a.secteam-secretary "Security Team Secretary <email xmlns='http://docbook.org/ns/docbook'>secteam-secretary@FreeBSD.org</email>">
diff --git a/es_ES.ISO8859-1/share/xml/teams.ent b/es_ES.ISO8859-1/share/xml/teams.ent
index 848b77f39c..6b016e7471 100644
--- a/es_ES.ISO8859-1/share/xml/teams.ent
+++ b/es_ES.ISO8859-1/share/xml/teams.ent
@@ -25,10 +25,6 @@
 
 <!ENTITY a.cvsadm "admins del repositorio CVS <email xmlns='http://docbook.org/ns/docbook'>cvsadm@FreeBSD.org</email>">
 
-<!ENTITY a.cvsup-master "Responsable de r�plicas de CVSup <email xmlns='http://docbook.org/ns/docbook'>cvsup-master@FreeBSD.org</email>">
-
-<!ENTITY a.dcvs "admins del repositorio CVS doc <email xmlns='http://docbook.org/ns/docbook'>dcvs@FreeBSD.org</email>">
-
 <!ENTITY a.doceng "Grupo de ingenier�a de documentaci�n <email xmlns='http://docbook.org/ns/docbook'>doceng@FreeBSD.org</email>">
 
 <!ENTITY a.donations "Responsable de donaciones <email xmlns='http://docbook.org/ns/docbook'>donations@FreeBSD.org</email>">
@@ -39,16 +35,12 @@
 
 <!ENTITY a.mirror-admin "Respansable de r�plicas de FTP/WWW <email xmlns='http://docbook.org/ns/docbook'>mirror-admin@FreeBSD.org</email>">
 
-<!ENTITY a.ncvs "admin del repositorio CVS src <email xmlns='http://docbook.org/ns/docbook'>ncvs@FreeBSD.org</email>">
-
 <!ENTITY a.perforce-admin "admins del repositorio Perforce<email xmlns='http://docbook.org/ns/docbook'>perforce-admin@FreeBSD.org</email>">
 
 <!ENTITY a.portmgr "Grupo de administraci�n de ports <email xmlns='http://docbook.org/ns/docbook'>portmgr@FreeBSD.org</email>">
 
 <!ENTITY a.portmgr-secretary "Secretario del grupo de administraci�n de ports <email xmlns='http://docbook.org/ns/docbook'>portmgr-secretary@FreeBSD.org</email>">
 
-<!ENTITY a.projcvs "admins del repositorio CVS Third-party Projectos <email xmlns='http://docbook.org/ns/docbook'>projcvs@FreeBSD.org</email>">
-
 <!ENTITY a.re "Grupo de ingenier�a de releases  <email xmlns='http://docbook.org/ns/docbook'>re@FreeBSD.org</email>">
 
 <!ENTITY a.security-officer "Grupo responsables de seguridad <email xmlns='http://docbook.org/ns/docbook'>security-officer@FreeBSD.org</email>">
diff --git a/fr_FR.ISO8859-1/share/xml/teams.ent b/fr_FR.ISO8859-1/share/xml/teams.ent
index ba4a444528..19d870f4ca 100644
--- a/fr_FR.ISO8859-1/share/xml/teams.ent
+++ b/fr_FR.ISO8859-1/share/xml/teams.ent
@@ -26,10 +26,6 @@
 
 <!ENTITY a.cvsadm "Les maitres du d�pot CVS <email xmlns='http://docbook.org/ns/docbook'>cvsadm@FreeBSD.org</email>">
 
-<!ENTITY a.cvsup-master "Le coordinateur des sites mirroirs CVSup <email xmlns='http://docbook.org/ns/docbook'>cvsup-master@FreeBSD.org</email>">
-
-<!ENTITY a.dcvs "Les maitres du d�pot CVS doc <email xmlns='http://docbook.org/ns/docbook'>dcvs@FreeBSD.org</email>">
-
 <!ENTITY a.doceng "L'�quipe d'ing�ni�rie de la documentation <email xmlns='http://docbook.org/ns/docbook'>doceng@FreeBSD.org</email>">
 
 <!ENTITY a.donations "Le bureau de liaison des donations <email xmlns='http://docbook.org/ns/docbook'>donations@FreeBSD.org</email>">
@@ -40,8 +36,6 @@
 
 <!ENTITY a.mirror-admin "Le coordinateur des sites mirroirs FTP/WWW <email xmlns='http://docbook.org/ns/docbook'>mirror-admin@FreeBSD.org</email>">
 
-<!ENTITY a.ncvs "Les maitres du d�pot CVS src <email xmlns='http://docbook.org/ns/docbook'>ncvs@FreeBSD.org</email>">
-
 <!ENTITY a.perforce-admin "Les maitres du d�pot Perforce <email xmlns='http://docbook.org/ns/docbook'>perforce-admin@FreeBSD.org</email>">
 
 <!ENTITY a.pcvs "Les maitres du d�pot CVS ports <email xmlns='http://docbook.org/ns/docbook'>pcvs@FreeBSD.org</email>">
@@ -50,8 +44,6 @@
 
 <!ENTITY a.portmgr-secretary "Le secr�taire de l'�quipe de gestion des logiciels port�s <email xmlns='http://docbook.org/ns/docbook'>portmgr-secretary@FreeBSD.org</email>">
 
-<!ENTITY a.projcvs "Les maitres du d�pot CVS pour les projets tiers <email xmlns='http://docbook.org/ns/docbook'>projcvs@FreeBSD.org</email>">
-
 <!ENTITY a.re "L'�quipe d'ing�ni�rie des versions  <email xmlns='http://docbook.org/ns/docbook'>re@FreeBSD.org</email>">
 
 <!ENTITY a.security-officer "L'officier de s�curit� <email xmlns='http://docbook.org/ns/docbook'>security-officer@FreeBSD.org</email>">
diff --git a/hu_HU.ISO8859-2/share/xml/teams.ent b/hu_HU.ISO8859-2/share/xml/teams.ent
index 11b9685f5f..3c41bc6a3c 100644
--- a/hu_HU.ISO8859-2/share/xml/teams.ent
+++ b/hu_HU.ISO8859-2/share/xml/teams.ent
@@ -24,10 +24,6 @@
 
 <!ENTITY a.cvsadm "CVS Repository Menedzserek <email xmlns='http://docbook.org/ns/docbook'>cvsadm@FreeBSD.org</email>">
 
-<!ENTITY a.cvsup-master "CVSup T�k�rszerver Koordin�torok <email xmlns='http://docbook.org/ns/docbook'>cvsup-master@FreeBSD.org</email>">
-
-<!ENTITY a.dcvs "CVS doc Repository Menedzserek <email xmlns='http://docbook.org/ns/docbook'>dcvs@FreeBSD.org</email>">
-
 <!ENTITY a.doceng "Documentation Engineering Team <email xmlns='http://docbook.org/ns/docbook'>doceng@FreeBSD.org</email>">
 
 <!ENTITY a.donations "Donations Liaison Office <email xmlns='http://docbook.org/ns/docbook'>donations@FreeBSD.org</email>">
@@ -38,8 +34,6 @@
 
 <!ENTITY a.mirror-admin "FTP/WWW T�k�rszerverk Koordin�tor <email xmlns='http://docbook.org/ns/docbook'>mirror-admin@FreeBSD.org</email>">
 
-<!ENTITY a.ncvs "CVS src Repository Menedzserek <email xmlns='http://docbook.org/ns/docbook'>ncvs@FreeBSD.org</email>">
-
 <!ENTITY a.perforce-admin "Perforce Repository Menedzserek <email xmlns='http://docbook.org/ns/docbook'>perforce-admin@FreeBSD.org</email>">
 
 <!ENTITY a.pcvs "CVS ports Repository Menedzserek <email xmlns='http://docbook.org/ns/docbook'>pcvs@FreeBSD.org</email>">
@@ -48,8 +42,6 @@
 
 <!ENTITY a.portmgr-secretary "Ports Management Team Titk�r <email xmlns='http://docbook.org/ns/docbook'>portmgr-secretary@FreeBSD.org</email>">
 
-<!ENTITY a.projcvs "CVS Third-party Projects Repository Meenedzserek <email xmlns='http://docbook.org/ns/docbook'>projcvs@FreeBSD.org</email>">
-
 <!ENTITY a.re "Release Engineering Team <email xmlns='http://docbook.org/ns/docbook'>re@FreeBSD.org</email>">
 
 <!ENTITY a.security-officer "Security Officer Team <email xmlns='http://docbook.org/ns/docbook'>security-officer@FreeBSD.org</email>">
diff --git a/ja_JP.eucJP/share/xml/teams.ent b/ja_JP.eucJP/share/xml/teams.ent
index afabc3eabe..9a7f4b42c9 100644
--- a/ja_JP.eucJP/share/xml/teams.ent
+++ b/ja_JP.eucJP/share/xml/teams.ent
@@ -37,8 +37,6 @@
 
 <!ENTITY a.mirror-admin "FTP/WWW �ߥ顼�����ȥ����ǥ��͡��� <email xmlns='http://docbook.org/ns/docbook'>mirror-admin@FreeBSD.org</email>">
 
-<!ENTITY a.ncvs "CVS src ��ݥ��ȥ������ <email xmlns='http://docbook.org/ns/docbook'>ncvs@FreeBSD.org</email>">
-
 <!ENTITY a.pcvs "CVS ports ��ݥ��ȥ������ <email xmlns='http://docbook.org/ns/docbook'>pcvs@FreeBSD.org</email>">
 
 <!ENTITY a.portmgr "ports ���������� <email xmlns='http://docbook.org/ns/docbook'>portmgr@FreeBSD.org</email>">
@@ -47,8 +45,6 @@
 
 <!ENTITY a.ports-secteam "ports �������ƥ������� <email xmlns='http://docbook.org/ns/docbook'>ports-secteam@FreeBSD.org</email>">
 
-<!ENTITY a.projcvs "CVS �����ɥѡ��ƥ��ץ��������ȥ�ݥ��ȥ������ <email xmlns='http://docbook.org/ns/docbook'>projcvs@FreeBSD.org</email>">
-
 <!ENTITY a.re "��꡼�����󥸥˥���󥰥����� <email xmlns='http://docbook.org/ns/docbook'>re@FreeBSD.org</email>">
 
 <!ENTITY a.secteam-secretary "�������ƥ�������� <email xmlns='http://docbook.org/ns/docbook'>secteam-secretary@FreeBSD.org</email>">
diff --git a/mn_MN.UTF-8/share/xml/teams.ent b/mn_MN.UTF-8/share/xml/teams.ent
index dc24688e6a..86d31cac06 100644
--- a/mn_MN.UTF-8/share/xml/teams.ent
+++ b/mn_MN.UTF-8/share/xml/teams.ent
@@ -27,10 +27,6 @@
 
 <!ENTITY a.cvsadm "CVS архивын Администраторууд <email xmlns='http://docbook.org/ns/docbook'>cvsadm@FreeBSD.org</email>">
 
-<!ENTITY a.cvsup-master "CVSup Толин Тусгал сайтын Зохицуулагч <email xmlns='http://docbook.org/ns/docbook'>cvsup-master@FreeBSD.org</email>">
-
-<!ENTITY a.dcvs "Баримтын CVS архивын Администраторууд <email xmlns='http://docbook.org/ns/docbook'>dcvs@FreeBSD.org</email>">
-
 <!ENTITY a.doceng "Баримтжуулалт Инженерчлэлийн Баг <email xmlns='http://docbook.org/ns/docbook'>doceng@FreeBSD.org</email>">
 
 <!ENTITY a.donations "Хандив хүлээн авах оффис <email xmlns='http://docbook.org/ns/docbook'>donations@FreeBSD.org</email>">
@@ -41,8 +37,6 @@
 
 <!ENTITY a.mirror-admin "FTP/WWW Толин Тусгал сайтын Зохицуулагч <email xmlns='http://docbook.org/ns/docbook'>mirror-admin@FreeBSD.org</email>">
 
-<!ENTITY a.ncvs "Эх кодын CVS архивын Администраторууд <email xmlns='http://docbook.org/ns/docbook'>ncvs@FreeBSD.org</email>">
-
 <!ENTITY a.perforce-admin "Perforce архивын Администраторууд <email xmlns='http://docbook.org/ns/docbook'>perforce-admin@FreeBSD.org</email>">
 
 <!ENTITY a.pcvs "Портын CVS архивын Администраторууд <email xmlns='http://docbook.org/ns/docbook'>pcvs@FreeBSD.org</email>">
@@ -51,8 +45,6 @@
 
 <!ENTITY a.portmgr-secretary "Портын Удирдлагын Багийн Нарийн бичиг <email xmlns='http://docbook.org/ns/docbook'>portmgr-secretary@FreeBSD.org</email>">
 
-<!ENTITY a.projcvs "Гуравдагчдын Төслүүдийн CVS архивын Администраторууд <email xmlns='http://docbook.org/ns/docbook'>projcvs@FreeBSD.org</email>">
-
 <!ENTITY a.re "Хувилбар Инженерчлэлийн Баг <email xmlns='http://docbook.org/ns/docbook'>re@FreeBSD.org</email>">
 
 <!ENTITY a.secteam-secretary "Security Team Secretary <email xmlns='http://docbook.org/ns/docbook'>secteam-secretary@FreeBSD.org</email>">
diff --git a/nl_NL.ISO8859-1/share/xml/teams.ent b/nl_NL.ISO8859-1/share/xml/teams.ent
index 177de0c28e..17a90e78a9 100644
--- a/nl_NL.ISO8859-1/share/xml/teams.ent
+++ b/nl_NL.ISO8859-1/share/xml/teams.ent
@@ -24,8 +24,6 @@
 
 <!ENTITY a.cvsadm "CVS reservoir Meisters <email xmlns='http://docbook.org/ns/docbook'>cvsadm@FreeBSD.org</email>">
 
-<!ENTITY a.cvsup-master "Co�rdinator van de CVSup spiegelsites <email xmlns='http://docbook.org/ns/docbook'>cvsup-master@FreeBSD.org</email>">
-
 <!ENTITY a.doceng "Documentatie Engineering Team <email xmlns='http://docbook.org/ns/docbook'>doceng@FreeBSD.org</email>">
 
 <!ENTITY a.donations "Liaisonkantoor voor donaties <email xmlns='http://docbook.org/ns/docbook'>donations@FreeBSD.org</email>">
@@ -36,8 +34,6 @@
 
 <!ENTITY a.mirror-admin "Co�rdinator van de FTP/WWW spiegelsites <email xmlns='http://docbook.org/ns/docbook'>mirror-admin@FreeBSD.org</email>">
 
-<!ENTITY a.ncvs "CVS src reservoir Meisters <email xmlns='http://docbook.org/ns/docbook'>ncvs@FreeBSD.org</email>">
-
 <!ENTITY a.perforce-admin "Perforce reservoir Meisters <email xmlns='http://docbook.org/ns/docbook'>perforce-admin@FreeBSD.org</email>">
 
 <!ENTITY a.pcvs "CVS ports reservoir Meisters <email xmlns='http://docbook.org/ns/docbook'>pcvs@FreeBSD.org</email>">
@@ -46,8 +42,6 @@
 
 <!ENTITY a.portmgr-secretary "Secretaris van het Ports Beheerteam <email xmlns='http://docbook.org/ns/docbook'>portmgr-secretary@FreeBSD.org</email>">
 
-<!ENTITY a.projcvs "CVS reservoir Meisters voor projecten van derde partijen <email xmlns='http://docbook.org/ns/docbook'>projcvs@FreeBSD.org</email>">
-
 <!ENTITY a.re "Uitgave Engineeringteam <email xmlns='http://docbook.org/ns/docbook'>re@FreeBSD.org</email>">
 
 <!ENTITY a.secteam-secretary "Beveiligingsteamsecretaris <email xmlns='http://docbook.org/ns/docbook'>secteam-secretary@FreeBSD.org</email>">
diff --git a/pl_PL.ISO8859-2/share/xml/teams.ent b/pl_PL.ISO8859-2/share/xml/teams.ent
index 8d401c7a56..be3d2712cf 100644
--- a/pl_PL.ISO8859-2/share/xml/teams.ent
+++ b/pl_PL.ISO8859-2/share/xml/teams.ent
@@ -43,22 +43,6 @@
 <!ENTITY a.pl.cvsadm.n "Mistrzami repozytorium CVS <email xmlns='http://docbook.org/ns/docbook'>cvsadm@FreeBSD.org</email>">
 <!ENTITY a.pl.cvsadm.ms "Mistrzach repozytorium CVS <email xmlns='http://docbook.org/ns/docbook'>cvsadm@FreeBSD.org</email>">
 
-<!ENTITY a.cvsup-master "Koordynator serwer�w lustrzanych CVSup <email xmlns='http://docbook.org/ns/docbook'>cvsup-master@FreeBSD.org</email>">
-<!ENTITY a.pl.cvsup-master.m "Koordynator serwer�w lustrzanych CVSup <email xmlns='http://docbook.org/ns/docbook'>cvsup-master@FreeBSD.org</email>">
-<!ENTITY a.pl.cvsup-master.d "Koordynatora serwer�w lustrzanych CVSup <email xmlns='http://docbook.org/ns/docbook'>cvsup-master@FreeBSD.org</email>">
-<!ENTITY a.pl.cvsup-master.c "Koordynatorowi serwer�w lustrzanych CVSup <email xmlns='http://docbook.org/ns/docbook'>cvsup-master@FreeBSD.org</email>">
-<!ENTITY a.pl.cvsup-master.b "Koordynatora serwer�w lustrzanych CVSup <email xmlns='http://docbook.org/ns/docbook'>cvsup-master@FreeBSD.org</email>">
-<!ENTITY a.pl.cvsup-master.n "Koordynatorem serwer�w lustrzanych CVSup <email xmlns='http://docbook.org/ns/docbook'>cvsup-master@FreeBSD.org</email>">
-<!ENTITY a.pl.cvsup-master.ms "Koordynatorze serwer�w lustrzanych CVSup <email xmlns='http://docbook.org/ns/docbook'>cvsup-master@FreeBSD.org</email>">
-
-<!ENTITY a.dcvs "Mistrzowie repozytorium CVS dokumentacji <email xmlns='http://docbook.org/ns/docbook'>dcvs@FreeBSD.org</email>">
-<!ENTITY a.pl.dcvs.m "Mistrzowie repozytorium CVS dokumentacji <email xmlns='http://docbook.org/ns/docbook'>dcvs@FreeBSD.org</email>">
-<!ENTITY a.pl.dcvs.d "Mistrz�w repozytorium CVS dokumentacji <email xmlns='http://docbook.org/ns/docbook'>dcvs@FreeBSD.org</email>">
-<!ENTITY a.pl.dcvs.c "Mistrzom repozytorium CVS dokumentacji <email xmlns='http://docbook.org/ns/docbook'>dcvs@FreeBSD.org</email>">
-<!ENTITY a.pl.dcvs.b "Mistrz�w repozytorium CVS dokumentacji <email xmlns='http://docbook.org/ns/docbook'>dcvs@FreeBSD.org</email>">
-<!ENTITY a.pl.dcvs.n "Mistrzami repozytorium CVS dokumentacji <email xmlns='http://docbook.org/ns/docbook'>dcvs@FreeBSD.org</email>">
-<!ENTITY a.pl.dcvs.ms "Mistrzach repozytorium CVS dokumentacji <email xmlns='http://docbook.org/ns/docbook'>dcvs@FreeBSD.org</email>">
-
 <!ENTITY a.doceng "Zesp� dokumentacji <email xmlns='http://docbook.org/ns/docbook'>doceng@FreeBSD.org</email>">
 <!ENTITY a.pl.doceng.m "Zesp� dokumentacji <email xmlns='http://docbook.org/ns/docbook'>doceng@FreeBSD.org</email>">
 <!ENTITY a.pl.doceng.d "Zespo�u dokumentacji <email xmlns='http://docbook.org/ns/docbook'>doceng@FreeBSD.org</email>">
@@ -99,14 +83,6 @@
 <!ENTITY a.pl.mirror-admin.n "Koordynatorem serwer�w lustrzanych FTP/WWW <email xmlns='http://docbook.org/ns/docbook'>mirror-admin@FreeBSD.org</email>">
 <!ENTITY a.pl.mirror-admin.ms "Koordynatorze serwer�w lustrzanych FTP/WWW <email xmlns='http://docbook.org/ns/docbook'>mirror-admin@FreeBSD.org</email>">
 
-<!ENTITY a.ncvs "Mistrzowie repozytorium CVS �r�de� <email xmlns='http://docbook.org/ns/docbook'>ncvs@FreeBSD.org</email>">
-<!ENTITY a.pl.ncvs.m "Mistrzowie repozytorium CVS �r�de� <email xmlns='http://docbook.org/ns/docbook'>ncvs@FreeBSD.org</email>">
-<!ENTITY a.pl.ncvs.d "Mistrz�w repozytorium CVS �r�de� <email xmlns='http://docbook.org/ns/docbook'>ncvs@FreeBSD.org</email>">
-<!ENTITY a.pl.ncvs.c "Mistrzom repozytorium CVS �r�de� <email xmlns='http://docbook.org/ns/docbook'>ncvs@FreeBSD.org</email>">
-<!ENTITY a.pl.ncvs.b "Mistrz�w repozytorium CVS �r�de� <email xmlns='http://docbook.org/ns/docbook'>ncvs@FreeBSD.org</email>">
-<!ENTITY a.pl.ncvs.n "Mistrzami repozytorium CVS �r�de� <email xmlns='http://docbook.org/ns/docbook'>ncvs@FreeBSD.org</email>">
-<!ENTITY a.pl.ncvs.ms "Mistrzach repozytorium CVS �r�de� <email xmlns='http://docbook.org/ns/docbook'>ncvs@FreeBSD.org</email>">
-
 <!ENTITY a.perforce-admin "Perforce Repository Meisters <email xmlns='http://docbook.org/ns/docbook'>perforce-admin@FreeBSD.org</email>">
 
 <!ENTITY a.pcvs "Mistrzowie repozytorium CVS port�w <email xmlns='http://docbook.org/ns/docbook'>pcvs@FreeBSD.org</email>">
@@ -133,8 +109,6 @@
 <!ENTITY a.pl.portmgr-secretary.n "Sekretariatem zespo�u zarz�dzaj�cego portami <email xmlns='http://docbook.org/ns/docbook'>portmgr-secretary@FreeBSD.org</email>">
 <!ENTITY a.pl.portmgr-secretary.ms "Sekretariacie zespo�u zarz�dzaj�cego portami <email xmlns='http://docbook.org/ns/docbook'>portmgr-secretary@FreeBSD.org</email>">
 
-<!ENTITY a.projcvs "CVS Third-Party Projects Repository Meisters <email xmlns='http://docbook.org/ns/docbook'>projcvs@FreeBSD.org</email>">
-
 <!ENTITY a.re "Zesp� techniczny publikacji <email xmlns='http://docbook.org/ns/docbook'>re@FreeBSD.org</email>">
 <!ENTITY a.pl.re.m "Zesp� techniczny publikacji <email xmlns='http://docbook.org/ns/docbook'>re@FreeBSD.org</email>">
 <!ENTITY a.pl.re.d "Zespo�u technicznego publikacji <email xmlns='http://docbook.org/ns/docbook'>re@FreeBSD.org</email>">
diff --git a/pt_BR.ISO8859-1/share/xml/teams.ent b/pt_BR.ISO8859-1/share/xml/teams.ent
index 2054fd70ff..2029b44cea 100644
--- a/pt_BR.ISO8859-1/share/xml/teams.ent
+++ b/pt_BR.ISO8859-1/share/xml/teams.ent
@@ -51,9 +51,6 @@ IMPORTANT:  If you delete names from this file you *must* ensure that
 <!ENTITY a.mirror-admin "Coordenador de sites espelho FTP/WWW
   <email xmlns='http://docbook.org/ns/docbook'>mirror-admin@FreeBSD.org</email>">
 
-<!ENTITY a.ncvs "Respons�veis pelo Reposit�rio CVS src
-  <email xmlns='http://docbook.org/ns/docbook'>ncvs@FreeBSD.org</email>">
-
 <!ENTITY a.pcvs "Respons�veis pelo Reposit�rio CVS
   <literal>ports</literal> <email xmlns='http://docbook.org/ns/docbook'>pcvs@FreeBSD.org</email>">
 
@@ -66,9 +63,6 @@ IMPORTANT:  If you delete names from this file you *must* ensure that
 <!ENTITY a.ports-secteam "Equipe de Seguran�a do Ports
   <email xmlns='http://docbook.org/ns/docbook'>ports-secteam@FreeBSD.org</email>">
 
-<!ENTITY a.projcvs "Respons�veis pelo Reposit�rio CVS de projetos de
-  terceiros <email xmlns='http://docbook.org/ns/docbook'>projcvs@FreeBSD.org</email>">
-
 <!ENTITY a.re "Time de engenharia de Lan�amento
   <email xmlns='http://docbook.org/ns/docbook'>re@FreeBSD.org</email>">
 
diff --git a/ru_RU.KOI8-R/share/xml/teams.ent b/ru_RU.KOI8-R/share/xml/teams.ent
index ab7cca8fc3..ed286ff047 100644
--- a/ru_RU.KOI8-R/share/xml/teams.ent
+++ b/ru_RU.KOI8-R/share/xml/teams.ent
@@ -28,10 +28,6 @@
 
 <!ENTITY a.cvsadm "�������������� �������� CVS ����������� <email xmlns='http://docbook.org/ns/docbook'>cvsadm@FreeBSD.org</email>">
 
-<!ENTITY a.cvsup-master "����������� ���� �������� CVSup <email xmlns='http://docbook.org/ns/docbook'>cvsup-master@FreeBSD.org</email>">
-
-<!ENTITY a.dcvs "�������������� ����������� ������������ <email xmlns='http://docbook.org/ns/docbook'>dcvs@FreeBSD.org</email>">
-
 <!ENTITY a.doceng "������ ���������� ������ ������������ FreeBSD <email xmlns='http://docbook.org/ns/docbook'>doceng@FreeBSD.org</email>">
 
 <!ENTITY a.donations "����������� ������������� ��� ������� FreeBSD <email xmlns='http://docbook.org/ns/docbook'>donations@FreeBSD.org</email>">
@@ -42,8 +38,6 @@
 
 <!ENTITY a.mirror-admin "����������� ���� ������ FTP/WWW <email xmlns='http://docbook.org/ns/docbook'>mirror-admin@FreeBSD.org</email>">
 
-<!ENTITY a.ncvs "�������������� ����������� �������� ������� <email xmlns='http://docbook.org/ns/docbook'>ncvs@FreeBSD.org</email>">
-
 <!ENTITY a.perforce-admin "�������������� ����������� Perforce <email xmlns='http://docbook.org/ns/docbook'>perforce-admin@FreeBSD.org</email>">
 
 <!ENTITY a.pcvs "�������������� ����������� ������<email xmlns='http://docbook.org/ns/docbook'>pcvs@FreeBSD.org</email>">
@@ -52,8 +46,6 @@
 
 <!ENTITY a.portmgr-secretary "��������� ������ ���������� ������ ������ <email xmlns='http://docbook.org/ns/docbook'>portmgr-secretary@FreeBSD.org</email>">
 
-<!ENTITY a.projcvs "�������������� ����������� ������ �������� <email xmlns='http://docbook.org/ns/docbook'>projcvs@FreeBSD.org</email>">
-
 <!ENTITY a.re "������ ������� ������� FreeBSD <email xmlns='http://docbook.org/ns/docbook'>re@FreeBSD.org</email>">
 
 <!ENTITY a.secteam-secretary "Security Team Secretary <email xmlns='http://docbook.org/ns/docbook'>secteam-secretary@FreeBSD.org</email>">
diff --git a/zh_CN.UTF-8/share/xml/teams.ent b/zh_CN.UTF-8/share/xml/teams.ent
index ed54729e99..a372a45761 100644
--- a/zh_CN.UTF-8/share/xml/teams.ent
+++ b/zh_CN.UTF-8/share/xml/teams.ent
@@ -25,10 +25,6 @@
 
 <!ENTITY a.cvsadm "CVS 代码库管理员 <email xmlns='http://docbook.org/ns/docbook'>cvsadm@FreeBSD.org</email>">
 
-<!ENTITY a.cvsup-master "CVSup 镜像站点召集人 <email xmlns='http://docbook.org/ns/docbook'>cvsup-master@FreeBSD.org</email>">
-
-<!ENTITY a.dcvs "CVS doc 代码库管理员 <email xmlns='http://docbook.org/ns/docbook'>dcvs@FreeBSD.org</email>">
-
 <!ENTITY a.doceng "文档工程组 <email xmlns='http://docbook.org/ns/docbook'>doceng@FreeBSD.org</email>">
 
 <!ENTITY a.donations "捐赠联络官 <email xmlns='http://docbook.org/ns/docbook'>donations@FreeBSD.org</email>">
@@ -39,8 +35,6 @@
 
 <!ENTITY a.mirror-admin "FTP/WWW 镜像站点召集人 <email xmlns='http://docbook.org/ns/docbook'>mirror-admin@FreeBSD.org</email>">
 
-<!ENTITY a.ncvs "CVS src 代码库管理员 <email xmlns='http://docbook.org/ns/docbook'>ncvs@FreeBSD.org</email>">
-
 <!ENTITY a.perforce-admin "Perforce 代码库管理员 <email xmlns='http://docbook.org/ns/docbook'>perforce-admin@FreeBSD.org</email>">
 
 <!ENTITY a.pcvs "CVS ports 代码库管理员 <email xmlns='http://docbook.org/ns/docbook'>pcvs@FreeBSD.org</email>">
@@ -49,8 +43,6 @@
 
 <!ENTITY a.portmgr-secretary "Ports 管理团队秘书 <email xmlns='http://docbook.org/ns/docbook'>portmgr-secretary@FreeBSD.org</email>">
 
-<!ENTITY a.projcvs "CVS 第三方项目代码库管理员 <email xmlns='http://docbook.org/ns/docbook'>projcvs@FreeBSD.org</email>">
-
 <!ENTITY a.re "Release Engineering 团队 <email xmlns='http://docbook.org/ns/docbook'>re@FreeBSD.org</email>">
 
 <!ENTITY a.secteam-secretary "Security Team Secretary <email xmlns='http://docbook.org/ns/docbook'>secteam-secretary@FreeBSD.org</email>">