From d18c149e8ce59a26ede3ed2b5013aeb7fbb8456d Mon Sep 17 00:00:00 2001
From: david <david@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Fri, 2 Sep 2011 22:21:12 +0000
Subject: [PATCH] o Relaxed the XML DTD to allow validation of files where the
 verbosity   level changed during the scan. [Daniel Miller]

---
 CHANGELOG     | 3 +++
 docs/nmap.dtd | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index b5af0add2..8f6d88764 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,8 @@
 # Nmap Changelog ($Id$); -*-text-*-
 
+o Relaxed the XML DTD to allow validation of files where the verbosity
+  level changed during the scan. [Daniel Miller]
+
 o Made a service confidence of 8 (used when tcpwrapped) and indeed any
   number between 0 and 10 be legal in XML output according to the DTD.
   [Daniel Miller]
diff --git a/docs/nmap.dtd b/docs/nmap.dtd
index b1a51656c..4dd01e010 100644
--- a/docs/nmap.dtd
+++ b/docs/nmap.dtd
@@ -72,7 +72,7 @@
      It represents to the topmost element of the output document.
 -->
 <!ELEMENT nmaprun      (scaninfo*, verbose, debugging,
-                        ((taskbegin, taskprogress*, taskend) |
+                        ( taskbegin | taskprogress | taskend |
                             prescript | postscript | host | output)*,
                             runstats) >
 <!ATTLIST nmaprun