From owner-svn-doc-projects@FreeBSD.ORG  Sat Jan 12 23: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 CC2152EA;
 Sat, 12 Jan 2013 23: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 943C9E36;
 Sat, 12 Jan 2013 23:51:20 +0000 (UTC)
Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0CNpKVf018354;
 Sat, 12 Jan 2013 23:51:20 GMT (envelope-from rene@svn.freebsd.org)
Received: (from rene@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0CNpKv2018352;
 Sat, 12 Jan 2013 23:51:20 GMT (envelope-from rene@svn.freebsd.org)
Message-Id: <201301122351.r0CNpKv2018352@svn.freebsd.org>
From: Rene Ladan <rene@FreeBSD.org>
Date: Sat, 12 Jan 2013 23:51:20 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r40582 - 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: Sat, 12 Jan 2013 23:51:20 -0000

Author: rene
Date: Sat Jan 12 23:51:19 2013
New Revision: 40582
URL: http://svnweb.freebsd.org/changeset/doc/40582

Log:
  - Fix some mismerges causing build breakage
  - Use correct entities in pgpkeys-developers.xml

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

Modified: projects/entities/share/pgpkeys/pgpkeys-developers.xml
==============================================================================
--- projects/entities/share/pgpkeys/pgpkeys-developers.xml	Sat Jan 12 19:14:56 2013	(r40581)
+++ projects/entities/share/pgpkeys/pgpkeys-developers.xml	Sat Jan 12 23:51:19 2013	(r40582)
@@ -487,7 +487,7 @@
     </sect2>
 
     <sect2 id="pgpkey-mdf">
-      <title>&a.mdf;</title>
+      <title>&a.mdf.email;</title>
       &pgpkey.mdf;
     </sect2>
 
@@ -657,7 +657,7 @@
     </sect2>
 
     <sect2 id="pgpkey-wen">
-      <title>&a.wen;</title>
+      <title>&a.wen.email;</title>
       &pgpkey.wen;
     </sect2>
 
@@ -737,7 +737,7 @@
     </sect2>
 
     <sect2 id="pgpkey-markj">
-      <title>&a.markj;</title>
+      <title>&a.markj.email;</title>
       &pgpkey.markj;
     </sect2>
 
@@ -1107,7 +1107,7 @@
     </sect2>
 
     <sect2 id="pgpkey-emaste">
-      <title>&a.emaste;</title>
+      <title>&a.emaste.email;</title>
       &pgpkey.emaste;
     </sect2>
 
@@ -1902,7 +1902,7 @@
     </sect2>
 
     <sect2 id="pgpkey-zeising">
-      <title>&a.zeising;</title>
+      <title>&a.zeising.email;</title>
       &pgpkey.zeising;
     </sect2>
 

Modified: projects/entities/share/xml/authors.ent
==============================================================================
--- projects/entities/share/xml/authors.ent	Sat Jan 12 19:14:56 2013	(r40581)
+++ projects/entities/share/xml/authors.ent	Sat Jan 12 23:51:19 2013	(r40582)
@@ -1204,10 +1204,10 @@
 <!ENTITY a.maho.email "&a.maho; <email>maho@FreeBSD.org</email>">
 
 <!ENTITY a.markj "Mark Johnston">
-<!ENTITY a.markj.email "&markj; <email>markj@FreeBSD.org</email>">
+<!ENTITY a.markj.email "&a.markj; <email>markj@FreeBSD.org</email>">
 
 <!ENTITY a.markm "Mark Murray">
-<!ENTITY a.markm.email "&markm; <email>markm@FreeBSD.org</email>">
+<!ENTITY a.markm.email "&a.markm; <email>markm@FreeBSD.org</email>">
 
 <!ENTITY a.makc "Max Brazhnikov">
 <!ENTITY a.makc.email "&a.makc; <email>makc@FreeBSD.org</email>">