----Security_Multipart0(Sun_Apr_10_23_12_25_2005_538)--
Content-Type: Multipart/Mixed;
 boundary="--Next_Part(Sun_Apr_10_23_12_25_2005_253)--"
Content-Transfer-Encoding: 7bit

----Next_Part(Sun_Apr_10_23_12_25_2005_253)--
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

Hi,

Klaus Heinz <heinz@NetBSD.org> wrote
  in <20050410012600.B10A92DA27@cvs.netbsd.org>:

he> Module Name:	htdocs
he> Committed By:	heinz
he> Date:		Sun Apr 10 01:26:00 UTC 2005
he> 
he> Modified Files:
he> 	htdocs/share/xsl: netbsd.xsl
he> 
he> Log Message:
he> Added a template for <startCVStag>. This enables escaping of CVS (or
he> RCS) tags:
he>   XML : <startCVStag id="NetBSD" />$
he>   HTML: &#24;NetBSD$

 I think <startCVStag> is overkill for this purpose...  Would you mind
 if I committed the attached patch instead?  Since extending XML
 vocabulary tends to break validation and make maintainability worse,
 we should avoid it as much as possible.

-- 
| Hiroki SATO

----Next_Part(Sun_Apr_10_23_12_25_2005_253)--
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Content-Disposition: inline; filename="startCVStag.diff"

Index: developers/translate.xml
===================================================================
RCS file: /cvsroot/htdocs/developers/translate.xml,v
retrieving revision 1.2
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.2 translate.xml
--- developers/translate.xml	10 Apr 2005 01:48:17 -0000	1.2
+++ developers/translate.xml	10 Apr 2005 13:59:54 -0000
@@ -1,9 +1,8 @@
 <?xml version="1.0"?>
 <!DOCTYPE webpage
-PUBLIC "-//Norman Walsh//DTD Website V2.2//EN"
-"http://docbook.sourceforge.net/release/website/2.2/website.dtd" [
-<!ENTITY % man-refs.ent SYSTEM "../share/xml/man-refs.ent"> %man-refs.ent;
-]>
+PUBLIC "-//NetBSD//DTD Website-based NetBSD Extension//EN"
+"http://www.NetBSD.org/XML/htdocs/lang/share/xml/website-netbsd.dtd">
+
 <webpage id="translate-htdocs">
   <config param="desc" value="Translating htdocs" />
   <config param="cvstag"
@@ -378,13 +377,13 @@
         <para>Please always include a comment which explains which
         exact english version the document is based on. For
         example:</para>
-        <programlisting>  <startCVStag id="NetBSD" />: index.html,v 1.611 2001/11/30 19:30:43 dent Exp $
+        <programlisting>  &dollar;NetBSD: index.html,v 1.611 2001/11/30 19:30:43 dent Exp $
   &lt;br&gt; &lt;!-- Based on english version: --&gt;
   &lt;!-- NetBSD: index.html,v 1.611 2001/11/30 19:30:43 dent Exp $ --&gt;</programlisting>
         <para>If you are familiar with CVS or RCS, you will
         recognize the format. NetBSD's CVS server has been
-        configured to use the "<startCVStag id="NetBSD" />$" tag rather than the
-        "<startCVStag id="Id" />$" tag, so that the proper revision number etc. are
+        configured to use the "&dollar;NetBSD$" tag rather than the
+        "&dollar;Id$" tag, so that the proper revision number etc. are
         substituted when you commit the file - the second tag will
         remain untouched, as it is not prepended with the "$" sign.
         Obviously, it's important to remove the "$" from the
Index: share/xsl/netbsd.xsl
===================================================================
RCS file: /cvsroot/htdocs/share/xsl/netbsd.xsl,v
retrieving revision 1.6
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.6 netbsd.xsl
--- share/xsl/netbsd.xsl	10 Apr 2005 01:41:24 -0000	1.6
+++ share/xsl/netbsd.xsl	10 Apr 2005 13:59:54 -0000
@@ -6,16 +6,6 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 		xmlns:html="http://www.w3.org/1999/xhtml"
 		version="1.0">
-  <!--
-    Encode the starting $ of CVS tags. The id attribute contains the tag
-    identifier.
-    XML:   <startCVStag id="NetBSD" />
-    HTML:  $NetBSD
-  -->
-  <xsl:template match="startCVStag">
-    <xsl:text disable-output-escaping="yes">&amp;#x24;</xsl:text>
-    <xsl:value-of select="@id" />
-  </xsl:template>
 
   <!-- beautify blocks of code -->
   <xsl:template match="programlisting|screen">

----Next_Part(Sun_Apr_10_23_12_25_2005_253)----

----Security_Multipart0(Sun_Apr_10_23_12_25_2005_538)--
Content-Type: application/pgp-signature
Content-Transfer-Encoding: 7bit

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (FreeBSD)

iD8DBQBCWTRLTyzT2CeTzy0RAjkBAKCGHpT33r3QJlgAF+5fZvgS9jN4QACg3ZCt
irmlLpaz10AAc1dOfMoqvqY=
=IK+a
-----END PGP SIGNATURE-----

----Security_Multipart0(Sun_Apr_10_23_12_25_2005_538)----