Date: Fri, 09 Nov 2012 18:25:22 +0100 From: =?UTF-8?B?UmVuw6kgTGFkYW4=?= <rene@freebsd.org> To: "Simon L. B. Nielsen" <simon@FreeBSD.org> Cc: FBSD Doc project <doc@freebsd.org> Subject: Re: authors.ent and developers.ent ? Message-ID: <509D3C82.5030301@freebsd.org> In-Reply-To: <CAC8HS2GT4OGSD75L-ZYx_uatJ3c%2BYxb%2BunnQSSc13JGbpFVj4A@mail.gmail.com> References: <5095AF77.2070908@freebsd.org> <CAC8HS2GT4OGSD75L-ZYx_uatJ3c%2BYxb%2BunnQSSc13JGbpFVj4A@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --]
On 08-11-2012 17:10, Simon L. B. Nielsen wrote:
> On 3 November 2012 23:57, René Ladan <rene@freebsd.org> wrote:
>
>> author entities are defined both in authors.ent (with email address) and
>> developers.ent (without email address). The latter is used in e.g.
>> htdocs/administration.xml, resulting in cumbersome lines like
>>
>> <li>&a.name; <<a
>> href="mailto:name@FreeBSD.org">name@FreeBSD.org</a>></li>
>>
>> where just
>>
>> <li>&a.name;</li> would be clearer.
> This is an artifact of the old doc/ www/ split, and yes - it should be
> fixed. But I suspect developers.ent is used in HTML files, so you
> can't use <email> but that may have changed since I last looked at it.
Indeed, the doc build finishes but the website build fails with:
env SGML_CATALOG_FILES=
XML_CATALOG_FILES="file:///usr/home/rene/freebsd/doc/head/en_US.ISO8859-1/htdocs/catalog-cwd.xml
file:///usr/home/rene/freebsd/doc/head/en_US.ISO8859-1/share/xml/catalog.xml
file:///usr/home/rene/freebsd/doc/head/share/xml/catalog.xml
file:///usr/home/rene/freebsd/doc/head/share/xml/catalog-common.xml
file:///usr/local/share/xml/catalog" /usr/local/bin/xmllint --xinclude
--valid --noout --nonet --catalogs administration.xml
namespace warning : Namespace default prefix was not found
Thomas Abthorpe <email>tabthorpe@FreeBSD.org</email>
^
administration.xml:86: element email: validity error : No declaration
for element email
<li>&a.tabthorpe; <<a
href="mailto:tabthorpe@FreeBSD.org">tabthorpe@FreeB
^
namespace warning : Namespace default prefix was not found
for each developer.
This is with the attached (work in progress quality) patch, in which the
idea is to merge developers.ent into authors.ent.
René
[-- Attachment #2 --]
Index: en_US.ISO8859-1/articles/contributors/contrib.committers.xml
===================================================================
--- en_US.ISO8859-1/articles/contributors/contrib.committers.xml (revision 39964)
+++ en_US.ISO8859-1/articles/contributors/contrib.committers.xml (working copy)
@@ -428,7 +428,7 @@
</listitem>
<listitem>
- <para>&a.decke;</para>
+ <para>&a.decke.email;</para>
</listitem>
<listitem>
@@ -740,7 +740,7 @@
</listitem>
<listitem>
- <para>&a.rene;</para>
+ <para>&a.rene.email;</para>
</listitem>
<listitem>
Index: en_US.ISO8859-1/htdocs/administration.xml
===================================================================
--- en_US.ISO8859-1/htdocs/administration.xml (revision 39964)
+++ en_US.ISO8859-1/htdocs/administration.xml (working copy)
@@ -127,7 +127,7 @@
<li>&a.tabthorpe; <<a href="mailto:tabthorpe@FreeBSD.org">tabthorpe@FreeBSD.org</a>></li>
<li>&a.marcus; <<a href="mailto:marcus@FreeBSD.org">marcus@FreeBSD.org</a>></li>
<li>&a.bapt; <<a href="mailto:bapt@FreeBSD.org">bapt@FreeBSD.org</a>></li>
- <li>&a.decke; <<a href="mailto:decke@FreeBSD.org">decke@FreeBSD.org</a>></li>
+ <li>&a.decke.email;</li>
<li>&a.beat; <<a href="mailto:beat@FreeBSD.org">beat@FreeBSD.org</a>></li>
<li>&a.erwin; <<a href="mailto:erwin@FreeBSD.org">erwin@FreeBSD.org</a>></li>
<li>&a.linimon; <<a href="mailto:linimon@FreeBSD.org">linimon@FreeBSD.org</a>></li>
Index: en_US.ISO8859-1/htdocs/news/2008/news.xml
===================================================================
--- en_US.ISO8859-1/htdocs/news/2008/news.xml (revision 39964)
+++ en_US.ISO8859-1/htdocs/news/2008/news.xml (working copy)
@@ -160,6 +160,8 @@
<day>
<name>3</name>
<event>
+ <!--&a.name.*; not yet allowed here-->
+ <!--<p>New committer: &a.rene.email; (doc-nl)</p>-->
<p>New committer: <a href="mailto:rene@FreeBSD.org">
René Ladan</a> (doc-nl)</p>
</event>
Index: share/pgpkeys/pgpkeys-developers.xml
===================================================================
--- share/pgpkeys/pgpkeys-developers.xml (revision 39964)
+++ share/pgpkeys/pgpkeys-developers.xml (working copy)
@@ -497,7 +497,7 @@
</sect2>
<sect2 id="pgpkey-decke">
- <title>&a.decke;</title>
+ <title>&a.decke.email;</title>
&pgpkey.decke;
</sect2>
@@ -867,7 +867,7 @@
</sect2>
<sect2 id="pgpkey-rene">
- <title>&a.rene;</title>
+ <title>&a.rene.email;</title>
&pgpkey.rene;
</sect2>
Index: share/xml/authors.ent
===================================================================
--- share/xml/authors.ent (revision 39964)
+++ share/xml/authors.ent (working copy)
@@ -316,7 +316,8 @@
<!ENTITY a.dec "David E. Cross <email>dec@FreeBSD.org</email>">
-<!ENTITY a.decke "Bernhard Fröhlich <email>decke@FreeBSD.org</email>">
+<!ENTITY a.decke "Bernhard Fröhlich">
+<!ENTITY a.decke.email "&a.decke; <email>decke@FreeBSD.org</email>">
<!ENTITY a.deischen "Daniel Eischen <email>deischen@FreeBSD.org</email>">
@@ -1070,7 +1071,8 @@
<!ENTITY a.remko "Remko Lodder <email>remko@FreeBSD.org</email>">
-<!ENTITY a.rene "René Ladan <email>rene@FreeBSD.org</email>">
+<!ENTITY a.rene "René Ladan">
+<!ENTITY a.rene.email "&a.rene; <email>rene@FreeBSD.org</email>">
<!ENTITY a.rgrimes "Rodney Grimes <email>rgrimes@FreeBSD.org</email>">
Index: share/xml/catalog
===================================================================
--- share/xml/catalog (revision 39964)
+++ share/xml/catalog (working copy)
@@ -78,7 +78,7 @@
"common.ent"
PUBLIC "-//FreeBSD//ENTITIES FreeBSD Developers Entities//EN"
- "developers.ent"
+ "authors.ent"
PUBLIC "-//FreeBSD//ENTITIES FreeBSD Release Entities//EN"
"release.ent"
Index: share/xml/catalog.xml
===================================================================
--- share/xml/catalog.xml (revision 39964)
+++ share/xml/catalog.xml (working copy)
@@ -21,14 +21,14 @@
<!--
<public
publicId="-//FreeBSD//ENTITIES FreeBSD Language Specific Developers Entities//EN"
- uri="developers.ent" />
+ uri="authors.ent" />
<public
publicId="-//FreeBSD//ENTITIES FreeBSD Miscellaneous Entities//EN"
uri="misc.ent" />
-->
<public
publicId="-//FreeBSD//ENTITIES FreeBSD Developers Entities//EN"
- uri="developers.ent" />
+ uri="authors.ent" />
<public
publicId="-//FreeBSD//ENTITIES ISO 8879:1986 Entity Set//EN//XML"
uri="iso8859.ent" />
Index: share/xml/developers.ent
===================================================================
--- share/xml/developers.ent (revision 39964)
+++ share/xml/developers.ent (working copy)
@@ -153,7 +153,7 @@
<!ENTITY a.dd "Dima Dorfman">
<!ENTITY a.dds "Diomidis D. Spinellis">
<!ENTITY a.dec "David E. Cross">
-<!ENTITY a.decke "Bernhard Fröhlich">
+<!--ENTITY a.decke "Bernhard Fröhlich"-->
<!ENTITY a.deischen "Daniel Eischen">
<!ENTITY a.delphij "Xin Li">
<!ENTITY a.demon "Dmitry Sivachenko">
@@ -518,7 +518,7 @@
<!ENTITY a.rees "Jim Rees">
<!ENTITY a.reg "Jeremy Lea">
<!ENTITY a.remko "Remko Lodder">
-<!ENTITY a.rene "René Ladan">
+<!--ENTITY a.rene "René Ladan"-->
<!ENTITY a.rgrimes "Rodney Grimes">
<!ENTITY a.ricardag "Ricardo AG">
<!ENTITY a.rich "Rich Murphey">
@@ -711,6 +711,7 @@
<!ENTITY a.donations '&a.tabthorpe;, &a.gjb;, &a.gahr;, &a.pgollucci;, &a.skreuzer;, &a.obrien;, &a.trhodes;, Daniel Seuffert, &a.rwatson;'>
<!-- FreeBSD Ports Manager Team -->
+<!--TODO move these definitions to authors.ent-->
<!ENTITY a.portmgr '&a.tabthorpe;, &a.marcus;, &a.bapt;, &a.decke;, &a.beat;, &a.erwin;, &a.linimon;, &a.itetcu;, &a.miwi;'>
<!-- FreeBSD Release Engineering Teams -->
Index: share/xml/xhtml10-freebsd.dtd
===================================================================
--- share/xml/xhtml10-freebsd.dtd (revision 39964)
+++ share/xml/xhtml10-freebsd.dtd (working copy)
@@ -40,7 +40,7 @@
%header.ent;
<!ENTITY % developers PUBLIC "-//FreeBSD//ENTITIES FreeBSD Developers Entities//EN"
-"http://www.FreeBSD.org/XML/doc/share/xml/developers.ent">;
+"http://www.FreeBSD.org/XML/doc/share/xml/authors.ent">;
%developers;
<!-- Allow xmlns on all elements -->
Index: share/xml/xslt10-freebsd.dtd
===================================================================
--- share/xml/xslt10-freebsd.dtd (revision 39964)
+++ share/xml/xslt10-freebsd.dtd (working copy)
@@ -10,10 +10,10 @@
"http://www.FreeBSD.org/XML/doc/share/xml/man-refs.ent">;
%man-refs.ent;
-<!ENTITY % developers.ent
+<!ENTITY % authors.ent
PUBLIC "-//FreeBSD//ENTITIES FreeBSD Developers Entities//EN"
- "http://www.FreeBSD.org/XML/doc/share/xml/developers.ent">;
-%developers.ent;
+ "http://www.FreeBSD.org/XML/doc/share/xml/authors.ent">;
+%authors.ent;
-->
<!ENTITY % autogen.ent
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?509D3C82.5030301>