From b2eefcfe69d59e0990c72e621fac3740ff7f61fa Mon Sep 17 00:00:00 2001
From: david <david@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Fri, 2 Sep 2011 21:35:16 +0000
Subject: [PATCH] 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]

---
 CHANGELOG     | 4 ++++
 docs/nmap.dtd | 5 ++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 97aaa2248..b5af0add2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,9 @@
 # Nmap Changelog ($Id$); -*-text-*-
 
+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]
+
 o [NSE] Added three scripts that do host discovery on local IPv6
   subnets. Each of them uses a different multicast technique, meaning
   that even very large networks have host discovery done without
diff --git a/docs/nmap.dtd b/docs/nmap.dtd
index 45d0b1967..b1a51656c 100644
--- a/docs/nmap.dtd
+++ b/docs/nmap.dtd
@@ -64,10 +64,9 @@
 
 <!ENTITY % port_protocols "(ip|tcp|udp|sctp)" >
 
-<!-- I don't know exactly what these are, but the values were enumerated via:
-     grep "conf=" *
+<!-- Service detection confidence level (portlist.h:struct serviceDeductions)
 --> 
-<!ENTITY % service_confs  "( 0 | 3 | 5 | 10)" >
+<!ENTITY % service_confs  "( 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10)" >
 
 <!-- This element was started in nmap.c:nmap_main().
      It represents to the topmost element of the output document.