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
@@ -1,59 +1,51 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      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$
      $FreeBSDde: de-docproj/share/xml/teams.ent,v 1.14 2011/07/25 15:54:58 bcr Exp $
      basiert auf: 1.19
 -->
 
 <!ENTITY a.admins "FreeBSD Administrators <email xmlns='http://docbook.org/ns/docbook'>admins@FreeBSD.org</email>">
 
 <!ENTITY a.bugmeister "Problem Report Database administrators <email xmlns='http://docbook.org/ns/docbook'>bugmeister@FreeBSD.org</email>">
 
 <!ENTITY a.core-secretary "Core Team Secretary <email xmlns='http://docbook.org/ns/docbook'>core-secretary@FreeBSD.org </email>">
 
 <!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>">
 
 <!ENTITY a.faq "FAQ Maintainer <email xmlns='http://docbook.org/ns/docbook'>faq@FreeBSD.org</email>">
 
 <!ENTITY a.ftp-master "FTP Mirror Site Coordinator <email xmlns='http://docbook.org/ns/docbook'>ftp-master@FreeBSD.org</email>">
 
 <!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>">
 
 <!ENTITY a.portmgr "Ports Management Team <email xmlns='http://docbook.org/ns/docbook'>portmgr@FreeBSD.org</email>">
 
 <!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>">
 
 <!ENTITY a.www "FreeBSD Webmasters <email xmlns='http://docbook.org/ns/docbook'>www@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
@@ -1,65 +1,57 @@
 <?xml version="1.0" encoding="iso-8859-7"?>
 <!--
 
   Ôá ïíüìáôá êáé ïé äéåõèýóåéò ôùí ïìÜäùí ðïõ Ý÷ïõí óõãêåêñéìÝíç
   åñãáóßá.  ÓõíÞèùò åßíáé áðëþò aliases óôï hub.FreeBSD.org
 
   Íá ÷ñçóéìïðïéåßôå áõôÝò ôéò entities üôáí áíáöÝñåóôå óå êÜðïéá
   óõãêåêñéìÝíç ïìÜäá.
 
   Ðáñáêáëþ êñáôÞóôå áõôÞ ôç ëßóôá óôçí ßäéá óåéñÜ ðïõ Ý÷ïõí ïé email
   äéåõèýíóåéò óôï Áããëéêü ðñùôüôõðï.  ¸ôóé ìåéþíïíôáé ôá conflicts üôáí
   êÜíåôå merge ôéò áëëáãÝò áðü ÁããëéêÜ -> ÅëëçíéêÜ.
 
   ÓÇÌÁÍÔÉÊÏ:	Áí óâÞóåôå êÜðïéá áðü áõôÝò ôéò ïíôüôçôåò èá ðñÝðåé íá
 		áöáéñÝóåôå êáé ïðïéåóäÞðïôå ÷ñÞóåéò ôùí entities
 		õðÜñ÷ïõí óôá êåßìåíá.  Áí äåí ôï êÜíåôå, èá Ý÷åé
 		*ðñüâëçìá* ç äçìéïõñãßá ôùí óôáôéêþí web óåëßäùí óôï
 		www.FreeBSD.org.
 
   $FreeBSD$
 
   %SOURCE%	en_US.ISO8859-1/share/xml/teams.ent
   %SRCID%	1.18
 
 -->
 
 <!ENTITY a.admins "Äéá÷åéñéóôÝò ÓõóôçìÜôùí ôïõ FreeBSD <email xmlns='http://docbook.org/ns/docbook'>admins@FreeBSD.org</email>">
 
 <!ENTITY a.bugmeister "Äéá÷åéñéóôÝò ôçò ÂÜóçò Áíáöïñþí ÐñïâëçìÜôùí <email xmlns='http://docbook.org/ns/docbook'>bugmeister@FreeBSD.org</email>">
 
 <!ENTITY a.core-secretary "ÃñáììáôÝáò ôçò ÏìÜäáò Core <email xmlns='http://docbook.org/ns/docbook'>core-secretary@FreeBSD.org</email>">
 
 <!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>">
 
 <!ENTITY a.faq "ÓõíôçñçôÞò FAQ <email xmlns='http://docbook.org/ns/docbook'>faq@FreeBSD.org</email>">
 
 <!ENTITY a.ftp-master "ÓõíôïíéóôÞò Åîõðçñåôçôþí FTP <email xmlns='http://docbook.org/ns/docbook'>ftp-master@FreeBSD.org</email>">
 
 <!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>">
 
 <!ENTITY a.portmgr "ÏìÜäá Äéá÷åßñéóçò ôùí Ports <email xmlns='http://docbook.org/ns/docbook'>portmgr@FreeBSD.org</email>">
 
 <!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>">
 
 <!ENTITY a.secteam-secretary "Security Team Secretary <email xmlns='http://docbook.org/ns/docbook'>secteam-secretary@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
