Index: openacs-4/packages/acs-admin/tcl/merge-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/tcl/merge-procs.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-admin/tcl/merge-procs.tcl	4 Jun 2006 00:45:19 -0000	1.2
+++ openacs-4/packages/acs-admin/tcl/merge-procs.tcl	27 Jul 2006 00:31:25 -0000	1.3
@@ -14,6 +14,12 @@
     -from_user_id:required
     -to_user_id:required
 } {
+    Merge user info.  Revokes permissions for from_user_id and grants
+    them to to_user_id.
+
+    @param from_user_id From user ID.
+    @param to_user_id To user ID. 
+} {
     ns_log Notice "Running merge::MergeUserInfo"
     db_transaction {
 	if { ![db_0or1row to_user_portrait {*SQL*}] &&  [db_0or1row from_user_portrait {*SQL*}] } {
Index: openacs-4/packages/acs-subsite/tcl/subsite-callback-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/subsite-callback-procs.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/tcl/subsite-callback-procs.tcl	4 Jun 2006 00:45:42 -0000	1.2
+++ openacs-4/packages/acs-subsite/tcl/subsite-callback-procs.tcl	27 Jul 2006 00:31:25 -0000	1.3
@@ -80,6 +80,15 @@
    -parameter:required
    -value:required
 } {
+    Callback for changing the value of a parameter.
+
+    @param package_id The package_id of the package the parameter was changed for.
+    @param parameter The parameter value.
+    @param value The new value.
+
+    @see package::set_value
+} {
+
 }
 
 ad_proc -public -callback subsite::parameter_changed -impl subsite {
Index: openacs-4/packages/acs-tcl/tcl/test/ad-proc-test-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/test/ad-proc-test-procs.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-tcl/tcl/test/ad-proc-test-procs.tcl	13 Jul 2006 23:19:52 -0000	1.4
+++ openacs-4/packages/acs-tcl/tcl/test/ad-proc-test-procs.tcl	27 Jul 2006 00:31:26 -0000	1.5
@@ -29,7 +29,7 @@
             $callback_procs \
             ::callback::a_callback::contract] >= 0}]
 
-    ad_proc -callback a_callback_2 { arg1 arg2 } { this is a test callback }
+    ad_proc -callback a_callback_2 { arg1 arg2 } { this is a test callback } {}
     set callback_procs [info procs ::callback::a_callback_2::*]
     aa_true "creation of a valid callback contract with no body" \
         [expr {[lsearch -exact \
@@ -99,6 +99,8 @@
 }
 
 ad_proc EvilCallback {} {
+    This is a test callback implementation that should not be invoked.
+} {
         error "Should not be invoked"
 }