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.6.2.5 -r1.6.2.6
--- openacs-4/packages/xotcl-core/tcl/03-doc-procs.tcl	14 Feb 2014 18:20:43 -0000	1.6.2.5
+++ openacs-4/packages/xotcl-core/tcl/03-doc-procs.tcl	30 Aug 2014 16:39:31 -0000	1.6.2.6
@@ -219,16 +219,54 @@
   nsv_set api_proc_doc $proc_index [array get doc_elements]
 }
 
-::xotcl::Object instproc ad_proc {
-  {-private:switch false}
-  {-deprecated:switch false}
-  {-warn:switch false}
-  {-debug:switch false} 
-  proc_name arguments doc body} {
-    uplevel [list [self] proc $proc_name $arguments $body]
-    my __api_make_doc "" $proc_name
-  }
+if {[info commands ::nx::Object] ne ""} {
+  ::xotcl::Object instproc ad_proc {
+    {-private:switch false}
+    {-deprecated:switch false}
+    {-warn:switch false}
+    {-debug:switch false} 
+    proc_name 
+    arguments:parameter,0..*
+    doc 
+    body} {
+      uplevel [list [self] proc $proc_name $arguments $body]
+      my __api_make_doc "" $proc_name
+    }
 
+  ::xotcl::Class instproc ad_instproc {
+    {-private:switch false}
+    {-deprecated:switch false}
+    {-warn:switch false}
+    {-debug:switch false} 
+    proc_name 
+    arguments:parameter,0..*
+    doc 
+    body} {
+      uplevel [list [self] instproc $proc_name $arguments $body]
+      my __api_make_doc inst $proc_name
+    }
+}  else {
+  ::xotcl::Object instproc ad_proc {
+    {-private:switch false}
+    {-deprecated:switch false}
+    {-warn:switch false}
+    {-debug:switch false} 
+    proc_name arguments doc body} {
+      uplevel [list [self] proc $proc_name $arguments $body]
+      my __api_make_doc "" $proc_name
+    }
+
+  ::xotcl::Class instproc ad_instproc {
+    {-private:switch false}
+    {-deprecated:switch false}
+    {-warn:switch false}
+    {-debug:switch false} 
+    proc_name arguments doc body} {
+      uplevel [list [self] instproc $proc_name $arguments $body]
+      my __api_make_doc inst $proc_name
+    }
+}
+
 ::xotcl::Object instproc ad_forward {
   {-private:switch false}
   {-deprecated:switch false}
@@ -239,16 +277,6 @@
     my __api_make_forward_doc "" $method_name
   }
 
-::xotcl::Class instproc ad_instproc {
-  {-private:switch false}
-  {-deprecated:switch false}
-  {-warn:switch false}
-  {-debug:switch false} 
-  proc_name arguments doc body} {
-    uplevel [list [self] instproc $proc_name $arguments $body]
-    my __api_make_doc inst $proc_name
-  }
-
 ::xotcl::Object instproc ad_instforward {
   {-private:switch false}
   {-deprecated:switch false}