@@ -1,54 +1,50 @@
 <!--
      Names and email address of teams of people working on specified
      tasks. Usually 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.admins "FreeBSD Administrators <email xmlns='http://docbook.org/ns/docbook'>admins@FreeBSD.org</email>">
 
 <!ENTITY a.bugmeister "Problem Report Database administrators <email xmlns='http://docbook.org/ns/docbook'>bugmeister@FreeBSD.org</email>">
 
 <!ENTITY a.core "Core Team <email xmlns='http://docbook.org/ns/docbook'>core@FreeBSD.org</email>">
 
 <!ENTITY a.core-secretary "Core Team Secretary <email xmlns='http://docbook.org/ns/docbook'>core-secretary@FreeBSD.org</email>">
 
 <!ENTITY a.cvsadm "CVS Repository Meisters <email xmlns='http://docbook.org/ns/docbook'>cvsadm@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>">
 
 <!ENTITY a.faq "FAQ Maintainer <email xmlns='http://docbook.org/ns/docbook'>faq@FreeBSD.org</email>">
 
 <!ENTITY a.ftp-master "FTP Mirror Site Coordinator <email xmlns='http://docbook.org/ns/docbook'>ftp-master@FreeBSD.org</email>">
 
 <!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>">
 
 <!ENTITY a.portmgr-secretary "Ports Management Team Secretary <email xmlns='http://docbook.org/ns/docbook'>portmgr-secretary@FreeBSD.org</email>">
 
 <!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>">
 
 <!ENTITY a.security-officer "Security Officer Team <email xmlns='http://docbook.org/ns/docbook'>security-officer@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
@@ -1,54 +1,46 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      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$
 -->
 
 <!-- The FreeBSD Spanish Documentation Project
      Original Revision: r1.18			-->
 
 <!ENTITY a.admins "Administradores de FreeBSD <email xmlns='http://docbook.org/ns/docbook'>admins@FreeBSD.org</email>">
 
 <!ENTITY a.core-secretary "Secretario del Core Team <email xmlns='http://docbook.org/ns/docbook'>core-secretary@FreeBSD.org</email>">
 
 <!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>">
 
 <!ENTITY a.faq "mantenimiento de las FAQ <email xmlns='http://docbook.org/ns/docbook'>faq@FreeBSD.org</email>">
 
 <!ENTITY a.ftp-master "Responsable de réplicas de FTP <email xmlns='http://docbook.org/ns/docbook'>ftp-master@FreeBSD.org</email>">
 
 <!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
@@ -1,59 +1,51 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
 
      Original revision: 1.17
 
      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.admins "Les administrateurs <email xmlns='http://docbook.org/ns/docbook'>admins@FreeBSD.org</email>">
 
 <!ENTITY a.core-secretary "Le secrétaire de l'équipe de base <email xmlns='http://docbook.org/ns/docbook'>core-secretary@FreeBSD.org</email>">
 
 <!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>">
 
 <!ENTITY a.faq "Le mainteneur de la FAQ <email xmlns='http://docbook.org/ns/docbook'>faq@FreeBSD.org</email>">
 
 <!ENTITY a.ftp-master "Le coordinateur des sites mirroirs FTP <email xmlns='http://docbook.org/ns/docbook'>ftp-master@FreeBSD.org</email>">
 
 <!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>">
 
 <!ENTITY a.portmgr "L'équipe de gestion des logiciels portés <email xmlns='http://docbook.org/ns/docbook'>portmgr@FreeBSD.org</email>">
 
 <!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>">
 
 <!ENTITY a.secteam-secretary "Security Team Secretary <email xmlns='http://docbook.org/ns/docbook'>secteam-secretary@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
@@ -1,57 +1,49 @@
 <?xml version="1.0" encoding="iso-8859-2"?>
 <!--
      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.
 
      $FreeBSD$
 -->
 
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: Gabor Kovesdan <gabor@FreeBSD.org>
      %SOURCE%	en_US.ISO8859-1/share/xml/teams.ent
      %SRCID%	1.18
 -->
 
 <!ENTITY a.admins "FreeBSD Adminisztrátorok <email xmlns='http://docbook.org/ns/docbook'>admins@FreeBSD.org</email>">
 
 <!ENTITY a.bugmeister "PR Adatbázis Adminisztrátorok <email xmlns='http://docbook.org/ns/docbook'>bugmeister@FreeBSD.org</email>">
 
 <!ENTITY a.core-secretary "Core Team Titkár <email xmlns='http://docbook.org/ns/docbook'>core-secretary@FreeBSD.org</email>">
 
 <!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>">
 
 <!ENTITY a.faq "FAQ Karbantartó <email xmlns='http://docbook.org/ns/docbook'>faq@FreeBSD.org</email>">
 
 <!ENTITY a.ftp-master "FTP Tükörszerver Koordinátor <email xmlns='http://docbook.org/ns/docbook'>ftp-master@FreeBSD.org</email>">
 
 <!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>">
 
 <!ENTITY a.portmgr "Ports Management Team <email xmlns='http://docbook.org/ns/docbook'>portmgr@FreeBSD.org</email>">
 
 <!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>">
 
 <!ENTITY a.secteam-secretary "Security Team Secretary <email xmlns='http://docbook.org/ns/docbook'>secteam-secretary@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
