* all that is not specifically allowed, is forbidden

* keeping the allowed media type value to a single field (with several values separated with a space if necessary)

1 files changed, 8 insertions, 40 deletions

diff --git a/htdocs/config/types.conf b/htdocs/config/types.conf
index 746c66c..7c3321b 100644
--- a/htdocs/config/types.conf
+++ b/htdocs/config/types.conf
@@ -1,7 +1,7 @@
 #
 # Main Document Type Database for the W3C Markup Validation Service.
 #
-# $Id: types.conf,v 1.21 2006-10-10 09:35:33 ot Exp $
+# $Id: types.conf,v 1.22 2007-03-07 06:41:12 ot Exp $
 #
 # Maintains all information for each of the document types we support.
 # See 'perldoc Config::General' for the syntax, and be aware that the
@@ -26,7 +26,6 @@
   Parse Mode = SGML
   <Types>
     Allowed   = text/html
-    Forbidden = application/xhtml+xml
     Preferred = text/html
   </Types>
   <Badge>
@@ -42,7 +41,6 @@
   Parse Mode = SGML
   <Types>
     Allowed   = text/html
-    Forbidden = application/xhtml+xml
     Preferred = text/html
   </Types>
   <Badge>
@@ -58,7 +56,6 @@
   Parse Mode = SGML
   <Types>
     Allowed   = text/html
-    Forbidden = application/xhtml+xml
     Preferred = text/html
   </Types>
   <Badge>
@@ -74,7 +71,6 @@
   Parse Mode = SGML
   <Types>
     Allowed   = text/html
-    Forbidden = application/xhtml+xml
     Preferred = text/html
   </Types>
   <Badge>
@@ -90,7 +86,6 @@
   Parse Mode = SGML
   <Types>
     Allowed   = text/html
-    Forbidden = application/xhtml+xml
     Preferred = text/html
   </Types>
   <Badge>
@@ -109,7 +104,6 @@
   Parse Mode = SGML
   <Types>
     Allowed   = text/html
-    Forbidden = application/xhtml+xml
     Preferred = text/html
   </Types>
   <Badge>
@@ -132,7 +126,6 @@
   Parse Mode = SGML
   <Types>
     Allowed   = text/html
-    Forbidden = application/xhtml+xml
     Preferred = text/html
   </Types>
   <Badge>
@@ -152,7 +145,6 @@
   Parse Mode = SGML
   <Types>
     Allowed   = text/html
-    Forbidden = application/xhtml+xml
     Preferred = text/html
   </Types>
   <Badge>
@@ -172,7 +164,6 @@
   Parse Mode = SGML
   <Types>
     Allowed   = text/html
-    Forbidden = application/xhtml+xml
     Preferred = text/html
   </Types>
   <Badge>
@@ -192,7 +183,6 @@
   Parse Mode = SGML
   <Types>
     Allowed   = text/html
-    Forbidden = application/xhtml+xml
     Preferred = text/html
   </Types>
   <Badge>
@@ -212,7 +202,6 @@
   Parse Mode = SGML
   <Types>
     Allowed   = text/html
-    Forbidden = application/xhtml+xml
     Preferred = text/html
   </Types>
   <Badge>
@@ -232,7 +221,6 @@
   Parse Mode = SGML
   <Types>
     Allowed   = text/html
-    Forbidden = application/xhtml+xml
     Preferred = text/html
   </Types>
   <Badge>
@@ -252,8 +240,7 @@
   Namespace  = http://www.w3.org/1999/xhtml
   Parse Mode = XML
   <Types>
-    Allowed   = text/html
-    Allowed   = application/xhtml+xml
+    Allowed   = text/html application/xhtml+xml
     Preferred = application/xhtml+xml
   </Types>
   <Badge>
@@ -273,8 +260,7 @@
   Namespace  = http://www.w3.org/1999/xhtml
   Parse Mode = XML
   <Types>
-    Allowed   = text/html
-    Allowed   = application/xhtml+xml
+    Allowed   = text/html application/xhtml+xml
     Preferred = application/xhtml+xml
   </Types>
   <Badge>
