Index: openacs-4/packages/acs-tcl/lib/ad-return-error.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/lib/ad-return-error.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-tcl/lib/ad-return-error.adp	30 Dec 2003 22:11:51 -0000	1.1
@@ -0,0 +1,6 @@
+<master>
+  <property name="title">@title;noquote@</property>
+
+<p>
+  @explanation;noquote@
+</p>
Index: openacs-4/packages/acs-tcl/lib/page-error.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/lib/page-error.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-tcl/lib/page-error.adp	22 Dec 2003 21:44:44 -0000	1.1
+++ openacs-4/packages/acs-tcl/lib/page-error.adp	30 Dec 2003 22:11:51 -0000	1.2
@@ -5,13 +5,21 @@
   There was a server error processing your request. We apologize.
 </p>
 
+<if @message@ not nil>
+  <p>
+    @message;noquote@
+  </p>
+</if>
+
 <if @stacktrace@ not nil>
   <p>
     Here is a detailed dump of what took place at the time of the error, which may assist a programmer in tracking down the problem:
   </p>
   <blockquote><pre>@stacktrace@</pre></blockquote>
 </if>
 <else>
-  The error has been logged and will be investigated by our system
-  programmers.
+  <p>
+    The error has been logged and will be investigated by our system
+    programmers.
+  </p>
 </else>