@@ -1,56 +1,52 @@
 <?xml version="1.0" encoding="euc-jp"?>
 <!--
      Names and email address of teams of people working on specified
      tasks. Usually 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$
      Original revision: r51679
 -->
 
 <!ENTITY a.admins "FreeBSD ¥µ¥¤¥È´ÉÍý¼Ô <email xmlns='http://docbook.org/ns/docbook'>admins@FreeBSD.org</email>">
 
 <!ENTITY a.bugmeister "¾ã³²Êó¹ð¥Ç¡¼¥¿¥Ù¡¼¥¹´ÉÍý¼Ô <email xmlns='http://docbook.org/ns/docbook'>bugmeister@FreeBSD.org</email>">
 
 <!ENTITY a.core "¥³¥¢¥Á¡¼¥à <email xmlns='http://docbook.org/ns/docbook'>core@FreeBSD.org</email>">
 
 <!ENTITY a.core-secretary "¥³¥¢¥Á¡¼¥à½ñµ­ <email xmlns='http://docbook.org/ns/docbook'>core-secretary@FreeBSD.org</email>">
 
 <!ENTITY a.cvsadm "CVS ¥ê¥Ý¥¸¥È¥ê´ÉÍý¼Ô <email xmlns='http://docbook.org/ns/docbook'>cvsadm@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>">
 
 <!ENTITY a.faq "FAQ ´ÉÍý¼Ô <email xmlns='http://docbook.org/ns/docbook'>faq@FreeBSD.org</email>">
 
 <!ENTITY a.ftp-master "FTP ¥ß¥é¡¼¥µ¥¤¥È¥³¡¼¥Ç¥£¥Í¡¼¥¿ <email xmlns='http://docbook.org/ns/docbook'>ftp-master@FreeBSD.org</email>">
 
 <!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>">
 
 <!ENTITY a.portmgr-secretary "ports ´ÉÍý¥Á¡¼¥à½ñµ­ <email xmlns='http://docbook.org/ns/docbook'>portmgr-secretary@FreeBSD.org</email>">
 
 <!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>">
 
 <!ENTITY a.security-officer "¥»¥­¥å¥ê¥Æ¥£¥ª¥Õ¥£¥µ¥Á¡¼¥à <email xmlns='http://docbook.org/ns/docbook'>security-officer@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
@@ -1,60 +1,52 @@
 <!--
      The FreeBSD Mongolian Documentation Project
 
      Original revision 1.19
 
      $FreeBSD$
 
      Names and email address of teams of people working on specified
      tasks. Usually 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.
 -->
 
 <!ENTITY a.admins "FreeBSD-ийн �дмини�траторууд <email xmlns='http://docbook.org/ns/docbook'>admins@FreeBSD.org</email>">
 
 <!ENTITY a.bugmeister "��уудлын тайлангийн м�д��ллийн баазын админи�траторууд <email xmlns='http://docbook.org/ns/docbook'>bugmeister@FreeBSD.org</email>">
 
 <!ENTITY a.core-secretary "Гол багийн нарийн бичиг <email xmlns='http://docbook.org/ns/docbook'>core-secretary@FreeBSD.org</email>">
 
 <!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>">
 
 <!ENTITY a.faq "FAQ �рчлагч <email xmlns='http://docbook.org/ns/docbook'>faq@FreeBSD.org</email>">
 
 <!ENTITY a.ftp-master "FTP Толин Ту�гал �айтын Зохицуулагч <email xmlns='http://docbook.org/ns/docbook'>ftp-master@FreeBSD.org</email>">
 
 <!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>">
 
 <!ENTITY a.portmgr "Портын Удирдлагын Баг <email xmlns='http://docbook.org/ns/docbook'>portmgr@FreeBSD.org</email>">
 
 <!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>">
 
 <!ENTITY a.security-officer "�юулгүй байдлын Түшм�дийн Баг <email xmlns='http://docbook.org/ns/docbook'>security-officer@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
