From fb5c9474536097e08f0b6e722ea71be734467c29 Mon Sep 17 00:00:00 2001
From: dmiller <dmiller@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Fri, 21 Aug 2015 16:35:19 +0000
Subject: [PATCH] Fix Nmap DTD to account for PCDATA in script element

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

diff --git a/CHANGELOG b/CHANGELOG
index 4025201ad..88fe88262 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,9 @@
 # Nmap Changelog ($Id$); -*-text-*-
 
+o Fix Nmap's DTD, which did not recognize that the script element could contain
+  character data when a script returns a number or a boolean.
+  [Jonathan Daugherty]
+
 o [GH#75] Normalize check targets to standard format check-*.
   [Gioacchino Mazzurco]
 
diff --git a/docs/nmap.dtd b/docs/nmap.dtd
index 301756234..d4bcf05c6 100644
--- a/docs/nmap.dtd
+++ b/docs/nmap.dtd
@@ -230,7 +230,7 @@
 
 <!ELEMENT cpe (#PCDATA)>
 
-<!ELEMENT script	(table|elem)* >
+<!ELEMENT script	(#PCDATA|table|elem)* >
 <!ATTLIST script	
 	id	CDATA	#REQUIRED
 	output	CDATA	#REQUIRED