Index: openacs-4/packages/calendar/tcl/apm-callback-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/tcl/apm-callback-procs.tcl,v
diff -u -r1.3.2.1 -r1.3.2.2
--- openacs-4/packages/calendar/tcl/apm-callback-procs.tcl	30 Jul 2020 14:23:45 -0000	1.3.2.1
+++ openacs-4/packages/calendar/tcl/apm-callback-procs.tcl	26 Feb 2021 19:18:24 -0000	1.3.2.2
@@ -13,7 +13,7 @@
 namespace eval calendar::apm {}
 
 
-ad_proc -public calendar::apm::package_after_upgrade {
+ad_proc -private calendar::apm::package_after_upgrade {
     -from_version_name:required
     -to_version_name:required
 } {
@@ -34,7 +34,7 @@
     }
 }
 
-ad_proc -public calendar::apm::before_uninstantiate {
+ad_proc -private calendar::apm::before_uninstantiate {
     -package_id:required
 } {
     Cleanup calendars from this package instance upon uninstantiation.
Index: openacs-4/packages/file-storage/tcl/test/webtest-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/tcl/test/webtest-procs.tcl,v
diff -u -r1.1.2.5 -r1.1.2.6
--- openacs-4/packages/file-storage/tcl/test/webtest-procs.tcl	23 Nov 2020 19:04:34 -0000	1.1.2.5
+++ openacs-4/packages/file-storage/tcl/test/webtest-procs.tcl	26 Feb 2021 19:18:24 -0000	1.1.2.6
@@ -6,7 +6,7 @@
 
 namespace eval file_storage::test {
 
-    ad_proc ::file_storage::test::create_new_folder {
+    ad_proc -private ::file_storage::test::create_new_folder {
         -last_request:required
         folder_name
         folder_description
@@ -44,7 +44,7 @@
         return $d
     }
 
-    ad_proc ::file_storage::test::edit_folder {
+    ad_proc  -private ::file_storage::test::edit_folder {
         -last_request:required
         folder_name
     } {
@@ -79,7 +79,7 @@
         return $d
     }
 
-    ad_proc ::file_storage::test::delete_current_folder {
+    ad_proc  -private ::file_storage::test::delete_current_folder {
         -last_request:required
     } {
         Delete the current folder via Web UI.
Index: openacs-4/packages/notifications/tcl/apm-callback-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/tcl/apm-callback-procs.tcl,v
diff -u -r1.6.2.1 -r1.6.2.2
--- openacs-4/packages/notifications/tcl/apm-callback-procs.tcl	3 Jun 2020 13:20:02 -0000	1.6.2.1
+++ openacs-4/packages/notifications/tcl/apm-callback-procs.tcl	26 Feb 2021 19:18:24 -0000	1.6.2.2
@@ -9,7 +9,7 @@
 
 namespace eval notification::apm {}
 
-ad_proc -public notification::apm::after_install {} {
+ad_proc -private notification::apm::after_install {} {
     After install callback.  Create service contracts.
 } {
     db_transaction {
@@ -28,7 +28,7 @@
     }
 }
 
-ad_proc -public notification::apm::before_uninstall {} {
+ad_proc -private notification::apm::before_uninstall {} {
     Before uninstall callback.  Get rid of service contracts.
 } {
     db_transaction {
@@ -48,7 +48,7 @@
     }
 }
 
-ad_proc -public notification::apm::after_upgrade {
+ad_proc -private notification::apm::after_upgrade {
     {-from_version_name:required}
     {-to_version_name:required}
 } {
@@ -110,7 +110,7 @@
 }
 
 
-ad_proc -public notification::apm::create_delivery_method_contract {} {
+ad_proc -private notification::apm::create_delivery_method_contract {} {
     Create the delivery method service contract.
 } {
     acs_sc::contract::new_from_spec \
@@ -138,13 +138,13 @@
         }
 }
 
-ad_proc -public notification::apm::delete_delivery_method_contract {} {
+ad_proc -private notification::apm::delete_delivery_method_contract {} {
     Delete the delivery method contract.
 } {
     acs_sc::contract::delete -name "NotificationDeliveryMethod"
 }
 
-ad_proc -public notification::apm::create_email_delivery_method_impl {} {
+ad_proc -private notification::apm::create_email_delivery_method_impl {} {
     Register the service contract implementation and return the impl_id
 
     @return impl_id of the created implementation
@@ -160,7 +160,7 @@
     }]
 }
 
-ad_proc -public notification::apm::delete_email_delivery_method_impl {
+ad_proc -private notification::apm::delete_email_delivery_method_impl {
     {-impl_name "notification_email"}
 } {
     Unregister the NotificationDeliveryMethod service contract implementation for email.
@@ -170,7 +170,7 @@
         -impl_name $impl_name
 }
 
-ad_proc -public notification::apm::register_email_delivery_method {
+ad_proc -private notification::apm::register_email_delivery_method {
     -impl_id:required
 } {
     Register the email delivery method with the notifications service.
@@ -183,7 +183,7 @@
         -pretty_name "Email"
 }
 
-ad_proc -public notification::apm::update_email_delivery_method_impl {
+ad_proc -private notification::apm::update_email_delivery_method_impl {
     -impl_id:required
 } {
     Register the email delivery method with the notifications service.
@@ -197,7 +197,7 @@
         -sc_impl_id $impl_id
 }
 
-ad_proc -public notification::apm::unregister_email_delivery_method {} {
+ad_proc -private notification::apm::unregister_email_delivery_method {} {
     Unregister the service contract delivery method with the notifications service.
 } {
     set delivery_method_id [notification::delivery::get_id -short_name "email"]
@@ -206,7 +206,7 @@
         -delivery_method_id $delivery_method_id
 }
 
-ad_proc -public notification::apm::create_notification_type_contract {} {
+ad_proc -private notification::apm::create_notification_type_contract {} {
     Create the notification type service contract, used by client packages to define notification
     types specific to the client's object types.
 } {
@@ -238,7 +238,7 @@
         }
 }
 
-ad_proc -public notification::apm::delete_notification_type_contract {} {
+ad_proc -private notification::apm::delete_notification_type_contract {} {
     Delete the notification type service contract.
 } {
     acs_sc::contract::delete -name "NotificationType"
Index: openacs-4/packages/search/tcl/apm-callback-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/tcl/apm-callback-procs.tcl,v
diff -u -r1.4 -r1.4.2.1
--- openacs-4/packages/search/tcl/apm-callback-procs.tcl	7 Aug 2017 23:48:29 -0000	1.4
+++ openacs-4/packages/search/tcl/apm-callback-procs.tcl	26 Feb 2021 19:18:24 -0000	1.4.2.1
@@ -1,7 +1,7 @@
 namespace eval search {}
 namespace eval search::install {}
 
-ad_proc search::install::after_instantiate {
+ad_proc -private search::install::after_instantiate {
     -package_id:required
 } {
     Package after instantiation callback proc.
Index: openacs-4/packages/xowiki/tcl/menu-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/menu-procs.tcl,v
diff -u -r1.19.2.13 -r1.19.2.14
--- openacs-4/packages/xowiki/tcl/menu-procs.tcl	1 Feb 2021 10:41:29 -0000	1.19.2.13
+++ openacs-4/packages/xowiki/tcl/menu-procs.tcl	26 Feb 2021 19:18:24 -0000	1.19.2.14
@@ -61,7 +61,7 @@
       }
 
 
-  MenuItem ad_instproc init args {doku} {
+  MenuItem ad_instproc -private init args {doku} {
     next
     # Use computed default values when not specified
     if {![info exists :title]} {
Index: openacs-4/packages/xowiki/tcl/test/xowiki-test-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/test/xowiki-test-procs.tcl,v
diff -u -r1.1.2.42 -r1.1.2.43
--- openacs-4/packages/xowiki/tcl/test/xowiki-test-procs.tcl	16 Feb 2021 20:59:03 -0000	1.1.2.42
+++ openacs-4/packages/xowiki/tcl/test/xowiki-test-procs.tcl	26 Feb 2021 19:18:24 -0000	1.1.2.43
@@ -399,6 +399,7 @@
         "::xowiki::Package instproc invoke"
         "::xowiki::Package instproc require_root_folder"
         "::xowiki::Package instproc www-edit-new"
+        "::xowiki::Package instproc www-import-prototype-page"
         "::xowiki::Page instproc get_form_data"
         "::xowiki::Page instproc include"
         "::xowiki::PageInstance instproc get_from_template"
Index: openacs-4/packages/acs-content-repository/tcl/image-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/image-procs.tcl,v
diff -u -r1.18.2.3 -r1.18.2.4
--- openacs-4/packages/acs-content-repository/tcl/image-procs.tcl	28 Oct 2020 15:39:19 -0000	1.18.2.3
+++ openacs-4/packages/acs-content-repository/tcl/image-procs.tcl	26 Feb 2021 19:20:06 -0000	1.18.2.4
@@ -412,7 +412,7 @@
     return $resize_item_id
 }
 
-ad_proc -public image::get_size_item_id {
+ad_proc -private image::get_size_item_id {
     -item_id
     -size_name
 } {
Index: openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl,v
diff -u -r1.126.2.14 -r1.126.2.15
--- openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl	22 Feb 2021 15:13:32 -0000	1.126.2.14
+++ openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl	26 Feb 2021 19:20:06 -0000	1.126.2.15
@@ -1231,7 +1231,7 @@
     db_exec_plsql apm_version_delete {}
 }
 
-ad_proc -public apm_package_version_count {package_key} {
+ad_proc -private apm_package_version_count {package_key} {
 
     @return The number of versions of the indicated package.
 } {
Index: openacs-4/packages/acs-tcl/tcl/test/acs-tcl-test-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/test/acs-tcl-test-procs.tcl,v
diff -u -r1.71.2.34 -r1.71.2.35
--- openacs-4/packages/acs-tcl/tcl/test/acs-tcl-test-procs.tcl	16 Feb 2021 20:59:03 -0000	1.71.2.34
+++ openacs-4/packages/acs-tcl/tcl/test/acs-tcl-test-procs.tcl	26 Feb 2021 19:20:06 -0000	1.71.2.35
@@ -6,13 +6,13 @@
     @creation-date 22 January 2003
 }
 
-ad_proc apm_test_callback_file_path {} {
+ad_proc -private apm_test_callback_file_path {} {
     The path of the test file used to check that the callback proc executed ok.
 } {
     return "[acs_package_root_dir acs-tcl]/tcl/test/callback_proc_test_file"
 }
 
-ad_proc apm_test_callback_proc {
+ad_proc -private apm_test_callback_proc {
     {-arg1:required}
     {-arg2:required}
 } {
Index: openacs-4/packages/acs-tcl/tcl/test/navigation-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/test/navigation-procs.tcl,v
diff -u -r1.15.2.10 -r1.15.2.11
--- openacs-4/packages/acs-tcl/tcl/test/navigation-procs.tcl	15 Feb 2021 13:41:25 -0000	1.15.2.10
+++ openacs-4/packages/acs-tcl/tcl/test/navigation-procs.tcl	26 Feb 2021 19:20:06 -0000	1.15.2.11
@@ -8,7 +8,7 @@
 
 namespace eval navigation::test {}
 
-ad_proc navigation::test::context_bar_multirow_filter {} {
+ad_proc -private navigation::test::context_bar_multirow_filter {} {
     Procedure for the context_bar_multirow test filter
 } {
     aa_run_with_teardown -rollback -test_code {