@@ -1,55 +1,49 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Dutch Documentation Project
 
      Namen en emailadressen van teams van mensen die aan specifieke taken
      werken.  Gewoonlijk zijn het alleen de mailaliassen zoals ze op
      hub.FreeBSD.org zijn ingesteld.
 
      Gebruik deze entiteiten bij het verwijzen naar de juiste teams.
 
      Houd deze lijst alstublieft in alfabetische volgorde van entiteitsnamen.
 
      $FreeBSD$
 
      %SOURCE%	en_US.ISO8859-1/share/xml/teams.ent
      %SRCID%	39697
 -->
 
 <!ENTITY a.admins "&os; Beheerders <email xmlns='http://docbook.org/ns/docbook'>admins@FreeBSD.org</email>">
 
 <!ENTITY a.bugmeister "Beheerders van de probleemrapportendatabase <email xmlns='http://docbook.org/ns/docbook'>bugmeister@FreeBSD.org</email>">
 
 <!ENTITY a.core-secretary "Secretaris van het Core Team <email xmlns='http://docbook.org/ns/docbook'>core-secretary@FreeBSD.org</email>">
 
 <!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>">
 
 <!ENTITY a.faq "FAQ-beheerder <email xmlns='http://docbook.org/ns/docbook'>faq@FreeBSD.org</email>">
 
 <!ENTITY a.ftp-master "Coördinator van de FTP spiegelsites <email xmlns='http://docbook.org/ns/docbook'>ftp-master@FreeBSD.org</email>">
 
 <!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>">
 
 <!ENTITY a.portmgr "Ports Beheerteam <email xmlns='http://docbook.org/ns/docbook'>portmgr@FreeBSD.org</email>">
 
 <!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>">
 
 <!ENTITY a.security-officer "Beveiligingsbeambtenteam <email xmlns='http://docbook.org/ns/docbook'>security-officer@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
