merge soc07 r4957 - Put <extrareasons> inside <extraports> as this should really simplify XML parsers' jobs because they won't have to keep track of what states and reasons go together

docs/nmap.dtd

@@ -161,9 +161,9 @@
 
 <!-- these elements are written by output.c:printportoutput() -->
 
-<!ELEMENT ports		(extraports* , extrareasons*, port*) >
+<!ELEMENT ports		(extraports* , port*) >
 
-<!ELEMENT extraports	EMPTY >
+<!ELEMENT extraports	(extrareasons)* >
 <!ATTLIST extraports
 			state		%port_states;	#REQUIRED
 			count		%attr_numeric;  #REQUIRED	

docs/nmap.xsl

@@ -505,15 +505,15 @@
     <xsl:if test="@count > 0">
 	    <p>The <xsl:value-of select="@count" /> ports scanned but not shown below are in state: <b><xsl:value-of select="@state" /></b></p>
     </xsl:if>
-</xsl:for-each>
 
-<ul>
-<xsl:for-each select="extrareasons">
-    <xsl:if test="@count > 0">
-	    <li><p><xsl:value-of select="@count" /> ports replied with: <b><xsl:value-of select="@reason" /></b></p></li>
-    </xsl:if>
+    <ul>
+    <xsl:for-each select="extrareasons">
+        <xsl:if test="@count > 0">
+            <li><p><xsl:value-of select="@count" /> ports replied with: <b><xsl:value-of select="@reason" /></b></p></li>
+        </xsl:if>
+    </xsl:for-each>
+    </ul>
 </xsl:for-each>
-</ul>
 
 <xsl:if test="count(port) > 0">
     <table cellspacing="1">