Remove all references to AOSD, but mention Spring

- The website is just a front page.
- I failed to contact anyone via:
    * fb9553b7471df638478bbf918044bf52.gdrp@customers.whoisprivacycorp.com
    * info@aosd.net
    * admin@aosd.net
- The discuss@aosd.net mailing list had its last post 6 years ago and
  the last one concerning AspectJ 11 years ago according to the archive
  at https://discuss.aosd.narkive.com/.

Mention Spring support for native AspectJ an Spring AOP as a real world
example in the FAQ.

Also remove an FAQ link to a no longer existing PARC website about
AspectJ and fix a small typo.

Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>

5 files changed, 28 insertions, 56 deletions

diff --git a/build/release-checklist.txt b/build/release-checklist.txt
index d5a8137e3..d51d5f519 100644
--- a/build/release-checklist.txt
+++ b/build/release-checklist.txt
@@ -298,7 +298,6 @@ Once developer consensus is reached on the build:
 
 * post link on download page                                            [   ]
 
-* post announce message to aspectj-users, aspectj-announce,
-    aosd-discuss, aosd-announce                                         [   ]
+* post announce message to aspectj-users, aspectj-announce              [   ]
 
 * buy beer                                                              [   ]
diff --git a/docs/dist/doc/index.adoc b/docs/dist/doc/index.adoc
index 3e838031f..53f047719 100644
--- a/docs/dist/doc/index.adoc
+++ b/docs/dist/doc/index.adoc
@@ -24,8 +24,7 @@ link:runtime-api/index.html[API] and link:examples/[example code].
 |https://eclipse.org/aspectj[AspectJ]; development environment support
 for https://eclipse.org/ajdt[Eclipse].
 
-|xref:#resources[Other resources] |http://aosd.net[aosd.net];
-https://eclipse.org/aspectj[AspectJ project] the bug
+|xref:#resources[Other resources] |https://eclipse.org/aspectj[AspectJ project], the bug
 https://bugs.eclipse.org/bugs[db], and mailing lists for
 mailto:aspectj-users@eclipse.org[users] and
 mailto:aspectj-dev@eclipse.org[developers].
@@ -175,11 +174,6 @@ https://bugs.eclipse.org/bugs/buglist.cgi?product=AspectJ&keywords=info[flagged
 with the "info" keyword]. See the faq.html#q:ajcbugs[FAQ entry] for
 instructions on submitting compiler bugs.
 
-|http://aosd.net - the AOSD web site |This site has discussion and
-announcements related to aspect-oriented software development (AOSD) in
-general. Use announce@aosd.net to get and publish notices about AOSD
-workshops, conferences, and technology releases. Use discuss@aosd.net
-for general AOSD discussions.
 |===
 
 [[paths]]
diff --git a/docs/dist/doc/index.html b/docs/dist/doc/index.html
index 7c52cde81..dbcc52f90 100644
--- a/docs/dist/doc/index.html
+++ b/docs/dist/doc/index.html
@@ -39,8 +39,7 @@
         <a href="https://jdeveloperaop.dev.java.net/">JDeveloper</a>.
         </td></tr>
     <tr><td><a href="#resources">resources</a></td><td>
-       <a href="http://aosd.net">aosd.net</a>;
-       <a href="https://eclipse.org/aspectj">AspectJ project</a>
+       <a href="https://eclipse.org/aspectj">AspectJ project</a>,
        the bug <a href="https://bugs.eclipse.org/bugs">db</a>,
        and mailing lists for
        <a href="mailto:aspectj-users@eclipse.org">users</a> and
@@ -296,16 +295,6 @@
      	FAQ entry</a> for instructions on submitting compiler bugs.
      </td> </tr>
 
-<tr> <td> <a href="http://aosd.net">http://aosd.net</a> - the AOSD web site
-     </td>
-     <td>This site has discussion and announcements related to
-         aspect-oriented software development (AOSD) in general.
-         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:discuss@aosd.net">discuss@aosd.net</a>
-         for general AOSD discussions.
-     </td> </tr>
 </table>
 
 <p/>
diff --git a/docs/faq/faq.adoc b/docs/faq/faq.adoc
index 40c86420d..1a5f727ae 100644
--- a/docs/faq/faq.adoc
+++ b/docs/faq/faq.adoc
@@ -428,9 +428,6 @@ is an overall framework into which many of these approaches fit. AspectJ
 is one particular instance of AOP, distinguished by the fact that it was
 designed from the ground up to be compatible with Java.
 
-For more alternatives for aspect-oriented programming, see
-http://aosd.net.
-
 *Q:* How do you compare the features of AspectJ with reflective systems?
 
 *A:* Reflective and aspect-oriented languages have an important
@@ -578,11 +575,13 @@ AspectJ.
 * Removing AspectJ from your program is not difficult, although you will
 lose the flexibility and economy that AspectJ provided.
 * A number of significant open-source projects and industry products use