@@ -1,153 +1,127 @@
 <?xml version="1.0" encoding="iso-8859-2"?>
 <!--
      The FreeBSD Polish Documentation Project
 
      Nazwiska i adresy e-mail zespo³ów ludzi pracuj±cych nad okre¶lonymi
      zadaniami. Zazwyczaj s± to po prostu aliasy mailowe ustawione na hub.FreeBSD.org
 
      Nale¿y u¿ywaæ tych encji odwo³uj±c siê do odpowiednich zespo³ów.
 
      Prosimy utrzymywaæ listê w alfabetycznym porz±dku wed³ug nazwy encji.
 
      WA¯NE:  Je¶li usuwasz nazwiska z tego pliku, *musisz* upewniæ siê, ¿e
              wszystkie odniesienia do nich zosta³y usuniête z t³umaczeñ
              podrêcznika.  Je¶li nie zosta³y, *zepsujesz* budowania
              w innych jêzykach, a w konsekwencji zostaniesz publicznie
              wy¶miany.
 
      $FreeBSD$
      Original revision: 1.17
 -->
 
 <!ENTITY a.admins "Administratorzy FreeBSD <email xmlns='http://docbook.org/ns/docbook'>admins@FreeBSD.org</email>">
 <!ENTITY a.pl.admins.m "Administratorzy FreeBSD <email xmlns='http://docbook.org/ns/docbook'>admins@FreeBSD.org</email>">
 <!ENTITY a.pl.admins.d "Administratorów FreeBSD <email xmlns='http://docbook.org/ns/docbook'>admins@FreeBSD.org</email>">
 <!ENTITY a.pl.admins.c "Administratorom FreeBSD <email xmlns='http://docbook.org/ns/docbook'>admins@FreeBSD.org</email>">
 <!ENTITY a.pl.admins.b "Administratorów FreeBSD <email xmlns='http://docbook.org/ns/docbook'>admins@FreeBSD.org</email>">
 <!ENTITY a.pl.admins.n "Administratorami FreeBSD <email xmlns='http://docbook.org/ns/docbook'>admins@FreeBSD.org</email>">
 <!ENTITY a.pl.admins.ms "Administratorach FreeBSD <email xmlns='http://docbook.org/ns/docbook'>admins@FreeBSD.org</email>">
 
 <!ENTITY a.core-secretary "Sekretariat zespo³u g³ównego <email xmlns='http://docbook.org/ns/docbook'>core-secretary@FreeBSD.org</email>">
 <!ENTITY a.pl.core-secretary.m "Sekretariat zespo³u g³ównego <email xmlns='http://docbook.org/ns/docbook'>core-secretary@FreeBSD.org</email>">
 <!ENTITY a.pl.core-secretary.d "Sekretariatu zespo³u g³ównego <email xmlns='http://docbook.org/ns/docbook'>core-secretary@FreeBSD.org</email>">
 <!ENTITY a.pl.core-secretary.c "Sekretariatowi zespo³u g³ównego <email xmlns='http://docbook.org/ns/docbook'>core-secretary@FreeBSD.org</email>">
 <!ENTITY a.pl.core-secretary.b "Sekretariat zespo³u g³ównego <email xmlns='http://docbook.org/ns/docbook'>core-secretary@FreeBSD.org</email>">
 <!ENTITY a.pl.core-secretary.n "Sekretariatem zespo³u g³ównego <email xmlns='http://docbook.org/ns/docbook'>core-secretary@FreeBSD.org</email>">
 <!ENTITY a.pl.core-secretary.ms "Sekretariacie zespo³u g³ównego <email xmlns='http://docbook.org/ns/docbook'>core-secretary@FreeBSD.org</email>">
 
 <!ENTITY a.cvsadm "Mistrzowie repozytorium CVS <email xmlns='http://docbook.org/ns/docbook'>cvsadm@FreeBSD.org</email>">
 <!ENTITY a.pl.cvsadm.m "Mistrzowie repozytorium CVS <email xmlns='http://docbook.org/ns/docbook'>cvsadm@FreeBSD.org</email>">
 <!ENTITY a.pl.cvsadm.d "Mistrzów repozytorium CVS <email xmlns='http://docbook.org/ns/docbook'>cvsadm@FreeBSD.org</email>">
 <!ENTITY a.pl.cvsadm.c "Mistrzom repozytorium CVS <email xmlns='http://docbook.org/ns/docbook'>cvsadm@FreeBSD.org</email>">
 <!ENTITY a.pl.cvsadm.b "Mistrzów repozytorium CVS <email xmlns='http://docbook.org/ns/docbook'>cvsadm@FreeBSD.org</email>">
 <!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>">
 <!ENTITY a.pl.doceng.c "Zespo³owi dokumentacji <email xmlns='http://docbook.org/ns/docbook'>doceng@FreeBSD.org</email>">
 <!ENTITY a.pl.doceng.b "Zespó³ dokumentacji <email xmlns='http://docbook.org/ns/docbook'>doceng@FreeBSD.org</email>">
 <!ENTITY a.pl.doceng.n "Zespo³em dokumentacji <email xmlns='http://docbook.org/ns/docbook'>doceng@FreeBSD.org</email>">
 <!ENTITY a.pl.doceng.s "Zespole dokumentacji <email xmlns='http://docbook.org/ns/docbook'>doceng@FreeBSD.org</email>">
 
 <!ENTITY a.donations "Biuro wspó³pracy finansowej <email xmlns='http://docbook.org/ns/docbook'>donations@FreeBSD.org</email>">
 <!ENTITY a.pl.donations.m "Biuro wspó³pracy finansowej <email xmlns='http://docbook.org/ns/docbook'>donations@FreeBSD.org</email>">
 <!ENTITY a.pl.donations.d "Biura wspó³pracy finansowej <email xmlns='http://docbook.org/ns/docbook'>donations@FreeBSD.org</email>">
 <!ENTITY a.pl.donations.c "Biurze wspó³pracy finansowej <email xmlns='http://docbook.org/ns/docbook'>donations@FreeBSD.org</email>">
 <!ENTITY a.pl.donations.b "Biuro wspó³pracy finansowej <email xmlns='http://docbook.org/ns/docbook'>donations@FreeBSD.org</email>">
 <!ENTITY a.pl.donations.n "Biurem wspó³pracy finansowej <email xmlns='http://docbook.org/ns/docbook'>donations@FreeBSD.org</email>">
 <!ENTITY a.pl.donations.ms "Biurze wspó³pracy finansowej <email xmlns='http://docbook.org/ns/docbook'>donations@FreeBSD.org</email>">
 
 <!ENTITY a.faq "Opiekun FAQ <email xmlns='http://docbook.org/ns/docbook'>faq@FreeBSD.org</email>">
 <!ENTITY a.pl.faq.m "Opiekun FAQ <email xmlns='http://docbook.org/ns/docbook'>faq@FreeBSD.org</email>">
 <!ENTITY a.pl.faq.d "Opiekuna FAQ <email xmlns='http://docbook.org/ns/docbook'>faq@FreeBSD.org</email>">
 <!ENTITY a.pl.faq.c "Opiekunowi FAQ <email xmlns='http://docbook.org/ns/docbook'>faq@FreeBSD.org</email>">
 <!ENTITY a.pl.faq.b "Opiekuna FAQ <email xmlns='http://docbook.org/ns/docbook'>faq@FreeBSD.org</email>">
 <!ENTITY a.pl.faq.n "Opiekunem FAQ <email xmlns='http://docbook.org/ns/docbook'>faq@FreeBSD.org</email>">
 <!ENTITY a.pl.faq.ms "Opiekunie FAQ <email xmlns='http://docbook.org/ns/docbook'>faq@FreeBSD.org</email>">
 
 <!ENTITY a.ftp-master "Koordynator serwerów lustrzanych FTP <email xmlns='http://docbook.org/ns/docbook'>ftp-master@FreeBSD.org</email>">
 <!ENTITY a.pl.ftp-master.m "Koordynator serwerów lustrzanych FTP <email xmlns='http://docbook.org/ns/docbook'>ftp-master@FreeBSD.org</email>">
 <!ENTITY a.pl.ftp-master.d "Koordynatora serwerów lustrzanych FTP <email xmlns='http://docbook.org/ns/docbook'>ftp-master@FreeBSD.org</email>">
 <!ENTITY a.pl.ftp-master.c "Koordynatorowi serwerów lustrzanych FTP <email xmlns='http://docbook.org/ns/docbook'>ftp-master@FreeBSD.org</email>">
 <!ENTITY a.pl.ftp-master.b "Koordynatora serwerów lustrzanych FTP <email xmlns='http://docbook.org/ns/docbook'>ftp-master@FreeBSD.org</email>">
 <!ENTITY a.pl.ftp-master.n "Koordynatorem serwerów lustrzanych FTP <email xmlns='http://docbook.org/ns/docbook'>ftp-master@FreeBSD.org</email>">
 <!ENTITY a.pl.ftp-master.ms "Koordynatorze serwerów lustrzanych FTP <email xmlns='http://docbook.org/ns/docbook'>ftp-master@FreeBSD.org</email>">
 
 <!ENTITY a.mirror-admin "Koordynator serwerów lustrzanych FTP/WWW <email xmlns='http://docbook.org/ns/docbook'>mirror-admin@FreeBSD.org</email>">
 <!ENTITY a.pl.mirror-admin.m "Koordynator serwerów lustrzanych FTP/WWW <email xmlns='http://docbook.org/ns/docbook'>mirror-admin@FreeBSD.org</email>">
 <!ENTITY a.pl.mirror-admin.d "Koordynatora serwerów lustrzanych FTP/WWW <email xmlns='http://docbook.org/ns/docbook'>mirror-admin@FreeBSD.org</email>">
 <!ENTITY a.pl.mirror-admin.c "Koordynatorowi serwerów lustrzanych FTP/WWW <email xmlns='http://docbook.org/ns/docbook'>mirror-admin@FreeBSD.org</email>">
 <!ENTITY a.pl.mirror-admin.b "Koordynatora serwerów lustrzanych FTP/WWW <email xmlns='http://docbook.org/ns/docbook'>mirror-admin@FreeBSD.org</email>">
 <!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>">
 <!ENTITY a.pl.pcvs.m "Mistrzowie repozytorium CVS portów <email xmlns='http://docbook.org/ns/docbook'>pcvs@FreeBSD.org</email>">
 <!ENTITY a.pl.pcvs.d "Mistrzów repozytorium CVS portów <email xmlns='http://docbook.org/ns/docbook'>pcvs@FreeBSD.org</email>">
 <!ENTITY a.pl.pcvs.c "Mistrzom repozytorium CVS portów <email xmlns='http://docbook.org/ns/docbook'>pcvs@FreeBSD.org</email>">
 <!ENTITY a.pl.pcvs.b "Mistrzów repozytorium CVS portów <email xmlns='http://docbook.org/ns/docbook'>pcvs@FreeBSD.org</email>">
 <!ENTITY a.pl.pcvs.n "Mistrzami repozytorium CVS portów <email xmlns='http://docbook.org/ns/docbook'>pcvs@FreeBSD.org</email>">
 <!ENTITY a.pl.pcvs.ms "Mistrzach repozytorium CVS portów <email xmlns='http://docbook.org/ns/docbook'>pcvs@FreeBSD.org</email>">
 
 <!ENTITY a.portmgr "Zespó³ zarz±dzaj±cy portami <email xmlns='http://docbook.org/ns/docbook'>portmgr@FreeBSD.org</email>">
 <!ENTITY a.pl.portmgr.m "Zespó³ zarz±dzaj±cy portami <email xmlns='http://docbook.org/ns/docbook'>portmgr@FreeBSD.org</email>">
 <!ENTITY a.pl.portmgr.d "Zespo³u zarz±dzaj±cego portami <email xmlns='http://docbook.org/ns/docbook'>portmgr@FreeBSD.org</email>">
 <!ENTITY a.pl.portmgr.c "Zespo³owi zarz±dzaj±cemu portami <email xmlns='http://docbook.org/ns/docbook'>portmgr@FreeBSD.org</email>">
 <!ENTITY a.pl.portmgr.b "Zespó³ zarz±dzaj±cy portami <email xmlns='http://docbook.org/ns/docbook'>portmgr@FreeBSD.org</email>">
 <!ENTITY a.pl.portmgr.n "Zespo³em zarz±dzaj±cym portami <email xmlns='http://docbook.org/ns/docbook'>portmgr@FreeBSD.org</email>">
 <!ENTITY a.pl.portmgr.ms "Zespole zarz±dzaj±cym portami <email xmlns='http://docbook.org/ns/docbook'>portmgr@FreeBSD.org</email>">
 
 <!ENTITY a.portmgr-secretary "Sekretariat zespo³u zarz±dzaj±cego portami <email xmlns='http://docbook.org/ns/docbook'>portmgr-secretary@FreeBSD.org</email>">
 <!ENTITY a.pl.portmgr-secretary.m "Sekretariat zespo³u zarz±dzaj±cego portami <email xmlns='http://docbook.org/ns/docbook'>portmgr-secretary@FreeBSD.org</email>">
 <!ENTITY a.pl.portmgr-secretary.d "Sekretariatu zespo³u zarz±dzaj±cego portami <email xmlns='http://docbook.org/ns/docbook'>portmgr-secretary@FreeBSD.org</email>">
 <!ENTITY a.pl.portmgr-secretary.c "Sekretariatowi zespo³u zarz±dzaj±cego portami <email xmlns='http://docbook.org/ns/docbook'>portmgr-secretary@FreeBSD.org</email>">
 <!ENTITY a.pl.portmgr-secretary.b "Sekretariat zespo³u zarz±dzaj±cego portami <email xmlns='http://docbook.org/ns/docbook'>portmgr-secretary@FreeBSD.org</email>">
 <!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>">
 <!ENTITY a.pl.re.c "Zespo³owi technicznemu publikacji <email xmlns='http://docbook.org/ns/docbook'>re@FreeBSD.org</email>">
 <!ENTITY a.pl.re.b "Zespó³ techniczny publikacji <email xmlns='http://docbook.org/ns/docbook'>re@FreeBSD.org</email>">
 <!ENTITY a.pl.re.n "Zespo³em technicznym publikacji <email xmlns='http://docbook.org/ns/docbook'>re@FreeBSD.org</email>">
 <!ENTITY a.pl.re.ms "Zespole technicznym publikacji <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>">
 <!ENTITY a.security-officer "Zespó³ oficera bezpieczeñstwa <email xmlns='http://docbook.org/ns/docbook'>security-officer@FreeBSD.org</email>">
 <!ENTITY a.pl.security-officer.m "Zespó³ oficera bezpieczeñstwa <email xmlns='http://docbook.org/ns/docbook'>security-officer@FreeBSD.org</email>">
 <!ENTITY a.pl.security-officer.d "Zespo³u oficera bezpieczeñstwa <email xmlns='http://docbook.org/ns/docbook'>security-officer@FreeBSD.org</email>">
 <!ENTITY a.pl.security-officer.c "Zespo³owi oficera bezpieczeñstwa <email xmlns='http://docbook.org/ns/docbook'>security-officer@FreeBSD.org</email>">
 <!ENTITY a.pl.security-officer.b "Zespó³ oficera bezpieczeñstwa <email xmlns='http://docbook.org/ns/docbook'>security-officer@FreeBSD.org</email>">
 <!ENTITY a.pl.security-officer.n "Zespo³em oficera bezpieczeñstwa <email xmlns='http://docbook.org/ns/docbook'>security-officer@FreeBSD.org</email>">
 <!ENTITY a.pl.security-officer.ms "Zespole oficera bezpieczeñstwa <email xmlns='http://docbook.org/ns/docbook'>security-officer@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
