Index: TODO
===================================================================
diff -u -r9f32dd2c379759ca82cf9b49dcc9c62af01f5cc8 -r0a3f13c609346712210b8fd9c48aab505249e06f
--- TODO	(.../TODO)	(revision 9f32dd2c379759ca82cf9b49dcc9c62af01f5cc8)
+++ TODO	(.../TODO)	(revision 0a3f13c609346712210b8fd9c48aab505249e06f)
@@ -3917,7 +3917,10 @@
 - don't allow object creation to overwrite non-object cmds (e.g. procs)
 - don't allow method to overwrite child object
 - extended regression test
+- documented cmd overwrite protection feature as incompatibility with XOTcl 1
+- documented dependencies between configure flags and feature activation cpp macros
 
+
 ========================================================================
 TODO:
 
Index: generic/nsf.h
===================================================================
diff -u -ra6e6e5de115f92c579b867bb88323a9916aec4d4 -r0a3f13c609346712210b8fd9c48aab505249e06f
--- generic/nsf.h	(.../nsf.h)	(revision a6e6e5de115f92c579b867bb88323a9916aec4d4)
+++ generic/nsf.h	(.../nsf.h)	(revision 0a3f13c609346712210b8fd9c48aab505249e06f)
@@ -78,37 +78,54 @@
  * Feature activation/deactivation
  */
 
-/* activate bytecode support
-#define NSF_BYTECODE
-*/
-
-/* activate/deactivate profiling information at the end
-   of running the program
+/* 
+ * The following features are controlled via 
+ * configure flags
+ *   --with-dtrace
+ *   --enable-development
+ *   --enable-profile
+ *   --enable-memcount=yes|trace
+ *   --enable-assertions
+ *
+ * are we developing?
+ *
+#define NSF_DEVELOPMENT 1
+ *
+ * activate/deactivate profiling information
+ *
 #define NSF_PROFILE 1
+ *
+ * compile with dtrace support
+ *
 #define NSF_DTRACE 1
-*/
+ *
+ * scripting level assertions
+ *
+#define NSF_WITH_ASSERTIONS 1
+ *
+ * activate/deactivate memory tracing
+ *
+#define NSF_MEM_TRACE 1
+#define NSF_MEM_COUNT 1
+ */
 
-/* are we developing?
-#define NSF_DEVELOPMENT 1
+/* activate bytecode support
+#define NSF_BYTECODE
 */
 
-/* activate/deactivate assert
+/* activate/deactivate C-level assert()
+   activated automatically when 
+   NSF_DEVELOPMENT is set
 #define NDEBUG 1
 */
 
 /* additional language features
 #define NSF_WITH_INHERIT_NAMESPACES 1
-#define NSF_WITH_ASSERTIONS 1
 */
 
 #define NSF_WITH_OS_RESOLVER 1
 #define NSF_WITH_VALUE_WARNINGS 1
 
-/* activate/deactivate memory tracing
-#define NSF_MEM_TRACE 1
-#define NSF_MEM_COUNT 1
-*/
-
 /* turn  tracing output on/off
 #define NSFOBJ_TRACE 1
 #define NAMESPACE_TRACE 1
@@ -123,6 +140,7 @@
 #define NRE_CALLBACK_TRACE 1
 #define METHOD_OBJECT_TRACE 1
 */
+
 /*
  * Sanity checks and dependencies for optional compile flags
  */