-----BEGIN PGP SIGNATURE-----
 
 iFoEABECABoFAlp55Z0THGJvZGV3aWdAYXBhY2hlLm9yZwAKCRCiEVrhX2uLcggk
 AJ9I2oq243FdkyU/leNG4Au2/Rb9mgCdEzwkjDDVn8Rw5VsqEwKuBYikhIs=
 =Vqby
 -----END PGP SIGNATURE-----

Merge tag 'rel/1.10.2' and prepare for next iteration

-----BEGIN PGP SIGNATURE-----
 
 iFoEABECABoFAlp55cATHGJvZGV3aWdAYXBhY2hlLm9yZwAKCRCiEVrhX2uLciFP
 AKC4x5HsfFp5rMRyAswvMoHOEwVgYgCeJEJ/v3w35MbrO8fBGI+M3NE18rk=
 =D3zf
 -----END PGP SIGNATURE-----

Merge tag 'rel/1.9.10' into 1.9.x and prepare next iteration

reviewed use of multiple-choice attributes and definition of “unix” (see conditions)

also, loose is mostly used as an adjective

uniform style of notes and new feature markers

- stripped trailing whitespace;
- corrected the tag soup;
- corrected Java versions (1.4 followed by 5);
- stripped inline styling (use CSS for uniformity).

This close #48 pull request at github/apache/ant

closes #33 by @niggemannmj

https://bz.apache.org/bugzilla/show_bug.cgi?id=61079

https://bz.apache.org/bugzilla/show_bug.cgi?id=61079

https://bz.apache.org/bugzilla/show_bug.cgi?id=60968

https://bz.apache.org/bugzilla/show_bug.cgi?id=60665

JavaxScriptRunner:
- Better compiled script reference name to avoid reference name
  collision, project wide : execName + ".compiled." +
  getScript().hashCode() + "." + getProject().hashCode();

ScriptDef:
- Fixed Javadoc + use of 3rd person
  [(oracle style
guideline)](http://www.oracle.com/technetwork/articles/java/index-137868.html#styleguide)

Task manual: documentation for `encoding` and `compiled` options.
- `encoding` : script.html, scriptdef.html, conditions.html,
   selectors.html, mapper.html, filterchain.html
- `compiled` : scriptdef.html

Added source file `encoding` option on:
- org.apache.tools.ant.taskdefs.optional.Script
- org.apache.tools.ant.types.optional.AbstractScriptComponent
  (inherited by ScriptCondition, ScriptMapper)
- org.apache.tools.ant.types.optional.ScriptFilter
- org.apache.tools.ant.types.optional.ScriptSelector

Test units :
- org.apache.tools.ant.taskdefs.optional.script.ScriptDefTest,
  script.xml : src + encoding
- org.apache.tools.ant.taskdefs.optional.RhinoScriptDefTest,
  scriptdef.xml : src + encoding, compiled
- new file: src/etc/testcases/taskdefs/optional/script/heavy-script.js