@@ -1,79 +1,73 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!--
   Names and email address of teams of people working on specified
   tasks. Usually 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.
 
   The FreeBSD Documentation Project
   The FreeBSD Brazilian Portuguese Documentation Project
 
   Original revision: r51679
 
   $FreeBSD$
 -->
 
 <!ENTITY a.admins "Administradores do FreeBSD
   <email xmlns='http://docbook.org/ns/docbook'>admins@FreeBSD.org</email>">
 
 <!ENTITY a.bugmeister "Administradores do Banco de Dados de 
   Relatórios de Problema <email xmlns='http://docbook.org/ns/docbook'>bugmeister@FreeBSD.org</email>">
 
 <!ENTITY a.core "Core Team 
   <email xmlns='http://docbook.org/ns/docbook'>core@FreeBSD.org</email>">
 
 <!ENTITY a.core-secretary "Secretário do Core Team 
   <email xmlns='http://docbook.org/ns/docbook'>core-secretary@FreeBSD.org</email>">
 
 <!ENTITY a.cvsadm "Responsáveis pelo Repositório CVS 
   <email xmlns='http://docbook.org/ns/docbook'>cvsadm@FreeBSD.org</email>">
 
 <!ENTITY a.doceng "Equipe de Engenharia de Documentação
   <email xmlns='http://docbook.org/ns/docbook'>doceng@FreeBSD.org</email>">
 
 <!ENTITY a.donations "Escritório de relacionamento para doações
   <email xmlns='http://docbook.org/ns/docbook'>donations@FreeBSD.org</email>">
 
 <!ENTITY a.faq "Responsável pelo <literal xmlns='http://docbook.org/ns/docbook'>FAQ</literal>
   <email xmlns='http://docbook.org/ns/docbook'>faq@FreeBSD.org</email>">
 
 <!ENTITY a.ftp-master "Coordenador de sites espelho FTP
   <email xmlns='http://docbook.org/ns/docbook'>ftp-master@FreeBSD.org</email>">
 
 <!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>">
 
 <!ENTITY a.portmgr "Equipe de Gerenciamento do Ports
   <email xmlns='http://docbook.org/ns/docbook'>portmgr@FreeBSD.org</email>">
 
 <!ENTITY a.portmgr-secretary "Secretário da equipe de gerenciamento do Ports 
   <email xmlns='http://docbook.org/ns/docbook'>portmgr-secretary@FreeBSD.org</email>">
 
 <!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>">
 
 <!ENTITY a.secteam-secretary "Secretário da equipe de Segurança
   <email xmlns='http://docbook.org/ns/docbook'>secteam-secretary@FreeBSD.org</email>">
 
 <!ENTITY a.security-officer "Equipe de Oficiais de Segurança
   <email xmlns='http://docbook.org/ns/docbook'>security-officer@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