-AspectJ successfully. One list is kept on
-http://www.aosd.net/wiki/index.php?title=FAQ[the AOSD FAQ], and more
-appear on the mailing lists (search for, e.g., "AspectJ in real world",
-as described in #q:searchingsite[Q:How can I search the email archives
-or the web site?]).
+AspectJ successfully. A prominent example is the Spring framework which supports
+both native AspectJ and its internal "AOP lite" framework Spring AOP. Spring AOP
+is based on dynamic proxies, offers a subset of AspectJ features and offers the
+corresponding subset of the @AspectJ annotation-based aspect syntax.
+* You may also search for search for, e.g., "AspectJ in real world" on the WWW
+or in AspectJ mailing list archives, as described in
+xref:#searchingsite[How can I search the email archives or the web site?]).
 
 *Q:* What is the effect of using AspectJ on the source code size of
 programs?
@@ -958,8 +957,7 @@ subscribe, visit the https://eclipse.org/aspectj[AspectJ web site].
 
 There you can also subscribe to `aspectj-announce@eclipse.org`, a
 low-traffic list containing only announcements about significant AspectJ
-events and product releases. To get on a similar list for
-aspect-oriented software development generally, see http://aosd.net.
+events and product releases.
 
 [[compiler]]
 == Using the AspectJ compiler
@@ -3128,6 +3126,7 @@ link:pdguide/index.html[AspectJ Problem Diagnosis Guide].
 mailing list. You can subscribe to the list or view the list archives
 from the AspectJ home page https://eclipse.org/aspectj .
 
+[[searchingsite]]
 *Q:* How can I search the email archives or the web site?
 
 *A:* It is very effective to do a google search of the form,
@@ -3208,15 +3207,11 @@ in #q:harnesstestcases[Q:How should I submit test cases for bugs?].
 *Q:* Can you recommend reading or teaching material for AspectJ?
 
 *A:* The documentation available in the distribution is the best source
-for language and usage questions. You can also find selected AspectJ
-papers and presentations on the
-http://www.parc.com/groups/csl/projects/aspectj/index.html[PARC AspectJ
-page]. For links to Aspect-oriented programming materials in general,
-see http://aosd.net.
+for language and usage questions.
 
 *Q:* Where can our group get consulting and support?
 
-*A:* The best thing to to is join and email the
+*A:* The best thing to do is join and email the
 `aspectj-dev@eclipse.org` mailing list.
 
 *Q:* What has changed since the last FAQ version?
diff --git a/docs/faq/faq.xml b/docs/faq/faq.xml
index b367c1bf2..b2f97ede8 100644
--- a/docs/faq/faq.xml
+++ b/docs/faq/faq.xml
@@ -810,9 +810,6 @@ java -jar <emphasis>jar file name</emphasis>
             distinguished by the fact that it was designed from the ground up
             to be compatible with Java.
           </para>
-          <para>For more alternatives for aspect-oriented programming, see
-            <ulink url="http://aosd.net">http://aosd.net</ulink>.
-          </para>
         </answer>
       </qandaentry>
       <qandaentry>
@@ -1039,12 +1036,18 @@ aspect.
                 </para>
               </listitem>
               <listitem>
-                <para>A number of significant open-source projects and industry
-                    products use AspectJ successfully.  One list is kept on
-                    <ulink url="http://www.aosd.net/wiki/index.php?title=FAQ">
-                        the AOSD FAQ</ulink>, and more appear on the mailing
-                    lists (search for, e.g., "AspectJ in real world", as
-                    described in <xref linkend="q:searchingsite"/>).
+                <para>
+                  A number of significant open-source projects and industry products use
+                  AspectJ successfully. A prominent example is the Spring framework which supports
+                  both native AspectJ and its internal "AOP lite" framework Spring AOP. Spring AOP
+                  is based on dynamic proxies, offers a subset of AspectJ features and offers the
+                  corresponding subset of the @AspectJ annotation-based aspect syntax.
+                </para>
+              </listitem>
+              <listitem>
+                <para>
+                  You may also search for search for, e.g., "AspectJ in real world" on the WWW
+                  or in AspectJ mailing list archives, as described in <xref linkend="q:searchingsite"/>.
                 </para>
               </listitem>
             </itemizedlist>
@@ -1593,9 +1596,6 @@ aspect PublicErrorLogging {
             <literal>aspectj-announce@eclipse.org</literal>,
             a low-traffic list containing only announcements
             about significant AspectJ events and product releases.
-            To get on a similar list for aspect-oriented software
-            development generally, see
-            <ulink url="http://aosd.net">http://aosd.net</ulink>.
           </para>
         </answer>
       </qandaentry>
@@ -5102,12 +5102,7 @@ cd build
         </question>
         <answer>
           <para>The documentation available in the distribution is the
-          best source for language and usage questions.  You can also find
-          selected AspectJ papers and presentations on the
-          <ulink url="http://www.parc.com/groups/csl/projects/aspectj/index.html">
-                            PARC AspectJ page</ulink>.
-          For links to Aspect-oriented programming materials in general, see
-          <ulink url="http://aosd.net">http://aosd.net</ulink>.
+          best source for language and usage questions.
           </para>
         </answer>
       </qandaentry>
@@ -5119,7 +5114,7 @@ cd build
           </para>
         </question>
         <answer>
-          <para>The best thing to to is join and email the
+          <para>The best thing to do is join and email the
            <literal>aspectj-dev@eclipse.org</literal> mailing list.
           </para>
         </answer>