modernize a whole lot of links and example outputs - BZ 55551 - submitted by Erik Costlow

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@1522924 13f79535-47bb-0310-9956-ffa450edef68

22 files changed, 64 insertions, 69 deletions

diff --git a/manual/Tasks/checksum.html b/manual/Tasks/checksum.html
index 1754af7f6..29f48ddfd 100644
--- a/manual/Tasks/checksum.html
+++ b/manual/Tasks/checksum.html
@@ -48,7 +48,8 @@ Warning: the case of the extension is that of the algorithm used.
 If you ask for "SHA1", you get a .SHA1 extension; if you ask for "sha1", you
 get a file ending in .sha1. The Java Crypto Engines are case-insensitive
 in matching algorithms, so choose a name to match your desired output extension,
-or set the <tt>fileext</tt> attribute.
+or set the <tt>fileext</tt> attribute. The names of common hashing algorithms can be located on the
+<a target="_blank" href="http://docs.oracle.com/javase/7/docs/technotes/guides/security/StandardNames.html#MessageDigest">Cryptography Architecture Standard Algorithm Name Documentation</a>
 </p>
 
 <h3>Parameters</h3>
@@ -76,7 +77,7 @@ or set the <tt>fileext</tt> attribute.
     <td valign="top">algorithm</td>
     <td valign="top">Specifies the algorithm to be used to
       compute the checksum. Defaults to &quot;MD5&quot;.
-      Other popular algorithms like &quot;SHA&quot; or &quot;SHA-512&quot; may be used
+      Other <a target="_blank" href="http://docs.oracle.com/javase/7/docs/technotes/guides/security/StandardNames.html#MessageDigest">popular algorithms</a> like &quot;SHA&quot; or &quot;SHA-512&quot; may be used
       as well.
     </td>
     <td valign="top" align="center">No</td>
diff --git a/manual/Tasks/concat.html b/manual/Tasks/concat.html
index ced7eb1e2..11372d07e 100644
--- a/manual/Tasks/concat.html
+++ b/manual/Tasks/concat.html
@@ -110,8 +110,8 @@ Resource Collection</a>s are used to
           <td valign="top">encoding</td>
           <td valign="top">
             Specifies the encoding for the input files. Please see <a
-            href="http://download.oracle.com/javase/1.5.0/docs/guide/intl/encoding.doc.html">
-            http://download.oracle.com/javase/1.5.0/docs/guide/intl/encoding.doc.html</a>
+            href="http://docs.oracle.com/javase/7/docs/technotes/guides/intl/encoding.doc.html">
+            Supported Encodings</a>
             for a list of possible values. Defaults to the platform's
             default character encoding.
           </td>
diff --git a/manual/Tasks/ear.html b/manual/Tasks/ear.html
index 8dde7dfd5..5ee8206c9 100644
--- a/manual/Tasks/ear.html
+++ b/manual/Tasks/ear.html
@@ -147,7 +147,7 @@ to a value other than its default, <code>&quot;add&quot;</code>.</b></p>
   <tr>
     <td valign="top">index</td>
     <td valign="top">whether to create an <A
-    HREF="http://download.oracle.com/javase/1.5.0/docs/guide/jar/jar.html#JAR%20Index">index
+    HREF="http://docs.oracle.com/javase/7/docs/technotes/guides/jar/jar.html#JAR_Index">index
     list</A> to speed up classloading.  This is a JDK 1.3+ specific
     feature.  Unless you specify additional jars with nested <a
     href="jar.html#indexjars"><code>indexjars</code></a> elements, only the
@@ -160,9 +160,9 @@ to a value other than its default, <code>&quot;add&quot;</code>.</b></p>
     <td valign="top">whether to include META-INF and its children in
       the index.  Doesn't have any effect if <em>index</em> is
       false.<br/>
-      Sun's jar implementation used to skip the META-INF directory and
+      Oracle's jar implementation used to skip the META-INF directory and
       Ant followed that example.  The behavior has been changed with
-      <a href="http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4408526">Java
+      <a href="https://bugs.openjdk.java.net/browse/JDK-4408526">Java
       5</a>.  In order to avoid problems with Ant generated jars on
       Java 1.4 or earlier Ant will not include META-INF unless
       explicitly asked to.<br/>
