Index: library/nx/nx.nxd
===================================================================
diff -u -ra30ab6e6c90ea83d59472f398a5065b08ad23094 -rcc815189194d14214c6846ca33f39d74b4d8edc5
--- library/nx/nx.nxd	(.../nx.nxd)	(revision a30ab6e6c90ea83d59472f398a5065b08ad23094)
+++ library/nx/nx.nxd	(.../nx.nxd)	(revision cc815189194d14214c6846ca33f39d74b4d8edc5)
@@ -38,60 +38,6 @@
 # @version 1.0.0a
 # @namespace ::nx
 
-
-# @glossary metaclass
-#
-# A meta-class is a certain kind of <<@gls class>> that manages
-# classes. The instances of meta classes are classes. 
-#
-# @pretty_name Meta Class
-# @pretty_plural Meta Classes
-
-# @glossary class
-#
-# A class is a certain kind of <<@gls object>> that is responsible for
-# the life-cycle management of other objects (creation,
-# initialization, destruction) and which serves as a method
-# respository for abjects (typically along a class hierarchy). In the
-# object systems of XOTcl and NX, where objects might have their own
-# methods, the class objects might have as well methods applicable
-# only to the class object. We refer to these methods as class-object
-# specific methods, sometimes these methods are called "static methods".
-#
-# @pretty_name Class
-# @pretty_plural Classes
-
-
-# @glossary baseclass
-#
-# A base class is the most general class (common root class) of an
-# object system.  All objects of an object system are direct or
-# indirect instances of the base class.
-#
-# @pretty_name Base Class
-# @pretty_plural Base Classes
-
-# @glossary basemetaclass
-#
-# A base meta class is the most general meta class of an object
-# system. All classes are direct or indirect instances of the base
-# meta class.
-#
-# @pretty_name Base Meta Class
-# @pretty_plural Base Meta Classes
-
-# @glossary object
-#
-# An object is the basic entity of an object system. Every object is
-# the instance of a <<@gls class>> and might contain variables (called
-# instance variables). In the object systems of XOTcl and NX, objects
-# might have as well their own methods (called object specific
-# methods).
-#
-# @pretty_name Object
-# @pretty_plural Objects
-
-
 # @class Object
 #
 # Programs written in the <<@glossary nx>> are constructed out of
Index: nsf.nxd
===================================================================
diff -u -r39306d4d36096f20dba3262638e2a87f04e90111 -rcc815189194d14214c6846ca33f39d74b4d8edc5
--- nsf.nxd	(.../nsf.nxd)	(revision 39306d4d36096f20dba3262638e2a87f04e90111)
+++ nsf.nxd	(.../nsf.nxd)	(revision cc815189194d14214c6846ca33f39d74b4d8edc5)
@@ -14,8 +14,6 @@
 # @version 1.0.0a
 # @namespace ::nsf
 
-
-#
 # @glossary metaclass
 #
 # A meta-class is a certain kind of <<@gls class>> that manages
@@ -24,8 +22,6 @@
 # @pretty_name Meta Class
 # @pretty_plural Meta Classes
 
-
-#
 # @glossary class
 #
 # A class is a certain kind of <<@gls object>> that is responsible for
@@ -40,7 +36,25 @@
 # @pretty_name Class
 # @pretty_plural Classes
 
+
+# @glossary baseclass
 #
+# A base class is the most general class (common root class) of an
+# object system.  All objects of an object system are direct or
+# indirect instances of the base class.
+#
+# @pretty_name Base Class
+# @pretty_plural Base Classes
+
+# @glossary basemetaclass
+#
+# A base meta class is the most general meta class of an object
+# system. All classes are direct or indirect instances of the base
+# meta class.
+#
+# @pretty_name Base Meta Class
+# @pretty_plural Base Meta Classes
+
 # @glossary object
 #
 # An object is the basic entity of an object system. Every object is
@@ -51,8 +65,6 @@
 #
 # @pretty_name Object
 # @pretty_plural Objects
-
-
 # @glossary alias
 #
 # An alias is an alternate name for some artefact. In NSF, the term