Date: Sun, 16 Nov 2003 15:54:50 +0100 From: "Simon L. Nielsen" <simon@FreeBSD.org> To: Hiroki Sato <hrs@FreeBSD.org> Cc: freebsd-doc@FreeBSD.org Subject: Re: Site lists in the Handbook Message-ID: <20031116145448.GC402@arthur.nitro.dk> In-Reply-To: <20031116.221410.106767692.hrs@eos.ocn.ne.jp> References: <20031115211339.GB20162@electra.cse.Buffalo.EDU> <20031116.090904.35667861.hrs@eos.ocn.ne.jp> <87124995263.20031116120847@alexdupre.com> <20031116.221410.106767692.hrs@eos.ocn.ne.jp>
next in thread | previous in thread | raw e-mail | index | archive | help
--1sNVjLsmu1MXqwQ/
Content-Type: multipart/mixed; boundary="2JFBq9zoW8cOFH7v"
Content-Disposition: inline
--2JFBq9zoW8cOFH7v
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
On 2003.11.16 22:14:10 +0900, Hiroki Sato wrote:
> I think I'll commit a patch[*], which is for moving lists of FreeBSD
> mirror sites into doc/share/sgml/mirrors.xml, and generating lists
> used in index.html and handbook from the file dynamically. This should
> make maintenance easier for the maintainers and the translation teams.
>=20
> Any objections or comments?
I think it's a great idea, but it does mean that doc/ is now always
required to build www/. I think there should be an explicit dependency
=66rom index.html to the mirror xml file, like the attached patch so
make(1) will fail instead of generating an empty mirror dropdown.
I don't think it is a big problem that www/ depend on doc/, since most
people will have doc/ checked out anyway to build the documentation as
part of the web build. This also allows us to reduce the amount of
duplicate meta information in doc/ and www/, at some later point.
Should't it be in share/xml or something like that, since it's not
really sgml? (It's not something I feel strongly about)
A few very minor things, there are some end-of-line whitespace and some
spaces that IMO should be tabs. Should be simple to see in the attached
patches.
Nice work!
--=20
Simon L. Nielsen
FreeBSD Documentation Team
--2JFBq9zoW8cOFH7v
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="www-makefile-mirrordepend.patch"
Content-Transfer-Encoding: quoted-printable
Index: Makefile
=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
RCS file: /home/ncvs/www/en/Makefile,v
retrieving revision 1.99
diff -u -r1.99 Makefile
--- Makefile 29 Oct 2003 20:42:50 -0000 1.99
+++ Makefile 16 Nov 2003 14:11:44 -0000
@@ -91,7 +91,7 @@
DATA+=3D index.html
CLEANFILES+=3D index.html
=20
-index.html: index.xsl news/news.xml news/press.xml includes.xsl news/inclu=
des.xsl security/advisories.xml
+index.html: index.xsl news/news.xml news/press.xml includes.xsl news/inclu=
des.xsl security/advisories.xml ../../doc/share/sgml/mirrors.xml
${XSLTPROC} ${XSLTPROCOPTS} -o ${.TARGET} \
${.CURDIR}/index.xsl ${.CURDIR}/news/news.xml
.if !defined(NO_TIDY)
--2JFBq9zoW8cOFH7v
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="index.xsl-tab.patch"
Content-Transfer-Encoding: quoted-printable
--- index.xsl.orig Sun Nov 16 15:42:56 2003
+++ index.xsl Sun Nov 16 15:43:09 2003
@@ -50,35 +50,35 @@
which are not mirrored should be listed in
support.sgml. -->
=20
- <xsl:for-each select=3D"document($mirrors)/mirrors/entry=
[url[contains(@proto, 'httpv6')]]">
- <xsl:for-each select=3D"url[contains(@proto, 'httpv6')=
and contains(@type, 'www')]">
+ <xsl:for-each select=3D"document($mirrors)/mirrors/entry[url[contains(=
@proto, 'httpv6')]]">
+ <xsl:for-each select=3D"url[contains(@proto, 'httpv6') and contains(=
@type, 'www')]">
<option><xsl:attribute name=3D"value"><xsl:value-of select=3D"." />=
</xsl:attribute>
- <xsl:choose>
- <xsl:when test=3D"last() =3D 1">
- <xsl:value-of select=3D"concat('IPv6 ', ../coun=
try)" />
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select=3D"concat('IPv6 ', ../coun=
try, '/', position())" />
- </xsl:otherwise>
- </xsl:choose>
- </option>
- </xsl:for-each>
- </xsl:for-each>
+ <xsl:choose>
+ <xsl:when test=3D"last() =3D 1">
+ <xsl:value-of select=3D"concat('IPv6 ', ../country)" />
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select=3D"concat('IPv6 ', ../country, '/', position())=
" />
+ </xsl:otherwise>
+ </xsl:choose>
+ </option>
+ </xsl:for-each>
+ </xsl:for-each>
=20
- <xsl:for-each select=3D"document($mirrors)/mirrors/entry=
[url[contains(@proto, 'http')]]">
- <xsl:for-each select=3D"url[contains(@proto, 'http') a=
nd contains(@type, 'www')]">
+ <xsl:for-each select=3D"document($mirrors)/mirrors/entry[url[contains(=
@proto, 'http')]]">
+ <xsl:for-each select=3D"url[contains(@proto, 'http') and contains(@t=
ype, 'www')]">
<option><xsl:attribute name=3D"value"><xsl:value-of select=3D"." />=
</xsl:attribute>
- <xsl:choose>
- <xsl:when test=3D"last() =3D 1">
- <xsl:value-of select=3D"../country" />
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select=3D"concat(../country, '/',=
position())" />
- </xsl:otherwise>
- </xsl:choose>
- </option>
- </xsl:for-each>
- </xsl:for-each>
+ <xsl:choose>
+ <xsl:when test=3D"last() =3D 1">
+ <xsl:value-of select=3D"../country" />
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select=3D"concat(../country, '/', position())" />
+ </xsl:otherwise>
+ </xsl:choose>
+ </option>
+ </xsl:for-each>
+ </xsl:for-each>
</select>
=09
<input type=3D"submit" value=3D" Go "/>
--2JFBq9zoW8cOFH7v
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="mirrors.xml-eolwhitespace.patch"
Content-Transfer-Encoding: quoted-printable
--- mirrors.xml.orig Sun Nov 16 15:40:22 2003
+++ mirrors.xml Sun Nov 16 15:41:52 2003
@@ -554,9 +554,9 @@
<entry id=3D"mirrors-ua">
<country>Ukraine</country>
<url proto=3D"http" type=3D"www">http://www.ua.FreeBSD.org/</url>;
- <url proto=3D"http" type=3D"www">http://www2.ua.FreeBSD.org/</url>=20
- <url proto=3D"http" type=3D"www">http://www5.ua.FreeBSD.org/</url>=20
- <url proto=3D"http" type=3D"www">http://www4.ua.FreeBSD.org/</url>=20
+ <url proto=3D"http" type=3D"www">http://www2.ua.FreeBSD.org/</url>;
+ <url proto=3D"http" type=3D"www">http://www5.ua.FreeBSD.org/</url>;
+ <url proto=3D"http" type=3D"www">http://www4.ua.FreeBSD.org/</url>;
<url proto=3D"ftp,http">ftp://ftp.ua.FreeBSD.org/pub/FreeBSD/</url>;
<url proto=3D"ftp,http">ftp://ftp2.ua.FreeBSD.org/pub/FreeBSD/</url>;
<url proto=3D"ftp">ftp://ftp3.ua.FreeBSD.org/pub/FreeBSD/</url>;
--2JFBq9zoW8cOFH7v
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
filename="mirrors.xsl-eolwhitespace-tab.patch"
Content-Transfer-Encoding: quoted-printable
--- mirrors.xsl.orig Sun Nov 16 15:40:27 2003
+++ mirrors.xsl Sun Nov 16 15:44:29 2003
@@ -2,54 +2,54 @@
<!-- $FreeBSD$ -->
=20
<xsl:stylesheet xmlns:xsl=3D"http://www.w3.org/1999/XSL/Transform" version=
=3D"1.0">
- =20
+
<xsl:output type=3D"xml" encoding=3D"iso-8859-1"
- omit-xml-declaration=3D"yes"
- indent=3D"yes"/>
+ omit-xml-declaration=3D"yes"
+ indent=3D"yes"/>
=20
<xsl:template match=3D"/mirrors">
<para>
<xsl:for-each select=3D"entry[url[contains(@proto, $proto)] or host[=
contains(@proto, $proto)]]">
<link><xsl:attribute name=3D"linkend"><xsl:value-of select=3D"conca=
t(@id, '-', $proto)" /></xsl:attribute>
- <xsl:value-of select=3D"country" /></link>
+ <xsl:value-of select=3D"country" /></link>
<xsl:choose>
- <xsl:when test=3D'position() =3D last()'><xsl:text>.</xsl:text></=
xsl:when>
- <xsl:otherwise><xsl:text>, </xsl:text></xsl:otherwise>
+ <xsl:when test=3D'position() =3D last()'><xsl:text>.</xsl:text></xsl:whe=
n>
+ <xsl:otherwise><xsl:text>, </xsl:text></xsl:otherwise>
</xsl:choose>
</xsl:for-each>
</para>
=20
<variablelist>
<xsl:for-each select=3D"entry[url[contains(@proto, $proto)] or host[=
contains(@proto, $proto)]]">
- <varlistentry>
- <term><anchor><xsl:attribute name=3D"id"><xsl:value-of select=3D=
"concat(@id, '-', $proto)" /></xsl:attribute>
- </anchor><xsl:value-of select=3D"country" /></term>
+ <varlistentry>
+ <term><anchor><xsl:attribute name=3D"id"><xsl:value-of select=3D"concat=
(@id, '-', $proto)" /></xsl:attribute>
+ </anchor><xsl:value-of select=3D"country" /></term>
=20
<listitem>
- <xsl:if test=3D"$proto =3D 'ftp' and email">
- <para>In case of problems, please contact the hostmaster
- <email><xsl:value-of select=3D"email" /></email> for this domain.=
</para>
- </xsl:if>
- =20
- <itemizedlist>
- <xsl:for-each select=3D"child::*[contains(@proto, $proto)]">
- <listitem>
- <para>
- <xsl:choose>
- <xsl:when test=3D"self::url">
- <ulink><xsl:attribute name=3D"url"><xsl:value-of select=
=3D"." /></xsl:attribute>
- </ulink>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select=3D"." />
- </xsl:otherwise>
- </xsl:choose>
- </para>
- </listitem>
- </xsl:for-each>
- </itemizedlist> =20
+ <xsl:if test=3D"$proto =3D 'ftp' and email">
+ <para>In case of problems, please contact the hostmaster
+ <email><xsl:value-of select=3D"email" /></email> for this domain.</para>
+ </xsl:if>
+
+ <itemizedlist>
+ <xsl:for-each select=3D"child::*[contains(@proto, $proto)]">
+ <listitem>
+ <para>
+ <xsl:choose>
+ <xsl:when test=3D"self::url">
+ <ulink><xsl:attribute name=3D"url"><xsl:value-of select=3D"." /></xsl:=
attribute>
+ </ulink>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select=3D"." />
+ </xsl:otherwise>
+ </xsl:choose>
+ </para>
+ </listitem>
+ </xsl:for-each>
+ </itemizedlist>
</listitem>
- </varlistentry>
+ </varlistentry>
</xsl:for-each>
</variablelist>
</xsl:template>
--2JFBq9zoW8cOFH7v--
--1sNVjLsmu1MXqwQ/
Content-Type: application/pgp-signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.3 (FreeBSD)
iD8DBQE/t4+4h9pcDSc1mlERAjVnAJ9j0Jztk5cO1PSPtvBx6nKcjCgBxQCcDMNU
Z+Kh444KKLvSykB3qmY6Yes=
=CgOf
-----END PGP SIGNATURE-----
--1sNVjLsmu1MXqwQ/--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20031116145448.GC402>