Index: openacs-4/packages/acs-api-browser/tcl/acs-api-documentation-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/tcl/acs-api-documentation-procs.tcl,v
diff -u -r1.30.2.17 -r1.30.2.18
--- openacs-4/packages/acs-api-browser/tcl/acs-api-documentation-procs.tcl	1 Jan 2016 19:13:40 -0000	1.30.2.17
+++ openacs-4/packages/acs-api-browser/tcl/acs-api-documentation-procs.tcl	25 Jan 2016 08:06:42 -0000	1.30.2.18
@@ -760,7 +760,7 @@
             return [::xo::api get_method_source "" $obj $prefix $method]
         }
     } elseif {[info commands ::xo::api] ne ""
-              && [regexp {^([^ ]+)(Class|Object) (.*)$} $proc_name . thread kind obj]} {
+              && [regexp {^([^ ]+) (Class|Object) (.*)$} $proc_name . thread kind obj]} {
         return [::xo::api get_object_source $thread $obj]
     } elseif {[info commands ::xo::api] ne ""
               && [regexp {(Class|Object) (.*)$} $proc_name . kind obj]} {
Index: openacs-4/packages/xotcl-core/tcl/03-doc-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/03-doc-procs.tcl,v
diff -u -r1.7.2.10 -r1.7.2.11
--- openacs-4/packages/xotcl-core/tcl/03-doc-procs.tcl	25 Jan 2016 07:05:38 -0000	1.7.2.10
+++ openacs-4/packages/xotcl-core/tcl/03-doc-procs.tcl	25 Jan 2016 08:04:52 -0000	1.7.2.11
@@ -31,6 +31,8 @@
     0-instproc "instproc"
     0-proc "proc"
     0-forward "forward"
+    0-Class "Class"
+    0-Object "Object"
   }
   
   #
@@ -85,6 +87,8 @@
       set modifier "-per-object"
     } elseif {$methodType in {instproc nsfproc}} {
       set modifier ""
+    } elseif {$methodType eq "Class"} {
+      return ""
     } else {
       ns_log warning "unexpected method type <$methodType>"
       set modifier ""
@@ -225,7 +229,7 @@
 
   :public object method object_index {scope obj} {
     set kind [expr {[:isclass $scope $obj] ? "Class" : "Object"}]
-    return "$scope$kind $obj"
+    return "$scope $kind $obj"
   }
 
   :public object method proc_index {scope obj instproc proc_name} {
@@ -291,9 +295,10 @@
   }
 
   :public object method update_object_doc {scope obj doc_string} {
+    ns_log notice "update_object_doc $scope $obj ..."
     #
-    # Update the api browser informatio nsvs with information about
-    # the provided object.
+    # Update the api browser nsvs with information about the provided
+    # object.
     #
 
     # If no doc string is provided, try to get it from the object
@@ -335,6 +340,7 @@
                  positionals "" \
                  flags $flags \
                 ]
+    #ns_log notice "proc_index <$proc_index> -> $doc"
     nsv_set api_proc_doc $proc_index $doc
     nsv_set api_library_doc $proc_index $doc
 
@@ -352,7 +358,7 @@
       append oldDoc ", $entry"
     }
     set elements(main) [list $oldDoc]
-    #my log "elements = [array get elements]"
+    #ns_log notice "elements = [array get elements]"
     nsv_set api_library_doc $file_index [array get elements]
 
     if {[::nsf::dispatch $obj ::nsf::methods::object::info::hastype ::nx::Class]} {
@@ -603,7 +609,7 @@
   }
 
 ::xotcl::Object instproc ad_doc {doc_string} {
-  ::xo::api update_object_doc "" [self] $doc_string
+  ::xo::api update_object_doc [::xo::api scope] [self] $doc_string
 }
 
 # Class ::Test -ad_doc {