Sync - Federico

svn path=/trunk/; revision=10455

3 files changed, 76 insertions, 73 deletions

diff --git a/doc/devel/calendar/cal-util/tmpl/cal-component.sgml b/doc/devel/calendar/cal-util/tmpl/cal-component.sgml
index 004e48674e..0bd957e9c2 100644
--- a/doc/devel/calendar/cal-util/tmpl/cal-component.sgml
+++ b/doc/devel/calendar/cal-util/tmpl/cal-component.sgml
@@ -115,6 +115,7 @@ RFC 2445 iCalendar component object.
 @CAL_COMPONENT_FIELD_OVERDUE: 
 @CAL_COMPONENT_FIELD_COLOR: 
 @CAL_COMPONENT_FIELD_STATUS: 
+@CAL_COMPONENT_FIELD_COMPONENT: 
 @CAL_COMPONENT_FIELD_NUM_FIELDS: 
 
 <!-- ##### ENUM CalComponentClassification ##### -->
diff --git a/doc/devel/calendar/cal-util/tmpl/evolution-cal-util-unused.sgml b/doc/devel/calendar/cal-util/tmpl/evolution-cal-util-unused.sgml
index 93625da7df..98c3ac55dd 100644
--- a/doc/devel/calendar/cal-util/tmpl/evolution-cal-util-unused.sgml
+++ b/doc/devel/calendar/cal-util/tmpl/evolution-cal-util-unused.sgml
@@ -10,46 +10,45 @@
 @CAL_COMPONENT_ALARM_PROCEDURE: 
 @CAL_COMPONENT_ALARM_UNKNOWN: 
 
-<!-- ##### FUNCTION time_from_isodate ##### -->
+<!-- ##### TYPEDEF CalComponentAlarmTrigger ##### -->
 <para>
 
 </para>
 
-@str: 
-@Returns: 
 
-<!-- ##### FUNCTION cal_component_get_pilot_status ##### -->
+<!-- ##### ENUM CalComponentAlarmTriggerRelated ##### -->
 <para>
 
 </para>
 
-@comp: 
-@pilot_status: 
+@CAL_COMPONENT_ALARM_TRIGGER_RELATED_START: 
+@CAL_COMPONENT_ALARM_TRIGGER_RELATED_END: 
 
-<!-- ##### FUNCTION cal_recur_from_icalrecurrencetype ##### -->
+<!-- ##### ENUM CalComponentAlarmTriggerType ##### -->
 <para>
 
 </para>
 
-@ir: 
-@Returns: 
+@CAL_COMPONENT_ALARM_TRIGGER_RELATIVE: 
+@CAL_COMPONENT_ALARM_TRIGGER_ABSOLUTE: 
 
-<!-- ##### FUNCTION get_time_t_hour ##### -->
+<!-- ##### STRUCT CalComponentPrivate ##### -->
 <para>
 
 </para>
 
-@t: 
-@Returns: 
 
-<!-- ##### FUNCTION time_from_start_duration ##### -->
+<!-- ##### STRUCT CalObjTime ##### -->
 <para>
 
 </para>
 
-@start: 
-@duration: 
-@Returns: 
+@year: 
+@month: 
+@day: 
+@hour: 
+@minute: 
+@second: 
 
 <!-- ##### ENUM CalRecurType ##### -->
 <para>
@@ -64,165 +63,166 @@
 @CAL_RECUR_MINUTELY: 
 @CAL_RECUR_SECONDLY: 
 
-<!-- ##### FUNCTION parse_date ##### -->
+<!-- ##### TYPEDEF CalRecurrence ##### -->
 <para>
 
 </para>
 
-@str: 
-@Returns: 
 
-<!-- ##### FUNCTION cal_component_get_pilot_id ##### -->
+<!-- ##### FUNCTION cal_alarm_instance_list_free ##### -->
 <para>
 
 </para>
 
-@comp: 
-@pilot_id: 
+@list: 
 
-<!-- ##### ENUM CalComponentAlarmTriggerRelated ##### -->
+<!-- ##### FUNCTION cal_component_alarm_free_trigger ##### -->
 <para>
 
 </para>
 
-@CAL_COMPONENT_ALARM_TRIGGER_RELATED_START: 
-@CAL_COMPONENT_ALARM_TRIGGER_RELATED_END: 
+@trigger: <!--
+Local variables:
+mode: sgml
+sgml-parent-document: ("../../../evolution-devel-guide.sgml" "book" "refsect2" "")
+End:
+-->
 
-<!-- ##### FUNCTION isodiff_to_secs ##### -->
+<!-- ##### FUNCTION cal_component_get_first_alarm ##### -->
 <para>
 
 </para>
 
-@str: 
+@comp: 
 @Returns: 
 
-<!-- ##### FUNCTION cal_recur_free ##### -->
+<!-- ##### FUNCTION cal_component_get_next_alarm ##### -->
 <para>
 
 </para>
 
