Date: Sat, 12 Jan 2013 18:57:28 -0500 From: Glen Barber <gjb@FreeBSD.org> To: Rene Ladan <rene@FreeBSD.org> Cc: svn-doc-projects@freebsd.org, doc-committers@freebsd.org Subject: Re: svn commit: r40582 - in projects/entities/share: pgpkeys xml Message-ID: <20130112235728.GG1359@glenbarber.us> In-Reply-To: <201301122351.r0CNpKv2018352@svn.freebsd.org> References: <201301122351.r0CNpKv2018352@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--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--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20130112235728.GG1359>