From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Wed, 7 Sep 2016 09:56:14 +0000 (+0100)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
X-Git-Tag: Release_2_10_0~45^2~4
X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=commitdiff_plain;h=d6a7a52ed783274ebf338417af48cd931cfba60e;hp=a9b2a4dd7dcbb2c86bb247970a8fe1b2ab6dc37d

Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
---

diff --git a/utils/checkstyle/checkstyle.xml b/utils/checkstyle/checkstyle.xml
index 8a5f14f..85ac8e6 100644
--- a/utils/checkstyle/checkstyle.xml
+++ b/utils/checkstyle/checkstyle.xml
@@ -594,7 +594,13 @@
 			Check for TODO and similar comments 
 	 	-->
 		<module name="TodoComment">
-			<property name="format" value="(TODO)|(FIXME)|(DOCUMENT ME)"/>
+			<property name="format" value="(TODO)|(FIXME)"/>
+			<message key="todo.match" value="TODO or FIXME comment"/>
+		</module>
+
+		<module name="TodoComment">
+			<property name="format" value="DOCUMENT ME"/>
+			<message key="todo.match" value="Documentation incomplete"/>
 		</module>
 
 	</module>