diff --git a/nxdl.xsd b/nxdl.xsd
index 360b87f177..5f515f3fc5 100644
--- a/nxdl.xsd
+++ b/nxdl.xsd
@@ -384,8 +384,8 @@
 		  			defined by the parent ``choice`` element
 		  			so do not specify the ``@name`` attribute of
 		  			the group here.
-		  			<!-- TODO: How to enforce in this schema? -->
 		  		</xs:documentation>
+		  		<!-- TODO: How to enforce the name rule in the schema? -->
 		  	</xs:annotation>
 		  </xs:element>
 		</xs:sequence>
diff --git a/utils/nxdl_desc2rst.py b/utils/nxdl_desc2rst.py
index a3e3837c82..a98a6f3622 100755
--- a/utils/nxdl_desc2rst.py
+++ b/utils/nxdl_desc2rst.py
@@ -84,6 +84,15 @@
 :ref:`NXDL.data.type.fieldType`
                 ''',
                 
+                'choice': '''
+A ``choice`` element is used when a named group might take one
+of several possible NeXus base classes.  Logically, it must
+have at least two group children.
+
+For more details, see: 
+:ref:`NXDL.data.type.choiceType`
+                ''',
+                
                 'group': '''
 A ``group`` element can *only* be a child of a 
 ``definition`` or ``group`` element.
@@ -323,7 +332,7 @@ def applyTemplates(ns, parent, path, indentLevel, handler=generalHandler):
     for node in parent.xpath(path, namespaces=ns):
         name = node.get('name') or node.get('ref') or node.get('value')
         if name is not None:
-            if name in ('nx:groupGroup'):
+            if name in ('nx:groupGroup',):
                 print(">"*45, name)
             if name in db:
                 raise "Duplicate name found: " + name
@@ -438,6 +447,7 @@ def main(tree, ns):
                  "/xs:schema/xs:complexType[@name='docType']",
                  "/xs:schema/xs:complexType[@name='enumerationType']",
                  "/xs:schema/xs:complexType[@name='fieldType']",
+                 "/xs:schema/xs:complexType[@name='choiceType']",
                  "/xs:schema/xs:complexType[@name='groupType']",
                  "/xs:schema/xs:complexType[@name='linkType']",
                  "/xs:schema/xs:complexType[@name='symbolsType']",