- Simplify keyword markup

- Extract related schema definition into own DTD Approved by: doceng (implicit)
svn path=/projects/sgml2xml/; revision=39374
2012-08-13 20:43:41 +00:00 · 2012-08-13 20:43:41 +00:00 · 217c06b0cd · 2020-12-08 03:00:23 +00:00
commit 217c06b0cd
parent 6f0813b25d
136 changed files with 178 additions and 441 deletions
--- a/de_DE.ISO8859-1/htdocs/news/2002/news.xml
+++ b/de_DE.ISO8859-1/htdocs/news/2002/news.xml
@ -25,11 +25,9 @@
 -->

 <news>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <year>
    <name>2002</name>
--- a/de_DE.ISO8859-1/htdocs/news/2003/news.xml
+++ b/de_DE.ISO8859-1/htdocs/news/2003/news.xml
@ -26,11 +26,9 @@
 -->

 <news>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <year>
    <name>2003</name>
--- a/de_DE.ISO8859-1/htdocs/news/2004/news.xml
+++ b/de_DE.ISO8859-1/htdocs/news/2004/news.xml
@ -26,11 +26,9 @@
 -->

 <news>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <year>
    <name>2004</name>
--- a/de_DE.ISO8859-1/htdocs/news/2004/press.xml
+++ b/de_DE.ISO8859-1/htdocs/news/2004/press.xml
@ -10,11 +10,9 @@
 -->

 <press>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <year>
    <name>2004</name>
--- a/de_DE.ISO8859-1/htdocs/news/2005/news.xml
+++ b/de_DE.ISO8859-1/htdocs/news/2005/news.xml
@ -25,11 +25,9 @@
 -->

 <news>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <year>
    <name>2005</name>
--- a/de_DE.ISO8859-1/htdocs/news/2005/press.xml
+++ b/de_DE.ISO8859-1/htdocs/news/2005/press.xml
@ -10,11 +10,9 @@
 -->

 <press>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <year>
    <name>2005</name>
--- a/de_DE.ISO8859-1/htdocs/news/2006/news.xml
+++ b/de_DE.ISO8859-1/htdocs/news/2006/news.xml
@ -26,11 +26,9 @@
 -->

 <news>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <year>
    <name>2006</name>
--- a/de_DE.ISO8859-1/htdocs/news/2006/press.xml
+++ b/de_DE.ISO8859-1/htdocs/news/2006/press.xml
@ -10,11 +10,9 @@
 -->

 <press>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <year>
    <name>2006</name>
--- a/de_DE.ISO8859-1/htdocs/news/2007/news.xml
+++ b/de_DE.ISO8859-1/htdocs/news/2007/news.xml
@ -31,11 +31,9 @@
 -->

 <news>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <year>
    <name>2007</name>
--- a/de_DE.ISO8859-1/htdocs/news/2007/press.xml
+++ b/de_DE.ISO8859-1/htdocs/news/2007/press.xml
@ -10,11 +10,9 @@
 -->

 <press>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <year>
    <name>2007</name>
--- a/de_DE.ISO8859-1/htdocs/news/2008/news.xml
+++ b/de_DE.ISO8859-1/htdocs/news/2008/news.xml
@ -31,11 +31,9 @@
 -->

 <news>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <year>
    <name>2008</name>
--- a/de_DE.ISO8859-1/htdocs/news/2008/press.xml
+++ b/de_DE.ISO8859-1/htdocs/news/2008/press.xml
@ -10,11 +10,9 @@
 -->

 <press>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <year>
    <name>2008</name>
--- a/de_DE.ISO8859-1/htdocs/news/2009/news.xml
+++ b/de_DE.ISO8859-1/htdocs/news/2009/news.xml
@ -31,11 +31,9 @@
 -->

 <news>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <year>
    <name>2009</name>
--- a/de_DE.ISO8859-1/htdocs/news/2009/press.xml
+++ b/de_DE.ISO8859-1/htdocs/news/2009/press.xml
@ -11,11 +11,9 @@
 -->

 <press>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <year>
    <name>2009</name>