@@ -1,63 +1,55 @@
 <?xml version="1.0" encoding="koi8-r"?>
 <!--
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
      $FreeBSDru: frdp/doc/ru_RU.KOI8-R/share/xml/teams.ent,v 1.7 2006/01/06 20:54:08 gad Exp $
 
      Original revision: r26478
 -->
 <!--
      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.
 -->
 
 <!ENTITY a.admins "áÄÍÉÎÉÓÔÒÁÔÏÒÙ FreeBSD.org <email xmlns='http://docbook.org/ns/docbook'>admins@FreeBSD.org</email>">
 
 <!ENTITY a.core-secretary "óÅËÒÅÔÁÒØ CORE <email xmlns='http://docbook.org/ns/docbook'>core-secretary@FreeBSD.org</email>">
 
 <!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>">
 
 <!ENTITY a.faq "òÅÄÁËÔÏÒ FAQ <email xmlns='http://docbook.org/ns/docbook'>faq@FreeBSD.org</email>">
 
 <!ENTITY a.ftp-master "ëÏÏÒÄÉÎÁÔÏÒ óÅÔÉ óÅÒ×ÅÒÏ× FTP <email xmlns='http://docbook.org/ns/docbook'>ftp-master@FreeBSD.org</email>">
 
 <!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>">
 
 <!ENTITY a.portmgr "çÒÕÐÐÁ íÅÎÅÄÖÅÒÏ× äÅÒÅ×Á ðÏÒÔÏ× FreeBSD <email xmlns='http://docbook.org/ns/docbook'>portmgr@FreeBSD.org</email>">
 
 <!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>">
 
 <!ENTITY a.security-officer "çÒÕÐÐÁ ïÆÉÃÅÒÏ× âÅÚÏÐÁÓÎÏÓÔÉ <email xmlns='http://docbook.org/ns/docbook'>security-officer@FreeBSD.org</email>">
 
 <!ENTITY a.www "óÐÉÓÏË ÒÁÓÓÙÌËÉ webmaster'Ï× FreeBSD <email xmlns='http://docbook.org/ns/docbook'>www@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
