Repository: ant Updated Branches: refs/heads/master a04350e0b -> d3827f7d8
http://git-wip-us.apache.org/repos/asf/ant/blob/d3827f7d/manual/Tasks/replace.html ---------------------------------------------------------------------- diff --git a/manual/Tasks/replace.html b/manual/Tasks/replace.html index ef8f183..7cc6e0a 100644 --- a/manual/Tasks/replace.html +++ b/manual/Tasks/replace.html @@ -123,13 +123,13 @@ have been regenerated by this task.</p> <tr> <td valign="top">preserveLastModified</td> <td valign="top">Keep the file timestamp(s) even if the file(s) - is(are) modified. <em>since Apache Ant 1.8.0.</em></td> + is(are) modified. <em>since Apache Ant 1.8.0</em>.</td> <td valign="top" align="center">No, defaults to false</td> </tr> <tr> <td valign="top">failOnNoReplacements</td> <td valign="top">Whether to fail the build if the task didn't do - anything. <em>since Ant 1.8.0.</em></td> + anything. <em>since Ant 1.8.0</em>.</td> <td valign="top" align="center">No, defaults to false</td> </tr> </table> @@ -159,7 +159,7 @@ them.</p> <tr> <td valign="top">expandProperties</td> <td valign="top">Whether to expand properties in the nested text. - <em>since Ant 1.8.0.</em></td> + <em>since Ant 1.8.0</em>.</td> <td align="center">No, defaults to true.</td> </tr> </table> @@ -208,7 +208,7 @@ token]]></replacevalue> <td valign="top">Name of the property whose value is to serve as the replacement value.</td> </tr> </table> -<p>Since Ant 1.8.0 token and value can be specified as nested elements +<p><em>Since Ant 1.8.0</em> token and value can be specified as nested elements just like in the task itself.</p> <p>If neither <i>value</i> nor <i>property</i> is used, the value provided using the <code><replace></code> attribute <i>value</i> and/or the <code><replacevalue></code> element is used. If no value was specified using either of these options, the token is replaced with an empty string. </p> @@ -233,9 +233,7 @@ token]]></replacevalue> </replace> </pre></blockquote> <p>In file <code>configure.sh</code>, replace all instances of "@token1@" with "defaultvalue", all instances of "@token2@" with "value2", and all instances of "@token3@" with the value of the property "property.key", as it appears in property file <code>src/name.properties</code>.</p> -<p><b>Note:</b> It is possible to use either the <i>token</i>/<code><replacetoken></code> and <i>value</i>/<code><replacevalue></code> attributes/elements, the nested replacefilter elements, or both in the same operation. -</p> - +<p><strong>Note</strong>: It is possible to use either the <i>token</i>/<code><replacetoken></code> and <i>value</i>/<code><replacevalue></code> attributes/elements, the nested replacefilter elements, or both in the same operation.</p> </body> </html> http://git-wip-us.apache.org/repos/asf/ant/blob/d3827f7d/manual/Tasks/replaceregexp.html ---------------------------------------------------------------------- diff --git a/manual/Tasks/replaceregexp.html b/manual/Tasks/replaceregexp.html index f0b612b..9861b73 100644 --- a/manual/Tasks/replaceregexp.html +++ b/manual/Tasks/replaceregexp.html @@ -90,7 +90,7 @@ See details in the documentation of the <a href="../Types/regexp.html#implementa <tr> <td valign="top">preserveLastModified</td> <td valign="top">Keep the file timestamp(s) even if the file(s) - is(are) modified. <em>since Ant 1.8.0.</em></td> + is(are) modified. <em>since Ant 1.8.0</em>.</td> <td valign="top" align="center">No, defaults to false</td> </tr> </table> http://git-wip-us.apache.org/repos/asf/ant/blob/d3827f7d/manual/Tasks/resourcecount.html ---------------------------------------------------------------------- diff --git a/manual/Tasks/resourcecount.html b/manual/Tasks/resourcecount.html index c463631..39d9627 100644 --- a/manual/Tasks/resourcecount.html +++ b/manual/Tasks/resourcecount.html @@ -29,7 +29,7 @@ <h3>Description</h3> <p>Display or set a property containing the size of a nested <a href="../Types/resources.html#collection">Resource Collection</a>. - Can also be used as a condition. <b>Since Apache Ant 1.7</b></p> + Can also be used as a condition. <em>Since Apache Ant 1.7</em></p> <h3>Parameters</h3> <table> <tr> http://git-wip-us.apache.org/repos/asf/ant/blob/d3827f7d/manual/Tasks/rexec.html ---------------------------------------------------------------------- diff --git a/manual/Tasks/rexec.html b/manual/Tasks/rexec.html index 2aed66a..7874c7b 100644 --- a/manual/Tasks/rexec.html +++ b/manual/Tasks/rexec.html @@ -30,7 +30,7 @@ Task to automate a remote rexec session. Just like the Telnet task, it uses nested <tt><read></tt> to indicate strings to wait for, and <tt><write></tt> tags to specify text to send to the remote process. -<p><b>Note:</b> This task depends on external libraries not included in the Apache Ant distribution. +<p><strong>Note</strong>: This task depends on external libraries not included in the Apache Ant distribution. See <a href="../install.html#librarydependencies">Library Dependencies</a> for more information.</p> <p>You can specify the commands you want to execute as nested elements http://git-wip-us.apache.org/repos/asf/ant/blob/d3827f7d/manual/Tasks/rmic.html ---------------------------------------------------------------------- diff --git a/manual/Tasks/rmic.html b/manual/Tasks/rmic.html index 9c59c0c..8de6f58 100644 --- a/manual/Tasks/rmic.html +++ b/manual/Tasks/rmic.html @@ -52,17 +52,15 @@ with the "build.rmic" property, the <code>compiler</code> attribute, or a nested element. Here are the choices:</p> <ul> <li>default -the default compiler (kaffe, sun or forking) for the platform. - <li>sun (the standard compiler of the JDK < JDK 9)</li> - <li>kaffe (the standard compiler of <a href="http://www.kaffe.org"; target="_top">Kaffe</a>)</li> + <li>sun - the standard compiler of the JDK < 9</li> + <li>kaffe - the standard compiler of <a href="http://www.kaffe.org"; target="_top">Kaffe</a></li> <li>weblogic</li> - <li>forking - the sun compiler forked into a separate process (since - Apache Ant 1.7). Starting with Ant 1.9.8 this is the default when - running on JDK 9+.</li> - <li>xnew - the sun compiler forked into a separate process, - with the -Xnew option (since Ant 1.7). - This is the most reliable way to use -Xnew. - <br>JDK 9 has removed support for -Xnew and starting with Ant - 1.9.8 this option will be rejected by Ant when running on JDK 9.</li> + <li>forking - (<em>since Apache Ant 1.7</em>) the sun compiler forked into a separate process. + <em>Since Ant 1.9.8</em>, this is the default when running on JDK 9+.</li> + <li>xnew - (<em>since Ant 1.7</em>) the sun compiler forked into a separate process, + with the -Xnew option. This is the most reliable way to use -Xnew.<br> + JDK 9 has removed support for -Xnew and <em>since Ant 1.9.8</em> + this option will be rejected when running on JDK 9.</li> <li> "" (empty string). This has the same behaviour as not setting the compiler attribute. First the value of <tt>build.rmic</tt> is used if defined, and if not, the default for the platform is chosen. If build.rmic is set to this, you get the default.</li> @@ -110,7 +108,7 @@ please consult miniRMI's documentation to learn how to use it.</p> <td valign="top">stubversion</td> <td valign="top">Specify the JDK version for the generated stub code. Specify "1.1" to pass the "-v1.1" option to rmic, - "1.2" for -v12, compat for -vcompat. <br> + "1.2" for -v12, compat for -vcompat.<br> <em>Since Ant 1.7</em>, if you do not specify a version, and do not ask for iiop or idl files, "compat" is selected. @@ -287,7 +285,7 @@ used.</p> <td valign="top">prefix</td> <td align="center" rowspan="2">See <a href="../using.html#arg">Command-line Arguments</a>. - <em>Since Ant 1.8.</em></td> + <em>Since Ant 1.8</em>.</td> <td valign="top" align="center">No</td> </tr> <tr> @@ -305,7 +303,7 @@ used.</p> </tr> </table> -<h4>compilerclasspath <em>since Ant 1.8.0</em></h4> +<h4>compilerclasspath (<em>since Ant 1.8.0</em>)</h4> <p>A <a href="../using.html#path">PATH like structure</a> holding the classpath to use when loading the compiler implementation if a @@ -313,7 +311,7 @@ used.</p> using one of the built-in compilers.</p> <h4>Any nested element of a type that implements RmicAdapter - <em>since Ant 1.8.0</em></h4> + (<em>since Ant 1.8.0</em>)</h4> <p>If a defined type implements the <code>RmicAdapter</code> interface a nested element of that type can be used as an http://git-wip-us.apache.org/repos/asf/ant/blob/d3827f7d/manual/Tasks/scp.html ---------------------------------------------------------------------- diff --git a/manual/Tasks/scp.html b/manual/Tasks/scp.html index 173b1b8..bcd9964 100644 --- a/manual/Tasks/scp.html +++ b/manual/Tasks/scp.html @@ -33,7 +33,7 @@ FileSet <i>only</i> works for copying files from the local machine to a remote machine.</p> -<p><b>Note:</b> This task depends on external libraries not included +<p><strong>Note</strong>: This task depends on external libraries not included in the Ant distribution. See <a href="../install.html#librarydependencies">Library Dependencies</a> for more information. This task has been tested with jsch-0.1.2 and later.</p> @@ -121,7 +121,7 @@ for more information. This task has been tested with jsch-0.1.2 and later.</p> <tr> <td valign="top">trust</td> <td valign="top">This trusts all unknown hosts if set to yes/true.<br> - <strong>Note</strong> If you set this to false (the default), the + <strong>Note</strong>: If you set this to false (the default), the host you connect to must be listed in your knownhosts file, this also implies that the file exists.</td> <td valign="top" align="center">No, defaults to No.</td> @@ -291,7 +291,7 @@ authentication.</b></p> </scp> </pre> -<p><strong>Security Note:</strong> Hard coding passwords and/or usernames +<p><strong>Security Note</strong>: Hardcoding passwords and/or usernames in scp task can be a serious security hole. Consider using variable substitution and include the password on the command line. For example: <p> @@ -309,7 +309,7 @@ system (via the ps command). The best approach is to use the .properties file. </p> -<p><strong>Unix Note:</strong> File permissions are not retained when files +<p><strong>Unix Note</strong>: File permissions are not retained when files are downloaded; they end up with the default <code>UMASK</code> permissions instead. This is caused by the lack of any means to query or set file permissions in the current Java runtimes. If you need a permission- http://git-wip-us.apache.org/repos/asf/ant/blob/d3827f7d/manual/Tasks/script.html ---------------------------------------------------------------------- diff --git a/manual/Tasks/script.html b/manual/Tasks/script.html index ff8478d..eedbb17 100644 --- a/manual/Tasks/script.html +++ b/manual/Tasks/script.html @@ -31,7 +31,7 @@ or <a href="https://scripting.dev.java.net";>JSR 223</a> supported language. </p> - <p><b>Note:</b> + <p><strong>Note</strong>: This task depends on external libraries not included in the Apache Ant distribution. See <a href="../install.html#librarydependencies">Library Dependencies</a> for more information. @@ -82,7 +82,7 @@ different location values.</p> <tr> <td valign="top">manager</td> <td valign="top"> - <em>Since: Ant 1.7.</em> + <em>Since Ant 1.7</em>. The script engine manager to use. This can have one of three values ("auto", "bsf" or "javax"). The default value is "auto". @@ -104,7 +104,7 @@ different location values.</p> </tr> <tr> <td valign="top">encoding</td> - <td valign="top">The encoding of the script as a file. <em>since Ant 1.10.2.</em></td> + <td valign="top">The encoding of the script as a file. <em>Since Ant 1.10.2</em>.</td> <td valign="top" align="center">No - defaults to default JVM encoding</td> </tr> <tr> @@ -153,7 +153,7 @@ different location values.</p> specific jar files. </p> <p> - <b>NB: (Since Ant 1.7.1)</b> + <strong>Note</strong>: (<em>since Ant 1.7.1</em>) This classpath <em>can</em> be used to specify the location of the BSF jar file and/or languages http://git-wip-us.apache.org/repos/asf/ant/blob/d3827f7d/manual/Tasks/scriptdef.html ---------------------------------------------------------------------- diff --git a/manual/Tasks/scriptdef.html b/manual/Tasks/scriptdef.html index a102891..1d016e6 100644 --- a/manual/Tasks/scriptdef.html +++ b/manual/Tasks/scriptdef.html @@ -41,7 +41,7 @@ of the script increases it would be better to migrate the task definition into a Java based custom task. </p> -<p><b>Note:</b> This task depends on external libraries not included in the +<p><strong>Note</strong>: This task depends on external libraries not included in the Ant distribution. See <a href="../install.html#librarydependencies">Library Dependencies</a> for more information.</p> @@ -58,12 +58,12 @@ element name. This will return a list of all instances of the nested element. The instances in this list may be accessed by an integer index. </p> -<p><b>Note:</b> Ant will turn all attribute and element names into all +<p><strong>Note</strong>: Ant will turn all attribute and element names into all lowercase names, so even if you use name="SomeAttribute", you'll have to use "someattribute" to retrieve the attribute's value from the <code>attributes</code> collection.</p> -<p>The name "self" (<i>since Ant 1.6.3</i>) is a pre-defined reference to the +<p>The name "self" (<em>since Ant 1.6.3</em>) is a pre-defined reference to the script def task instance. It can be used for logging, or for integration with the rest of Ant. the <code>self.text attribute</code> contains @@ -117,7 +117,7 @@ more information on writing scripts, please refer to the </tr> <tr> <td valign="top">encoding</td> - <td valign="top">The encoding of the script as a file. <em>since Ant 1.10.2.</em></td> + <td valign="top">The encoding of the script as a file. <em>since Ant 1.10.2</em>.</td> <td valign="top" align="center">No - defaults to default JVM encoding</td> </tr> <tr> @@ -126,7 +126,7 @@ more information on writing scripts, please refer to the evaluation for faster multiple executions, on the condition that the <em>manager</em> is "javax" and the target engine implements <code>javax.script.Compilable</code>. Note that the <code>bsf</code> manager may automatically compiles the script. - <em>since Ant 1.10.2.</em></td> + <em>since Ant 1.10.2</em>.</td> <td valign="top" align="center">No - defaults to false</td> </tr> <tr> http://git-wip-us.apache.org/repos/asf/ant/blob/d3827f7d/manual/Tasks/setpermissions.html ---------------------------------------------------------------------- diff --git a/manual/Tasks/setpermissions.html b/manual/Tasks/setpermissions.html index 427c545..28bf999 100644 --- a/manual/Tasks/setpermissions.html +++ b/manual/Tasks/setpermissions.html @@ -25,7 +25,7 @@ <body> <h2 id="setpermissions">SetPermissions</h2> -<p><em>Since Ant 1.10.0.</em></p> +<p><em>Since Ant 1.10.0</em>.</p> <h3>Description</h3> <p>Changes the file permissions using Java's NIO support for permissions.</p> http://git-wip-us.apache.org/repos/asf/ant/blob/d3827f7d/manual/Tasks/sound.html ---------------------------------------------------------------------- diff --git a/manual/Tasks/sound.html b/manual/Tasks/sound.html index 96821f7..f0de67d 100644 --- a/manual/Tasks/sound.html +++ b/manual/Tasks/sound.html @@ -30,7 +30,7 @@ the build failed or succeeded. You can specify either a specific sound-file to play, or, if a directory is specified, the <code><sound></code> task will randomly select a file to play. -Note: At this point, the random selection is based on all the files +<strong>Note</strong>: At this point, the random selection is based on all the files in the directory, not just those ending in appropriate suffixes for sound-files, so be sure you only have sound-files in the directory you specify.</p> http://git-wip-us.apache.org/repos/asf/ant/blob/d3827f7d/manual/Tasks/sql.html ---------------------------------------------------------------------- diff --git a/manual/Tasks/sql.html b/manual/Tasks/sql.html index d7873ae..6094d53 100644 --- a/manual/Tasks/sql.html +++ b/manual/Tasks/sql.html @@ -124,7 +124,7 @@ and <b>abort</b> execution and transaction and fail task.</p> <tr> <td width="12%" valign="top">output</td> <td width="78%" valign="top">Output file for result sets (defaults to System.out) - <b>Since Ant 1.8</b> can specify any Resource that supports output (see + <em>Since Ant 1.8</em> can specify any Resource that supports output (see <a href="../develop.html#set-magic">note</a>). </td> <td width="10%" valign="top">No (print to System.out by default)</td> @@ -226,7 +226,7 @@ and <b>abort</b> execution and transaction and fail task.</p> <td width="12%" valign="top">showWarnings</td> <td width="78%" valign="top">If true, SQLWarnings will be logged at the WARN level. <em>Since Ant 1.8.0</em>.<br/> - <b>Note:</b> even if the attribute is set to false, warnings that + <strong>Note</strong>: even if the attribute is set to false, warnings that apply to the connection will be logged at the verbose level.</td> <td width="10%" valign="top">No, default <em>false</em></td> </tr> @@ -256,7 +256,7 @@ and <b>abort</b> execution and transaction and fail task.</p> quote character itself will be surrounded by the quote character. The quote character itself will be doubled if it appears inside of the column's value.<br/> - <b>Note:</b> BLOB values will never be quoted. + <strong>Note</strong>: BLOB values will never be quoted. <em>Since Ant 1.8.0</em>.</td> <td width="10%" valign="top">No, default is not set (i.e. no quoting ever occurs)</td> http://git-wip-us.apache.org/repos/asf/ant/blob/d3827f7d/manual/Tasks/sshexec.html ---------------------------------------------------------------------- diff --git a/manual/Tasks/sshexec.html b/manual/Tasks/sshexec.html index 5efa5bd..1072d3e 100644 --- a/manual/Tasks/sshexec.html +++ b/manual/Tasks/sshexec.html @@ -29,10 +29,9 @@ <p><em>since Apache Ant 1.6</em></p> -<p>Runs a command on a remote machine running SSH daemon. -</p> +<p>Runs a command on a remote machine running SSH daemon.</p> -<p><b>Note:</b> This task depends on external libraries not included +<p><strong>Note</strong>: This task depends on external libraries not included in the Ant distribution. See <a href="../install.html#librarydependencies">Library Dependencies</a> for more information. This task has been tested with jsch-0.1.29 and above @@ -78,7 +77,7 @@ and won't work with versions of jsch earlier than <td valign="top">trust</td> <td valign="top">This trusts all unknown hosts if set to yes/true.<br> - <strong>Note</strong> If you set this to false (the default), the + <strong>Note</strong>: If you set this to false (the default), the host you connect to must be listed in your knownhosts file, this also implies that the file exists.</td> <td valign="top" align="center">No, defaults to No.</td> @@ -283,7 +282,7 @@ and won't work with versions of jsch earlier than commandResource="to_run"/> </pre> -<p><strong>Security Note:</strong> Hard coding passwords and/or usernames +<p><strong>Security Note</strong>: Hard coding passwords and/or usernames in sshexec task can be a serious security hole. Consider using variable substitution and include the password on the command line. For example:</p> <pre> http://git-wip-us.apache.org/repos/asf/ant/blob/d3827f7d/manual/Tasks/sshsession.html ---------------------------------------------------------------------- diff --git a/manual/Tasks/sshsession.html b/manual/Tasks/sshsession.html index 4758719..8c9052d 100644 --- a/manual/Tasks/sshsession.html +++ b/manual/Tasks/sshsession.html @@ -35,7 +35,7 @@ remote tunnels over that connection, then executes any nested tasks before taking down the connection. </p> -<p><b>Note:</b> This task depends on external libraries not included +<p><strong>Note</strong>: This task depends on external libraries not included in the Ant distribution. See <a href="../install.html#librarydependencies">Library Dependencies</a> for more information. This task has been tested with @@ -90,7 +90,7 @@ and <a href="scp.html">scp</a> tasks</p> <td valign="top">trust</td> <td valign="top">This trusts all unknown hosts if set to yes/true.<br> - <strong>Note</strong> If you set this to false (the default), the + <strong>Note</strong>: If you set this to false (the default), the host you connect to must be listed in your knownhosts file, this also implies that the file exists.</td> <td valign="top" align="center">No, defaults to No.</td> @@ -253,8 +253,7 @@ accessible, then run a get task using that tunnel.</b></p> </sshsession> </pre> - -<p><strong>Security Note:</strong> Hard coding passwords or +<p><strong>Security Note</strong>: Hardcoding passwords or passphrases and/or usernames in sshsession task can be a serious security hole. Consider using variable substitution and include the password on the command line. For example:</p> http://git-wip-us.apache.org/repos/asf/ant/blob/d3827f7d/manual/Tasks/style.html ---------------------------------------------------------------------- diff --git a/manual/Tasks/style.html b/manual/Tasks/style.html index 496e621..9c4afc1 100644 --- a/manual/Tasks/style.html +++ b/manual/Tasks/style.html @@ -30,7 +30,7 @@ <p>Process a set of documents via XSLT.</p> <p>This is useful for building views of XML based documentation, or for generating code.</p> -<p><b>Note:</b> If you are using JDK 1.4 or higher, this task does not require external libraries +<p><strong>Note</strong>: If you are using JDK 1.4 or higher, this task does not require external libraries not supplied in the Apache Ant distribution. However, often the built in XSL engine is not as up to date as a fresh download, so an update is still highly recommended in particular since the built-in XSLT processors of Java 5 (and to a @@ -50,7 +50,7 @@ inclusion/exclusion of files works, and how to write patterns.</p> as well as the nested <code><include></code>, <code><exclude></code> and <code><patternset></code> elements.</p> -<p><b>Note</b>: Unlike other similar tasks, this task treats +<p><strong>Note</strong>: Unlike other similar tasks, this task treats directories that have been matched by the include/exclude patterns of the implicit fileset in a special way. It will apply the stylesheets to all files contain in them as well. Since the default include @@ -296,8 +296,8 @@ element is used to perform Entity and URI resolution.</p> <h4>param</h4> <p>Param is used to pass a parameter to the XSL stylesheet.</p> -<blockquote> -<h4>Parameters</h4> + +<h5>Parameters</h5> <table> <tr> <td valign="top"><b>Attribute</b></td> @@ -347,9 +347,7 @@ element is used to perform Entity and URI resolution.</p> <td valign="top">The param will not be passed <a href="../properties.html#if+unless">if this property is set</a>.</td> <td align="center" valign="top">No</td> </tr> - </table> -</blockquote> <p> The <code>XPATH_*</code> types says that the <code>expression</code> is not just a primitive-type value but an XPath expression. @@ -367,8 +365,8 @@ element is used to perform Entity and URI resolution.</p> <p>Used to specify how you wish the result tree to be output as specified in the <a href="http://www.w3.org/TR/xslt#output";> XSLT specifications</a>. -<blockquote> -<h4>Parameters</h4> + +<h5>Parameters</h5> <table> <tr> <td valign="top"><b>Attribute</b></td> @@ -386,12 +384,11 @@ XSLT specifications</a>. <td align="center" valign="top">Yes</td> </tr> </table> -</blockquote> <h4 id="factory">factory ('trax' processors only)</h4> Used to specify factory settings. -<blockquote> -<h4>Parameters</h4> + +<h5>Parameters</h5> <table> <tr> <td valign="top"><b>Attribute</b></td> @@ -409,8 +406,8 @@ Used to specify factory settings. <td align="center" valign="top">No. Defaults to the JAXP lookup mechanism.</td> </tr> </table> -<h3>Parameters specified as nested elements</h3> -<h4>attribute</h4> +<h5>Parameters specified as nested elements</h5> +<h6>attribute</h6> <p>Used to specify settings of the processor factory. The attribute names and values are entirely processor specific so you must be aware of the implementation to figure them out. @@ -431,7 +428,7 @@ And in Saxon 7.x: <li>...</li> </ul> <blockquote> -<h4>Parameters</h4> +<h6>Parameters</h6> <table> <tr> <td valign="top"><b>Attribute</b></td> @@ -460,8 +457,9 @@ And in Saxon 7.x: with the given id. <em>since Ant 1.9.8</em></td> </tr> </table> +</blockquote> -<h4>Examples</h4> +<h5>Examples</h5> <pre> <path id="extension-path"> @@ -478,10 +476,10 @@ And in Saxon 7.x: </pre> <p>Sets the classloader to use when loading extension functions to a classloader using the <code>path</code> with the - id <code>extension-path</code>. -</blockquote> -<h4>feature</h4> + id <code>extension-path</code>.</p> <p><em>since Ant 1.9.8</em></p> + +<h6>feature</h6> <p>Used to specify settings of the processor factory. The feature names are mostly processor specific so you must be aware of the implementation to figure them out. Read the documentation of your @@ -489,7 +487,7 @@ processor. The only feature all implementations are required to support is <code>http://javax.xml.XMLConstants/feature/secure-processing</code>. <blockquote> -<h4>Parameters</h4> +<h6>Parameters</h6> <table> <tr> <td valign="top"><b>Attribute</b></td> @@ -504,12 +502,12 @@ is <code>http://javax.xml.XMLConstants/feature/secure-processing</code>. <tr> <td valign="top">value</td> <td valign="top">value of the feature. A boolean value - (i.e. permitted values are true,false,yes,no,on,off).</td> + (i.e. permitted values are true, false, yes, no, on, off).</td> <td align="center" valign="top">No, defaults to false</td> </tr> </table> </blockquote> -</blockquote> + <h4>mapper</h4> <p><em>since Ant 1.6.2</em></p> @@ -547,7 +545,6 @@ with <a href="../Types/propertyset.html">syspropertyset</a>s.</p> <p><em>since Ant 1.8.0</em>.</p> <h3>Examples</h3> -<blockquote> <pre> <xslt basedir="doc" destdir="build/doc" extension=".html" style="style/apache.xsl"/></pre> @@ -670,8 +667,7 @@ with <a href="../Types/propertyset.html">syspropertyset</a>s.</p> <project> <xslt style="printFilename.xsl" destdir="out" basedir="in" extension=".txt" filenameparameter="filename" - filedirparameter="filedir" - /> + filedirparameter="filedir"/> </project> <xsl:stylesheet @@ -693,11 +689,9 @@ with <a href="../Types/propertyset.html">syspropertyset</a>s.</p> <pre> <xslt ...> <sysproperty key="org.apache.xerces.xni.parser.XMLParserConfiguration" - value="org.apache.xerces.parsers.XIncludeParserConfiguration" - /> + value="org.apache.xerces.parsers.XIncludeParserConfiguration"/> <xslt> </pre> -</blockquote> </body> </html> http://git-wip-us.apache.org/repos/asf/ant/blob/d3827f7d/manual/Tasks/symlink.html ---------------------------------------------------------------------- diff --git a/manual/Tasks/symlink.html b/manual/Tasks/symlink.html index 2ed74fc..127514e 100644 --- a/manual/Tasks/symlink.html +++ b/manual/Tasks/symlink.html @@ -52,7 +52,7 @@ set of links to record, or a set of property files to create links from. <tr> <td valign="top">link</td> <td valign="top">The name of the link to be created or deleted.<br/> - <b>Note</b> this attribute is resolved against the current + <strong>Note</strong>: this attribute is resolved against the current working directory rather than the project's basedir for historical reasons. It is recommended you always use an absolute path or a path like <code>${basedir}/some-path</code> @@ -124,7 +124,7 @@ set of links to record, or a set of property files to create links from. <symlink action="delete" link="${dir.top}/foo"/> </pre> - <p><strong>Java 1.2 and earlier:</strong> Due to limitations on executing system + <p><strong>Java 1.2 and earlier</strong>: Due to limitations on executing system level commands in Java versions earlier than 1.3 this task may have difficulty operating with a relative path in ANT_HOME. The typical symptom is an IOException where Apache Ant can't find /some/working/directory${ANT_HOME}/bin/antRun @@ -132,7 +132,7 @@ set of links to record, or a set of property files to create links from. variable to an absolute path, which will remove the /some/working/directory portion of the above path and allow Ant to find the correct commandline execution script. - <p><strong>NOTE:</strong> Starting Ant version 1.10.2, this task relies on the symbolic +<p><strong>Note</strong>: <em>Since Ant 1.10.2</em>, this task relies on the symbolic link support introduced in Java 7 through the java.nio.file.Files APIs</p> </body> http://git-wip-us.apache.org/repos/asf/ant/blob/d3827f7d/manual/Tasks/sync.html ---------------------------------------------------------------------- diff --git a/manual/Tasks/sync.html b/manual/Tasks/sync.html index b1d4d1d..e315cec 100644 --- a/manual/Tasks/sync.html +++ b/manual/Tasks/sync.html @@ -58,7 +58,7 @@ dir, it will get removed from the target.</p> <td valign="top">includeEmptyDirs</td> <td valign="top">Copy any empty directories included in the resource collection(s).<br/> - <b>Note</b> this attribute also controls the behavior for any + <strong>Note</strong> this attribute also controls the behavior for any nested <preserveintarget> element. If this attribute is false (the default) empty directories that only exist in the target directory will be removed even if they are matched by http://git-wip-us.apache.org/repos/asf/ant/blob/d3827f7d/manual/Tasks/tar.html ---------------------------------------------------------------------- diff --git a/manual/Tasks/tar.html b/manual/Tasks/tar.html index ae972e7..aa7a644 100644 --- a/manual/Tasks/tar.html +++ b/manual/Tasks/tar.html @@ -243,11 +243,11 @@ and the rest are use the default mode (read-write by owner). The first fileset selects just the executable files. The second fileset must exclude the executable files and include all others.</p> -<p><strong>Note:</strong> The tar task does not ensure that a file is only selected +<p><strong>Note</strong>: The tar task does not ensure that a file is only selected by one resource collection. If the same file is selected by more than one collection, it will be included in the tar file twice, with the same path.</p> -<p><strong>Note:</strong> The patterns in the include and exclude +<p><strong>Note</strong>: The patterns in the include and exclude elements are considered to be relative to the corresponding dir attribute as with all other filesets. In the example above, <code>${dist.name}</code> is not an absolute path, but a simple name @@ -265,7 +265,7 @@ Unix file permissions have been stored as part of the ZIP file, they will be retained in the resulting tar archive.</p> -<p><strong>Note:</strong> +<p><strong>Note</strong>: Please note the tar task creates a tar file, it does not append to an existing tar file. The existing tar file is replaced instead. As with most tasks in Ant, the task only takes action if the output http://git-wip-us.apache.org/repos/asf/ant/blob/d3827f7d/manual/Tasks/telnet.html ---------------------------------------------------------------------- diff --git a/manual/Tasks/telnet.html b/manual/Tasks/telnet.html index c658864..af507fb 100644 --- a/manual/Tasks/telnet.html +++ b/manual/Tasks/telnet.html @@ -32,7 +32,7 @@ nested <tt><read></tt> to indicate strings to wait for, and <p>If you do specify a userid and password, the system will assume a common unix prompt to wait on. This behavior can be easily over-ridden.</p> -<p><b>Note:</b> This task depends on external libraries not included in the Apache Ant distribution. +<p><strong>Note</strong>: This task depends on external libraries not included in the Apache Ant distribution. See <a href="../install.html#librarydependencies">Library Dependencies</a> for more information.</p> <h3>Parameters</h3> http://git-wip-us.apache.org/repos/asf/ant/blob/d3827f7d/manual/Tasks/touch.html ---------------------------------------------------------------------- diff --git a/manual/Tasks/touch.html b/manual/Tasks/touch.html index 0acd734..c265f50 100644 --- a/manual/Tasks/touch.html +++ b/manual/Tasks/touch.html @@ -32,7 +32,7 @@ at the same time. In addition to working with a single file, this Task can also work on <a href="../Types/resources.html">resources</a> and resource collections (which also includes directories). Prior to Apache Ant 1.7 only FileSet or <a href="../Types/filelist.html">Filelist</a> -(since Ant 1.6) have been supported.</p> +(<em>since Ant 1.6</em>) have been supported.</p> <p>Ant uses the API of <code>java.io.File</code> to set the last modification time which has some limitations. For example the @@ -99,7 +99,7 @@ resource collections (which also includes directories). Prior to Apache Ant <p>You can use any number of nested resource collection elements to define the resources for this task and refer to resources defined -elsewhere. <b>Note:</b> resources passed to this task must implement +elsewhere. <strong>Note</strong>: resources passed to this task must implement the <code>org.apache.tools.ant.types.resources.Touchable</code> interface, this is true for all filesystem-based resources like those returned by path, fileset ot filelist.</p> http://git-wip-us.apache.org/repos/asf/ant/blob/d3827f7d/manual/Tasks/truncate.html ---------------------------------------------------------------------- diff --git a/manual/Tasks/truncate.html b/manual/Tasks/truncate.html index 0644e04..2dabff6 100644 --- a/manual/Tasks/truncate.html +++ b/manual/Tasks/truncate.html @@ -88,7 +88,7 @@ a single file, this Task can also work on <p>You can use any number of nested resource collection elements to define the resources for this task and refer to resources defined -elsewhere. <b>Note:</b> resources passed to this task are expected +elsewhere. <strong>Note</strong>: resources passed to this task are expected to be filesystem-based.</p> <h3>Examples</h3> http://git-wip-us.apache.org/repos/asf/ant/blob/d3827f7d/manual/Tasks/unzip.html ---------------------------------------------------------------------- diff --git a/manual/Tasks/unzip.html b/manual/Tasks/unzip.html index 8d7e688..6b6c579 100644 --- a/manual/Tasks/unzip.html +++ b/manual/Tasks/unzip.html @@ -91,7 +91,7 @@ archive.</p> </tr> <tr> <td valign="top">compression</td> - <td valign="top"><b>Note:</b> This attribute is only available for + <td valign="top"><strong>Note</strong>: This attribute is only available for the <code>untar</code> task.<br> compression method. Allowable values are "none", "gzip", "xz" and "bzip2". Default is @@ -130,7 +130,7 @@ archive.</p> </tr> <tr> <td valign="top">scanForUnicodeExtraFields</td> - <td valign="top"><b>Note:</b> This attribute is not available for + <td valign="top"><strong>Note</strong>: This attribute is not available for the <code>untar</code> task.<br> If the archive contains uncode extra fields then use them to set the file names, ignoring the specified encoding. http://git-wip-us.apache.org/repos/asf/ant/blob/d3827f7d/manual/Tasks/uptodate.html ---------------------------------------------------------------------- diff --git a/manual/Tasks/uptodate.html b/manual/Tasks/uptodate.html index 62cf7e5..b5a8f5c 100644 --- a/manual/Tasks/uptodate.html +++ b/manual/Tasks/uptodate.html @@ -82,7 +82,7 @@ target execution depending on the relative age of the specified files.</p> <a href="../Types/fileset.html">fileset</a> and allows you to specify a set of files to check against the target file(s).</p> -<p><strong>Note:</strong> You can specify either the <code>srcfile</code> +<p><strong>Note</strong>: You can specify either the <code>srcfile</code> attribute or nested <code><srcfiles></code> elements, but not both. <p>Note that the task will completely ignore any directories that seem http://git-wip-us.apache.org/repos/asf/ant/blob/d3827f7d/manual/Tasks/war.html ---------------------------------------------------------------------- diff --git a/manual/Tasks/war.html b/manual/Tasks/war.html index 4b17527..9f337a6 100644 --- a/manual/Tasks/war.html +++ b/manual/Tasks/war.html @@ -212,7 +212,7 @@ to a value other than its default, <code>"add"</code>.</b></p> that the permissions haven't been stored at all rather than real permissions and will instead apply its own default values.<br/> Set this attribute to true if you really want to preserve the - original permission field.<em>since Ant 1.8.0</em> + original permission field. <em>since Ant 1.8.0</em> </td> <td valign="top" align="center">No, default is false</td> </tr> http://git-wip-us.apache.org/repos/asf/ant/blob/d3827f7d/manual/Tasks/whichresource.html ---------------------------------------------------------------------- diff --git a/manual/Tasks/whichresource.html b/manual/Tasks/whichresource.html index e4fc243..0ec0901 100644 --- a/manual/Tasks/whichresource.html +++ b/manual/Tasks/whichresource.html @@ -75,7 +75,7 @@ The classpath to use, given as a <a href="../using.html#references">reference</a> to a path defined elsewhere. - <em>Since Apache Ant 1.7.1.</em> + <em>Since Apache Ant 1.7.1</em>. </td> <td align="center" valign="top">No</td> </tr> http://git-wip-us.apache.org/repos/asf/ant/blob/d3827f7d/manual/Tasks/xmlproperty.html ---------------------------------------------------------------------- diff --git a/manual/Tasks/xmlproperty.html b/manual/Tasks/xmlproperty.html index 00f9690..dc86912 100644 --- a/manual/Tasks/xmlproperty.html +++ b/manual/Tasks/xmlproperty.html @@ -145,7 +145,7 @@ is roughly equivalent to the following fragments in a build.xml file: </tr> <tr> <td valign="top">delimiter</td> - <td valign="top">Delimiter for splitting multiple values.<br><i>since Apache Ant 1.7.1</i></td> + <td valign="top">Delimiter for splitting multiple values.<br><em>since Apache Ant 1.7.1</em></td> <td valign="top" align="center">No, defaults to comma</td> </tr> </table> http://git-wip-us.apache.org/repos/asf/ant/blob/d3827f7d/manual/Tasks/zip.html ---------------------------------------------------------------------- diff --git a/manual/Tasks/zip.html b/manual/Tasks/zip.html index 4b0949f..c887d08 100644 --- a/manual/Tasks/zip.html +++ b/manual/Tasks/zip.html @@ -210,7 +210,7 @@ archive.</p> <td valign="top">Whether the file modification times will be rounded up to the next even number of seconds.<br> Zip archives store file modification times with a granularity of - two seconds, so the times will either be rounded up or down. If + two seconds, so the times will either be rounded up or down. If you round down, the archive will always seem out-of-date when you rerun the task, so the default is to round up. Rounding up may lead to a different type of problems like JSPs inside a web @@ -246,7 +246,7 @@ archive.</p> <tr> <td valign="top">useLanguageEncodingFlag</td> <td valign="top">Whether to set the language encoding flag if the - encoding is UTF-8. This setting doesn't have any effect if the + encoding is UTF-8. This setting doesn't have any effect if the encoding is not UTF-8. <em>Since Ant 1.8.0</em>.<br/> See also the <a href="#encoding">discussion below</a></td> @@ -301,7 +301,7 @@ archive.</p> <p>More recent versions of the ZIP specification introduce something called the "language encoding flag" which can be used to signal that a file name has been encoded using UTF-8. <em>Since - Ant 1.8.0</em>, all zip-/jar- and similar archives written by Ant will set + Ant 1.8.0</em>, all zip, jar and similar archives written by Ant will set this flag, if the encoding has been set to UTF-8. Our interoperability tests with existing archivers didn't show any ill effects (in fact, most archivers ignore the flag to date), but you @@ -345,7 +345,7 @@ archive.</p> jars from your CLASSPATH reads and writes UTF-8 names, it doesn't set or recognize any flags or unicode extra fields.</li> - <li>Starting with Java 7 <code>java.util.zip</code> writes UTF-8 by + <li>Since Java 7, <code>java.util.zip</code> writes UTF-8 by default and uses the language encoding flag. It is possible to specify a different encoding when reading/writing ZIPs via new constructors. The package now recognizes the language encoding @@ -411,8 +411,8 @@ archive.</p> will be written has to be made before writing the entry's content.</p> -<p>Starting with Ant 1.9.0 Ant supports Zip64 extensions but didn't - provide any control over their usage, starting with Ant 1.9.1 a +<p>Ant 1.9.0 introduced support for Zip64 extensions but didn't + provide any control over their usage. <em>Since Ant 1.9.1</em>, a new <em>zip64mode</em> attribute was added to the <code>zip</code> family of tasks. It supports three values: @@ -420,7 +420,7 @@ archive.</p> <li><em>never</em> means no Zip64 extra fields will ever be written, this is the behavior of Ant 1.8.x and earlier and the default behavior of <code>jar</code>, <code>ear</code> - and <code>war</code> starting with Ant 1.9.1.</li> + and <code>war</code> <em>since Ant 1.9.1</em>.</li> <li><em>always</em> means Zip64 extra fields are written for all entries.</li> <li><em>as-needed</em> means Zip64 extra fields are written for all @@ -461,29 +461,25 @@ the same way that <i>zipfileset src</i> files are added.</p> <h3>Examples</h3> <pre> <zip destfile="${dist}/manual.zip" - basedir="htdocs/manual" - /></pre> + basedir="htdocs/manual"/></pre> <p>zips all files in the <code>htdocs/manual</code> directory into a file called <code>manual.zip</code> in the <code>${dist}</code> directory.</p> <pre> <zip destfile="${dist}/manual.zip" basedir="htdocs/manual" - update="true" - /></pre> + update="true"/></pre> <p>zips all files in the <code>htdocs/manual</code> directory into a file called <code>manual.zip</code> in the <code>${dist}</code> directory. If <code>manual.zip</code> doesn't exist, it is created; otherwise it is updated with the new/changed files.</p> <pre> <zip destfile="${dist}/manual.zip" basedir="htdocs/manual" - excludes="mydocs/**, **/todo.html" - /></pre> + excludes="mydocs/**, **/todo.html"/></pre> <p>zips all files in the <code>htdocs/manual</code> directory. Files in the directory <code>mydocs</code>, or files with the name <code>todo.html</code> are excluded.</p> <pre> <zip destfile="${dist}/manual.zip" basedir="htdocs/manual" includes="api/**/*.html" - excludes="**/todo.html" - /></pre> + excludes="**/todo.html"/></pre> <p>zips all files in the <code>htdocs/manual</code> directory. Only html files under the directory <code>api</code> are zipped, and files with the name <code>todo.html</code> are excluded.</p> <pre> <zip destfile="${dist}/manual.zip"> http://git-wip-us.apache.org/repos/asf/ant/blob/d3827f7d/manual/stylesheets/style.css ---------------------------------------------------------------------- diff --git a/manual/stylesheets/style.css b/manual/stylesheets/style.css index cf26c60..f1e8f84 100644 --- a/manual/stylesheets/style.css +++ b/manual/stylesheets/style.css @@ -17,50 +17,70 @@ */ h2 { font-size: 200%; - background-color: ffffff; + background-color: white; } h3 { font-size: 130%; - color: #ffffff; + color: white; background-color: #525D76; } h4 { - color: #ffffff; + color: white; background-color: #828DA6; } +h5 { + font-size: 100%; + color: white; + background-color: #a6adbe; + margin-top: .5rem; + margin-bottom: .5rem; +} + +h6 { + font-size: 100%; + color: white; + background-color: #c1c5d1; + margin-top: .5rem; + margin-bottom: .5rem; +} + +h5 + p, h6 + p { + margin-top: .5rem; + margin-bottom: .5rem; +} + td { - background-color: eeeeee; - color: 000000; + background-color: #eeeeee; + color: black; } /* first row */ table tr:first-child td { - background-color: cccccc; - color: 000000; + background-color: silver; + color: black; } /* or th as first row */ table th { - background-color: cccccc; - color: 000000; + background-color: silver; + color: black; } pre { - background-color: efefef; + background-color: #efefef; } /* code snippets in examples and tutorials */ .code { background: #EFEFEF; - margin-top: } /* highlight console output */ .output { - color: #FFFFFF; + color: white; background: #837A67; }