--- a/de_DE.ISO8859-1/htdocs/platforms/ia64/news.xml
+++ b/de_DE.ISO8859-1/htdocs/platforms/ia64/news.xml
@ -24,10 +24,8 @@
 -->

 <news>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

 </news>
--- a/de_DE.ISO8859-1/share/sgml/news.xml
+++ b/de_DE.ISO8859-1/share/sgml/news.xml
@ -31,11 +31,9 @@
 -->

 <news>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <year>
    <name>2012</name>
--- a/de_DE.ISO8859-1/share/sgml/press.xml
+++ b/de_DE.ISO8859-1/share/sgml/press.xml
@ -11,11 +11,9 @@
 -->

 <press>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <year>
    <name>2012</name>
--- a/de_DE.ISO8859-1/share/sgml/transtable.xml
+++ b/de_DE.ISO8859-1/share/sgml/transtable.xml
@ -17,11 +17,9 @@
 -->

 <transtable>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <group id="country">
    <word>
--- a/en_US.ISO8859-1/htdocs/gnome/news.xml
+++ b/en_US.ISO8859-1/htdocs/gnome/news.xml
@ -17,10 +17,7 @@ News//EN"
     the contents of <title> will be preferred over <p>.
 -->
 <news>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS"
-  version="1.0">
-    <cvs:keyword name="freebsd">$FreeBSD$</cvs:keyword>
-  </cvs:keywords>
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">$FreeBSD$</cvs:keyword>

  <year>
    <name>2010</name>
--- a/en_US.ISO8859-1/htdocs/java/news.xml
+++ b/en_US.ISO8859-1/htdocs/java/news.xml
@ -18,11 +18,9 @@
 -->

 <news>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <year>
    <name>2012</name>
--- a/en_US.ISO8859-1/htdocs/news/1998/press.xml
+++ b/en_US.ISO8859-1/htdocs/news/1998/press.xml
@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <press>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <year>
    <name>1998</name>
--- a/en_US.ISO8859-1/htdocs/news/1999/press.xml
+++ b/en_US.ISO8859-1/htdocs/news/1999/press.xml
@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <press>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <year>
    <name>1999</name>
--- a/en_US.ISO8859-1/htdocs/news/2000/press.xml
+++ b/en_US.ISO8859-1/htdocs/news/2000/press.xml
@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <press>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <year>
    <name>2000</name>
--- a/en_US.ISO8859-1/htdocs/news/2001/news.xml
+++ b/en_US.ISO8859-1/htdocs/news/2001/news.xml
@ -18,11 +18,9 @@
 -->

 <news>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <year>
    <name>2001</name>
--- a/en_US.ISO8859-1/htdocs/news/2001/press.xml
+++ b/en_US.ISO8859-1/htdocs/news/2001/press.xml
@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <press>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <year>
    <name>2001</name>
--- a/en_US.ISO8859-1/htdocs/news/2002/news.xml
+++ b/en_US.ISO8859-1/htdocs/news/2002/news.xml
@ -18,11 +18,9 @@
 -->

 <news>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <year>
    <name>2002</name>
--- a/en_US.ISO8859-1/htdocs/news/2002/press.xml
+++ b/en_US.ISO8859-1/htdocs/news/2002/press.xml
@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <press>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <year>
    <name>2002</name>
--- a/en_US.ISO8859-1/htdocs/news/2003/news.xml
+++ b/en_US.ISO8859-1/htdocs/news/2003/news.xml
@ -18,11 +18,9 @@
 -->

 <news>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <year>
    <name>2003</name>
--- a/en_US.ISO8859-1/htdocs/news/2003/press.xml
+++ b/en_US.ISO8859-1/htdocs/news/2003/press.xml
@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <press>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <year>
    <name>2003</name>
--- a/en_US.ISO8859-1/htdocs/news/2004/news.xml
+++ b/en_US.ISO8859-1/htdocs/news/2004/news.xml
@ -18,11 +18,9 @@
 -->

 <news>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <year>
    <name>2004</name>
