[svn-upgrade] Integrating new upstream version, ion3 (20070506)

[ion3.git] / doc / ionnotes / node5.html

diff --git a/doc/ionnotes/node5.html b/doc/ionnotes/node5.html
index d3aba2e7d96c6cc553064f83c0e67646e0071b54..45b1c2964cb30faca198b2e78deb86f0465f0e8e 100644 (file)
--- a/doc/ionnotes/node5.html
+++ b/doc/ionnotes/node5.html
@@ -83,10 +83,9 @@ original version by:  Nikos Drakos, CBLU, University of Leeds
 <P>
 To keep Ion's code as simple as possible yet safe, there are restrictions
 when the WObj
-<TT>destroy_obj</TT><A NAME="618"></A>
+<TT>destroy_obj</TT><A NAME="617"></A>
 function that calls watches, the deinit routine and frees memory may
-be called directly. In all other cases the 
-<TT>defer_destroy</TT><A NAME="619"></A>
+be called directly. In all other cases the <TT>mainloop_defer_destroy</TT><A NAME="618"></A>
 function should be used to defer the call of <TT>destroy_obj</TT> until
 Ioncore returns to its main event loop. 
 
@@ -103,8 +102,7 @@ following cases:
       when the function created a frame to manage some other object but for
       some reason failed to reparent the object to this frame.
 </LI>
-<LI>In a deferred action handler set with
-      <TT>defer_action</TT><A NAME="620"></A>.
+<LI>In a deferred action handler set with <TT>mainloop_defer_action</TT><A NAME="619"></A>.
       Like deferred destroys, other deferred actions are called when
       Ioncore has returned to the main loop.
 </LI>
@@ -116,7 +114,7 @@ following cases:
 <P>
 If there are no serious side effects from deferring destroying the
 object or you're unsure whether it is safe to destroy the object
-immediately, use <TT>defer_destroy</TT>.
+immediately, use <TT>mainloop_defer_destroy</TT>.
 
 <P>
 
@@ -145,7 +143,7 @@ parameters to functions.
 <TR><TD ALIGN="LEFT"><TT>char*</TT></TD>
 <TD ALIGN="LEFT">The string is the caller's responsibility and it
        <SPAN  CLASS="textit">must</SPAN> free it when no longer needed.</TD>
-<TD ALIGN="LEFT">The called function may modify the string but the ''owner'' of
+<TD ALIGN="LEFT">The called function may modify the string but the ``owner'' of
        the string is case-dependant.</TD>
 </TR>
 </TABLE>