diff --git a/manual/Tasks/echo.html b/manual/Tasks/echo.html
index e9c9176f5..bcf804ec1 100644
--- a/manual/Tasks/echo.html
+++ b/manual/Tasks/echo.html
@@ -62,7 +62,7 @@ ignored</p>
   <tr>
     <td valign="top">append</td>
     <td valign="top">Append to an existing file (or
-      <a href="http://download.oracle.com/javase/6/docs/api/java/io/FileWriter.html#FileWriter%28java.lang.String,%20boolean%29" target="_blank">
+      <a href="http://docs.oracle.com/javase/7/docs/api//java/io/FileWriter.html#FileWriter%28java.lang.String,%20boolean%29" target="_blank">
       open a new file / overwrite an existing file</a>)? Default <i>false</i>.
     </td>
     <td valign="top" align="center">No; ignored unless <i>output</i> indicates a
diff --git a/manual/Tasks/ejb.html b/manual/Tasks/ejb.html
index 503da28a3..aa140e703 100644
--- a/manual/Tasks/ejb.html
+++ b/manual/Tasks/ejb.html
@@ -1294,7 +1294,7 @@ This step can be performed by the websphere element as part of the jar generatio
 switch <code>ejbdeploy</code> is on, the ejbdeploy tool from the websphere toolset is called for
 every ejb-jar. Unfortunately, this step only works, if you use the ibm jdk. Otherwise, the rmic
 (called by ejbdeploy) throws a ClassFormatError. Be sure to switch ejbdeploy off, if run ant with
-sun jdk.
+Oracle JDK or OpenJDK.
 </p>
 
 <p>