--- a/en_US.ISO8859-1/htdocs/news/2004/press.xml
+++ b/en_US.ISO8859-1/htdocs/news/2004/press.xml
@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <press>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <year>
    <name>2004</name>
--- a/en_US.ISO8859-1/htdocs/news/2005/news.xml
+++ b/en_US.ISO8859-1/htdocs/news/2005/news.xml
@ -18,11 +18,9 @@
 -->

 <news>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <year>
    <name>2005</name>
--- a/en_US.ISO8859-1/htdocs/news/2005/press.xml
+++ b/en_US.ISO8859-1/htdocs/news/2005/press.xml
@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <press>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <year>
    <name>2005</name>
--- a/en_US.ISO8859-1/htdocs/news/2006/news.xml
+++ b/en_US.ISO8859-1/htdocs/news/2006/news.xml
@ -18,11 +18,9 @@
 -->

 <news>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <year>
    <name>2006</name>
--- a/en_US.ISO8859-1/htdocs/news/2006/press.xml
+++ b/en_US.ISO8859-1/htdocs/news/2006/press.xml
@ -7,11 +7,9 @@
    "freefall:/c/www/bsddoc/press/".
 -->
 <press>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <year>
    <name>2006</name>
--- a/en_US.ISO8859-1/htdocs/news/2007/news.xml
+++ b/en_US.ISO8859-1/htdocs/news/2007/news.xml
@ -18,11 +18,9 @@
 -->

 <news>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <year>
    <name>2007</name>
--- a/en_US.ISO8859-1/htdocs/news/2007/press.xml
+++ b/en_US.ISO8859-1/htdocs/news/2007/press.xml
@ -7,11 +7,9 @@
    "freefall:/c/www/bsddoc/press/".
 -->
 <press>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <year>
    <name>2007</name>
--- a/en_US.ISO8859-1/htdocs/news/2008/news.xml
+++ b/en_US.ISO8859-1/htdocs/news/2008/news.xml
@ -23,11 +23,9 @@
 -->

 <news>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <year>
    <name>2008</name>
--- a/en_US.ISO8859-1/htdocs/news/2008/press.xml
+++ b/en_US.ISO8859-1/htdocs/news/2008/press.xml
@ -7,11 +7,9 @@
    "freefall:/c/www/bsddoc/press/".
 -->
 <press>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <year>
    <name>2008</name>
--- a/en_US.ISO8859-1/htdocs/news/2009/news.xml
+++ b/en_US.ISO8859-1/htdocs/news/2009/news.xml
@ -23,11 +23,9 @@
 -->

 <news>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <year>
    <name>2009</name>
--- a/en_US.ISO8859-1/htdocs/news/2009/press.xml
+++ b/en_US.ISO8859-1/htdocs/news/2009/press.xml
@ -7,11 +7,9 @@
    "freefall:/c/www/bsddoc/press/".
 -->
 <press>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <year>
    <name>2009</name>
--- a/en_US.ISO8859-1/htdocs/news/status/report-2001-06.xml
+++ b/en_US.ISO8859-1/htdocs/news/status/report-2001-06.xml
@ -11,11 +11,9 @@
    <year>2001</year>
  </date>

-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <section>
    <title>Introduction</title>
--- a/en_US.ISO8859-1/htdocs/news/status/report-2001-07.xml
+++ b/en_US.ISO8859-1/htdocs/news/status/report-2001-07.xml
@ -11,11 +11,9 @@
    <year>2001</year>
  </date>

-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <section>
    <title>Introduction</title>
--- a/en_US.ISO8859-1/htdocs/news/status/report-2001-08.xml
+++ b/en_US.ISO8859-1/htdocs/news/status/report-2001-08.xml
@ -11,11 +11,9 @@
    <year>2001</year>
  </date>

-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <section>
    <title>Introduction</title>
