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

[Glen Barber]

On Sat, Jan 12, 2013 at 11:51:20PM +0000, Rene Ladan wrote:
> 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>
>  

Whoops.  Thanks for fixing these.

> 
> 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 at FreeBSD.org</email>">
>  
>  <!ENTITY a.markj "Mark Johnston">
> -<!ENTITY a.markj.email "&markj; <email>markj at FreeBSD.org</email>">
> +<!ENTITY a.markj.email "&a.markj; <email>markj at FreeBSD.org</email>">
>  
>  <!ENTITY a.markm "Mark Murray">
> -<!ENTITY a.markm.email "&markm; <email>markm at FreeBSD.org</email>">
> +<!ENTITY a.markm.email "&a.markm; <email>markm at FreeBSD.org</email>">
>  
>  <!ENTITY a.makc "Max Brazhnikov">
>  <!ENTITY a.makc.email "&a.makc; <email>makc at FreeBSD.org</email>">

Bah.  Pointyhat to me.

Glen

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/svn-doc-projects/attachments/20130112/c6d16566/attachment.sig>