- Update to 1.0

- Clean up the Makefile

Feature safe:	yes

5 files changed, 93 insertions, 120 deletions

diff --git a/www/validator/Makefile b/www/validator/Makefile
index f45ed4c87657..cc343687c164 100644
--- a/www/validator/Makefile
+++ b/www/validator/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	validator
-PORTVERSION=	0.8.6
-PORTREVISION=	1
+PORTVERSION=	1.0
 CATEGORIES=	www
 MASTER_SITES=	http://validator.w3.org/dist/ \
 		http://www.cyberbotx.com/w3c-validator/
@@ -53,93 +52,12 @@ pre-install:
 	@${CP} ${WRKDIR}/validator.conf.sample ${WRKSRC}/htdocs/config/
 
 do-install:
-	${MKDIR} ${PREFIX}/www/validator
 	${MKDIR} ${PREFIX}/www/validator/htdocs
-	${MKDIR} ${PREFIX}/www/validator/htdocs/config
-	${MKDIR} ${PREFIX}/www/validator/htdocs/dev
-	${MKDIR} ${PREFIX}/www/validator/htdocs/dev/autotest
-	${MKDIR} ${PREFIX}/www/validator/htdocs/dev/tests
-	${MKDIR} ${PREFIX}/www/validator/htdocs/docs
-	${MKDIR} ${PREFIX}/www/validator/htdocs/images
-	${MKDIR} ${PREFIX}/www/validator/htdocs/images/info_icons
-	${MKDIR} ${PREFIX}/www/validator/htdocs/images/roadmap
-	${MKDIR} ${PREFIX}/www/validator/htdocs/images/valid_icons
-	${MKDIR} ${PREFIX}/www/validator/htdocs/misc
-	${MKDIR} ${PREFIX}/www/validator/htdocs/scripts
-	${MKDIR} ${PREFIX}/www/validator/htdocs/sgml-lib
-	${MKDIR} ${PREFIX}/www/validator/htdocs/sgml-lib/IETF
-	${MKDIR} ${PREFIX}/www/validator/htdocs/sgml-lib/ISO-HTML
-	${MKDIR} ${PREFIX}/www/validator/htdocs/sgml-lib/REC-SMIL2-20051213
-	${MKDIR} ${PREFIX}/www/validator/htdocs/sgml-lib/REC-SMIL3-20081201
-	${MKDIR} ${PREFIX}/www/validator/htdocs/sgml-lib/REC-SVG-20010904
-	${MKDIR} ${PREFIX}/www/validator/htdocs/sgml-lib/REC-SVG11-20030114
-	${MKDIR} ${PREFIX}/www/validator/htdocs/sgml-lib/REC-html32-19970114
-	${MKDIR} ${PREFIX}/www/validator/htdocs/sgml-lib/REC-html40-19980424
-	${MKDIR} ${PREFIX}/www/validator/htdocs/sgml-lib/REC-html401-19991224
-	${MKDIR} ${PREFIX}/www/validator/htdocs/sgml-lib/REC-rdfa-syntax-20081014
-	${MKDIR} ${PREFIX}/www/validator/htdocs/sgml-lib/REC-smil-19980615
-	${MKDIR} ${PREFIX}/www/validator/htdocs/sgml-lib/REC-smil20-20050107
-	${MKDIR} ${PREFIX}/www/validator/htdocs/sgml-lib/REC-xhtml-basic-20001219
-	${MKDIR} ${PREFIX}/www/validator/htdocs/sgml-lib/REC-xhtml-basic-20080729
-	${MKDIR} ${PREFIX}/www/validator/htdocs/sgml-lib/REC-xhtml-modularization-20081008
-	${MKDIR} ${PREFIX}/www/validator/htdocs/sgml-lib/REC-xhtml-print-20060920
-	${MKDIR} ${PREFIX}/www/validator/htdocs/sgml-lib/REC-xhtml1-20020801
-	${MKDIR} ${PREFIX}/www/validator/htdocs/sgml-lib/Specification
-	${MKDIR} ${PREFIX}/www/validator/htdocs/sgml-lib/WD-MathML3-20090924
-	${MKDIR} ${PREFIX}/www/validator/htdocs/sgml-lib/WD-XHTMLplusMathMLplusSVG-20020809
-	${MKDIR} ${PREFIX}/www/validator/htdocs/sgml-lib/XX-MathML2-20031104
-	${MKDIR} ${PREFIX}/www/validator/htdocs/sgml-lib/XX-MathML2-20031104/iso8879
-	${MKDIR} ${PREFIX}/www/validator/htdocs/sgml-lib/XX-MathML2-20031104/iso9573-13
-	${MKDIR} ${PREFIX}/www/validator/htdocs/sgml-lib/XX-MathML2-20031104/mathml
-	${MKDIR} ${PREFIX}/www/validator/htdocs/sgml-lib/XX-xhtml11-20090630
-	${MKDIR} ${PREFIX}/www/validator/htdocs/source
-	${MKDIR} ${PREFIX}/www/validator/htdocs/style
-	${MKDIR} ${PREFIX}/www/validator/httpd
 	${MKDIR} ${PREFIX}/www/validator/httpd/cgi-bin
 	${MKDIR} ${PREFIX}/www/validator/share