--- a/en_US.ISO8859-1/htdocs/news/status/report-2001-09.xml
+++ b/en_US.ISO8859-1/htdocs/news/status/report-2001-09.xml
@ -11,10 +11,7 @@
    <year>2001</year>
  </date>

-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS"
-  version="1.0">
-    <cvs:keyword name="freebsd">$FreeBSD$</cvs:keyword>
-  </cvs:keywords>
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">$FreeBSD$</cvs:keyword>

  <section>
    <title>Introduction</title>
--- a/en_US.ISO8859-1/htdocs/news/status/report-2001-12-2002-01.xml
+++ b/en_US.ISO8859-1/htdocs/news/status/report-2001-12-2002-01.xml
@ -11,11 +11,9 @@
    <year></year> <!-- XXX -->
  </date>

-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <section>
    <title>Introduction</title>
--- a/en_US.ISO8859-1/htdocs/platforms/ia64/news.xml
+++ b/en_US.ISO8859-1/htdocs/platforms/ia64/news.xml
@ -18,10 +18,8 @@
 -->

 <news>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

 </news>
--- a/en_US.ISO8859-1/htdocs/projects/ideas/ideas.xml
+++ b/en_US.ISO8859-1/htdocs/projects/ideas/ideas.xml
@ -13,11 +13,9 @@ Ideas//EN"
 -->

 <ideas>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <category>
    <title>Embedded</title>
--- a/fr_FR.ISO8859-1/htdocs/gnome/news.xml
+++ b/fr_FR.ISO8859-1/htdocs/gnome/news.xml
@ -26,11 +26,9 @@
 -->

 <news>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <year>
    <name>2002</name>
--- a/fr_FR.ISO8859-1/htdocs/news/2001/news.xml
+++ b/fr_FR.ISO8859-1/htdocs/news/2001/news.xml
@ -37,11 +37,9 @@
 -->

 <news>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <year>
    <name>2001</name>
--- a/fr_FR.ISO8859-1/htdocs/news/2002/news.xml
+++ b/fr_FR.ISO8859-1/htdocs/news/2002/news.xml
@ -37,11 +37,9 @@
 -->

 <news>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <year>
    <name>2002</name>
--- a/fr_FR.ISO8859-1/htdocs/platforms/ia64/news.xml
+++ b/fr_FR.ISO8859-1/htdocs/platforms/ia64/news.xml
@ -26,10 +26,8 @@
 -->

 <news>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

 </news>
--- a/fr_FR.ISO8859-1/share/sgml/events.xml
+++ b/fr_FR.ISO8859-1/share/sgml/events.xml
@ -15,11 +15,9 @@
 -->

 <events>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <event id="sucon-2004">
    <name>2ème Conférence Unix Helvétique</name>
--- a/fr_FR.ISO8859-1/share/sgml/news.xml
+++ b/fr_FR.ISO8859-1/share/sgml/news.xml
@ -42,11 +42,9 @@
 -->

 <news>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <year>
    <name>2004</name>
--- a/fr_FR.ISO8859-1/share/sgml/press.xml
+++ b/fr_FR.ISO8859-1/share/sgml/press.xml
@ -16,11 +16,9 @@
 -->

 <press>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <year>
    <name>2004</name>
--- a/fr_FR.ISO8859-1/share/sgml/transtable.xml
+++ b/fr_FR.ISO8859-1/share/sgml/transtable.xml
@ -23,11 +23,9 @@
 -->

 <transtable>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword>
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

 <!--
  <word>
--- a/hu_HU.ISO8859-2/htdocs/news/2008/press.xml
+++ b/hu_HU.ISO8859-2/htdocs/news/2008/press.xml
@ -9,11 +9,9 @@
 -->

 <press>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <year>
    <name>2008</name>
--- a/hu_HU.ISO8859-2/htdocs/news/2009/news.xml
+++ b/hu_HU.ISO8859-2/htdocs/news/2009/news.xml
@ -9,11 +9,9 @@
 -->

 <news>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <year>
    <name>2009</name>
