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

3 files changed, 6 insertions, 24 deletions

diff --git a/docs/dist/doc/examples/telecom/Billing.java b/docs/dist/doc/examples/telecom/Billing.java
index a87d73998..651d64b36 100644
--- a/docs/dist/doc/examples/telecom/Billing.java
+++ b/docs/dist/doc/examples/telecom/Billing.java
@@ -1,5 +1,4 @@
 /*
-
 Copyright (c) Xerox Corporation 1998-2002.  All rights reserved.
 
 Use and copying of this software and preparation of derivative works based
@@ -9,11 +8,6 @@ laws.
 
 This software is made available AS IS, and Xerox Corporation makes no warranty
 about the software, its performance or its conformity to any specification.
-
-|<---            this code is formatted to fit into 80 columns             --->|
-|<---            this code is formatted to fit into 80 columns             --->|
-|<---            this code is formatted to fit into 80 columns             --->|
-
 */
 
 package telecom;
@@ -29,13 +23,12 @@ package telecom;
  * it depends only on timing and on the type of the connection.
  */
 public aspect Billing {
-    // domination required to get advice on endtiming in the right order
+    // precedence required to get advice on endtiming in the right order
     declare precedence: Billing, Timing;
 
     public static final long LOCAL_RATE = 3;
     public static final long LONG_DISTANCE_RATE = 10;
 
-
     public Customer Connection.payer;
     public Customer getPayer(Connection conn) { return conn.payer; }
     /**
diff --git a/docs/dist/doc/examples/telecom/TimerLog.java b/docs/dist/doc/examples/telecom/TimerLog.java
index 4591894dc..c736625b5 100644
--- a/docs/dist/doc/examples/telecom/TimerLog.java
+++ b/docs/dist/doc/examples/telecom/TimerLog.java
@@ -1,5 +1,4 @@
 /*
-
 Copyright (c) Xerox Corporation 1998-2002.  All rights reserved.
 
 Use and copying of this software and preparation of derivative works based
@@ -9,11 +8,6 @@ laws.
 
 This software is made available AS IS, and Xerox Corporation makes no warranty
 about the software, its performance or its conformity to any specification.
-
-|<---            this code is formatted to fit into 80 columns             --->|
-|<---            this code is formatted to fit into 80 columns             --->|
-|<---            this code is formatted to fit into 80 columns             --->|
-
 */
 package telecom;
 
diff --git a/docs/dist/doc/examples/telecom/Timing.java b/docs/dist/doc/examples/telecom/Timing.java
index f40bd0fca..29eba02ea 100644
--- a/docs/dist/doc/examples/telecom/Timing.java
+++ b/docs/dist/doc/examples/telecom/Timing.java
@@ -1,5 +1,4 @@
 /*
-
 Copyright (c) Xerox Corporation 1998-2002.  All rights reserved.
 
 Use and copying of this software and preparation of derivative works based
@@ -9,12 +8,8 @@ laws.
 
 This software is made available AS IS, and Xerox Corporation makes no warranty
 about the software, its performance or its conformity to any specification.
-
-|<---            this code is formatted to fit into 80 columns             --->|
-|<---            this code is formatted to fit into 80 columns             --->|
-|<---            this code is formatted to fit into 80 columns             --->|
-
 */
+
 package telecom;
 
 /**
@@ -28,9 +23,9 @@ public aspect Timing {
      * Every Customer has a total connection time
      */
     public long Customer.totalConnectTime = 0;
-  
-    public long getTotalConnectTime(Customer cust) { 
-        return cust.totalConnectTime; 
+
+    public long getTotalConnectTime(Customer cust) {
+        return cust.totalConnectTime;
     }
     /**
      * Every connection has a timer
@@ -48,7 +43,7 @@ public aspect Timing {
     /**
      * When to stop the timer
      */
-    pointcut endTiming(Connection c): target(c) && 
+    pointcut endTiming(Connection c): target(c) &&
         call(void Connection.drop());
 
     /**