2 files changed, 7 insertions, 22 deletions
diff --git a/doc/devel/calendar/cal-util/tmpl/cal-component.sgml b/doc/devel/calendar/cal-util/tmpl/cal-component.sgml
index cb0362f2d3..b38745bbca 100644
--- a/doc/devel/calendar/cal-util/tmpl/cal-component.sgml
+++ b/doc/devel/calendar/cal-util/tmpl/cal-component.sgml
@@ -128,13 +128,11 @@ RFC 2445 iCalendar component object.
 @CAL_COMPONENT_CLASS_CONFIDENTIAL: 
 @CAL_COMPONENT_CLASS_UNKNOWN: 
 
-<!-- ##### STRUCT CalComponentDateTime ##### -->
+<!-- ##### TYPEDEF CalComponentDateTime ##### -->
   <para>
     This structure defines a date and time value.
   </para>
 
-@value: 
-@tzid: 
 
 <!-- ##### ENUM CalComponentPeriodType ##### -->
   <para>
@@ -144,22 +142,18 @@ RFC 2445 iCalendar component object.
 @CAL_COMPONENT_PERIOD_DATETIME: 
 @CAL_COMPONENT_PERIOD_DURATION: 
 
-<!-- ##### STRUCT CalComponentPeriod ##### -->
+<!-- ##### TYPEDEF CalComponentPeriod ##### -->
   <para>
     This structure defines a period of time.
   </para>
 
-@type: 
-@start: 
 
-<!-- ##### STRUCT CalComponentText ##### -->
+<!-- ##### TYPEDEF CalComponentText ##### -->
   <para>
     This structure defines the value of a text property that may have
     an alternate representation parameter.
   </para>
 
-@value: 
-@altrep: 
 
 <!-- ##### ENUM CalComponentTransparency ##### -->
 <para>
@@ -848,22 +842,17 @@ RFC 2445 iCalendar component object.
 </para>
 
 
-<!-- ##### STRUCT CalAlarmInstance ##### -->
+<!-- ##### TYPEDEF CalAlarmInstance ##### -->
 <para>
 
 </para>
 
-@auid: 
-@trigger: 
-@occur: 
 
-<!-- ##### STRUCT CalComponentAlarms ##### -->
+<!-- ##### TYPEDEF CalComponentAlarms ##### -->
 <para>
 
 </para>
 
-@comp: 
-@alarms: 
 
 <!-- ##### ENUM CalAlarmAction ##### -->
 <para>
@@ -887,12 +876,11 @@ RFC 2445 iCalendar component object.
 @CAL_ALARM_TRIGGER_RELATIVE_END: 
 @CAL_ALARM_TRIGGER_ABSOLUTE: 
 
-<!-- ##### STRUCT CalAlarmTrigger ##### -->
+<!-- ##### TYPEDEF CalAlarmTrigger ##### -->
 <para>
 
 </para>
 
-@type: 
 
 <!-- ##### FUNCTION cal_component_has_alarms ##### -->
 <para>
diff --git a/doc/devel/calendar/cal-util/tmpl/cal-util.sgml b/doc/devel/calendar/cal-util/tmpl/cal-util.sgml
index d0742746e5..ccd35fac2e 100644
--- a/doc/devel/calendar/cal-util/tmpl/cal-util.sgml
+++ b/doc/devel/calendar/cal-util/tmpl/cal-util.sgml
@@ -14,14 +14,11 @@ Miscellaneous utilities
 
 </para>
 
-<!-- ##### STRUCT CalObjInstance ##### -->
+<!-- ##### TYPEDEF CalObjInstance ##### -->
 <para>
 
 </para>
 
-@uid: 
-@start: 
-@end: 
 
 <!-- ##### FUNCTION cal_obj_instance_list_free ##### -->
 <para>