--- a/hu_HU.ISO8859-2/htdocs/platforms/ia64/news.xml
+++ b/hu_HU.ISO8859-2/htdocs/platforms/ia64/news.xml
@ -18,10 +18,8 @@
 -->

 <news>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

 </news>
--- a/hu_HU.ISO8859-2/share/sgml/events.xml
+++ b/hu_HU.ISO8859-2/share/sgml/events.xml
@ -15,11 +15,9 @@
 -->

 <events>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <event id="bsdcan-2013">
    <name>BSDCan 2013</name>
--- a/hu_HU.ISO8859-2/share/sgml/news.xml
+++ b/hu_HU.ISO8859-2/share/sgml/news.xml
@ -9,11 +9,9 @@
 -->

 <news>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <year>
    <name>2010</name>
--- a/hu_HU.ISO8859-2/share/sgml/press.xml
+++ b/hu_HU.ISO8859-2/share/sgml/press.xml
@ -9,11 +9,9 @@
 -->

 <press>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <year>
    <name>2010</name>
--- a/hu_HU.ISO8859-2/share/sgml/transtable.xml
+++ b/hu_HU.ISO8859-2/share/sgml/transtable.xml
@ -22,11 +22,9 @@
 -->

 <transtable>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <group id="continents">
    <word>
--- a/it_IT.ISO8859-15/share/sgml/transtable.xml
+++ b/it_IT.ISO8859-15/share/sgml/transtable.xml
@ -8,11 +8,9 @@
 -->

 <transtable>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <group id="country">
    <word>
--- a/ja_JP.eucJP/htdocs/java/news.xml
+++ b/ja_JP.eucJP/htdocs/java/news.xml
@ -21,11 +21,9 @@
 <!-- Original revision: r38915 -->

 <news>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <year>
    <name>2012</name>
--- a/ja_JP.eucJP/htdocs/news/2001/news.xml
+++ b/ja_JP.eucJP/htdocs/news/2001/news.xml
@ -22,11 +22,9 @@
 -->

 <news>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <year>
    <name>2001</name>
--- a/ja_JP.eucJP/htdocs/news/2001/press.xml
+++ b/ja_JP.eucJP/htdocs/news/2001/press.xml
@ -5,11 +5,9 @@
 <!-- Original revision: 1.2 -->

 <press>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <year>
    <name>2001</name>
--- a/ja_JP.eucJP/htdocs/platforms/ia64/news.xml
+++ b/ja_JP.eucJP/htdocs/platforms/ia64/news.xml
@ -21,10 +21,8 @@
 <!-- Original revision: 1.2 -->

 <news>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

 </news>
--- a/ja_JP.eucJP/share/sgml/news.xml
+++ b/ja_JP.eucJP/share/sgml/news.xml
@ -23,11 +23,9 @@
     Original revision: r39063
 -->
 <news>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <year>
    <name>2012</name>
--- a/ja_JP.eucJP/share/sgml/press.xml
+++ b/ja_JP.eucJP/share/sgml/press.xml
@ -4,11 +4,9 @@
 <!-- Original revision: 1.21 -->

 <press>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <year>
    <name>2002</name>
--- a/ja_JP.eucJP/share/sgml/transtable.xml
+++ b/ja_JP.eucJP/share/sgml/transtable.xml
@ -16,11 +16,9 @@
 -->

 <transtable>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <group id="continents">
    <word>
--- a/mn_MN.UTF-8/share/sgml/transtable.xml
+++ b/mn_MN.UTF-8/share/sgml/transtable.xml
@ -21,11 +21,9 @@
 -->

 <transtable>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSDmn: freebsd_mn_doc/mn_MN-UTF-8/share/sgml/transtable.xml,v 0.1 2007/03/27 23:16:46 ganbold Exp $
    </cvs:keyword>
-  </cvs:keywords>

 <group id="country">
  <word>
