svn commit: r41359 - in projects/entities/share: pgpkeys xml

[Rene Ladan]

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 MB">
 
-<!-- Teams and Hats -->
-<!ENTITY team.re "&a.kib;, &a.blackend;, &a.jpaetzel;, &a.hrs;, &a.kensmith;">
-
 <!-- GUI-buttons -->
 <!ENTITY gui.ok "<guibutton>[ OK ]</guibutton>">
 <!ENTITY gui.cancel "<guibutton>[ Cancel ]</guibutton>">