JENKINS-14884 Resume stopped instances (titles/help clarification)

jenkinsci · Sep 7, 2012 · 394893d · 394893d
1 parent fe70d09
commit 394893d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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>
diff --git 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>