@@ -1,58 +1,50 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
      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.
 
      Original revision: 1.18
      $FreeBSD$
 -->
 
 <!ENTITY a.admins "FreeBSD 集群管�员 <email xmlns='http://docbook.org/ns/docbook'>admins@FreeBSD.org</email>">
 
 <!ENTITY a.bugmeister "问题报告数�库管�员 <email xmlns='http://docbook.org/ns/docbook'>bugmeister@FreeBSD.org</email>">
 
 <!ENTITY a.core-secretary "核心团队秘书 <email xmlns='http://docbook.org/ns/docbook'>core-secretary@FreeBSD.org</email>">
 
 <!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>">
 
 <!ENTITY a.faq "FAQ 维护人 <email xmlns='http://docbook.org/ns/docbook'>faq@FreeBSD.org</email>">
 
 <!ENTITY a.ftp-master "FTP 镜�站点�集人 <email xmlns='http://docbook.org/ns/docbook'>ftp-master@FreeBSD.org</email>">
 
 <!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>">
 
 <!ENTITY a.portmgr "Ports 管�团队 <email xmlns='http://docbook.org/ns/docbook'>portmgr@FreeBSD.org</email>">
 
 <!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>">
 
 <!ENTITY a.security-officer "Security Officer 团队 <email xmlns='http://docbook.org/ns/docbook'>security-officer@FreeBSD.org</email>">