-	${MKDIR} ${PREFIX}/www/validator/share/templates
-	${MKDIR} ${PREFIX}/www/validator/share/templates/en_US
-	${INSTALL_DATA} `${FIND} ${WRKSRC}/htdocs -type f -depth 1` ${PREFIX}/www/validator/htdocs
-	${INSTALL_DATA} ${WRKSRC}/htdocs/config/* ${PREFIX}/www/validator/htdocs/config
-	${INSTALL_DATA} ${WRKSRC}/htdocs/dev/autotest/* ${PREFIX}/www/validator/htdocs/dev/autotest
-	${INSTALL_DATA} ${WRKSRC}/htdocs/dev/tests/* ${PREFIX}/www/validator/htdocs/dev/tests
-	${INSTALL_DATA} ${WRKSRC}/htdocs/docs/* ${PREFIX}/www/validator/htdocs/docs
-	${INSTALL_DATA} `${FIND} ${WRKSRC}/htdocs/images -type f -depth 1` ${PREFIX}/www/validator/htdocs/images
-	${INSTALL_DATA} ${WRKSRC}/htdocs/images/info_icons/* ${PREFIX}/www/validator/htdocs/images/info_icons
-	${INSTALL_DATA} ${WRKSRC}/htdocs/images/roadmap/* ${PREFIX}/www/validator/htdocs/images/roadmap
-	${INSTALL_DATA} ${WRKSRC}/htdocs/images/valid_icons/* ${PREFIX}/www/validator/htdocs/images/valid_icons
-	${INSTALL_DATA} ${WRKSRC}/htdocs/misc/* ${PREFIX}/www/validator/htdocs/misc
-	${INSTALL_DATA} `${FIND} ${WRKSRC}/htdocs/scripts -type f -depth 1` ${PREFIX}/www/validator/htdocs/scripts
-	${INSTALL_DATA} `${FIND} ${WRKSRC}/htdocs/sgml-lib -type f -depth 1` ${PREFIX}/www/validator/htdocs/sgml-lib
-	${INSTALL_DATA} ${WRKSRC}/htdocs/sgml-lib/IETF/* ${PREFIX}/www/validator/htdocs/sgml-lib/IETF
-	${INSTALL_DATA} ${WRKSRC}/htdocs/sgml-lib/ISO-HTML/* ${PREFIX}/www/validator/htdocs/sgml-lib/ISO-HTML
-	${INSTALL_DATA} ${WRKSRC}/htdocs/sgml-lib/REC-SMIL2-20051213/* ${PREFIX}/www/validator/htdocs/sgml-lib/REC-SMIL2-20051213
-	${INSTALL_DATA} ${WRKSRC}/htdocs/sgml-lib/REC-SMIL3-20081201/* ${PREFIX}/www/validator/htdocs/sgml-lib/REC-SMIL3-20081201
-	${INSTALL_DATA} ${WRKSRC}/htdocs/sgml-lib/REC-SVG-20010904/* ${PREFIX}/www/validator/htdocs/sgml-lib/REC-SVG-20010904
-	${INSTALL_DATA} ${WRKSRC}/htdocs/sgml-lib/REC-SVG11-20030114/* ${PREFIX}/www/validator/htdocs/sgml-lib/REC-SVG11-20030114
-	${INSTALL_DATA} ${WRKSRC}/htdocs/sgml-lib/REC-html32-19970114/* ${PREFIX}/www/validator/htdocs/sgml-lib/REC-html32-19970114
-	${INSTALL_DATA} ${WRKSRC}/htdocs/sgml-lib/REC-html40-19980424/* ${PREFIX}/www/validator/htdocs/sgml-lib/REC-html40-19980424
-	${INSTALL_DATA} ${WRKSRC}/htdocs/sgml-lib/REC-html401-19991224/* ${PREFIX}/www/validator/htdocs/sgml-lib/REC-html401-19991224
-	${INSTALL_DATA} ${WRKSRC}/htdocs/sgml-lib/REC-rdfa-syntax-20081014/* ${PREFIX}/www/validator/htdocs/sgml-lib/REC-rdfa-syntax-20081014
-	${INSTALL_DATA} ${WRKSRC}/htdocs/sgml-lib/REC-smil-19980615/* ${PREFIX}/www/validator/htdocs/sgml-lib/REC-smil-19980615
-	${INSTALL_DATA} ${WRKSRC}/htdocs/sgml-lib/REC-smil20-20050107/* ${PREFIX}/www/validator/htdocs/sgml-lib/REC-smil20-20050107
-	${INSTALL_DATA} ${WRKSRC}/htdocs/sgml-lib/REC-xhtml-basic-20001219/* ${PREFIX}/www/validator/htdocs/sgml-lib/REC-xhtml-basic-20001219
-	${INSTALL_DATA} ${WRKSRC}/htdocs/sgml-lib/REC-xhtml-basic-20080729/* ${PREFIX}/www/validator/htdocs/sgml-lib/REC-xhtml-basic-20080729
-	${INSTALL_DATA} ${WRKSRC}/htdocs/sgml-lib/REC-xhtml-modularization-20081008/* ${PREFIX}/www/validator/htdocs/sgml-lib/REC-xhtml-modularization-20081008
-	${INSTALL_DATA} ${WRKSRC}/htdocs/sgml-lib/REC-xhtml-print-20060920/* ${PREFIX}/www/validator/htdocs/sgml-lib/REC-xhtml-print-20060920
-	${INSTALL_DATA} ${WRKSRC}/htdocs/sgml-lib/REC-xhtml1-20020801/* ${PREFIX}/www/validator/htdocs/sgml-lib/REC-xhtml1-20020801
-	${INSTALL_DATA} ${WRKSRC}/htdocs/sgml-lib/Specification/* ${PREFIX}/www/validator/htdocs/sgml-lib/Specification
-	${INSTALL_DATA} ${WRKSRC}/htdocs/sgml-lib/WD-MathML3-20090924/* ${PREFIX}/www/validator/htdocs/sgml-lib/WD-MathML3-20090924
-	${INSTALL_DATA} ${WRKSRC}/htdocs/sgml-lib/WD-XHTMLplusMathMLplusSVG-20020809/* ${PREFIX}/www/validator/htdocs/sgml-lib/WD-XHTMLplusMathMLplusSVG-20020809
-	${INSTALL_DATA} `${FIND} ${WRKSRC}/htdocs/sgml-lib/XX-MathML2-20031104 -type f -depth 1` ${PREFIX}/www/validator/htdocs/sgml-lib/XX-MathML2-20031104
-	${INSTALL_DATA} ${WRKSRC}/htdocs/sgml-lib/XX-MathML2-20031104/iso8879/* ${PREFIX}/www/validator/htdocs/sgml-lib/XX-MathML2-20031104/iso8879
-	${INSTALL_DATA} ${WRKSRC}/htdocs/sgml-lib/XX-MathML2-20031104/iso9573-13/* ${PREFIX}/www/validator/htdocs/sgml-lib/XX-MathML2-20031104/iso9573-13
-	${INSTALL_DATA} ${WRKSRC}/htdocs/sgml-lib/XX-MathML2-20031104/mathml/* ${PREFIX}/www/validator/htdocs/sgml-lib/XX-MathML2-20031104/mathml
-	${INSTALL_DATA} ${WRKSRC}/htdocs/sgml-lib/XX-xhtml11-20090630/* ${PREFIX}/www/validator/htdocs/sgml-lib/XX-xhtml11-20090630
-	${INSTALL_DATA} ${WRKSRC}/htdocs/source/* ${PREFIX}/www/validator/htdocs/source
-	${INSTALL_DATA} ${WRKSRC}/htdocs/style/* ${PREFIX}/www/validator/htdocs/style
+	(cd ${WRKSRC}/htdocs && ${COPYTREE_SHARE} \* ${PREFIX}/www/validator/htdocs/)
 	${INSTALL_SCRIPT} ${WRKSRC}/httpd/cgi-bin/* ${PREFIX}/www/validator/httpd/cgi-bin
-	${INSTALL_DATA} ${WRKSRC}/share/templates/en_US/* ${PREFIX}/www/validator/share/templates/en_US
+	(cd ${WRKSRC}/share && ${COPYTREE_SHARE} \* ${PREFIX}/www/validator/share/)
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/www/validator/distinfo b/www/validator/distinfo
index 7408b5eab14c..33c75fcdb53a 100644
--- a/www/validator/distinfo
+++ b/www/validator/distinfo
@@ -1,6 +1,6 @@
-MD5 (validator-0_8_6.tar.gz) = 7a09093b298998ac53ee828de2d3e6f0
-SHA256 (validator-0_8_6.tar.gz) = da1fd90bc5059ccecbcc2259b7e756fa209a097ff3fd1d43e52a3b3ed623fbe4
-SIZE (validator-0_8_6.tar.gz) = 2584487
-MD5 (sgml-lib-0_8_6.tar.gz) = b12ef0e9d11b6edaa45bf438d80276df
-SHA256 (sgml-lib-0_8_6.tar.gz) = 0e2fc212862b682ab4de4118a5903de5c5a0f858f0aed4c5e6e45787e7ebecf9
-SIZE (sgml-lib-0_8_6.tar.gz) = 464332
+MD5 (validator-1_0.tar.gz) = bdb8a28be74d362ba377aefc04d3b53f
+SHA256 (validator-1_0.tar.gz) = 5543e4a1caf0921f799ecf3e9603d2cc59c2771073448417e2d8094d9da10967
+SIZE (validator-1_0.tar.gz) = 2580231
+MD5 (sgml-lib-1_0.tar.gz) = 61f3c8d29f3f06543ac5c5e3d2fe3535
+SHA256 (sgml-lib-1_0.tar.gz) = cb87db12608e57da06397f0f58fa026cfb60787f41e14778c885ff0e873d7021
+SIZE (sgml-lib-1_0.tar.gz) = 560495
diff --git a/www/validator/files/pkg-message.in b/www/validator/files/pkg-message.in
index 30347036ee36..0bf5474aaa9a 100644
--- a/www/validator/files/pkg-message.in
+++ b/www/validator/files/pkg-message.in
@@ -48,6 +48,7 @@ Alias /w3c-validator/  %%PREFIX%%/www/validator/htdocs/
   AddCharset     utf-8         .html
 # If you would like to move the location of validator.conf, set the following,
 #  making sure to change the path if you don't use this path.
-# SetEnv         %%PREFIX%%/www/validator/htdocs/config/validator.conf
+# SetEnv         W3C_VALIDATOR_CFG \
+#                %%PREFIX%%/www/validator/htdocs/config/validator.conf
 </Directory>
 -------------------------------------------------------------------------------
diff --git a/www/validator/files/validator.conf.sample.in b/www/validator/files/validator.conf.sample.in
index e70a37b7ec8f..b43c9cbc7f9b 100644
--- a/www/validator/files/validator.conf.sample.in
+++ b/www/validator/files/validator.conf.sample.in
@@ -1,7 +1,7 @@
-#
+
 # Main Configuration File for the W3C Markup Validation Service.
 #
-# $Id: validator.conf,v 1.28 2007/03/14 06:33:35 ot Exp $
+# $Id: validator.conf,v 1.39 2010-03-09 18:46:03 ville Exp $
 #
 # See 'perldoc Config::General' for the syntax, and be aware that the
 # 'SplitPolicy' is 'equalsign', ie. keys and values are separated by '\s*=\s*',
@@ -27,6 +27,14 @@
   # Location of template files
   Templates = $Base/share/templates
 
+  #
+  # Directory where to store cached templates.  Relative paths are
+  # treated as relative to the system temporary directory.  Templates
+  # are not cached at all if this option is empty or not set, except
+  # with mod_perl setups where this option has no effect and templates
+  # are always cached in memory.
+  #Cache = validator
+
   # configuration file for HTML Tidy Module, if available
   TidyConf = $Base/htdocs/config/tidy.conf
 
@@ -55,6 +63,7 @@ Allow Private IPs = no
 # see http://validator.w3.org/docs/api.html
 Enable SOAP = yes
 
+
 #
 # Whether the validator will check its own output.
 # 0 means it will refuse to check its own output, 1 means it will but it will
@@ -65,7 +74,7 @@ Max Recursion = 0
 # Protocols the validator is allowed to use for retrieving documents.
 # The default is to allow http and https.
 <Protocols>
-  Allow = data,http,https
+  Allow = data,ftp,http,https
 </Protocols>
 
 #
@@ -119,3 +128,11 @@ Languages = en
   Include %%PREFIX%%/www/validator/htdocs/config/tips.cfg
 </Tips>
 
+<External>
+## Enable checking documents via external services.
+## The example config below assumes that you have installed the validator.nu
+## engine on the same machine as the markup validator.
+## See http://about.validator.nu/ for installation instructions.
+#HTML5 = http://localhost:8888/html5/
+#CompoundXML = http://localhost:8888/
+</External>
diff --git a/www/validator/pkg-plist b/www/validator/pkg-plist
index 695b9e2a47d2..7f9b5207e342 100644
--- a/www/validator/pkg-plist
+++ b/www/validator/pkg-plist
@@ -119,6 +119,7 @@ www/validator/htdocs/dev/tests/xhtml-print_1_0-invalid.xhtml
 www/validator/htdocs/dev/tests/xhtml-print_1_0.html
 www/validator/htdocs/dev/tests/xhtml-print_1_0.xhtml
 www/validator/htdocs/dev/tests/xhtml-utf8-bom.xhtml
+www/validator/htdocs/dev/tests/xhtml-windows-1250.xhtml
 www/validator/htdocs/dev/tests/xhtml1-appc-empty.html
 www/validator/htdocs/dev/tests/xhtml1-appc-emptycontent.html
 www/validator/htdocs/dev/tests/xhtml1-appc-xmldecl.html
@@ -541,33 +542,67 @@ www/validator/htdocs/sgml-lib/REC-xhtml-print-20060920/xhtml-print10.dtd
 www/validator/htdocs/sgml-lib/REC-xhtml1-20020801/xhtml1-frameset.dtd
 www/validator/htdocs/sgml-lib/REC-xhtml1-20020801/xhtml1-strict.dtd
 www/validator/htdocs/sgml-lib/REC-xhtml1-20020801/xhtml1-transitional.dtd
+www/validator/htdocs/sgml-lib/REC-xml-entity-names-20100401/README.txt
+www/validator/htdocs/sgml-lib/REC-xml-entity-names-20100401/html5-uppercase.ent
+www/validator/htdocs/sgml-lib/REC-xml-entity-names-20100401/htmlmathml-f.ent
+www/validator/htdocs/sgml-lib/REC-xml-entity-names-20100401/htmlmathml.ent
+www/validator/htdocs/sgml-lib/REC-xml-entity-names-20100401/isoamsa.ent
+www/validator/htdocs/sgml-lib/REC-xml-entity-names-20100401/isoamsb.ent
+www/validator/htdocs/sgml-lib/REC-xml-entity-names-20100401/isoamsc.ent
+www/validator/htdocs/sgml-lib/REC-xml-entity-names-20100401/isoamsn.ent
+www/validator/htdocs/sgml-lib/REC-xml-entity-names-20100401/isoamso.ent
+www/validator/htdocs/sgml-lib/REC-xml-entity-names-20100401/isoamsr.ent
+www/validator/htdocs/sgml-lib/REC-xml-entity-names-20100401/isobox.ent
+www/validator/htdocs/sgml-lib/REC-xml-entity-names-20100401/isocyr1.ent
+www/validator/htdocs/sgml-lib/REC-xml-entity-names-20100401/isocyr2.ent
+www/validator/htdocs/sgml-lib/REC-xml-entity-names-20100401/isodia.ent
+www/validator/htdocs/sgml-lib/REC-xml-entity-names-20100401/isogrk1.ent
+www/validator/htdocs/sgml-lib/REC-xml-entity-names-20100401/isogrk2.ent
+www/validator/htdocs/sgml-lib/REC-xml-entity-names-20100401/isogrk3.ent
+www/validator/htdocs/sgml-lib/REC-xml-entity-names-20100401/isogrk4.ent
+www/validator/htdocs/sgml-lib/REC-xml-entity-names-20100401/isolat1.ent
+www/validator/htdocs/sgml-lib/REC-xml-entity-names-20100401/isolat2.ent
+www/validator/htdocs/sgml-lib/REC-xml-entity-names-20100401/isomopf.ent
+www/validator/htdocs/sgml-lib/REC-xml-entity-names-20100401/isomfrk.ent
+www/validator/htdocs/sgml-lib/REC-xml-entity-names-20100401/isomscr.ent
+www/validator/htdocs/sgml-lib/REC-xml-entity-names-20100401/isonum.ent
+www/validator/htdocs/sgml-lib/REC-xml-entity-names-20100401/isopub.ent
+www/validator/htdocs/sgml-lib/REC-xml-entity-names-20100401/isotech.ent
+www/validator/htdocs/sgml-lib/REC-xml-entity-names-20100401/mmlalias.ent
+www/validator/htdocs/sgml-lib/REC-xml-entity-names-20100401/mmlextra.ent
+www/validator/htdocs/sgml-lib/REC-xml-entity-names-20100401/predefined.ent
+www/validator/htdocs/sgml-lib/REC-xml-entity-names-20100401/w3centities-f.ent
+www/validator/htdocs/sgml-lib/REC-xml-entity-names-20100401/w3centities.ent
+www/validator/htdocs/sgml-lib/REC-xml-entity-names-20100401/xhtml1-lat1.ent
+www/validator/htdocs/sgml-lib/REC-xml-entity-names-20100401/xhtml1-special.ent
+www/validator/htdocs/sgml-lib/REC-xml-entity-names-20100401/xhtml1-symbol.ent
 www/validator/htdocs/sgml-lib/Specification/xmlspec-v20.dtd
 www/validator/htdocs/sgml-lib/Specification/xmlspec-v21.dtd
 www/validator/htdocs/sgml-lib/Specification/xmlspec.dtd
-www/validator/htdocs/sgml-lib/WD-MathML3-20090924/README.txt
-www/validator/htdocs/sgml-lib/WD-MathML3-20090924/isoamsa.ent
-www/validator/htdocs/sgml-lib/WD-MathML3-20090924/isoamsb.ent
-www/validator/htdocs/sgml-lib/WD-MathML3-20090924/isoamsc.ent
-www/validator/htdocs/sgml-lib/WD-MathML3-20090924/isoamsn.ent
-www/validator/htdocs/sgml-lib/WD-MathML3-20090924/isoamso.ent
-www/validator/htdocs/sgml-lib/WD-MathML3-20090924/isoamsr.ent
-www/validator/htdocs/sgml-lib/WD-MathML3-20090924/isobox.ent
-www/validator/htdocs/sgml-lib/WD-MathML3-20090924/isocyr1.ent
-www/validator/htdocs/sgml-lib/WD-MathML3-20090924/isocyr2.ent
-www/validator/htdocs/sgml-lib/WD-MathML3-20090924/isodia.ent
-www/validator/htdocs/sgml-lib/WD-MathML3-20090924/isogrk3.ent
-www/validator/htdocs/sgml-lib/WD-MathML3-20090924/isolat1.ent
-www/validator/htdocs/sgml-lib/WD-MathML3-20090924/isolat2.ent
-www/validator/htdocs/sgml-lib/WD-MathML3-20090924/isomfrk.ent
-www/validator/htdocs/sgml-lib/WD-MathML3-20090924/isomopf.ent
-www/validator/htdocs/sgml-lib/WD-MathML3-20090924/isomscr.ent
-www/validator/htdocs/sgml-lib/WD-MathML3-20090924/isonum.ent
-www/validator/htdocs/sgml-lib/WD-MathML3-20090924/isopub.ent
-www/validator/htdocs/sgml-lib/WD-MathML3-20090924/isotech.ent
-www/validator/htdocs/sgml-lib/WD-MathML3-20090924/mathml3-qname.mod
-www/validator/htdocs/sgml-lib/WD-MathML3-20090924/mathml3.dtd
-www/validator/htdocs/sgml-lib/WD-MathML3-20090924/mmlalias.ent
-www/validator/htdocs/sgml-lib/WD-MathML3-20090924/mmlextra.ent
+www/validator/htdocs/sgml-lib/WD-MathML3-20100610/README.txt
+www/validator/htdocs/sgml-lib/WD-MathML3-20100610/isoamsa.ent
+www/validator/htdocs/sgml-lib/WD-MathML3-20100610/isoamsb.ent
+www/validator/htdocs/sgml-lib/WD-MathML3-20100610/isoamsc.ent
+www/validator/htdocs/sgml-lib/WD-MathML3-20100610/isoamsn.ent
+www/validator/htdocs/sgml-lib/WD-MathML3-20100610/isoamso.ent
+www/validator/htdocs/sgml-lib/WD-MathML3-20100610/isoamsr.ent
+www/validator/htdocs/sgml-lib/WD-MathML3-20100610/isobox.ent
+www/validator/htdocs/sgml-lib/WD-MathML3-20100610/isocyr1.ent
+www/validator/htdocs/sgml-lib/WD-MathML3-20100610/isocyr2.ent
+www/validator/htdocs/sgml-lib/WD-MathML3-20100610/isodia.ent
+www/validator/htdocs/sgml-lib/WD-MathML3-20100610/isogrk3.ent
+www/validator/htdocs/sgml-lib/WD-MathML3-20100610/isolat1.ent
+www/validator/htdocs/sgml-lib/WD-MathML3-20100610/isolat2.ent
+www/validator/htdocs/sgml-lib/WD-MathML3-20100610/isomopf.ent
+www/validator/htdocs/sgml-lib/WD-MathML3-20100610/isomfrk.ent
+www/validator/htdocs/sgml-lib/WD-MathML3-20100610/isomscr.ent
+www/validator/htdocs/sgml-lib/WD-MathML3-20100610/isonum.ent
+www/validator/htdocs/sgml-lib/WD-MathML3-20100610/isopub.ent
+www/validator/htdocs/sgml-lib/WD-MathML3-20100610/isotech.ent
+www/validator/htdocs/sgml-lib/WD-MathML3-20100610/mathml3-qname.mod
+www/validator/htdocs/sgml-lib/WD-MathML3-20100610/mathml3.dtd
+www/validator/htdocs/sgml-lib/WD-MathML3-20100610/mmlalias.ent
+www/validator/htdocs/sgml-lib/WD-MathML3-20100610/mmlextra.ent
 www/validator/htdocs/sgml-lib/WD-XHTMLplusMathMLplusSVG-20020809/xhtml-basic-svg-tiny.dtd
 www/validator/htdocs/sgml-lib/WD-XHTMLplusMathMLplusSVG-20020809/xhtml-math-svg.dtd
 www/validator/htdocs/sgml-lib/XX-MathML2-20031104/README.txt
@@ -610,6 +645,7 @@ www/validator/htdocs/sgml-lib/XX-MathML2-20031104/mathml2.dtd
 www/validator/htdocs/sgml-lib/XX-xhtml11-20090630/README.txt
 www/validator/htdocs/sgml-lib/XX-xhtml11-20090630/xhtml11-model-1.mod
 www/validator/htdocs/sgml-lib/XX-xhtml11-20090630/xhtml11.dtd
+www/validator/htdocs/sgml-lib/catalog.xml
 www/validator/htdocs/sgml-lib/sgml.dcl
 www/validator/htdocs/sgml-lib/sgml.dtd
 www/validator/htdocs/sgml-lib/sgml.soc
@@ -675,8 +711,9 @@ www/validator/share/templates/en_US/warnings.tmpl
 @dirrm www/validator/htdocs/sgml-lib/XX-MathML2-20031104/iso8879
 @dirrm www/validator/htdocs/sgml-lib/XX-MathML2-20031104
 @dirrm www/validator/htdocs/sgml-lib/WD-XHTMLplusMathMLplusSVG-20020809
-@dirrm www/validator/htdocs/sgml-lib/WD-MathML3-20090924
+@dirrm www/validator/htdocs/sgml-lib/WD-MathML3-20100610
 @dirrm www/validator/htdocs/sgml-lib/Specification
+@dirrm www/validator/htdocs/sgml-lib/REC-xml-entity-names-20100401
 @dirrm www/validator/htdocs/sgml-lib/REC-xhtml1-20020801
 @dirrm www/validator/htdocs/sgml-lib/REC-xhtml-print-20060920
 @dirrm www/validator/htdocs/sgml-lib/REC-xhtml-modularization-20081008