@@ -294,8 +280,7 @@
   Namespace  = http://www.w3.org/1999/xhtml
   Parse Mode = XML
   <Types>
-    Allowed   = text/html
-    Allowed   = application/xhtml+xml
+    Allowed   = text/html application/xhtml+xml
     Preferred = application/xhtml+xml
   </Types>
   <Badge>
@@ -315,8 +300,7 @@
   Namespace  = http://www.w3.org/1999/xhtml
   Parse Mode = XML
   <Types>
-    Allowed   = text/html
-    Allowed   = application/xhtml+xml
+    Allowed   = text/html application/xhtml+xml
     Preferred = application/xhtml+xml
   </Types>
   <Badge>
@@ -338,6 +322,7 @@
   Parse Mode = XML
   <Types>
     Allowed   = application/xhtml+xml
+    Preferred   = application/xhtml+xml
   </Types>
 </XHTML-Print_1_0>
 
@@ -351,7 +336,6 @@
   Parse Mode = XML
   <Types>
     Allowed   = application/xhtml+xml
-    Forbidden = text/html
     Preferred = application/xhtml+xml
   </Types>
   <Badge>
@@ -370,7 +354,6 @@
   Parse Mode = SGML
   <Types>
     Allowed   = text/html
-    Forbidden = application/xhtml+xml
     Preferred = text/html
   </Types>
   <Badge>
@@ -387,7 +370,6 @@
   Parse Mode = SGML
   <Types>
     Allowed   = text/html
-    Forbidden = application/xhtml+xml
     Preferred = text/html
   </Types>
   <Badge>
@@ -408,8 +390,6 @@
   Parse Mode = XML
   <Types>
     Allowed   = application/mathml+xml
-    Forbidden = application/xhtml+xml
-    Forbidden = text/html
     Preferred = application/mathml+xml
   </Types>
 </MathML_2>
@@ -423,10 +403,7 @@
   Namespace  = http://www.w3.org/1999/xhtml
   Parse Mode = XML
   <Types>
-    Allowed   = application/xhtml+xml
-    Allowed   = application/xml
-    Allowed   = text/xml
-    Forbidden = text/html
+    Allowed   = application/xhtml+xml application/xml text/xml
     Preferred = application/xhtml+xml
   </Types>
 </XHTML_1.1_MathML_2>
@@ -440,10 +417,7 @@
   Namespace  = http://www.w3.org/1999/xhtml
   Parse Mode = XML
   <Types>
-    Allowed   = application/xhtml+xml
-    Allowed   = application/xml
-    Allowed   = text/xml
-    Forbidden = text/html
+    Allowed   = application/xhtml+xml application/xml text/xml
     Preferred = application/xhtml+xml
   </Types>
 </XHTML_1.1_MathML_2_SVG_1.1>
@@ -458,7 +432,6 @@
   Parse Mode = XML
   <Types>
     Allowed   = image/svg+xml
-    Forbidden = text/html
     Preferred = image/svg+xml
   </Types>
   <Badge>
@@ -477,7 +450,6 @@
   Parse Mode = XML
   <Types>
     Allowed   = image/svg+xml
-    Forbidden = text/html
     Preferred = image/svg+xml
   </Types>
   <Badge>
@@ -496,7 +468,6 @@
   Parse Mode = XML
   <Types>
     Allowed   = image/svg+xml
-    Forbidden = text/html
     Preferred = image/svg+xml
   </Types>
   <Badge>
@@ -515,7 +486,6 @@
   Parse Mode = XML
   <Types>
     Allowed   = image/svg+xml
-    Forbidden = text/html
     Preferred = image/svg+xml
   </Types>
 </SVG_1_1_Basic>
@@ -529,7 +499,6 @@
   Parse Mode = XML
   <Types>
     Allowed   = application/smil+xml
-    Forbidden = text/html
     Preferred = application/smil+xml
   </Types>
 </SMIL_1_0>
@@ -543,7 +512,6 @@
   Parse Mode = XML
   <Types>
     Allowed   = application/smil+xml
-    Forbidden = text/html
     Preferred = application/smil+xml
   </Types>
 </SMIL_2_0>