From owner-svn-doc-projects@FreeBSD.ORG  Sat Jan 12 23:57:36 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 1C17C347;
 Sat, 12 Jan 2013 23:57:36 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from onyx.glenbarber.us (onyx.glenbarber.us
 [IPv6:2607:fc50:1000:c200::face])
 by mx1.freebsd.org (Postfix) with ESMTP id D784DE4D;
 Sat, 12 Jan 2013 23:57:32 +0000 (UTC)
Received: from glenbarber.us (kaos.glenbarber.us [71.224.221.174])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (No client certificate requested) (Authenticated sender: gjb)
 by onyx.glenbarber.us (Postfix) with ESMTPSA id 436D723F763;
 Sat, 12 Jan 2013 18:57:31 -0500 (EST)
DKIM-Filter: OpenDKIM Filter v2.7.1 onyx.glenbarber.us 436D723F763
Authentication-Results: onyx.glenbarber.us; dkim=none
 reason="no signature"; dkim-adsp=none (insecure policy)
Date: Sat, 12 Jan 2013 18:57:28 -0500
From: Glen Barber <gjb@FreeBSD.org>
To: Rene Ladan <rene@FreeBSD.org>
Subject: Re: svn commit: r40582 - in projects/entities/share: pgpkeys xml
Message-ID: <20130112235728.GG1359@glenbarber.us>
References: <201301122351.r0CNpKv2018352@svn.freebsd.org>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
 protocol="application/pgp-signature"; boundary="Cgrdyab2wu3Akvjd"
Content-Disposition: inline
In-Reply-To: <201301122351.r0CNpKv2018352@svn.freebsd.org>
X-Operating-System: FreeBSD 10.0-CURRENT amd64
User-Agent: Mutt/1.5.21 (2010-09-15)
Cc: svn-doc-projects@freebsd.org, doc-committers@freebsd.org
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:57:36 -0000


--Cgrdyab2wu3Akvjd
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

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
>=20
> Log:
>   - Fix some mismerges causing build breakage
>   - Use correct entities in pgpkeys-developers.xml
>=20
> Modified:
>   projects/entities/share/pgpkeys/pgpkeys-developers.xml
>   projects/entities/share/xml/authors.ent
>=20
> Modified: projects/entities/share/pgpkeys/pgpkeys-developers.xml
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- 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>
> =20
>      <sect2 id=3D"pgpkey-mdf">
> -      <title>&a.mdf;</title>
> +      <title>&a.mdf.email;</title>
>        &pgpkey.mdf;
>      </sect2>
> =20
> @@ -657,7 +657,7 @@
>      </sect2>
> =20
>      <sect2 id=3D"pgpkey-wen">
> -      <title>&a.wen;</title>
> +      <title>&a.wen.email;</title>
>        &pgpkey.wen;
>      </sect2>
> =20
> @@ -737,7 +737,7 @@
>      </sect2>
> =20
>      <sect2 id=3D"pgpkey-markj">
> -      <title>&a.markj;</title>
> +      <title>&a.markj.email;</title>
>        &pgpkey.markj;
>      </sect2>
> =20
> @@ -1107,7 +1107,7 @@
>      </sect2>
> =20
>      <sect2 id=3D"pgpkey-emaste">
> -      <title>&a.emaste;</title>
> +      <title>&a.emaste.email;</title>
>        &pgpkey.emaste;
>      </sect2>
> =20
> @@ -1902,7 +1902,7 @@
>      </sect2>
> =20
>      <sect2 id=3D"pgpkey-zeising">
> -      <title>&a.zeising;</title>
> +      <title>&a.zeising.email;</title>
>        &pgpkey.zeising;
>      </sect2>
> =20

Whoops.  Thanks for fixing these.

>=20
> Modified: projects/entities/share/xml/authors.ent
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- projects/entities/share/xml/authors.ent	Sat Jan 12 19:14:56 2013	(r40=
581)
> +++ projects/entities/share/xml/authors.ent	Sat Jan 12 23:51:19 2013	(r40=
582)
> @@ -1204,10 +1204,10 @@
>  <!ENTITY a.maho.email "&a.maho; <email>maho@FreeBSD.org</email>">
> =20
>  <!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>">
> =20
>  <!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>">
> =20
>  <!ENTITY a.makc "Max Brazhnikov">
>  <!ENTITY a.makc.email "&a.makc; <email>makc@FreeBSD.org</email>">

Bah.  Pointyhat to me.

Glen


--Cgrdyab2wu3Akvjd
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (FreeBSD)

iQEcBAEBCAAGBQJQ8fhoAAoJEFJPDDeguUajPVwIALuTfgZgAFrNovuuYlJXaC16
gLdLFoUut5CJfVf8YBa+Oq77eyKvTbXodtb9naP2l3j+FRhfR95a5V1DZLgCvyfW
FVU61Y1AXvTBRs/XhVSt6XpbbBFfcvxOUeJ5v6FeNK53hgJJsC3qcMC51mIMGTmj
UTumuRUgm2h5p9pUxGSCpwFJh+6u8uahvngvtHxrPyvOuSrX0yetgBeZrGmTHFdc
YcDFKlcb2/DMX7ZDuAsbqoob6kWavT2gBiY66ooP76lg21p9EdVnnUXmpUxfBGKU
M/G6Tl7nnsKVqMZJA2spPg0nlseJdaQzIgGRlsJZQSFfTG9EOAsdJ3zH1PY6whY=
=Y7rL
-----END PGP SIGNATURE-----

--Cgrdyab2wu3Akvjd--