Updated for 1.1 language

1 files changed, 59 insertions, 30 deletions

diff --git a/docs/progGuideDB/quickreference.xml b/docs/progGuideDB/quickreference.xml
index 2b0c98f14..4f72dbb7c 100644
--- a/docs/progGuideDB/quickreference.xml
+++ b/docs/progGuideDB/quickreference.xml
@@ -55,6 +55,15 @@
                 <replaceable>Signature</replaceable>
               </entry>
             </row>
+            <row>
+              <entry>
+                <literal>preinitialization(<replaceable>Signature</replaceable>)</literal>
+              </entry>
+              <entry>
+                Object pre-initialization join point when the first constructor
+                called in the type matches <replaceable>Signature</replaceable>
+              </entry>
+            </row>
 
             <row>
               <entry spanname="hspan">
@@ -74,6 +83,20 @@
                 <literal>args</literal> pointcut.
               </entry>
             </row>
+            <row>
+              <entry spanname="hspan">
+                <emphasis role="bold">Advice</emphasis>
+              </entry>
+            </row>
+
+            <row rowsep="1">
+              <entry>
+                <literal>adviceexecution()</literal>
+              </entry>
+              <entry>
+                All advice execution join points. 
+              </entry>
+            </row>
 
             <row>
               <entry spanname="hspan">
@@ -127,46 +150,34 @@
 
             <row>
               <entry>
-                <literal>this(<replaceable>TypePattern</replaceable>)</literal>
+                <literal>this(<replaceable>Type</replaceable>)</literal>
               </entry>
               <entry>
                 Join points when the currently executing object is an
-                instance of a type in <replaceable>TypePattern</replaceable>
+                instance of <replaceable>Type</replaceable>
               </entry>
             </row>
 
             <row>
               <entry>
-                <literal>target(<replaceable>TypePattern</replaceable>)</literal>
+                <literal>target(<replaceable>Type</replaceable>)</literal>
               </entry>
               <entry>
                 Join points when the target object is an instance
-                of a type in <replaceable>TypePattern</replaceable>
+                of <replaceable>Type</replaceable>
               </entry>
             </row>
 
             <row>
               <entry>
-                <literal>args(<replaceable>TypePattern</replaceable>, ...)</literal>
+                <literal>args(<replaceable>Type</replaceable>, ...)</literal>
               </entry>
               <entry>
                 Join points when the argument objects are instances of
-                the <replaceable>TypePattern</replaceable>s
+                the <replaceable>Type</replaceable>s
               </entry>
             </row>
 
-<!--
-            <row rowsep="1">
-              <entry>
-                <literal>hasaspect(<replaceable>TypePattern</replaceable>)</literal>
-              </entry>
-              <entry>
-                Join points where an aspect instance of a type in
-                <replaceable>TypePattern</replaceable> is associated
-                with the join point
-              </entry>
-            </row>
--->
             <row>
               <entry spanname="hspan">
                 <emphasis role="bold">Lexical Extents</emphasis>
@@ -441,12 +452,12 @@
     </sect1>
 
     <sect1>
-      <title>Static Crosscutting</title>
-
-      <para></para>
+      <title>Inter-type declarations</title>
+      <para>
+      </para>
 
       <table frame="all" id="qrintroduction">
-        <title>Introduction</title>
+        <title>Inter-type declarations</title>
 
         <tgroup cols="2" colsep="1" rowsep="0">
 
@@ -454,43 +465,50 @@
 
             <row>
               <entry>
-                <replaceable>Modifiers Type TypePattern.Id(Formals) { Body }</replaceable>
+                <replaceable>Modifiers ReturnType OnType . Id(Formals) { Body }</replaceable>
               </entry>
               <entry>
-                Defines a method on the types in <replaceable>TypePattern</replaceable>.
+                Defines a method on <replaceable>OnType</replaceable>.
               </entry>
             </row>
 
             <row>
               <entry>
-                <literal>abstract <replaceable>Modifiers Type TypePattern.Id(Formals)</replaceable>;</literal>
+                <literal>abstract <replaceable>Modifiers ReturnType OnType . Id(Formals)</replaceable>;</literal>
               </entry>
               <entry>
-                Defines an abstract method on the types in <replaceable>TypePattern</replaceable>.
+                Defines an abstract method on <replaceable>OnType</replaceable>.
               </entry>
             </row>
 
             <row>
               <entry>
-                <literal><replaceable>Modifiers TypePattern</replaceable>.new<replaceable>(Formals) { Body }</replaceable></literal>
+                <literal><replaceable>Modifiers OnType</replaceable>.new<replaceable>(Formals) { Body }</replaceable></literal>
               </entry>
               <entry>
-                Defines a a constructor on the types in <replaceable>TypePattern</replaceable>.
+                Defines a a constructor on <replaceable>OnType</replaceable>.
               </entry>
             </row>
 
             <row>
               <entry>
-                <replaceable>Modifiers Type TypePattern.Id [ = Expression ];</replaceable>
+                <replaceable>Modifiers Type OnType.Id [ = Expression ];</replaceable>
               </entry>
               <entry>
-                Defines a field on the types in <replaceable>TypePattern</replaceable>.
+                Defines a field on <replaceable>OnType</replaceable>.
               </entry>
             </row>
           </tbody>
         </tgroup>
       </table>
 
+    </sect1>
+
+    <sect1>
+      <title>Other declarations</title>
+      <para>
+      </para>
+
       <table frame="all" id="qrotherdeclarations">
         <title>Other declarations</title>
 
@@ -554,6 +572,17 @@
                 <literal>org.aspectj.lang.SoftException</literal>.
               </entry>
             </row>
+            <row>
+              <entry>
+                <literal>declare precedence:
+                <replaceable>TypePatternList</replaceable> ; </literal>
+              </entry>
+              <entry>
+                Declares that at any join point where multiple pieces of advice
+                apply, the advice precedence at that join point is in 
+                <replaceable>TypePatternList</replaceable> order. 
+              </entry>
+            </row>
 
           </tbody>
         </tgroup>