Keep 'ci/dependabot-updates' up-to-date with 'master'

Author: TEAM4-0

ontopy/ontodoc_rst.py

@@ -166,9 +166,9 @@ def add_entity(self, entity: "Entity") -> None:
         elif isinstance(entity, owlready2.ObjectPropertyClass):
             self.object_properties.add(entity)
         elif isinstance(entity, owlready2.DataPropertyClass):
-            self.object_properties.add(entity)
+            self.data_properties.add(entity)
         elif isinstance(entity, owlready2.AnnotationPropertyClass):
-            self.object_properties.add(entity)
+            self.annotation_properties.add(entity)
         elif isinstance(entity, owlready2.Thing):
             if (
                 hasattr(entity.__class__, "iri")
@@ -522,7 +522,12 @@ def add_keyvalue(
                                 ),
                             )
                         # Add SubclassOf
-                        add_keyvalue("Subclass Of", parents)
+                        if isinstance(entity, owlready2.ThingClass):
+                            add_keyvalue("Subclass Of", parents)
+                        elif isinstance(entity, (owlready2.PropertyClass)):
+                            add_keyvalue("Subproperty Of", parents)
+                        elif isinstance(entity, owlready2.Thing):
+                            add_keyvalue("Instance of", parents)
                         # Add Subclasses if any
                         if subclasses:
                             add_keyvalue("Subclasses", subclasses)