Merge branch 'master' of https://github.com/radicallyopensecurity/pentext into development

# Conflicts:
#	chatops/bash/handler_build

xml/notes/README.md

@@ -1,2 +1,2 @@
 # notes
-This folder holds all email correspondence and other notes
+This folder holds all email correspondence, notes and received source code

xml/source/futurework.xml

@@ -1,4 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section id="futurework" xml:base="futurework.xml" break="before" inexecsummary="no">
   <title>Future Work</title>
+  <p>
+    <ul>
+      <li>
+        <b>Title</b><br/>
+        Description
+      </li>
+    </ul>
+  </p>
 </section>

xml/templates/pentestreport/report.xml

@@ -81,6 +81,19 @@
     <p>Through automated scans we were able to gain the following information about the
     software and infrastructure. Detailed scan output can be found in the sections
     below.</p>
+    <table border="1">
+      <tr><th>Fingerprinted Information</th></tr>
+      <tr>
+        <td>
+          <!--
+          <b>sitename</b><br/>
+          Port 80: HTTP<br/>
+          Port 443: SSL/TLS<br/>
+          DumboService 1.3.3.7<br/>
+          -->
+        </td>
+      </tr>
+    </table>
 
     <section id="scans">
       <title>Automated Scans</title>

xml/xslt/styles_inv.xslt

@@ -67,7 +67,7 @@
     <xsl:attribute-set name="logo">
         <xsl:attribute name="padding-top">0cm</xsl:attribute>
         <xsl:attribute name="padding-bottom">0cm</xsl:attribute>
-        <xsl:attribute name="src">url(../graphics/logo_alt.png)</xsl:attribute>
+        <xsl:attribute name="src">url(../graphics/logo.png)</xsl:attribute>
         <xsl:attribute name="width">30mm</xsl:attribute>
         <xsl:attribute name="content-width">scale-to-fit</xsl:attribute>
         <xsl:attribute name="content-height">scale-to-fit</xsl:attribute>
@@ -104,4 +104,4 @@
     <xsl:attribute-set name="table-shading">
         <xsl:attribute name="background-color">#EEEEEE</xsl:attribute>
     </xsl:attribute-set>
-</xsl:stylesheet>
+</xsl:stylesheet>