--- a/nl_NL.ISO8859-1/share/sgml/transtable.xml
+++ b/nl_NL.ISO8859-1/share/sgml/transtable.xml
@ -23,11 +23,9 @@
 -->

 <transtable>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <group id="country">
    <word>
--- a/ru_RU.KOI8-R/htdocs/gnome/news.xml
+++ b/ru_RU.KOI8-R/htdocs/gnome/news.xml
@ -27,11 +27,9 @@
 -->

 <news>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <year>
    <name>2003</name>
--- a/ru_RU.KOI8-R/htdocs/news/1998/press.xml
+++ b/ru_RU.KOI8-R/htdocs/news/1998/press.xml
@ -15,11 +15,9 @@
 -->

 <press>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <year>
    <name>1998</name>
--- a/ru_RU.KOI8-R/htdocs/news/1999/press.xml
+++ b/ru_RU.KOI8-R/htdocs/news/1999/press.xml
@ -15,11 +15,9 @@
 -->

 <press>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <year>
    <name>1999</name>
--- a/ru_RU.KOI8-R/htdocs/news/2000/press.xml
+++ b/ru_RU.KOI8-R/htdocs/news/2000/press.xml
@ -15,11 +15,9 @@
 -->

 <press>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <year>
    <name>2000</name>
--- a/ru_RU.KOI8-R/htdocs/news/2001/news.xml
+++ b/ru_RU.KOI8-R/htdocs/news/2001/news.xml
@ -27,11 +27,9 @@
 -->

 <news>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <year>
    <name>2001</name>
--- a/ru_RU.KOI8-R/htdocs/news/2001/press.xml
+++ b/ru_RU.KOI8-R/htdocs/news/2001/press.xml
@ -15,11 +15,9 @@
 -->

 <press>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <year>
    <name>2001</name>
--- a/ru_RU.KOI8-R/htdocs/news/2002/news.xml
+++ b/ru_RU.KOI8-R/htdocs/news/2002/news.xml
@ -27,11 +27,9 @@
 -->

 <news>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <year>
    <name>2002</name>
--- a/ru_RU.KOI8-R/htdocs/news/2002/press.xml
+++ b/ru_RU.KOI8-R/htdocs/news/2002/press.xml
@ -15,11 +15,9 @@
 -->

 <press>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <year>
    <name>2002</name>
--- a/ru_RU.KOI8-R/htdocs/news/2003/news.xml
+++ b/ru_RU.KOI8-R/htdocs/news/2003/news.xml
@ -27,11 +27,9 @@
 -->

 <news>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <year>
    <name>2003</name>
--- a/ru_RU.KOI8-R/htdocs/news/2003/press.xml
+++ b/ru_RU.KOI8-R/htdocs/news/2003/press.xml
@ -15,11 +15,9 @@
 -->

 <press>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <year>
    <name>2003</name>
--- a/ru_RU.KOI8-R/share/sgml/events.xml
+++ b/ru_RU.KOI8-R/share/sgml/events.xml
@ -15,11 +15,9 @@
 -->

 <events xmlns:xi="http://www.w3.org/2001/XInclude">
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <xi:include
    href="http://www.FreeBSD.org/XML/www/lang/share/sgml/events2013.xml"
--- a/ru_RU.KOI8-R/share/sgml/events2003.xml
+++ b/ru_RU.KOI8-R/share/sgml/events2003.xml
@ -15,11 +15,9 @@
 -->

 <events>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <event id="ccc-20">
    <name>20. Chaos Communication Congress</name>
--- a/ru_RU.KOI8-R/share/sgml/events2004.xml
+++ b/ru_RU.KOI8-R/share/sgml/events2004.xml
@ -15,11 +15,9 @@
 -->

 <events>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <event id="ccc-21">
    <name>21. Chaos Communication Congress</name>
--- a/ru_RU.KOI8-R/share/sgml/events2005.xml
+++ b/ru_RU.KOI8-R/share/sgml/events2005.xml
@ -15,11 +15,9 @@
 -->

 <events>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <event id="guficon-6">
    <name>GUFICon #6</name>
