Website changes for mandatory mark-and-sweep

website/guide/compiling.html

@@ -177,7 +177,7 @@ for more practical details.</p>
 <!-- XXX: this might be more suited to the Wiki -->
 <h3>Memory management alternatives</h3>
 
-<p>There are three supported memory management alternatives:</p>
+<p>There are two supported memory management alternatives:</p>
 <ul>
 <li><b>Reference counting and mark-and-sweep (default)</b>: heap objects are
     freed immediately when they become unreachable except for objects
@@ -190,31 +190,16 @@ for more practical details.</p>
     memory usage variance than in the default case.  The frequency of voluntary,
     stop the world mark-and-sweep collections is also higher than in the default
     case where reference counting is expected to handle almost all memory
-    management.</li>
+    management.  Voluntary (non-emergency) mark-and-sweep can be disabled via
-<li><b>Reference counting only</b>: reduces code footprint and eliminates
+    config options.</li>
-    garbage collection pauses, but has major limitations and is not recommended.
-    Objects in unreachable reference cycles are not collected until the Duktape
-    heap is destroyed.  Garbage created during debugger paused state is also not
-    collected until heap destruction.  This option will most likely be removed
-    in Duktape 2.x.</li>
 </ul>
 
-<p>When using only reference counting it is important to avoid creating
+<p>Reference counting relies on mark-and-sweep to handle reference cycles.
-unreachable reference cycles.  Reference cycles are usually easy to avoid in
+For example, every Ecmascript function instance is required to be in a
-application code e.g. by using only forward pointers in data structures.  Even
-if reference cycles are necessary, garbage collection can be allowed to work
-simply by breaking the cycles before deleting the final references to such objects.
-For example, if you have a tree structure where nodes maintain references to
-both children and parents (creating reference cycles for each node) you could
-walk the tree and set the parent reference to <code>null</code> before deleting
-the final reference to the tree.</p>
-
-<p>Unfortunately every Ecmascript function instance is required to be in a
 reference loop with an automatic prototype object created for the function.
 You can break this loop manually if you wish.  For internal technical reasons,
 named function expressions are also in a reference loop; this loop cannot be
-broken from user code and only mark-and-sweep can collect such functions.
+broken from user code and only mark-and-sweep can collect such functions.</p>
-See <a href="#limitations">Limitations</a>.</p>
 
 <h2>Compiling</h2>
 

website/guide/duktapebuiltins.html

@@ -254,11 +254,11 @@ print('running on line:', getCurrentLine());
 
 <h3 id="builtin-duktape-gc">gc()</h3>
 
-<p>Trigger a forced mark-and-sweep collection.  If mark-and-sweep is disabled,
+<p>Trigger a forced mark-and-sweep collection.  The call takes an optional
-this call is a no-op.</p>
+integer flags field, see <code>duktape.h</code> for constants.</p>
 
 <!-- Return value is undocumented for now, which is probably good for now.
-     Not sure what the best return value would be.  Arguments are undocumented.
+     Not sure what the best return value would be.
 -->
 
 <h3 id="builtin-duktape-compact">compact()</h3>

website/guide/limitations.html

@@ -179,8 +179,10 @@ var fn = function myfunc() {
 }
 </pre>
 
-<p>These issues can be avoided by compiling Duktape with mark-and-sweep
+<p>Since Duktape 2.x mark-and-sweep is always enabled so that objects
-enabled (which is the default).</p>
+participating in reference loops are eventually freed.  You can disable
+periodic "voluntary" (non-emergency) mark-and-sweep via config options
+to reduce collection pauses in time sensitive environments.</p>
 
 <h2>Non-standard function 'caller' property limitations</h2>
 
@@ -210,11 +212,6 @@ case for further details.</p>
 Duktape is paused, there are a few current limitations:</p>
 
 <ul>
-<li>When Duktape is built with reference counting only (mark-and-sweep left
-    out of config options), garbage created during the debugger paused state
-    will be left in the Duktape heap and freed only when the heap is destroyed.
-    The option to build with reference counting only is not recommended and will
-    most likely be removed in future versions.</li>
 <li>Because garbage collection is disabled during the paused state, calls to
     <code>Duktape.gc()</code> and <code>duk_gc()</code> will be silently
     ignored.</li>