diff --git a/manual/Tasks/exec.html b/manual/Tasks/exec.html
index e1dbbcc3d..5cef148c8 100644
--- a/manual/Tasks/exec.html
+++ b/manual/Tasks/exec.html
@@ -88,8 +88,8 @@ running is a standard Windows executable and is not aware of the Cygwin
 environment (i.e., doesn't load <code>cygwin1.dll</code>).  The only
 work-around for this is to compile a JVM under Cygwin (at your own risk).
 See for instance 
-<a href="http://java.sun.com/javase/6/docs/build/README-builds.html#cygwin">
-sun jdk 6 build instructions for cygwin</a>.
+<a href="http://hg.openjdk.java.net/jdk7/build/raw-file/tip/README-builds.html#cygwin">
+OpenJDK build instructions for cygwin</a>.
 </p>
 
 <h4>OpenVMS Users</h4>
diff --git a/manual/Tasks/ftp.html b/manual/Tasks/ftp.html
index 7d1700b04..83c18e311 100644
--- a/manual/Tasks/ftp.html
+++ b/manual/Tasks/ftp.html
@@ -303,7 +303,7 @@ try to set up a new connection.</p>
    <tr>
     <td valign="top">serverTimeZoneConfig</td>
     <td valign="top">Specify as a Java
-     <a href="http://download.oracle.com/javase/6/docs/api/java/util/TimeZone.html">
+     <a href="http://docs.oracle.com/javase/7/docs/api//java/util/TimeZone.html">
      TimeZone</a> identifier, (e.g. <code>GMT</code>, <code>America/Chicago</code> or
     <code>Asia/Jakarta</code>) the timezone used by the server for timestamps.  This 
       enables timestamp dependency checking even when the server is in a different 
@@ -318,7 +318,7 @@ try to set up a new connection.</p>
     
     <td valign="top">defaultDateFormatConfig</td>
     <td valign="top">Specify in Java 
-    <a href="http://download.oracle.com/javase/6/docs/api/java/text/SimpleDateFormat.html">
+    <a href="http://docs.oracle.com/javase/7/docs/api/java/text/SimpleDateFormat.html">
      SimpleDateFormat</a> notation, (e.g.
      <code>yyyy-MM-dd</code>), the date format generally used by the FTP server
       to parse dates.  In some cases this will be the only date format used.
@@ -335,7 +335,7 @@ try to set up a new connection.</p>
   <tr>
     <td valign="top">recentDateFormatConfig</td>
     <td valign="top">Specify in Java 
-    <a href="http://download.oracle.com/javase/6/docs/api/java/text/SimpleDateFormat.html">
+    <a href="http://docs.oracle.com/javase/7/docs/api/java/text/SimpleDateFormat.html">
      SimpleDateFormat</a> notation,
       (e.g. <code>MMM dd hh:mm</code>) the date format used by the FTP server
       to parse dates less than a year old.  If not specified (or specified as
diff --git a/manual/Tasks/jarlib-available.html b/manual/Tasks/jarlib-available.html
index 9e237edd0..adb732f03 100644
--- a/manual/Tasks/jarlib-available.html
+++ b/manual/Tasks/jarlib-available.html
@@ -33,11 +33,10 @@ If the extension is present then a property is set.</p>
 works with extensions as defined by the "Optional Package" specification.
  For more information about optional packages, see the document
 <em>Optional Package Versioning</em> in the documentation bundle for your
-Java2 Standard Edition package, in file
-<code>guide/extensions/versioning.html</code> or online at
-<a href="http://download.oracle.com/javase/1.3/docs/guide/extensions/versioning.html">
-http://download.oracle.com/javase/1.3/docs/guide/extensions/versioning.html
-<p>See the Extension and ExtensionSet documentation for further details</p>
+Java Standard Edition package, in file
+<code>guide/extensions/versioning.html</code> or the online
+<a target="_blank" href="http://docs.oracle.com/javase/7/docs/technotes/guides/extensions/versioning.html">
+Extension and ExtensionSet documentation</a> for further details</p>
 
 <h3>Parameters</h3>
 <table border="1" cellpadding="2" cellspacing="0">
diff --git a/manual/Tasks/jarlib-display.html b/manual/Tasks/jarlib-display.html
index 6eb8eb303..0ddbaa34e 100644
--- a/manual/Tasks/jarlib-display.html
+++ b/manual/Tasks/jarlib-display.html
@@ -33,11 +33,10 @@
 works with extensions as defined by the "Optional Package" specification.
  For more information about optional packages, see the document
 <em>Optional Package Versioning</em> in the documentation bundle for your
-Java2 Standard Edition package, in file
-<code>guide/extensions/versioning.html</code> or online at
-<a href="http://download.oracle.com/javase/1.3/docs/guide/extensions/versioning.html">
-http://download.oracle.com/javase/1.3/docs/guide/extensions/versioning.html
-<p>See the Extension and ExtensionSet documentation for further details</p>
+Java Standard Edition package, in file
+<code>guide/extensions/versioning.html</code> or the online
+<a target="_blank" href="http://docs.oracle.com/javase/7/docs/technotes/guides/extensions/versioning.html">
+Extension and ExtensionSet documentation</a> for further details</p>
 
 <h3>Parameters</h3>
 <table border="1" cellpadding="2" cellspacing="0">
diff --git a/manual/Tasks/jarlib-manifest.html b/manual/Tasks/jarlib-manifest.html
index 70e133d10..019b55459 100644
--- a/manual/Tasks/jarlib-manifest.html
+++ b/manual/Tasks/jarlib-manifest.html
@@ -35,11 +35,10 @@
 works with extensions as defined by the "Optional Package" specification.
  For more information about optional packages, see the document
 <em>Optional Package Versioning</em> in the documentation bundle for your
-Java2 Standard Edition package, in file
-<code>guide/extensions/versioning.html</code> or online at
-<a href="http://download.oracle.com/javase/1.3/docs/guide/extensions/versioning.html">
-http://download.oracle.com/javase/1.3/docs/guide/extensions/versioning.html
-<p>See the Extension and ExtensionSet documentation for further details</p>
+Java Standard Edition package, in file
+<code>guide/extensions/versioning.html</code> or the online
+<a target="_blank" href="http://docs.oracle.com/javase/7/docs/technotes/guides/extensions/versioning.html">
+Extension and ExtensionSet documentation</a> for further details</p>
 
 <h3>Parameters</h3>
 <table border="1" cellpadding="2" cellspacing="0">
diff --git a/manual/Tasks/jarlib-resolve.html b/manual/Tasks/jarlib-resolve.html
index d168d8121..2ef4f87ba 100644
--- a/manual/Tasks/jarlib-resolve.html
+++ b/manual/Tasks/jarlib-resolve.html
@@ -39,10 +39,9 @@ works with extensions as defined by the "Optional Package" specification.
  For more information about optional packages, see the document
 <em>Optional Package Versioning</em> in the documentation bundle for your
 Java2 Standard Edition package, in file
-<code>guide/extensions/versioning.html</code> or online at
-<a href="http://download.oracle.com/javase/1.3/docs/guide/extensions/versioning.html">
-http://download.oracle.com/javase/1.3/docs/guide/extensions/versioning.html
-<p>See the Extension and ExtensionSet documentation for further details</p>
+<code>guide/extensions/versioning.html</code> or the online
+<a target="_blank" href="http://docs.oracle.com/javase/7/docs/technotes/guides/extensions/versioning.html">
+Extension and ExtensionSet documentation</a> for further details</p>
 
 <h3>Parameters</h3>
 <table border="1" cellpadding="2" cellspacing="0">
diff --git a/manual/Tasks/java.html b/manual/Tasks/java.html
index a237039c5..a83b0aff2 100644
--- a/manual/Tasks/java.html
+++ b/manual/Tasks/java.html
@@ -321,7 +321,7 @@ task is run. If you need to locate a JAR file relative to the directory
 the task will be run in, you need to explicitly create the full path
 to the JAR file.</p>
 <p>When using the <tt>jar</tt> attribute, all classpath settings are 
-ignored according to <a href="http://download.oracle.com/javase/1.5.0/docs/tooldocs/windows/java.html#-jar">Sun's
+ignored according to <a href="http://docs.oracle.com/javase/7/docs/technotes/tools/windows/java.html">Oracle's
 specification</a>. 
 
 
diff --git a/manual/Tasks/javadoc.html b/manual/Tasks/javadoc.html
index 164adeb0e..31f3f3e38 100644
--- a/manual/Tasks/javadoc.html
+++ b/manual/Tasks/javadoc.html
@@ -61,7 +61,7 @@ to ensure that this command supports the attributes you wish to use.</p>
 
 <p><b>Note:</b><br>When generating the JavaDocs for classes which contains annotations
 you maybe get a <tt>java.lang.ClassCastException: com.sun.tools.javadoc.ClassDocImpl</tt>.
-This is due <a href="http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6442982" target="_blank">bug-6442982</a>. The cause is that JavaDoc cannot find the implementations of used annotations.
+This is due <a href="https://bugs.openjdk.java.net/browse/JDK-6442982" target="_blank">bug-6442982</a>. The cause is that JavaDoc cannot find the implementations of used annotations.
 The workaround is providing the jars with these implementations (like JAXBs <tt>@XmlType</tt>, ...)
 to &lt;javadoc&gt; using <tt>classpath</tt>, <tt>classpathref</tt> attributes or nested
 &lt;classpath&gt; element.</p>
@@ -515,7 +515,7 @@ to &lt;javadoc&gt; using <tt>classpath</tt>, <tt>classpathref</tt> attributes or
     order to mitigate CVE-2013-1571.  Defaults to true.  <em>Since Ant
     1.9.2</em><br></td>
     There is a frame injection attack possible in javadocs generated by Oracle
-    JDKs prior to Java7 Update 25.  When this flag is set to true, Ant
+    JDKs prior to Java7 Update 25 (<a href="http://www.oracle.com/technetwork/java/javase/7u25-relnotes-1955741.html#jpi-upt" target="_blank">details</a>).  When this flag is set to true, Ant
     will check whether the docs are vulnerable and will try to fix them.
     </td>
     <td align="center" valign="top">1.4</td>
@@ -715,7 +715,7 @@ with text contents, and the packages may be listed with nested
 
 <h4>doclet</h4>
 <p>The doclet nested element is used to specify the
-<a href="http://download.oracle.com/javase/1.4.2/docs/tooldocs/javadoc/overview.html">doclet</a>
+<a href="http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/doclet/overview.html">doclet</a>
 that javadoc will use to process the input source files. A number of the standard javadoc arguments
 are actually arguments of the standard doclet. If these are specified in the javadoc
 task's attributes, they will be passed to the doclet specified in the
@@ -779,7 +779,7 @@ not set the description attribute for those tags.</p>
     <td valign="top">If this attribute is specified, this element will behave as an implicit
     <a href="../Types/fileset.html">fileset</a>. The files included by this fileset should
     contain each tag definition on a separate line, as described in the
-    <a href="http://download.oracle.com/javase/1.4.2/docs/tooldocs/windows/javadoc.html#tag">Javadoc reference guide</a>:
+    <a href="http://docs.oracle.com/javase/7/docs/technotes/tools/windows/javadoc.html#javadoctags">Javadoc reference guide</a>:
     <pre>ejb.bean:t:XDoclet EJB Tag
 todo:a:To Do</pre>
       <b>Note:</b> The  Javadoc reference quide has double quotes around
@@ -796,7 +796,7 @@ the javadoc program.
 
 <h4><a name="tagletelement">taglet</a></h4>
 <p>The taglet nested element is used to specify custom
-  <a href="http://download.oracle.com/javase/1.4.2/docs/tooldocs/javadoc/taglet/overview.html">taglets</a>.</p>
+  <a href="http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/taglet/overview.html">taglets</a> beyond <a href="http://docs.oracle.com/javase/7/docs/technotes/tools/windows/javadoc.html#javadoctags" target="_blank">the default taglets</a>.</p>
 
 <h5>Parameters</h5>
 <table width="90%" border="1" cellpadding="2" cellspacing="0">
@@ -808,7 +808,7 @@ the javadoc program.
   <tr>
     <td valign="top">name</td>
     <td valign="top">The name of the taglet class
-              (e.g. <a href="http://download.oracle.com/javase/1.4.2/docs/tooldocs/javadoc/taglet/ToDoTaglet.java">
+              (e.g. <a href="http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/taglet/ToDoTaglet.java">
               <code>com.sun.tools.doclets.ToDoTaglet</code></a>)</td>
     <td align="center" valign="top">Yes</td>
   </tr>
@@ -849,8 +849,8 @@ arguments</a>. <em>Since Ant 1.6</em></p>
     &lt;tag name=&quot;todo&quot; scope=&quot;all&quot; description=&quot;To do:&quot;/&gt;
     &lt;group title=&quot;Group 1 Packages&quot; packages=&quot;com.dummy.test.a*&quot;/&gt;
     &lt;group title=&quot;Group 2 Packages&quot; packages=&quot;com.dummy.test.b*:com.dummy.test.c*&quot;/&gt;
-    &lt;link offline=&quot;true&quot; href=&quot;http://download.oracle.com/javase/6/docs/api/&quot; packagelistLoc=&quot;C:\tmp&quot;/&gt;
-    &lt;link href=&quot;http://developer.java.sun.com/developer/products/xml/docs/api/&quot;/&gt;
+    &lt;link offline=&quot;true&quot; href=&quot;http://docs.oracle.com/javase/7/docs/api/&quot; packagelistLoc=&quot;C:\tmp&quot;/&gt;
+    &lt;link href=&quot;http://docs.oracle.com/javase/7/docs/api/&quot;/&gt;
   &lt/javadoc&gt;</pre>
 
 <p>is the same as</p>
@@ -872,8 +872,8 @@ arguments</a>. <em>Since Ant 1.6</em></p>
     &lt;tag name=&quot;todo&quot; scope=&quot;all&quot; description=&quot;To do:&quot;/&gt;
     &lt;group title=&quot;Group 1 Packages&quot; packages=&quot;com.dummy.test.a*&quot;/&gt;
     &lt;group title=&quot;Group 2 Packages&quot; packages=&quot;com.dummy.test.b*:com.dummy.test.c*&quot;/&gt;
-    &lt;link offline=&quot;true&quot; href=&quot;http://download.oracle.com/javase/6/docs/api/&quot; packagelistLoc=&quot;C:\tmp&quot;/&gt;
-    &lt;link href=&quot;http://developer.java.sun.com/developer/products/xml/docs/api/&quot;/&gt;
+    &lt;link offline=&quot;true&quot; href=&quot;http://docs.oracle.com/javase/7/docs/api/&quot; packagelistLoc=&quot;C:\tmp&quot;/&gt;
+    &lt;link href=&quot;http://docs.oracle.com/javase/7/docs/api/&quot;/&gt;
   &lt/javadoc&gt;</pre>
 
 <p>or</p>
@@ -895,8 +895,8 @@ arguments</a>. <em>Since Ant 1.6</em></p>
     &lt;tag name=&quot;todo&quot; scope=&quot;all&quot; description=&quot;To do:&quot;/&gt;
     &lt;group title=&quot;Group 1 Packages&quot; packages=&quot;com.dummy.test.a*&quot;/&gt;
     &lt;group title=&quot;Group 2 Packages&quot; packages=&quot;com.dummy.test.b*:com.dummy.test.c*&quot;/&gt;
-    &lt;link offline=&quot;true&quot; href=&quot;http://download.oracle.com/javase/6/docs/api/&quot; packagelistLoc=&quot;C:\tmp&quot;/&gt;
-    &lt;link href=&quot;http://developer.java.sun.com/developer/products/xml/docs/api/&quot;/&gt;
+    &lt;link offline=&quot;true&quot; href=&quot;http://docs.oracle.com/javase/7/docs/api/&quot; packagelistLoc=&quot;C:\tmp&quot;/&gt;
+    &lt;link href=&quot;http://docs.oracle.com/javase/7/docs/api/&quot;/&gt;
   &lt/javadoc&gt;</pre>
 
 
diff --git a/manual/Tasks/javah.html b/manual/Tasks/javah.html
index 306499f81..34a7b875a 100644
--- a/manual/Tasks/javah.html
+++ b/manual/Tasks/javah.html
@@ -29,8 +29,8 @@
 <p>Generates JNI headers from a Java class.</p>
 <p> When this task executes, it will generate the C header and source files that
 are needed to implement native methods. JNI operates differently depending on
-whether <a href="http://download.oracle.com/javase/1.3/docs/tooldocs/win32/javah.html">JDK1.2</a>
-(or later) or <a href="http://java.sun.com/products/jdk/1.1/docs/tooldocs/win32/javah.html">pre-JDK1.2</a>
+whether <a href="http://docs.oracle.com/javase/7/docs/technotes/tools/windows/javah.html">JDK1.2+</a>
+or <a href="http://java.sun.com/products/jdk/1.1/docs/tooldocs/win32/javah.html">pre-JDK1.2</a>
 systems are used.</p>
 
 <p>It is possible to use different compilers. This can be selected
diff --git a/manual/Tasks/manifest.html b/manual/Tasks/manifest.html
index 457eb3bb3..7a5b98bcd 100644
--- a/manual/Tasks/manifest.html
+++ b/manual/Tasks/manifest.html
@@ -34,7 +34,7 @@ replacing or updating an existing file.</p>
 
 
 <p>Manifests are processed according to the 
-<a href="http://download.oracle.com/javase/1.5.0/docs/guide/jar/jar.html">Jar
+<a href="http://docs.oracle.com/javase/7/docs/technotes/guides/jar/jar.html">Jar
 file specification.</a>. Specifically, a manifest element consists of
 a set of attributes and sections. These sections in turn may contain
 attributes. Note in particular that this may result in manifest lines
@@ -169,21 +169,21 @@ href="#attribute">attribute</a> elements into sections.</p>
 attribute will take the value of the Ant property ${user.name}.  The
 same is true for the ${version} and ${TODAY} properties.  This example
 produces a MANIFEST.MF that contains 
-<a href="http://docs.oracle.com/javase/1.5.0/docs/guide/versioning/">package
+<a href="http://docs.oracle.com/javase/7/docs/technotes/guides/versioning/spec/versioning2.html#wp90779">package
 version identification</a> for the package <code>common</code>.</p>
 
 <p>The manifest produced by the above would look like this:</p>
 
 <pre><code>Manifest-Version: 1.0
 Built-By: bodewig
-Created-By: Apache Ant 1.7
+Created-By: Apache Ant 1.9
 
 Name: common
 Specification-Title: Example
 Specification-Vendor: Example Organization
 Implementation-Vendor: Example Corp.
 Specification-Version: 1.2
-Implementation-Version: 1.2 February 19 2006
+Implementation-Version: 1.2 September 10, 2013
 Implementation-Title: common
 
 Name: common/class1.class
diff --git a/manual/Tasks/mimemail.html b/manual/Tasks/mimemail.html
index c0ec7b551..ba066a6b6 100644
--- a/manual/Tasks/mimemail.html
+++ b/manual/Tasks/mimemail.html
@@ -31,7 +31,7 @@
 
 <h3>Description</h3>
 <p>Sends SMTP mail with MIME attachments.
-<a href="http://www.oracle.com/technetwork/java/index-jsp-139225.html">JavaMail</a>
+<a href="http://www.oracle.com/technetwork/java/index-138643.html">JavaMail</a>
 and <a href="http://www.oracle.com/technetwork/java/javase/jaf-135115.html">Java
 Activation Framework</a> are required for this task.</p>
 <p>Multiple files can be attached using <a href="../Types/fileset.html">FileSets.</a></p>
diff --git a/manual/Tasks/property.html b/manual/Tasks/property.html
index 16aa06db3..7d0c48532 100644
--- a/manual/Tasks/property.html
+++ b/manual/Tasks/property.html
@@ -269,12 +269,10 @@ about this feature
 <li>If the file is not there, nothing is printed except at -verbose log
 level. This lets you have optional configuration files for every
 project, that team members can customize.
-<li>The rules for this format are laid down
-<a href="http://download.oracle.com/javase/6/docs/api/java/util/Properties.html#load%28java.io.InputStream%29">by Sun</a>.
-This makes it hard for Team Ant to field bug reports about it.
-<li>Trailing spaces are not stripped. It may have been what you wanted.
-<li>Want unusual characters? Escape them \u0456 or \&quot; style.
-<li>Ant Properties are expanded in the file
+<li>The rules for this format match <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Properties.html#load%28java.io.InputStream%29">java.util.Properties</a>.</li>
+<li>Trailing spaces are not stripped. It may have been what you wanted.</li>
+<li>Want unusual characters? Escape them \u0456 or \&quot; style.</li>
+<li>Ant Properties are expanded in the file</li>
 <li>If you want to expand properties defined inside the same file and
   you use the prefix attribute of the task, you must use the same
   prefix when expanding the properties or
@@ -294,7 +292,7 @@ deploy.url=http://${deploy.server}:${deploy.port}/
 <a name="notes-env"></a>
 <h3>Notes about environment variables</h3>
 <p>
-  Ant runs on Java 1.2 therefore it cant use Java5 features for accessing environment
+  Ant runs on Java 1.2 therefore it cannot use Java5 features for accessing environment
   variables. So it starts a command in a new process which prints the environment variables,
   analyzes the output and creates the properties. <br>
   There are commands for the following operating systems implemented in
diff --git a/manual/Tasks/sql.html b/manual/Tasks/sql.html
index 4f6e4e4d4..84dc1279d 100644
--- a/manual/Tasks/sql.html
+++ b/manual/Tasks/sql.html
@@ -180,7 +180,7 @@ and <b>abort</b> execution and transaction and fail task.</p>
   <td width="78%" valign="top">Control whether the Java statement
     object will perform escape substitution.<br>
     See <a
-    href="http://download.oracle.com/javase/6/docs/api/java/sql/Statement.html#setEscapeProcessing%28boolean%29">Statement's
+    href="http://docs.oracle.com/javase/7/docs/api/java/sql/Statement.html#setEscapeProcessing%28boolean%29">Statement's
     API docs</a> for details.  <em>Since Ant 1.6</em>.
   <td width="10%" valign="top">No (default=true)</td>
 </tr>
diff --git a/manual/Tasks/tstamp.html b/manual/Tasks/tstamp.html
index c1930a000..82812a579 100644
--- a/manual/Tasks/tstamp.html
+++ b/manual/Tasks/tstamp.html
@@ -58,7 +58,7 @@ probably in an initialization target.</p>
 The Tstamp task supports a <code>&lt;format&gt;</code> nested element that
 allows a property to be set to the current date and time in a given format.
 The date/time patterns are as defined in the Java
-<a href="http://download.oracle.com/javase/6/docs/api/java/text/SimpleDateFormat.html">SimpleDateFormat</a> class.
+<a href="http://docs.oracle.com/javase/7/docs/api/java/text/SimpleDateFormat.html">SimpleDateFormat</a> class.
 The format element also allows offsets to be applied to the time to generate different time values.
 <br><br>
 <table width="60%" border="1" cellpadding="2" cellspacing="0">
@@ -81,7 +81,7 @@ The format element also allows offsets to be applied to the time to generate dif
   </tr>
   <tr>
     <td valign="top">timezone</td>
-    <td valign="top">The timezone to use for displaying time. The values are as defined by the Java <a href="http://download.oracle.com/javase/6/docs/api/java/util/TimeZone.html">TimeZone</a> class.</td>
+    <td valign="top">The timezone to use for displaying time. The values are as defined by the Java <a href="http://docs.oracle.com/javase/7/docs/api/java/util/TimeZone.html">TimeZone</a> class.</td>
     <td align="center" valign="top">No</td>
   </tr>
   <tr>
@@ -112,7 +112,7 @@ The format element also allows offsets to be applied to the time to generate dif
       form is &quot;language, country, variant&quot; but either variant or variant and
       country may be omitted. For more information please refer to documentation
       for the
-      <a href="http://download.oracle.com/javase/6/docs/api/java/util/Locale.html">Locale</a>
+      <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Locale.html">Locale</a>
       class.</td>
     <td align="center" valign="top">No</td>
   </tr>
diff --git a/manual/Tasks/typedef.html b/manual/Tasks/typedef.html
index 524390a65..bdd58a7f7 100644
--- a/manual/Tasks/typedef.html
+++ b/manual/Tasks/typedef.html
@@ -65,7 +65,7 @@
   <p>If you are defining tasks or types that share the same classpath
     with multiple taskdef or typedef tasks, the corresponding classes
     will be loaded by different
-    Java <a href="http://download.oracle.com/javase/1.4.2/docs/api/java/lang/ClassLoader.html">ClassLoaders</a>.
+    Java <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/ClassLoader.html">ClassLoaders</a>.
     Two classes with the same name loaded via different ClassLoaders
     are not the same class from the point of view of the Java VM, they
     don't share static variables and instances of these classes can't
diff --git a/manual/Tasks/unzip.html b/manual/Tasks/unzip.html
index f88f8597d..02df7acf9 100644
--- a/manual/Tasks/unzip.html
+++ b/manual/Tasks/unzip.html
@@ -103,8 +103,8 @@ archive.</p>
     <td valign="top"><b>Note:</b> This attribute is not available for
     the <code>untar</code> task.<br>
     The character encoding that has been used for filenames
-    inside the zip file.  For a list of possible values see <a
-    href="http://download.oracle.com/javase/1.5.0/docs/guide/intl/encoding.doc.html">http://download.oracle.com/javase/1.5.0/docs/guide/intl/encoding.doc.html</a>.<br>
+    inside the zip file.  For a list of possible values see the <a
+    href="http://docs.oracle.com/javase/7/docs/technotes/guides/intl/encoding.doc.html">Supported Encodings</a>.<br/>
     Defaults to &quot;UTF8&quot;, use the magic value
     <code>native-encoding</code> for the platform's default character
     encoding.
diff --git a/manual/Tasks/zip.html b/manual/Tasks/zip.html
index 7ef9f0ce0..4d66851aa 100644
--- a/manual/Tasks/zip.html
+++ b/manual/Tasks/zip.html
@@ -148,8 +148,8 @@ archive.</p>
   <tr>
     <td valign="top">encoding</td>
     <td valign="top">The character encoding to use for filenames
-    inside the zip file.  For a list of possible values see <a
-    href="http://download.oracle.com/javase/1.5.0/docs/guide/intl/encoding.doc.html">http://download.oracle.com/javase/1.5.0/docs/guide/intl/encoding.doc.html</a>.
+    inside the zip file.  For a list of possible values see the <a
+                href="http://docs.oracle.com/javase/7/docs/technotes/guides/intl/encoding.doc.html">Supported Encodings</a>.<br/>
     Defaults to the platform's default character encoding.
       <br/>See also the <a href="#encoding">discussion below</a></td>
     <td align="center" valign="top">No</td>