From 394893d3dce66495a1413e1636bee712d708919d Mon Sep 17 00:00:00 2001
From: Francis Upton IV <francis@oaklandsoftware.com>
Date: Fri, 7 Sep 2012 03:08:49 -0700
Subject: [PATCH] JENKINS-14884 Resume stopped instances (titles/help
 clarification)

---
 .../resources/hudson/plugins/ec2/EC2Computer/configure.jelly  | 2 +-
 .../plugins/ec2/EC2Computer/help-idleTerminationMinutes.html  | 4 ++--
 .../ec2/SlaveTemplate/help-idleTerminationMinutes.html        | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/hudson/plugins/ec2/EC2Computer/configure.jelly b/src/main/resources/hudson/plugins/ec2/EC2Computer/configure.jelly
index 0ee8b0224..c509fef5b 100644
--- a/src/main/resources/hudson/plugins/ec2/EC2Computer/configure.jelly
+++ b/src/main/resources/hudson/plugins/ec2/EC2Computer/configure.jelly
@@ -74,7 +74,7 @@ THE SOFTWARE.
           <f:textbox />
         </f:entry>
 
-	    <f:entry title="${%Stop on Terminate}" field="stopOnTerminate">
+	    <f:entry title="${%Stop/Disconnect on Idle Timeout}" field="stopOnTerminate">
     	  <f:checkbox />
     	</f:entry>
 
diff --git a/src/main/resources/hudson/plugins/ec2/EC2Computer/help-idleTerminationMinutes.html b/src/main/resources/hudson/plugins/ec2/EC2Computer/help-idleTerminationMinutes.html
index c4e4d49cc..be7e7d436 100644
--- a/src/main/resources/hudson/plugins/ec2/EC2Computer/help-idleTerminationMinutes.html
+++ b/src/main/resources/hudson/plugins/ec2/EC2Computer/help-idleTerminationMinutes.html
@@ -1,6 +1,6 @@
 <div>
-    Determines how long slaves can remain idle before being shut down.
+    Determines how long slaves can remain idle before being stopped or terminated (see the Stop/Disconnect on Idle Timeout setting).
     <p>
     Times are expressed in minutes, and a value of 0 (or an empty string) indicates that idle slaves should
-    never be terminated
+    never be stopped/terminated.
 </div>
\ No newline at end of file
diff --git a/src/main/resources/hudson/plugins/ec2/SlaveTemplate/help-idleTerminationMinutes.html b/src/main/resources/hudson/plugins/ec2/SlaveTemplate/help-idleTerminationMinutes.html
index c4e4d49cc..be7e7d436 100644
--- a/src/main/resources/hudson/plugins/ec2/SlaveTemplate/help-idleTerminationMinutes.html
+++ b/src/main/resources/hudson/plugins/ec2/SlaveTemplate/help-idleTerminationMinutes.html
@@ -1,6 +1,6 @@
 <div>
-    Determines how long slaves can remain idle before being shut down.
+    Determines how long slaves can remain idle before being stopped or terminated (see the Stop/Disconnect on Idle Timeout setting).
     <p>
     Times are expressed in minutes, and a value of 0 (or an empty string) indicates that idle slaves should
-    never be terminated
+    never be stopped/terminated.
 </div>
\ No newline at end of file