folded in material from README-11.html

finally totally and completely stomped out "introduction"
minor formatting changes
generating better filenames for the progguide
added A4 version of quick reference

2 files changed, 15 insertions, 18 deletions

diff --git a/docs/dist/doc/examples/tjp/Demo.java b/docs/dist/doc/examples/tjp/Demo.java
index 8b90a7a49..64d249c82 100644
--- a/docs/dist/doc/examples/tjp/Demo.java
+++ b/docs/dist/doc/examples/tjp/Demo.java
@@ -14,27 +14,24 @@ about the software, its performance or its conformity to any specification.
 package tjp;
 
 public class Demo {
-
     static Demo d;
 
     public static void main(String[] args){
-	new Demo().go();
+        new Demo().go();
     }
 
     void go(){
-	d = new Demo();
-	d.foo(1,d);
-	System.out.println(d.bar(new Integer(3)));
+        d = new Demo();
+        d.foo(1,d);
+        System.out.println(d.bar(new Integer(3)));
     }
 
     void foo(int i, Object o){
-	System.out.println("Demo.foo(" + i + ", " + o + ")\n");
+        System.out.println("Demo.foo(" + i + ", " + o + ")\n");
     }
 
-
     String bar (Integer j){
-	System.out.println("Demo.bar(" + j + ")\n");
-	return "Demo.bar(" + j  + ")";
+        System.out.println("Demo.bar(" + j + ")\n");
+        return "Demo.bar(" + j  + ")";
     }
-
 }
diff --git a/docs/dist/doc/examples/tjp/GetInfo.java b/docs/dist/doc/examples/tjp/GetInfo.java
index 63f13c74e..0d38a3766 100644
--- a/docs/dist/doc/examples/tjp/GetInfo.java
+++ b/docs/dist/doc/examples/tjp/GetInfo.java
@@ -1,4 +1,4 @@
-/* 
+/*
 Copyright (c) Xerox Corporation 1998-2002.  All rights reserved.
 
 Use and copying of this software and preparation of derivative works based
@@ -24,10 +24,10 @@ aspect GetInfo {
    pointcut demoExecs(): within(Demo) && execution(* *(..));
 
    Object around(): demoExecs() && !execution(* go()) && goCut() {
-      println("Intercepted message: " + 
-	  thisJoinPointStaticPart.getSignature().getName());
-      println("in class: " + 
-	  thisJoinPointStaticPart.getSignature().getDeclaringType().getName());
+      println("Intercepted message: " +
+          thisJoinPointStaticPart.getSignature().getName());
+      println("in class: " +
+          thisJoinPointStaticPart.getSignature().getDeclaringType().getName());
       printParameters(thisJoinPoint);
       println("Running original method: \n" );
       Object result = proceed();
@@ -41,9 +41,9 @@ aspect GetInfo {
       String[] names = ((CodeSignature)jp.getSignature()).getParameterNames();
       Class[] types = ((CodeSignature)jp.getSignature()).getParameterTypes();
       for (int i = 0; i < args.length; i++) {
-	 println("  "  + i + ". " + names[i] +
-	     " : " +            types[i].getName() +
-	     " = " +            args[i]);
+         println("  "  + i + ". " + names[i] +
+             " : " +            types[i].getName() +
+             " = " +            args[i]);
       }
    }
 }