actual URLs

2 files changed, 17 insertions, 12 deletions

diff --git a/docs/dist/doc/ant-tasks.html b/docs/dist/doc/ant-tasks.html
index f09bbc7e5..de3e5929a 100644
--- a/docs/dist/doc/ant-tasks.html
+++ b/docs/dist/doc/ant-tasks.html
@@ -29,7 +29,7 @@ three ways of running the compiler:
 
 This describes how to install and use the tasks and the adapter.  
 For an example Ant script,
-see <a href="../examples/build.xml">../examples/build.xml</a>.
+see <a href="examples/build.xml">examples/build.xml</a>.
 
 <h3>Installation</h3>
 <p>Install Jakarta Ant 1.5.1:&nbsp; 
@@ -42,7 +42,7 @@ This release is source-compatible with Ant 1.3 and Ant 1.4, but
 the task sources must be
 compiled with those versions of the Ant libraries to be used under those 
 versions of Ant.  Sources are available under the Common Public License v. 1.0
-at <a href="@aspectj.home.url@">@aspectj.home.url@</a>.
+at <a href="http://eclipse.org/aspectj">http://eclipse.org/aspectj</a>.
 
 <p>In Ant, third-party tasks can be declared using a <tt>taskdef</tt> entry 
 in the build script, to identify the name and classes.  
@@ -205,10 +205,12 @@ from Ant, then please send a report (including your build file, if possible).</l
 
 <p><b>Known Problems</b>
 <br>For the most up-to-date information on known problems, see the
-  <a href="@aspectj.home.url@/bugs">bug database</a> for 
-  <a href="@aspectj.home.url@/bugs/compiler">compiler bugs</a>
-  or <a href="@aspectj.home.url@/ant-support">task bugs</a>.
-
+  <a href="http://dev.eclipse.org">bug database</a>.
+  <!-- 
+  for 
+  <a href="http://dev.eclipse.org/compiler">compiler bugs</a>
+  or <a href="http://dev.eclipse.org/ant-support">task bugs</a>.
+  -->
 <li><u>Memory and forking</u>:
 Users email most often about the ajc task running out of memory.  This is
 not a problem with the task; some compiles take a lot of memory,
@@ -222,9 +224,12 @@ messages from the compiler are printed but not segregated.
 </li>
 
 <p>
-You can send email to <a href="mailto:users@aspectj.org">users@aspectj.org</a>.
+You can send email to <a href="mailto:aspectj-users@dev.eclipse.org">
+mailto:aspectj-users@dev.eclipse.org</a>.
 (Do join the list to participate!)  We also welcome any bug reports; you can 
-submit them to <a href="@aspectj.home.url@/bugs">@aspectj.home.url@/bugs</a>.
+submit them to the bug database at
+<a href="http://dev.eclipse.org">http://dev.eclipse.org</a>
+using the <code>AspectJ</code> product and <code>Ant</code> component.
 </body>
 
 </html>
diff --git a/docs/dist/doc/index.html b/docs/dist/doc/index.html
index 2e1d486b3..ee5e6b0eb 100644
--- a/docs/dist/doc/index.html
+++ b/docs/dist/doc/index.html
@@ -45,7 +45,7 @@
     <tr><td><a href="#resources">resources</a></td><td>
        <a href="http://aosd.net">aosd.net</a>;
        <a href="http://eclipse.org/aspectj">AspectJ project</a>
-       the bug <a href="http://eclipse.org/bugs">db</a>,
+       the bug <a href="http://dev.eclipse.org">db</a>,
        and mailing lists for 
        <a href="mailto:aspectj-users@eclipse.org">users</a> and
        <a href="mailto:aspectj-dev@eclipse.org">developers</a>.
@@ -236,11 +236,11 @@
          <a href="mailto:aspectj-developers@dev.eclipse.org">
           aspectj-developers@dev.eclipse.org</a> list.
          You can subscribe to the announce list
-         (<tt>aspectj-developers@dev.eclipse.org</tt>) 
+         (<tt>aspectj-announce@dev.eclipse.org</tt>) 
          to get occasional emails about AspectJ releases
          and relevant events.
 
-<tr> <td><a href="http://dev.eclipse.org/bugs">Bug database</a>
+<tr> <td><a href="http://dev.eclipse.org">Bug database</a>
      </td>
      <td>Use Bugzilla to submit bugs against the AspectJ
      product components 
@@ -258,7 +258,7 @@
          Use <a href="mailto:announce@aosd.net">announce@aosd.net</a>
          to get and publish notices about AOSD
          workshops, conferences, and technology releases.
-         Use <a href="mailto:announce@aosd.net">discuss@aosd.net</a>
+         Use <a href="mailto:discuss@aosd.net">discuss@aosd.net</a>
          for general AOSD discussions.
      </td> </tr>
 </table>