--- a/ru_RU.KOI8-R/share/sgml/events2006.xml
+++ b/ru_RU.KOI8-R/share/sgml/events2006.xml
@ -15,11 +15,9 @@
 -->

 <events>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <event id="chilebsdcon-2006">
    <name>ChileBSDCon 2006</name>
--- a/ru_RU.KOI8-R/share/sgml/events2007.xml
+++ b/ru_RU.KOI8-R/share/sgml/events2007.xml
@ -15,11 +15,9 @@
 -->

 <events>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <event id="meetbsd-2007">
    <name>MeetBSD 2007</name>
--- a/ru_RU.KOI8-R/share/sgml/events2008.xml
+++ b/ru_RU.KOI8-R/share/sgml/events2008.xml
@ -15,11 +15,9 @@
 -->

 <events>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <event id="nllgg-2008">
    <name>NLLGG-bijeenkomst december 2008</name>
--- a/ru_RU.KOI8-R/share/sgml/events2009.xml
+++ b/ru_RU.KOI8-R/share/sgml/events2009.xml
@ -15,11 +15,9 @@
 -->

 <events>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <event id="open-rheinruhr-2009">
    <name>OpenRheinRuhr 2009</name>
--- a/ru_RU.KOI8-R/share/sgml/events2010.xml
+++ b/ru_RU.KOI8-R/share/sgml/events2010.xml
@ -15,11 +15,9 @@
 -->

 <events>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <event id="nllgg-2010">
    <name>NLLGG gathering</name>
--- a/ru_RU.KOI8-R/share/sgml/events2011.xml
+++ b/ru_RU.KOI8-R/share/sgml/events2011.xml
@ -15,11 +15,9 @@
 -->

 <events>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <event id="bsdday-argentina-2011">
    <name>BSDday Argentina 2011</name>
--- a/ru_RU.KOI8-R/share/sgml/events2012.xml
+++ b/ru_RU.KOI8-R/share/sgml/events2012.xml
@ -15,11 +15,9 @@
 -->

 <events>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <event id="bsdcan-2012">
    <name>BSDCan 2012</name>
--- a/ru_RU.KOI8-R/share/sgml/events2013.xml
+++ b/ru_RU.KOI8-R/share/sgml/events2013.xml
@ -15,11 +15,9 @@
 -->

 <events>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <event id="bsdcan-2013">
    <name>BSDCan 2013</name>
--- a/ru_RU.KOI8-R/share/sgml/news.xml
+++ b/ru_RU.KOI8-R/share/sgml/news.xml
@ -29,11 +29,9 @@
 -->

 <news>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <year>
    <name>2005</name>
--- a/ru_RU.KOI8-R/share/sgml/press.xml
+++ b/ru_RU.KOI8-R/share/sgml/press.xml
@ -17,11 +17,9 @@
 -->

 <press>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <year>
    <name>2005</name>
--- a/ru_RU.KOI8-R/share/sgml/transtable.xml
+++ b/ru_RU.KOI8-R/share/sgml/transtable.xml
@ -22,11 +22,9 @@
 -->

 <transtable>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

 <group id="country">
  <word>
--- a/share/sgml/advisories.xml
+++ b/share/sgml/advisories.xml
@ -1,10 +1,8 @@
 <?xml version="1.0"?>
 <advisories>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
      $FreeBSD$
    </cvs:keyword>
-  </cvs:keywords>

  <year>
    <name>2012</name>
--- a/share/sgml/catalog.xml
+++ b/share/sgml/catalog.xml
@ -50,6 +50,9 @@
  <public
        publicId="-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD//EN"
        uri="xslt10-freebsd.dtd" />
+  <public
+	publicId="-//FreeBSD//DTD FreeBSD CVS Keywords//EN"
+        uri="cvs.dtd"/>
  <public
        publicId="-//FreeBSD//DTD FreeBSD XML Database for UserGroups//EN"
        uri="usergroups.dtd" />
--- a/Show more
+++ b/Show more