- Fixes after MFH

3 files changed, 14 insertions, 6 deletions

diff --git a/share/xml/authors.ent b/share/xml/authors.ent
index 2626972da2..519e103eb6 100644
--- a/share/xml/authors.ent
+++ b/share/xml/authors.ent
@@ -283,7 +283,7 @@
 <!ENTITY a.bp.email "&a.bp; <email xmlns='http://docbook.org/ns/docbook'>bp@FreeBSD.org</email>">
 
 <!ENTITY a.br "Ruslan Bukin">
-<!ENTITY a.br.email "&a.br; <email xmlns=''>br@FreeBSD.org</email>">
+<!ENTITY a.br.email "&a.br; <email xmlns='http://docbook.org/ns/docbook'>br@FreeBSD.org</email>">
 
 <!ENTITY a.brandon "Brandon Gillespie">
 <!ENTITY a.brandon.email "&a.brandon; <email xmlns='http://docbook.org/ns/docbook'>brandon@FreeBSD.org</email>">
@@ -451,7 +451,7 @@
 <!ENTITY a.danger.email "&a.danger; <email xmlns='http://docbook.org/ns/docbook'>danger@FreeBSD.org</email>">
 
 <!ENTITY a.danilo "Danilo Eg&ecirc;a Gondolfo">
-<!ENTITY a.danilo.email "&a.danilo; <email xmlns=''>danilo@FreeBSD.org</email>">
+<!ENTITY a.danilo.email "&a.danilo; <email xmlns='http://docbook.org/ns/docbook'>danilo@FreeBSD.org</email>">
 
 <!ENTITY a.danny "Daniel O'Callaghan">
 <!ENTITY a.danny.email "&a.danny; <email xmlns='http://docbook.org/ns/docbook'>danny@FreeBSD.org</email>">
@@ -622,7 +622,7 @@
 <!ENTITY a.ed.email "&a.ed; <email xmlns='http://docbook.org/ns/docbook'>ed@FreeBSD.org</email>">
 
 <!ENTITY a.edavis "Eric Davis">
-<!ENTITY a.edavis.email "&a.edavis; <email xmlns=''>edavis@FreeBSD.org</email>">
+<!ENTITY a.edavis.email "&a.edavis; <email xmlns='http://docbook.org/ns/docbook'>edavis@FreeBSD.org</email>">
 
 <!ENTITY a.edwin "Edwin Groothuis">
 <!ENTITY a.edwin.email "&a.edwin; <email xmlns='http://docbook.org/ns/docbook'>edwin@FreeBSD.org</email>">
@@ -1042,7 +1042,7 @@
 <!ENTITY a.jmg.email "&a.jmg; <email xmlns='http://docbook.org/ns/docbook'>jmg@FreeBSD.org</email>">
 
 <!ENTITY a.jmmv "Julio Merino">
-<!ENTITY a.jmmv.email "&a.jmmv; <email xmlns=''>jmmv@FreeBSD.org</email>">
+<!ENTITY a.jmmv.email "&a.jmmv; <email xmlns='http://docbook.org/ns/docbook'>jmmv@FreeBSD.org</email>">
 
 <!ENTITY a.jmz "Jean-Marc Zucconi">
 <!ENTITY a.jmz.email "&a.jmz; <email xmlns='http://docbook.org/ns/docbook' role='nolink'>jmz@FreeBSD.org</email>">
@@ -1723,7 +1723,7 @@
 <!ENTITY a.rm.email "&a.rm; <email xmlns='http://docbook.org/ns/docbook'>rm@FreeBSD.org</email>">
 
 <!ENTITY a.nemysis "Rusmir Dusko">
-<!ENTITY a.nemysis.email "&a.nemysis; <email xmlns=''>nemysis@FreeBSD.org</email>">
+<!ENTITY a.nemysis.email "&a.nemysis; <email xmlns='http://docbook.org/ns/docbook'>nemysis@FreeBSD.org</email>">
 
 <!ENTITY a.rmacklem "Rick Macklem">
 <!ENTITY a.rmacklem.email "&a.rmacklem; <email xmlns='http://docbook.org/ns/docbook'>rmacklem@FreeBSD.org</email>">
@@ -2230,7 +2230,7 @@
 <!ENTITY a.zarzycki.email "&a.zarzycki; <email xmlns='http://docbook.org/ns/docbook'>zarzycki@FreeBSD.org</email>">
 
 <!ENTITY a.zbb "Zbigniew Bodek">
-<!ENTITY a.zbb.email "&a.zbb; <email xmlns=''>zbb@FreeBSD.org</email>">
+<!ENTITY a.zbb.email "&a.zbb; <email xmlns='http://docbook.org/ns/docbook'>zbb@FreeBSD.org</email>">
 
 <!ENTITY a.zec "Marko Zec">
 <!ENTITY a.zec.email "&a.zec; <email xmlns='http://docbook.org/ns/docbook'>zec@FreeBSD.org</email>">
diff --git a/share/xml/freebsd.sch b/share/xml/freebsd.sch
index c8f75ba91a..aac5143c36 100644
--- a/share/xml/freebsd.sch
+++ b/share/xml/freebsd.sch
@@ -15,6 +15,7 @@
     </rule>
   </pattern>
 
+<!-- XXX: temporarily turned off
   <pattern name="Check filenames">
     <rule context="//db:filename">
       <report test="@role = 'directory'">Filename (<xsl:value-of select="."/>) has role="directory"; use class="directory"</report>
@@ -23,6 +24,7 @@
       <report test="@role != 'directory' and @role != 'package' and role != 'port'">Filename (<xsl:value-of select="."/>) has role attribute set; consider a properly set class attribute</report>
     </rule>
   </pattern>
+-->
 
   <pattern name="Check cross-reference validity">
     <rule context="//db:link">
diff --git a/share/xml/freebsd50.rnc b/share/xml/freebsd50.rnc
index 93cff05752..a240d0317a 100644
--- a/share/xml/freebsd50.rnc
+++ b/share/xml/freebsd50.rnc
@@ -30,6 +30,12 @@ include "/usr/local/share/xml/docbook/5.0/rng/docbook.rnc" inherit = db {
        | db.email )*
     }
 
+  # XXX: DocBook 5.0 disallows mixing CDATA and itemizedlist
+  db.entry =
+    element entry {
+      db.entry.attlist, (db.all.inlines|db.all.blocks)*
+    }
+
   # FreeBSD extension: add buildtarget element to allowed inlines
   db.extension.inlines = db.buildtarget
      | db.revnumber