Doc updates
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index ca6f4a0..e7c88c4 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -21,6 +21,18 @@
   </properties>
   <body>
       <release version="2.0.0" date="2018-01-20" description="Apache Chainsaw 2.0.0">
+      <action dev="sdeboy" type="fix">
+          Doc updates
+      </action>
+      <action dev="mattsicker" type="fix">
+          Update to minimum Java 1.6
+      </action>
+      <action dev="mattsicker" type="fix">
+          Branding fixes
+      </action>
+      <action dev="bodewig" type="fix">
+          Update to support maven3
+      </action>
       <action dev="psmith" issue="42789" type="add" due-to="Isuru Suriarachchi" due-to-email="">
 		Added support for remembering filter expressions for each LogPanel
       </action>
diff --git a/src/site/apt/distributionnotes.apt b/src/site/apt/distributionnotes.apt
index 0253353..1a208dd 100644
--- a/src/site/apt/distributionnotes.apt
+++ b/src/site/apt/distributionnotes.apt
@@ -14,27 +14,15 @@
 ~~ limitations under the License.
 Important Distribution Notes
 
-	Due to Java classloading rules, it is impossible to ship the Apache Commons VFS&#x2122; extension to Apache Chainsaw&#x2122; OR have DBReceiver or JMSReceiver bundled with Chainsaw.
+	JMSReceiver and DBReceiver require proprietary driver jars added to the Chainsaw classpath, which we obviously can't ship. 
 	
-	Several VFS filestore implementation jars cannot be shipped with Chainsaw because of licensing issues, and for JMSReceiver and DBReceiver you are required
-	to have proprietary driver jars locally which we obviously can't ship. You can follow these steps to enable the DB, JMS and/or VFS components inside Chainsaw.
-		
-		[[1]] [DBReceiver] Download the {{{http://logging.apache.org/log4j/docs/webstart/chainsaw/lib/log4j-db-1.3alpha-7.jar}DB extension}} to Chainsaw
-		
-		[[2]] [JMSReceiver] Download the {{{http://logging.apache.org/log4j/docs/webstart/chainsaw/lib/log4j-jms-1.3alpha-7.jar}JMS extension}} to Chainsaw
-		
-		[[3]] [VFS] Download the {{{http://logging.apache.org/log4j/docs/webstart/chainsaw/lib/log4j-chainsaw-vfs.jar}VFS extension}} to Chainsaw
-		
-		[[4]] [VFS] Download {{{http://people.apache.org/builds/jakarta-commons/nightly/commons-vfs/}VFS}}
-		
-		[[5]] [VFS] Download {{{http://commons.apache.org/downloads/download_logging.cgi}Commons Logging}} Jars
-		
-		[[6]] [VFS] Download the VFS {{{http://commons.apache.org/vfs/download.html}filestore implementation jars}} you wish to use
-		
-			
-	Place all these jars in your .chainsaw/plugins directory (the .chainsaw directory is in your home directory)
+	There are also additional Commons VFS filestore implementaitons which may be useful but which we don't include.  For
+	more information on Commons VFS, see http://commons.apache.org/proper/commons-vfs/download.html
+	
+	Place any required jars in your .chainsaw/plugins directory (the .chainsaw directory is in your home directory)
+
 	Start Chainsaw, which should now recognize the existence of these components and allow you to use them.
-		
+
 	This applies to all distributions.
 
 
diff --git a/src/site/apt/download.apt b/src/site/apt/download.apt
index 3f8f1ec..9f74734 100644
--- a/src/site/apt/download.apt
+++ b/src/site/apt/download.apt
@@ -14,12 +14,12 @@
 ~~ limitations under the License.
 Download
 
-   Latest Development Build:  Date: 2006-03-02 (SVN tag 'release_20060302')
+   Latest Build:
 
-	* {{{http://logging.apache.org/log4j/docs/webstart/chainsaw/chainsawWebStart.jnlp}Java Web Start}} 
-	
 	* {{{http://logging.apache.org/log4j/docs/webstart/chainsaw/chainsaw.dmg}OSX}} - .dmg bundled distribution.  Drag to your /Applications folder
 	
-	* {{{http://logging.apache.org/log4j/docs/webstart/chainsaw/chainsaw-bundle.zip}Unix/Dos Standalone}} (.bat/.sh)
+	* {{{http://logging.apache.org/log4j/docs/webstart/chainsaw/apache-chainsaw-2.0.0-standalone.tar.gz}Standalone tar.gz}} (Unix/Mac: bin/chainsaw, Windows: bin/chainsaw.bat)
+
+	* {{{http://logging.apache.org/log4j/docs/webstart/chainsaw/apache-chainsaw-2.0.0-standalone.zip}Standalone zip}} (Unix/Mac: bin/chainsaw, Windows: bin/chainsaw.bat)
 	
 	Please check the {{{distributionnotes.html}Important Distribution Notes}} for more information about some of the extended feature sets.
\ No newline at end of file
diff --git a/src/site/apt/index.apt b/src/site/apt/index.apt
index 014877a..f117adf 100644
--- a/src/site/apt/index.apt
+++ b/src/site/apt/index.apt
@@ -27,12 +27,11 @@
 
 Available Distributions	
 
-	* Java Web Start
-	
 	* Standalone -.sh/.bat
 	
 	* OS X 'native' distribution (uses Java still, but looks like a real OSX application)
-	
+
+    Web Start support will be re-added in an upcoming release
 	
  	Click {{{download.html}Download}} link for more information.
 
@@ -42,12 +41,16 @@
 	
 [images/chainsaw-1.jpg] Screenshot
                                        
-	These screen shots were taken on Windows 2000, running Sun JDK 1.4.2.
+	These screen shots were taken on Mac OS High Sierra.
+	
 	Rather than rely on a combination of tail/grep/vi or equivalent to view/query/trace-through
-    a huge trail of logging events, you can use Chainsaw.  Chainsaw can read log files formatted in Log4j's XMLLayout, receive
-    events from remote locations, read events from a DB, it can even work with the JDK 1.4 logging events.
+    a huge trail of logging events, you can use Chainsaw.  
+    
+    Chainsaw can read local and ssh-reachable regular text log files, as well as log files formatted in Log4j's XMLLayout.  Chainsaw can also 
+    receive events over TCP and UDP, read events from a DB, and can process events generated by java.util.logging.
 
       
 Tutorial and User Manual
 
-	Chainsaw already includes help with with a Quick Reference and a Tutorial to get you started, all viewable from within the GUI!. A User Manual will be made available around release time. 
+	Chainsaw already includes help with with a Quick Reference and a Tutorial to get you started, all 
+	viewable from within the GUI!