--- tomcat	2010-07-12 11:48:22.000000000 +0100
+++ tomcat-1	2010-07-12 12:42:29.000000000 +0100
@@ -28,11 +28,11 @@
 #   OCF_RESKEY_tomcat_suspend_trialcount  - The re-try number of times awaiting a stop. Default is 10
 #   OCF_RESKEY_tomcat_user  - A user name to start a resource. Default is root
 #   OCF_RESKEY_statusurl - URL for state confirmation. Default is http://127.0.0.1:8080
-#   OCF_RESKEY_java_home - Home directory of the Java. Default is None
-#   OCF_RESKEY_catalina_home - Home directory of Tomcat. Default is None
+#   OCF_RESKEY_java_home - Home directory of Java. Default is none
+#   OCF_RESKEY_catalina_home - Home directory of Tomcat. Default is none
 #   OCF_RESKEY_catalina_pid  - A PID file name of Tomcat. Default is OCF_RESKEY_catalina_home/logs/catalina.pid
-#   OCF_RESKEY_tomcat_start_opts - Start options of the tomcat. Default is None.
-#   OCF_RESKEY_catalina_opts - CATALINA_OPTS environment variable. Default is None.
+#   OCF_RESKEY_tomcat_start_opts - Start options of Tomcat. Default is none.
+#   OCF_RESKEY_catalina_opts - CATALINA_OPTS environment variable. Default is none.
 #   OCF_RESKEY_catalina_rotate_log - Control catalina.out logrotation flag. Default is NO.
 #   OCF_RESKEY_catalina_rotatetime - catalina.out logrotation time span(seconds). Default is 86400.
 ###############################################################################
@@ -49,13 +49,13 @@
 usage: $0 action
 
 action:
-        start   start tomcat
+        start   start Tomcat
 
-        stop    stop the tomcat
+        stop    stop Tomcat
 
-        status  return the status of tomcat, run or down
+        status  return the status of Tomcat, up or down
 
-        monitor  return TRUE if the tomcat appears to be working.
+        monitor  return TRUE if Tomcat appears to be working.
                  You have to have installed $WGETNAME for this to work.
 
         meta-data       show meta data message
@@ -254,7 +254,7 @@
 <version>1.0</version>
 
 <longdesc lang="en">
-Resource script for tomcat. It manages a Tomcat instance as an HA resource.
+Resource script for Tomcat. It manages a Tomcat instance as a cluster resource.
 </longdesc>
 <shortdesc lang="en">Manages a Tomcat servlet environment instance</shortdesc>
 
@@ -262,41 +262,43 @@
 
 <parameter name="tomcat_name" unique="1" >
 <longdesc lang="en">
-The name of the resource
+The name of the resource, added as a Java parameter in JAVA_OPTS: -Dname=<tomcat_name> to Tomcat 
+process on start.  Used to ensure process is still running and must be unique amongst all Tomcat 
+instances in this cluster.
 </longdesc>
-<shortdesc>The name of the resource</shortdesc>
+<shortdesc>The name of the resource, must be unique</shortdesc>
 <content type="string" default="" />
 </parameter>
 
 <parameter name="script_log" unique="1">
 <longdesc lang="en">
-A destination of the log of this script
+Log file for this resource agent, used during start and stop operations
 </longdesc>
-<shortdesc>A destination of the log of this script</shortdesc>
+<shortdesc>Log file for this resource agent</shortdesc>
 <content type="string" default="" />
 </parameter>
 
 <parameter name="tomcat_stop_timeout" unique="0">
 <longdesc lang="en">
-Time-out at the time of the stop
+Time-out for stop operation
 </longdesc>
-<shortdesc>Time-out at the time of the stop</shortdesc>
+<shortdesc>Time-out for stop operation</shortdesc>
 <content type="integer" default="" />
 </parameter>
 
 <parameter name="tomcat_suspend_trialcount" unique="0">
 <longdesc lang="en">
-The re-try number of times awaiting a stop
+Maximum number of times to re-try stop operation before suspending and killing Tomcat
 </longdesc>
-<shortdesc>The re-try number of times awaiting a stop</shortdesc>
+<shortdesc>Max re-try count for stop operation</shortdesc>
 <content type="integer" default="" />
 </parameter>
 
 <parameter name="tomcat_user" unique="0">
 <longdesc lang="en">
-A user name to start a resource
+The user who starts Tomcat.
 </longdesc>
-<shortdesc>A user name to start a resource</shortdesc>
+<shortdesc>The user who starts Tomcat</shortdesc>
 <content type="string" default="" />
 </parameter>
 
@@ -310,9 +312,9 @@
 
 <parameter name="java_home" unique="0" required="1">
 <longdesc lang="en">
-Home directory of the Java
+Home directory of Java
 </longdesc>
-<shortdesc>Home directory of the Java</shortdesc>
+<shortdesc>Home directory of Java</shortdesc>
 <content type="string" default="" />
 </parameter>
 
@@ -326,9 +328,9 @@
 
 <parameter name="catalina_pid" unique="1">
 <longdesc lang="en">
-A PID file name of Tomcat
+A PID file name for Tomcat
 </longdesc>
-<shortdesc>A PID file name of Tomcat</shortdesc>
+<shortdesc>A PID file name for Tomcat</shortdesc>
 <content type="string" default="" />
 </parameter>
 
@@ -342,7 +344,7 @@
 
 <parameter name="catalina_opts" unique="0">
 <longdesc lang="en">
-Catalina options
+Catalina options, applied on start operation only
 </longdesc>
 <shortdesc>Catalina options</shortdesc>
 <content type="string" default="" />
@@ -358,9 +360,9 @@
 
 <parameter name="catalina_rotatetime" unique="0">
 <longdesc lang="en">
-Time span of the rotate catalina.out
+catalina.out rotation interval (seconds)
 </longdesc>
-<shortdesc>Time span of the rotate catalina.out</shortdesc>
+<shortdesc>catalina.out rotation interval (s)</shortdesc>
 <content type="integer" default="" />
 </parameter>