Index: conf/tomcat-users.xml
===================================================================
--- conf/tomcat-users.xml	(revision 789447)
+++ conf/tomcat-users.xml	(working copy)
@@ -1,4 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
+<!DOCTYPE tomcat-users SYSTEM "tomcat-users.dtd">
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -17,8 +18,6 @@
 -->
 <tomcat-users>
 <!--
-  <role rolename="tomcat"/>
-  <role rolename="role1"/>
   <user username="tomcat" password="tomcat" roles="tomcat"/>
   <user username="both" password="tomcat" roles="tomcat,role1"/>
   <user username="role1" password="tomcat" roles="role1"/>
Index: res/confinstall/tomcat-users_1.xml
===================================================================
--- res/confinstall/tomcat-users_1.xml	(revision 782162)
+++ res/confinstall/tomcat-users_1.xml	(working copy)
@@ -1,3 +1,5 @@
+<?xml version='1.0' encoding='utf-8'?>
+<!DOCTYPE tomcat-users SYSTEM "tomcat-users.dtd">
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
Index: res/confinstall/tomcat-users_2.xml
===================================================================
--- res/confinstall/tomcat-users_2.xml	(revision 782162)
+++ res/confinstall/tomcat-users_2.xml	(working copy)
@@ -1,6 +1,4 @@
 <!--
-  <role rolename="tomcat"/>
-  <role rolename="role1"/>
   <user username="tomcat" password="tomcat" roles="tomcat"/>
   <user username="both" password="tomcat" roles="tomcat,role1"/>
   <user username="role1" password="tomcat" roles="role1"/>