-@r: 
+@comp: 
+@Returns: 
 
-<!-- ##### FUNCTION time_from_icaltimetype ##### -->
+<!-- ##### FUNCTION cal_component_get_pilot_id ##### -->
 <para>
 
 </para>
 
-@itt: 
-@Returns: 
+@comp: 
+@pilot_id: 
 
-<!-- ##### FUNCTION time_day_hour ##### -->
+<!-- ##### FUNCTION cal_component_get_pilot_status ##### -->
 <para>
 
 </para>
 
-@t: 
-@hour: 
-@Returns: 
+@comp: 
+@pilot_status: 
 
-<!-- ##### FUNCTION cal_component_get_first_alarm ##### -->
+<!-- ##### FUNCTION cal_component_set_pilot_id ##### -->
 <para>
 
 </para>
 
 @comp: 
-@Returns: 
+@pilot_id: 
 
-<!-- ##### STRUCT CalComponentPrivate ##### -->
+<!-- ##### FUNCTION cal_component_set_pilot_status ##### -->
 <para>
 
 </para>
 
+@comp: 
+@pilot_status: 
 
-<!-- ##### FUNCTION isodiff_from_secs ##### -->
+<!-- ##### FUNCTION cal_recur_free ##### -->
 <para>
 
 </para>
 
-@secs: 
-@Returns: 
+@r: 
 
-<!-- ##### FUNCTION cal_component_alarm_free_trigger ##### -->
+<!-- ##### FUNCTION cal_recur_from_icalrecurrencetype ##### -->
 <para>
 
 </para>
 
-@trigger: <!--
-Local variables:
-mode: sgml
-sgml-parent-document: ("../../../evolution-devel-guide.sgml" "book" "refsect2" "")
-End:
--->
+@ir: 
+@Returns: 
 
-<!-- ##### TYPEDEF CalRecurrence ##### -->
+<!-- ##### FUNCTION format_simple_hour ##### -->
 <para>
 
 </para>
 
+@hour: 
+@use_am_pm: 
+@Returns: 
 
-<!-- ##### FUNCTION cal_alarm_instance_list_free ##### -->
+<!-- ##### FUNCTION get_time_t_hour ##### -->
 <para>
 
 </para>
 
-@list: 
+@t: 
+@Returns: 
 
-<!-- ##### FUNCTION cal_component_set_pilot_status ##### -->
+<!-- ##### FUNCTION isodiff_from_secs ##### -->
 <para>
 
 </para>
 
-@comp: 
-@pilot_status: 
+@secs: 
+@Returns: 
 
-<!-- ##### FUNCTION cal_component_set_pilot_id ##### -->
+<!-- ##### FUNCTION isodiff_to_secs ##### -->
 <para>
 
 </para>
 
-@comp: 
-@pilot_id: 
+@str: 
+@Returns: 
 
-<!-- ##### STRUCT CalObjTime ##### -->
+<!-- ##### FUNCTION parse_date ##### -->
 <para>
 
 </para>
 
-@year: 
-@month: 
-@day: 
-@hour: 
-@minute: 
-@second: 
+@str: 
+@Returns: 
 
-<!-- ##### FUNCTION format_simple_hour ##### -->
+<!-- ##### FUNCTION time_day_hour ##### -->
 <para>
 
 </para>
 
+@t: 
 @hour: 
-@use_am_pm: 
 @Returns: 
 
-<!-- ##### FUNCTION cal_component_get_next_alarm ##### -->
+<!-- ##### FUNCTION time_from_icaltimetype ##### -->
 <para>
 
 </para>
 
-@comp: 
+@itt: 
 @Returns: 
 
-<!-- ##### ENUM CalComponentAlarmTriggerType ##### -->
+<!-- ##### FUNCTION time_from_isodate ##### -->
 <para>
 
 </para>
 
-@CAL_COMPONENT_ALARM_TRIGGER_RELATIVE: 
-@CAL_COMPONENT_ALARM_TRIGGER_ABSOLUTE: 
+@str: 
+@Returns: 
 
-<!-- ##### TYPEDEF CalComponentAlarmTrigger ##### -->
+<!-- ##### FUNCTION time_from_start_duration ##### -->
 <para>
 
 </para>
 
+@start: 
+@duration: 
+@Returns: 
 
diff --git a/doc/devel/calendar/cal-util/tmpl/timeutil.sgml b/doc/devel/calendar/cal-util/tmpl/timeutil.sgml
index 2b197ad685..2e7e15988d 100644
--- a/doc/devel/calendar/cal-util/tmpl/timeutil.sgml
+++ b/doc/devel/calendar/cal-util/tmpl/timeutil.sgml
@@ -136,6 +136,7 @@ timeutil
 </para>
 
 @t: 
+@week_start_day: 
 @Returns: 
 
 
@@ -145,6 +146,7 @@ timeutil
 </para>
 
 @t: 
+@week_start_day: 
 @Returns: