[JENKINS-31386] Merging #264.

Originally-Committed-As: c91ed650071362d9949da5fbffd13a9262c1fb1e
jenkinsci · Dec 7, 2015 · e3e8029 · e3e8029
2 parents bd606c2 + 154cf75
commit e3e8029
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/cps/src/main/resources/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinition/config.jelly b/cps/src/main/resources/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinition/config.jelly
@@ -27,7 +27,7 @@ THE SOFTWARE.
 <j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form" xmlns:st="jelly:stapler">
     <f:dropdownDescriptorSelector field="scm" title="SCM" descriptors="${descriptor.applicableDescriptors}"/>
     <f:entry field="scriptPath" title="${%Script Path}">
-        <f:textbox default="flow.groovy"/>
+        <f:textbox default="Jenkinsfile"/>
     </f:entry>
     <st:include it="${descriptor.snippetizer}" page="block.jelly"/>
 </j:jelly>
diff --git a/...in/resources/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinition/help-scriptPath.html b/...in/resources/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinition/help-scriptPath.html
@@ -1,4 +1,6 @@
 <div>
     Relative location within the checkout of your Workflow script.
     Note that it will always be run inside a Groovy sandbox.
+    <code>Jenkinsfile</code> is conventional and allows you to switch easily to a multibranch project
+    (just use <code>checkout scm</code> to retrieve sources from the same location as is configured here).
 </div>