Index: openacs-4/packages/acs-core-docs/tcl/acs-core-docs-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/tcl/acs-core-docs-procs.tcl,v
diff -u -r1.5.2.2 -r1.5.2.3
--- openacs-4/packages/acs-core-docs/tcl/acs-core-docs-procs.tcl	5 Aug 2016 18:14:05 -0000	1.5.2.2
+++ openacs-4/packages/acs-core-docs/tcl/acs-core-docs-procs.tcl	31 Aug 2016 18:41:00 -0000	1.5.2.3
@@ -57,10 +57,27 @@
     # compute the path (consider just the path after the package_url
     # for file name construction).
     #
-    set path    [string range [ad_conn url] [string length [ad_conn package_url]] end]
+    set url [ad_conn url]
+    #
+    # For now, ignore all version info
+    #
+    regsub {^/doc/(current|openacs-[0-9-]+|HEAD)/} $url /doc/ url
+        
+    set path    [string range $url [string length [ad_conn package_url]] end]
     set html_fn [acs_package_root_dir [ad_conn package_key]]/www/$path
+    if {[file exists html_fn]} {
+        #
+        # true acs-core-docs
+        #
+    } elseif {[regexp {^([a-z0-9_-]+)/(.+)$} $path _ pkg path]} {
+        #
+        # package acs-core-docs
+        #
+        set html_fn [acs_package_root_dir $pkg]/www/doc/$path
+        ns_log notice "... pkg doc <$html_fn>"
+    }
     set adp_fn  [file root $html_fn].adp
-    
+
     if {[file readable $adp_fn]} {
         #
         # Perform an internal redirect to the .adp file and stop the filter chain
Index: openacs-4/packages/acs-core-docs/www/xml/kernel/apm-design.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/kernel/apm-design.xml,v
diff -u -r1.10 -r1.10.6.1
--- openacs-4/packages/acs-core-docs/www/xml/kernel/apm-design.xml	11 Dec 2010 23:36:32 -0000	1.10
+++ openacs-4/packages/acs-core-docs/www/xml/kernel/apm-design.xml	31 Aug 2016 18:41:00 -0000	1.10.6.1
@@ -35,10 +35,10 @@
 <listitem><para><ulink url="/api-doc/procs-file-view?path=packages%2facs%2dtcl%2ftcl%2fapm%2dinstall%2dprocs%2etcl">
 apm-install-procs.tcl</ulink> (Supports installation of packages)</para></listitem>
 
-<listitem><para><ulink url="/api-doc/procs-file-view?path=packages%2facs%2dtcl%2ftcl%2f20%2dapm%2dload%2dprocs%2etcl">
-20-apm-load-procs.tcl</ulink> (Bootstraps APM for server startup)</para></listitem>
+<listitem><para><ulink url="/api-doc/procs-file-view?path=packages%2facs%2dbootstrap%2dinstaller%2ftcl%2f30%2dapm%2dload%2dprocs%2etcl">
+30-apm-load-procs.tcl</ulink> (Bootstraps APM for server startup)</para></listitem>
 
-<listitem><para><ulink url="/api-doc/procs-file-view?path=packages%2facs%2dtcl%2ftcl%2fapm%2dadmin%2dprocs%2etcl">
+<listitem><para><ulink url="/api-doc/procs-file-view?path=packages%2facs%2dadmin%2ftcl%2fapm%2dadmin%2dprocs%2etcl">
 apm-admin-procs.tcl</ulink> (Supports APM UI)</para></listitem>
 </itemizedlist>
 </listitem>