Merge branch 'master' of github.com:jenkinsci/jenkins

Conflicts:
	changelog.html

changelog.html

@@ -63,6 +63,9 @@ Upcoming changes</a>
   <li class=bug>
     When POST is required for some HTTP operation but GET was used, the response should have status code 405.
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-16918">issue 16918</a>)
+  <li class=bug>
+    Correct help text of Label field in automatic installation of tools in global configuration.
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-19091">issue 19091</a>)
 </ul>
 </div><!--=TRUNK-END=-->
 

war/src/main/webapp/help/tools/help-label.html

 <div>
     Optional label to restrict the use of this installation method.
-    Only nodes which have this label will be considered.
+    This label could be a Label Expression (for example : "linux&&x64" or "windows&&x86").
+    Only nodes which validate this label (or label expression) will be considered.
 </div>