From owner-svn-doc-projects@FreeBSD.ORG  Wed Apr  3 08:51:20 2013
Return-Path: <owner-svn-doc-projects@FreeBSD.ORG>
Delivered-To: svn-doc-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id CA311349;
 Wed,  3 Apr 2013 08:51:20 +0000 (UTC)
 (envelope-from rene@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id A4BF4DAB;
 Wed,  3 Apr 2013 08:51:20 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r338pKhX059865;
 Wed, 3 Apr 2013 08:51:20 GMT (envelope-from rene@svn.freebsd.org)
Received: (from rene@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r338pKUQ059861;
 Wed, 3 Apr 2013 08:51:20 GMT (envelope-from rene@svn.freebsd.org)
Message-Id: <201304030851.r338pKUQ059861@svn.freebsd.org>
From: Rene Ladan <rene@FreeBSD.org>
Date: Wed, 3 Apr 2013 08:51:20 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r41359 - in projects/entities/share: pgpkeys xml
X-SVN-Group: doc-projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for doc projects trees
 <svn-doc-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-projects>
List-Post: <mailto:svn-doc-projects@freebsd.org>
List-Help: <mailto:svn-doc-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 03 Apr 2013 08:51:20 -0000

Author: rene
Date: Wed Apr  3 08:51:19 2013
New Revision: 41359
URL: http://svnweb.freebsd.org/changeset/doc/41359

Log:
  Small post-merge fixups.

Modified:
  projects/entities/share/pgpkeys/pgpkeys-developers.xml
  projects/entities/share/xml/freebsd.ent

Modified: projects/entities/share/pgpkeys/pgpkeys-developers.xml
==============================================================================
--- projects/entities/share/pgpkeys/pgpkeys-developers.xml	Wed Apr  3 08:47:11 2013	(r41358)
+++ projects/entities/share/pgpkeys/pgpkeys-developers.xml	Wed Apr  3 08:51:19 2013	(r41359)
@@ -372,7 +372,7 @@
     </sect2>
 
     <sect2 id="pgpkey-carl">
-      <title>&a.carl;</title>
+      <title>&a.carl.email;</title>
       &pgpkey.carl;
     </sect2>
 
@@ -552,7 +552,7 @@
     </sect2>
 
     <sect2 id="pgpkey-girgen">
-      <title>&a.girgen;</title>
+      <title>&a.girgen.email;</title>
       &pgpkey.girgen;
     </sect2>
 
@@ -947,7 +947,7 @@
     </sect2>
 
     <sect2 id="pgpkey-dru">
-      <title>&a.dru;</title>
+      <title>&a.dru.email;</title>
       &pgpkey.dru;
     </sect2>
 
@@ -997,7 +997,7 @@
     </sect2>
 
     <sect2 id="pgpkey-achim">
-      <title>&a.achim;</title>
+      <title>&a.achim.email;</title>
       &pgpkey.achim;
     </sect2>
 
@@ -1037,7 +1037,7 @@
     </sect2>
 
     <sect2 id="pgpkey-pclin"> 
-      <title>&a.pclin;</title>
+      <title>&a.pclin.email;</title>
       &pgpkey.pclin;
     </sect2>
 
@@ -1252,7 +1252,7 @@
     </sect2>
 
     <sect2 id="pgpkey-dbn">
-      <title>&a.dbn;</title>
+      <title>&a.dbn.email;</title>
       &pgpkey.dbn;
     </sect2>
 
@@ -1522,7 +1522,7 @@
     </sect2>
 
     <sect2 id="pgpkey-tmseck">
-      <title>&a.tmseck;</title>
+      <title>&a.tmseck.email;</title>
       &pgpkey.tmseck;
     </sect2>
 

Modified: projects/entities/share/xml/freebsd.ent
==============================================================================
--- projects/entities/share/xml/freebsd.ent	Wed Apr  3 08:47:11 2013	(r41358)
+++ projects/entities/share/xml/freebsd.ent	Wed Apr  3 08:51:19 2013	(r41359)
@@ -98,9 +98,6 @@ used in both environments.
 <!ENTITY os.numports "24,000">
 <!ENTITY ports.size "500&nbsp;MB">
 
-<!-- Teams and Hats -->
-<!ENTITY team.re "&a.kib;, &a.blackend;, &a.jpaetzel;, &a.hrs;, &a.kensmith;">
-
 <!-- GUI-buttons -->
 <!ENTITY gui.ok "<guibutton>[&nbsp;OK&nbsp;]</guibutton>">
 <!ENTITY gui.cancel "<guibutton>[&nbsp;Cancel&nbsp;]</guibutton>">