Sync - Federico

svn path=/trunk/; revision=10455

18 files changed, 696 insertions, 338 deletions

diff --git a/doc/devel/calendar/cal-client/evolution-cal-client-decl.txt b/doc/devel/calendar/cal-client/evolution-cal-client-decl.txt
index d2f3663315..b6aeb89512 100644
--- a/doc/devel/calendar/cal-client/evolution-cal-client-decl.txt
+++ b/doc/devel/calendar/cal-client/evolution-cal-client-decl.txt
@@ -74,6 +74,14 @@ struct CalClient {
 	CalClientPrivate *priv;
 };
 </STRUCT>
+<USER_FUNCTION>
+<NAME>CalClientAuthFunc</NAME>
+<RETURNS>gchar *</RETURNS>
+CalClient *client,
+                                      const gchar *prompt,
+                                      const gchar *key,
+                                      gpointer user_data
+</USER_FUNCTION>
 <FUNCTION>
 <NAME>cal_client_get_type</NAME>
 <RETURNS>GtkType  </RETURNS>
@@ -90,6 +98,11 @@ CalClient *client
 void
 </FUNCTION>
 <FUNCTION>
+<NAME>cal_client_set_auth_func</NAME>
+<RETURNS>void  </RETURNS>
+CalClient *client, CalClientAuthFunc func, gpointer data
+</FUNCTION>
+<FUNCTION>
 <NAME>cal_client_open_calendar</NAME>
 <RETURNS>gboolean  </RETURNS>
 CalClient *client, const char *str_uri, gboolean only_if_exists
@@ -130,6 +143,11 @@ CalClient *client, CalObjType type, const char *change_id
 CalClient *client, CalObjType type,time_t start, time_t end
 </FUNCTION>
 <FUNCTION>
+<NAME>cal_client_get_free_busy</NAME>
+<RETURNS>CalClientGetStatus  </RETURNS>
+CalClient *client, time_t start, time_t end,CalComponent **comp
+</FUNCTION>
+<FUNCTION>
 <NAME>cal_client_generate_instances</NAME>
 <RETURNS>void  </RETURNS>
 CalClient *client, CalObjType type,time_t start, time_t end,CalRecurInstanceFn cb, gpointer cb_data
diff --git a/doc/devel/calendar/cal-client/evolution-cal-client-sections.txt b/doc/devel/calendar/cal-client/evolution-cal-client-sections.txt
index 0ce8d9427d..8e33be4933 100644
--- a/doc/devel/calendar/cal-client/evolution-cal-client-sections.txt
+++ b/doc/devel/calendar/cal-client/evolution-cal-client-sections.txt
@@ -27,6 +27,7 @@ cal_client_free_alarms
 cal_client_get_alarms_for_object
 cal_client_update_object
 cal_client_remove_object
+cal_client_get_query
 
 <SUBSECTION Standard>
 
@@ -42,3 +43,27 @@ CalClient
 CalClientPrivate
 
 </SECTION>
+
+
+<SECTION>
+<FILE>cal-query</FILE>
+CAL_QUERY
+<TITLE>CalQuery</TITLE>
+
+CalQueryDoneStatus
+cal_query_new
+
+<SUBSECTION Standard>
+
+CAL_QUERY_TYPE
+IS_CAL_QUERY
+CAL_QUERY_CLASS
+IS_CAL_QUERY_CLASS
+cal_query_get_type
+cal_query_construct
+
+<SUBSECTION Private>
+CalQuery
+CalQueryPrivate
+
+</SECTION>
diff --git a/doc/devel/calendar/cal-client/tmpl/cal-client.sgml b/doc/devel/calendar/cal-client/tmpl/cal-client.sgml
index e29fd8811f..27b0c28f98 100644
--- a/doc/devel/calendar/cal-client/tmpl/cal-client.sgml
+++ b/doc/devel/calendar/cal-client/tmpl/cal-client.sgml
@@ -255,3 +255,67 @@ GTK+ object for communication with personal calendar server.
 @Returns: 
 
 
+<!-- ##### FUNCTION cal_client_get_query ##### -->
+<para>
+
+</para>
+
+@client: 
+@sexp: 
+@Returns: 
+
+
+<!-- ##### SIGNAL CalClient::cal-opened ##### -->
+<para>
+
+</para>
+
+@calclient: the object which received the signal.
+@arg1: 
+
+<!-- ##### SIGNAL CalClient::obj-updated ##### -->
+  <para>
+    This signal is emitted when the calendar clients receives
+    notification of a calendar component's data being changed in the
+    personal calendar server.  Graphical clients may want to get the
+    new version of the object and update their display, for example.
+  </para>
+
+@calclient: the object which received the signal.
+@arg1: 
+<!-- # Unused Parameters # -->
+@client: Calendar client which received the notification.
+@uid: Unique identifier of the calendar component that changed in the
+  personal calendar server's storage.
+
+<!-- ##### SIGNAL CalClient::obj-removed ##### -->
+  <para>
+    This signal is emitted when the calendar client receives
+    notification for a calendar component being removed from the
+    storage in the personal calendar server.  Graphical clients may
+    want to delete the corresponding object from their display, for
+    example.
+  </para>
+
+@calclient: the object which received the signal.
+@arg1: 
+<!-- # Unused Parameters # -->
+@client: Calendar client which received the notification.
+@uid: Unique identifier of the calendar component that was removed
+  from the personal calendar server's storage.
+
+<!--
+Local variables:
+mode: sgml
+sgml-parent-document: ("../../../evolution-devel-guide.sgml" "book" "refsect2" "")
+End:
+-->
+
+<!-- ##### SIGNAL CalClient::forget-password ##### -->
+<para>
+
+</para>
+
+@calclient: the object which received the signal.
+@arg1: 
+
diff --git a/doc/devel/calendar/cal-client/tmpl/evolution-cal-client-unused.sgml b/doc/devel/calendar/cal-client/tmpl/evolution-cal-client-unused.sgml
index 3d050e171b..3e8ce25ee6 100644
--- a/doc/devel/calendar/cal-client/tmpl/evolution-cal-client-unused.sgml
+++ b/doc/devel/calendar/cal-client/tmpl/evolution-cal-client-unused.sgml
@@ -1,11 +1,30 @@
-<!-- ##### FUNCTION cal_client_load_calendar ##### -->
-<para>
+<!-- ##### SIGNAL CalClient::cal-loaded ##### -->
+  <para>
+    This signal is emitted some time after the calendar clients sends
+    a load or create request to the personal calendar server.  The
+    server will notify the client asynchronously of the completion of
+    the request.  The @status parameter indicates the status of the
+    request.
+  </para>
 
-</para>
+@calclient: the object which received the signal.
+@arg1: 
+@client: Calendar client which received the notification.
+@status: Status of the request.  See the description of
+  #CalClientLoadStatus for more details.
+
+<!-- ##### ENUM CalClientLoadStatus ##### -->
+  <para>
+    These values describe the status of a calendar load or create
+    request.  After asking a calendar factory to load or create a
+    calendar, the provided listener will get notification about the
+    result in asynchronous fashion.  Such notification is represented
+    by one of these enumeration values.  For values other than
+    #CAL_CLIENT_LOAD_SUCCESS, the #CalClient object will not accept
+    any other operations on the calendar and it should just be
+    destroyed.
+  </para>
 
-@client: 
-@str_uri: 
-@Returns: 
 
 <!-- ##### FUNCTION cal_client_create_calendar ##### -->
 <para>
@@ -16,14 +35,6 @@
 @str_uri: 
 @Returns: 
 
-<!-- ##### SIGNAL CalClient::cal-opened ##### -->
-<para>
-
-</para>
-
-@calclient: the object which received the signal.
-@arg1: 
-
 <!-- ##### FUNCTION cal_client_get_events_in_range ##### -->
 <para>
 
@@ -34,20 +45,15 @@
 @end: 
 @Returns: 
 
-<!-- ##### SIGNAL CalClient::cal-loaded ##### -->
-  <para>
-    This signal is emitted some time after the calendar clients sends
-    a load or create request to the personal calendar server.  The
-    server will notify the client asynchronously of the completion of
-    the request.  The @status parameter indicates the status of the
-    request.
-  </para>
+<!-- ##### FUNCTION cal_client_get_uid_by_pilot_id ##### -->
+<para>
 
-@calclient: the object which received the signal.
-@arg1: 
-@client: Calendar client which received the notification.
-@status: Status of the request.  See the description of
-  #CalClientLoadStatus for more details.
+</para>
+
+@client: 
+@pilot_id: 
+@uid: 
+@Returns: 
 
 <!-- ##### FUNCTION cal_client_is_loaded ##### -->
 <para>
@@ -57,72 +63,22 @@
 @client: 
 @Returns: 
 
-<!-- ##### SIGNAL CalClient::obj-updated ##### -->
-  <para>
-    This signal is emitted when the calendar clients receives
-    notification of a calendar component's data being changed in the
-    personal calendar server.  Graphical clients may want to get the
-    new version of the object and update their display, for example.
-  </para>
-
-@calclient: the object which received the signal.
-@arg1: 
-@client: Calendar client which received the notification.
-@uid: Unique identifier of the calendar component that changed in the
-  personal calendar server's storage.
-
-<!-- ##### FUNCTION cal_client_update_pilot_id ##### -->
+<!-- ##### FUNCTION cal_client_load_calendar ##### -->
 <para>
 
 </para>
 
 @client: 
-@uid: 
-@pilot_id: 
-@pilot_status: 
-
-<!-- ##### ENUM CalClientLoadStatus ##### -->
-  <para>
-    These values describe the status of a calendar load or create
-    request.  After asking a calendar factory to load or create a
-    calendar, the provided listener will get notification about the
-    result in asynchronous fashion.  Such notification is represented
-    by one of these enumeration values.  For values other than
-    #CAL_CLIENT_LOAD_SUCCESS, the #CalClient object will not accept
-    any other operations on the calendar and it should just be
-    destroyed.
-  </para>
-
+@str_uri: 
+@Returns: 
 
-<!-- ##### FUNCTION cal_client_get_uid_by_pilot_id ##### -->
+<!-- ##### FUNCTION cal_client_update_pilot_id ##### -->
 <para>
 
 </para>
 
 @client: 
-@pilot_id: 
 @uid: 
-@Returns: 
-
-<!-- ##### SIGNAL CalClient::obj-removed ##### -->
-  <para>
-    This signal is emitted when the calendar client receives
-    notification for a calendar component being removed from the
-    storage in the personal calendar server.  Graphical clients may
-    want to delete the corresponding object from their display, for
-    example.
-  </para>
-
-@calclient: the object which received the signal.
-@arg1: 
-@client: Calendar client which received the notification.
-@uid: Unique identifier of the calendar component that was removed
-  from the personal calendar server's storage.
-
-<!--
-Local variables:
-mode: sgml
-sgml-parent-document: ("../../../evolution-devel-guide.sgml" "book" "refsect2" "")
-End:
--->
+@pilot_id: 
+@pilot_status: 
 
diff --git a/doc/devel/calendar/cal-util/evolution-cal-util-decl.txt b/doc/devel/calendar/cal-util/evolution-cal-util-decl.txt
index 6f6994d8c4..b40d57f8b4 100644
--- a/doc/devel/calendar/cal-util/evolution-cal-util-decl.txt
+++ b/doc/devel/calendar/cal-util/evolution-cal-util-decl.txt
@@ -52,6 +52,7 @@ typedef enum {
 	CAL_COMPONENT_FIELD_OVERDUE,		/* not a real field */
 	CAL_COMPONENT_FIELD_COLOR,		/* not a real field */
 	CAL_COMPONENT_FIELD_STATUS,
+	CAL_COMPONENT_FIELD_COMPONENT,		/* not a real field */
 	CAL_COMPONENT_FIELD_NUM_FIELDS
 } CalComponentField;
 </ENUM>
@@ -95,6 +96,22 @@ typedef struct {
 	} u;
 } CalComponentPeriod;
 </TYPEDEF>
+<ENUM>
+<NAME>CalComponentRangeType</NAME>
+typedef enum {
+	CAL_COMPONENT_RANGE_SINGLE,
+	CAL_COMPONENT_RANGE_THISPRIOR,
+	CAL_COMPONENT_RANGE_THISFUTURE,
+} CalComponentRangeType;
+</ENUM>
+<TYPEDEF>
+<NAME>CalComponentRange</NAME>
+typedef struct {
+	CalComponentRangeType type;
+	
+	CalComponentDateTime *datetime;
+} CalComponentRange;
+</TYPEDEF>
 <TYPEDEF>
 <NAME>CalComponentText</NAME>
 typedef struct {
@@ -114,6 +131,66 @@ typedef enum {
 	CAL_COMPONENT_TRANSP_UNKNOWN
 } CalComponentTransparency;
 </ENUM>
+<ENUM>
+<NAME>CalComponentCUType</NAME>
+typedef enum {
+	CAL_COMPONENT_CUTYPE_INDIVIDUAL,
+	CAL_COMPONENT_CUTYPE_GROUP,
+	CAL_COMPONENT_CUTYPE_RESOURCE,
+	CAL_COMPONENT_CUTYPE_ROOM,
+	CAL_COMPONENT_CUTYPE_UNKNOWN
+} CalComponentCUType;
+</ENUM>
+<ENUM>
+<NAME>CalComponentRole</NAME>
+typedef enum {
+	CAL_COMPONENT_ROLE_CHAIR,
+	CAL_COMPONENT_ROLE_REQUIRED,
+	CAL_COMPONENT_ROLE_OPTIONAL,
+	CAL_COMPONENT_ROLE_NON,
+	CAL_COMPONENT_ROLE_UNKNOWN
+} CalComponentRole;
+</ENUM>
+<ENUM>
+<NAME>CalComponentPartStat</NAME>
+typedef enum {
+	CAL_COMPONENT_PARTSTAT_NEEDSACTION,
+	CAL_COMPONENT_PARTSTAT_ACCEPTED,
+	CAL_COMPONENT_PARTSTAT_DECLINED,
+	CAL_COMPONENT_PARTSTAT_TENTATIVE,
+	CAL_COMPONENT_PARTSTAT_DELEGATED,
+	CAL_COMPONENT_PARTSTAT_COMPLETED,
+	CAL_COMPONENT_PARTSTAT_INPROCESS,
+	CAL_COMPONENT_PARTSTAT_UNKNOWN
+} CalComponentPartStat;
+</ENUM>
+<TYPEDEF>
+<NAME>CalComponentAttendee</NAME>
+typedef struct {
+	const char *value;
+	
+	const char *member;
+	CalComponentCUType cutype;
+	CalComponentRole role;
+	CalComponentPartStat status;
+	gboolean rsvp;
+	
+	const char *delto;
+	const char *delfrom;
+	const char *sentby;
+	const char *cn;
+	const char *language;
+} CalComponentAttendee;
+</TYPEDEF>
+<TYPEDEF>
+<NAME>CalComponentOrganizer</NAME>
+typedef struct {
+	const char *value;
+	const char *sentby;
+	const char *cn;
+	const char *language;
+} CalComponentOrganizer;
+</TYPEDEF>
 <STRUCT>
 <NAME>CalComponent</NAME>
 </STRUCT>
@@ -363,6 +440,16 @@ CalComponent *comp, struct icaltimetype **t
 CalComponent *comp, struct icaltimetype *t
 </FUNCTION>
 <FUNCTION>
+<NAME>cal_component_get_organizer</NAME>
+<RETURNS>void  </RETURNS>
+CalComponent *comp, CalComponentOrganizer *organizer
+</FUNCTION>
+<FUNCTION>
+<NAME>cal_component_set_organizer</NAME>
+<RETURNS>void  </RETURNS>
+CalComponent *comp, CalComponentOrganizer *organizer
+</FUNCTION>
+<FUNCTION>
 <NAME>cal_component_get_percent</NAME>
 <RETURNS>void  </RETURNS>
 CalComponent *comp, int **percent
@@ -383,6 +470,16 @@ CalComponent *comp, int **priority
 CalComponent *comp, int *priority
 </FUNCTION>
 <FUNCTION>
+<NAME>cal_component_get_recurid</NAME>
+<RETURNS>void  </RETURNS>
+CalComponent *comp, CalComponentRange **recur_id
+</FUNCTION>
+<FUNCTION>
+<NAME>cal_component_set_recurid</NAME>
+<RETURNS>void  </RETURNS>
+CalComponent *comp, CalComponentRange *recur_id
+</FUNCTION>
+<FUNCTION>
 <NAME>cal_component_get_rdate_list</NAME>
 <RETURNS>void  </RETURNS>
 CalComponent *comp, GSList **period_list
@@ -473,6 +570,16 @@ CalComponent *comp, const char **url
 CalComponent *comp, const char *url
 </FUNCTION>
 <FUNCTION>
+<NAME>cal_component_get_attendee_list</NAME>
+<RETURNS>void  </RETURNS>
+CalComponent *comp, GSList **attendee_list
+</FUNCTION>
+<FUNCTION>
+<NAME>cal_component_set_attendee_list</NAME>
+<RETURNS>void  </RETURNS>
+CalComponent *comp, GSList *attendee_list
+</FUNCTION>
+<FUNCTION>
 <NAME>cal_component_event_dates_match</NAME>
 <RETURNS>gboolean  </RETURNS>
 CalComponent *comp1, CalComponent *comp2
@@ -532,6 +639,11 @@ int *sequence
 <RETURNS>void  </RETURNS>
 GSList *text_list
 </FUNCTION>
+<FUNCTION>
+<NAME>cal_component_free_attendee_list</NAME>
+<RETURNS>void  </RETURNS>
+GSList *attendee_list
+</FUNCTION>
 <STRUCT>
 <NAME>CalComponentAlarm</NAME>
 </STRUCT>
@@ -615,11 +727,6 @@ CalComponent *comp
 CalComponent *comp, const char *auid
 </FUNCTION>
 <FUNCTION>
-<NAME>cal_component_free_alarm_uids</NAME>
-<RETURNS>void  </RETURNS>
-GList *alarm_uids
-</FUNCTION>
-<FUNCTION>
 <NAME>cal_component_alarms_free</NAME>
 <RETURNS>void  </RETURNS>
 CalComponentAlarms *alarms
@@ -630,6 +737,11 @@ CalComponentAlarms *alarms
 void
 </FUNCTION>
 <FUNCTION>
+<NAME>cal_component_alarm_clone</NAME>
+<RETURNS>CalComponentAlarm  *</RETURNS>
+CalComponentAlarm *alarm
+</FUNCTION>
+<FUNCTION>
 <NAME>cal_component_alarm_get_uid</NAME>
 <RETURNS>const char  *</RETURNS>
 CalComponentAlarm *alarm
@@ -767,12 +879,12 @@ time_t t
 <FUNCTION>
 <NAME>time_week_begin</NAME>
 <RETURNS>time_t  </RETURNS>
-time_t t
+time_t t, int week_start_day
 </FUNCTION>
 <FUNCTION>
 <NAME>time_week_end</NAME>
 <RETURNS>time_t  </RETURNS>
-time_t t
+time_t t, int week_start_day
 </FUNCTION>
 <FUNCTION>
 <NAME>time_day_begin</NAME>
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: 
 
 
diff --git a/doc/devel/evolution-devel-guide.sgml b/doc/devel/evolution-devel-guide.sgml
index 10c779ce0c..c089c5b885 100644
--- a/doc/devel/evolution-devel-guide.sgml
+++ b/doc/devel/evolution-devel-guide.sgml
@@ -13,12 +13,6 @@
 <!ENTITY cal-util SYSTEM "calendar/cal-util/sgml/cal-util.sgml">
 <!ENTITY timeutil SYSTEM "calendar/cal-util/sgml/timeutil.sgml">
 
-<!-- ENTITY importer-public-reference SYSTEM "importer/public-reference.sgml">
-<!-- ENTITY importer-private-reference SYSTEM "importer/private-reference.sgml">
-<!-- ENTITY EvolutionImporter SYSTEM "importer/sgml/evolution-importer.sgml">
-<!-- ENTITY EvolutionImporterClient SYSTEM "importer/sgml/evolution-importer-client.sgml">
-<!-- ENTITY EvolutionImporterListener SYSTEM "importer/sgml/evolution-importer-listener.sgml">
-
 <!ENTITY evolution-services-public-reference SYSTEM "executive-summary/public-reference.sgml">
 <!ENTITY evolution-services-private-reference SYSTEM "executive-summary/private-reference.sgml">
 <!ENTITY ExecutiveSummaryComponent SYSTEM "executive-summary/sgml/executive-summary-component.sgml">
@@ -34,6 +28,13 @@
 <!ENTITY Executive-Summary "<application>Executive Summary</application>">
 ]>
 
+<!-- ENTITY importer-public-reference SYSTEM "importer/public-reference.sgml" -->
+<!-- ENTITY importer-private-reference SYSTEM "importer/private-reference.sgml" -->
+<!-- ENTITY EvolutionImporter SYSTEM "importer/sgml/evolution-importer.sgml" -->
+<!-- ENTITY EvolutionImporterClient SYSTEM "importer/sgml/evolution-importer-client.sgml" -->
+<!-- ENTITY EvolutionImporterListener SYSTEM "importer/sgml/evolution-importer-listener.sgml" -->
+
+
 <book id="index">
   <bookinfo>
     <title>&Evolution; Developer's Guide</title>
diff --git a/help/devel/calendar/cal-client/evolution-cal-client-decl.txt b/help/devel/calendar/cal-client/evolution-cal-client-decl.txt
index d2f3663315..b6aeb89512 100644
--- a/help/devel/calendar/cal-client/evolution-cal-client-decl.txt
+++ b/help/devel/calendar/cal-client/evolution-cal-client-decl.txt
@@ -74,6 +74,14 @@ struct CalClient {
 	CalClientPrivate *priv;
 };
 </STRUCT>
+<USER_FUNCTION>
+<NAME>CalClientAuthFunc</NAME>
+<RETURNS>gchar *</RETURNS>
+CalClient *client,
+                                      const gchar *prompt,
+                                      const gchar *key,
+                                      gpointer user_data
+</USER_FUNCTION>
 <FUNCTION>
 <NAME>cal_client_get_type</NAME>
 <RETURNS>GtkType  </RETURNS>
@@ -90,6 +98,11 @@ CalClient *client
 void
 </FUNCTION>
 <FUNCTION>
+<NAME>cal_client_set_auth_func</NAME>
+<RETURNS>void  </RETURNS>
+CalClient *client, CalClientAuthFunc func, gpointer data
+</FUNCTION>
+<FUNCTION>
 <NAME>cal_client_open_calendar</NAME>
 <RETURNS>gboolean  </RETURNS>
 CalClient *client, const char *str_uri, gboolean only_if_exists
@@ -130,6 +143,11 @@ CalClient *client, CalObjType type, const char *change_id
 CalClient *client, CalObjType type,time_t start, time_t end
 </FUNCTION>
 <FUNCTION>
+<NAME>cal_client_get_free_busy</NAME>
+<RETURNS>CalClientGetStatus  </RETURNS>
+CalClient *client, time_t start, time_t end,CalComponent **comp
+</FUNCTION>
+<FUNCTION>
 <NAME>cal_client_generate_instances</NAME>
 <RETURNS>void  </RETURNS>
 CalClient *client, CalObjType type,time_t start, time_t end,CalRecurInstanceFn cb, gpointer cb_data
diff --git a/help/devel/calendar/cal-client/evolution-cal-client-sections.txt b/help/devel/calendar/cal-client/evolution-cal-client-sections.txt
index 0ce8d9427d..8e33be4933 100644
--- a/help/devel/calendar/cal-client/evolution-cal-client-sections.txt
+++ b/help/devel/calendar/cal-client/evolution-cal-client-sections.txt
@@ -27,6 +27,7 @@ cal_client_free_alarms
 cal_client_get_alarms_for_object
 cal_client_update_object
 cal_client_remove_object
+cal_client_get_query
 
 <SUBSECTION Standard>
 
@@ -42,3 +43,27 @@ CalClient
 CalClientPrivate
 
 </SECTION>
+
+
+<SECTION>
+<FILE>cal-query</FILE>
+CAL_QUERY
+<TITLE>CalQuery</TITLE>
+
+CalQueryDoneStatus
+cal_query_new
+
+<SUBSECTION Standard>
+
+CAL_QUERY_TYPE
+IS_CAL_QUERY
+CAL_QUERY_CLASS
+IS_CAL_QUERY_CLASS
+cal_query_get_type
+cal_query_construct
+
+<SUBSECTION Private>
+CalQuery
+CalQueryPrivate
+
+</SECTION>
diff --git a/help/devel/calendar/cal-client/tmpl/cal-client.sgml b/help/devel/calendar/cal-client/tmpl/cal-client.sgml
index e29fd8811f..27b0c28f98 100644
--- a/help/devel/calendar/cal-client/tmpl/cal-client.sgml
+++ b/help/devel/calendar/cal-client/tmpl/cal-client.sgml
@@ -255,3 +255,67 @@ GTK+ object for communication with personal calendar server.
 @Returns: 
 
 
+<!-- ##### FUNCTION cal_client_get_query ##### -->
+<para>
+
+</para>
+
+@client: 
+@sexp: 
+@Returns: 
+
+
+<!-- ##### SIGNAL CalClient::cal-opened ##### -->
+<para>
+
+</para>
+
+@calclient: the object which received the signal.
+@arg1: 
+
+<!-- ##### SIGNAL CalClient::obj-updated ##### -->
+  <para>
+    This signal is emitted when the calendar clients receives
+    notification of a calendar component's data being changed in the
+    personal calendar server.  Graphical clients may want to get the
+    new version of the object and update their display, for example.
+  </para>
+
+@calclient: the object which received the signal.
+@arg1: 
+<!-- # Unused Parameters # -->
+@client: Calendar client which received the notification.
+@uid: Unique identifier of the calendar component that changed in the
+  personal calendar server's storage.
+
+<!-- ##### SIGNAL CalClient::obj-removed ##### -->
+  <para>
+    This signal is emitted when the calendar client receives
+    notification for a calendar component being removed from the
+    storage in the personal calendar server.  Graphical clients may
+    want to delete the corresponding object from their display, for
+    example.
+  </para>
+
+@calclient: the object which received the signal.
+@arg1: 
+<!-- # Unused Parameters # -->
+@client: Calendar client which received the notification.
+@uid: Unique identifier of the calendar component that was removed
+  from the personal calendar server's storage.
+
+<!--
+Local variables:
+mode: sgml
+sgml-parent-document: ("../../../evolution-devel-guide.sgml" "book" "refsect2" "")
+End:
+-->
+
+<!-- ##### SIGNAL CalClient::forget-password ##### -->
+<para>
+
+</para>
+
+@calclient: the object which received the signal.
+@arg1: 
+
diff --git a/help/devel/calendar/cal-client/tmpl/evolution-cal-client-unused.sgml b/help/devel/calendar/cal-client/tmpl/evolution-cal-client-unused.sgml
index 3d050e171b..3e8ce25ee6 100644
--- a/help/devel/calendar/cal-client/tmpl/evolution-cal-client-unused.sgml
+++ b/help/devel/calendar/cal-client/tmpl/evolution-cal-client-unused.sgml
@@ -1,11 +1,30 @@
-<!-- ##### FUNCTION cal_client_load_calendar ##### -->
-<para>
+<!-- ##### SIGNAL CalClient::cal-loaded ##### -->
+  <para>
+    This signal is emitted some time after the calendar clients sends
+    a load or create request to the personal calendar server.  The
+    server will notify the client asynchronously of the completion of
+    the request.  The @status parameter indicates the status of the
+    request.
+  </para>
 
-</para>
+@calclient: the object which received the signal.
+@arg1: 
+@client: Calendar client which received the notification.
+@status: Status of the request.  See the description of
+  #CalClientLoadStatus for more details.
+
+<!-- ##### ENUM CalClientLoadStatus ##### -->
+  <para>
+    These values describe the status of a calendar load or create
+    request.  After asking a calendar factory to load or create a
+    calendar, the provided listener will get notification about the
+    result in asynchronous fashion.  Such notification is represented
+    by one of these enumeration values.  For values other than
+    #CAL_CLIENT_LOAD_SUCCESS, the #CalClient object will not accept
+    any other operations on the calendar and it should just be
+    destroyed.
+  </para>
 
-@client: 
-@str_uri: 
-@Returns: 
 
 <!-- ##### FUNCTION cal_client_create_calendar ##### -->
 <para>
@@ -16,14 +35,6 @@
 @str_uri: 
 @Returns: 
 
-<!-- ##### SIGNAL CalClient::cal-opened ##### -->
-<para>
-
-</para>
-
-@calclient: the object which received the signal.
-@arg1: 
-
 <!-- ##### FUNCTION cal_client_get_events_in_range ##### -->
 <para>
 
@@ -34,20 +45,15 @@
 @end: 
 @Returns: 
 
-<!-- ##### SIGNAL CalClient::cal-loaded ##### -->
-  <para>
-    This signal is emitted some time after the calendar clients sends
-    a load or create request to the personal calendar server.  The
-    server will notify the client asynchronously of the completion of
-    the request.  The @status parameter indicates the status of the
-    request.
-  </para>
+<!-- ##### FUNCTION cal_client_get_uid_by_pilot_id ##### -->
+<para>
 
-@calclient: the object which received the signal.
-@arg1: 
-@client: Calendar client which received the notification.
-@status: Status of the request.  See the description of
-  #CalClientLoadStatus for more details.
+</para>
+
+@client: 
+@pilot_id: 
+@uid: 
+@Returns: 
 
 <!-- ##### FUNCTION cal_client_is_loaded ##### -->
 <para>
@@ -57,72 +63,22 @@
 @client: 
 @Returns: 
 
-<!-- ##### SIGNAL CalClient::obj-updated ##### -->
-  <para>
-    This signal is emitted when the calendar clients receives
-    notification of a calendar component's data being changed in the
-    personal calendar server.  Graphical clients may want to get the
-    new version of the object and update their display, for example.
-  </para>
-
-@calclient: the object which received the signal.
-@arg1: 
-@client: Calendar client which received the notification.
-@uid: Unique identifier of the calendar component that changed in the
-  personal calendar server's storage.
-
-<!-- ##### FUNCTION cal_client_update_pilot_id ##### -->
+<!-- ##### FUNCTION cal_client_load_calendar ##### -->
 <para>
 
 </para>
 
 @client: 
-@uid: 
-@pilot_id: 
-@pilot_status: 
-
-<!-- ##### ENUM CalClientLoadStatus ##### -->
-  <para>
-    These values describe the status of a calendar load or create
-    request.  After asking a calendar factory to load or create a
-    calendar, the provided listener will get notification about the
-    result in asynchronous fashion.  Such notification is represented
-    by one of these enumeration values.  For values other than
-    #CAL_CLIENT_LOAD_SUCCESS, the #CalClient object will not accept
-    any other operations on the calendar and it should just be
-    destroyed.
-  </para>
-
+@str_uri: 
+@Returns: 
 
-<!-- ##### FUNCTION cal_client_get_uid_by_pilot_id ##### -->
+<!-- ##### FUNCTION cal_client_update_pilot_id ##### -->
 <para>
 
 </para>
 
 @client: 
-@pilot_id: 
 @uid: 
-@Returns: 
-
-<!-- ##### SIGNAL CalClient::obj-removed ##### -->
-  <para>
-    This signal is emitted when the calendar client receives
-    notification for a calendar component being removed from the
-    storage in the personal calendar server.  Graphical clients may
-    want to delete the corresponding object from their display, for
-    example.
-  </para>
-
-@calclient: the object which received the signal.
-@arg1: 
-@client: Calendar client which received the notification.
-@uid: Unique identifier of the calendar component that was removed
-  from the personal calendar server's storage.
-
-<!--
-Local variables:
-mode: sgml
-sgml-parent-document: ("../../../evolution-devel-guide.sgml" "book" "refsect2" "")
-End:
--->
+@pilot_id: 
+@pilot_status: 
 
diff --git a/help/devel/calendar/cal-util/evolution-cal-util-decl.txt b/help/devel/calendar/cal-util/evolution-cal-util-decl.txt
index 6f6994d8c4..b40d57f8b4 100644
--- a/help/devel/calendar/cal-util/evolution-cal-util-decl.txt
+++ b/help/devel/calendar/cal-util/evolution-cal-util-decl.txt
@@ -52,6 +52,7 @@ typedef enum {
 	CAL_COMPONENT_FIELD_OVERDUE,		/* not a real field */
 	CAL_COMPONENT_FIELD_COLOR,		/* not a real field */
 	CAL_COMPONENT_FIELD_STATUS,
+	CAL_COMPONENT_FIELD_COMPONENT,		/* not a real field */
 	CAL_COMPONENT_FIELD_NUM_FIELDS
 } CalComponentField;
 </ENUM>
@@ -95,6 +96,22 @@ typedef struct {
 	} u;
 } CalComponentPeriod;
 </TYPEDEF>
+<ENUM>
+<NAME>CalComponentRangeType</NAME>
+typedef enum {
+	CAL_COMPONENT_RANGE_SINGLE,
+	CAL_COMPONENT_RANGE_THISPRIOR,
+	CAL_COMPONENT_RANGE_THISFUTURE,
+} CalComponentRangeType;
+</ENUM>
+<TYPEDEF>
+<NAME>CalComponentRange</NAME>
+typedef struct {
+	CalComponentRangeType type;
+	
+	CalComponentDateTime *datetime;
+} CalComponentRange;
+</TYPEDEF>
 <TYPEDEF>
 <NAME>CalComponentText</NAME>
 typedef struct {
@@ -114,6 +131,66 @@ typedef enum {
 	CAL_COMPONENT_TRANSP_UNKNOWN
 } CalComponentTransparency;
 </ENUM>
+<ENUM>
+<NAME>CalComponentCUType</NAME>
+typedef enum {
+	CAL_COMPONENT_CUTYPE_INDIVIDUAL,
+	CAL_COMPONENT_CUTYPE_GROUP,
+	CAL_COMPONENT_CUTYPE_RESOURCE,
+	CAL_COMPONENT_CUTYPE_ROOM,
+	CAL_COMPONENT_CUTYPE_UNKNOWN
+} CalComponentCUType;
+</ENUM>
+<ENUM>
+<NAME>CalComponentRole</NAME>
+typedef enum {
+	CAL_COMPONENT_ROLE_CHAIR,
+	CAL_COMPONENT_ROLE_REQUIRED,
+	CAL_COMPONENT_ROLE_OPTIONAL,
+	CAL_COMPONENT_ROLE_NON,
+	CAL_COMPONENT_ROLE_UNKNOWN
+} CalComponentRole;
+</ENUM>
+<ENUM>
+<NAME>CalComponentPartStat</NAME>
+typedef enum {
+	CAL_COMPONENT_PARTSTAT_NEEDSACTION,
+	CAL_COMPONENT_PARTSTAT_ACCEPTED,
+	CAL_COMPONENT_PARTSTAT_DECLINED,
+	CAL_COMPONENT_PARTSTAT_TENTATIVE,
+	CAL_COMPONENT_PARTSTAT_DELEGATED,
+	CAL_COMPONENT_PARTSTAT_COMPLETED,
+	CAL_COMPONENT_PARTSTAT_INPROCESS,
+	CAL_COMPONENT_PARTSTAT_UNKNOWN
+} CalComponentPartStat;
+</ENUM>
+<TYPEDEF>
+<NAME>CalComponentAttendee</NAME>
+typedef struct {
+	const char *value;
+	
+	const char *member;
+	CalComponentCUType cutype;
+	CalComponentRole role;
+	CalComponentPartStat status;
+	gboolean rsvp;
+	
+	const char *delto;
+	const char *delfrom;
+	const char *sentby;
+	const char *cn;
+	const char *language;
+} CalComponentAttendee;
+</TYPEDEF>
+<TYPEDEF>
+<NAME>CalComponentOrganizer</NAME>
+typedef struct {
+	const char *value;
+	const char *sentby;
+	const char *cn;
+	const char *language;
+} CalComponentOrganizer;
+</TYPEDEF>
 <STRUCT>
 <NAME>CalComponent</NAME>
 </STRUCT>
@@ -363,6 +440,16 @@ CalComponent *comp, struct icaltimetype **t
 CalComponent *comp, struct icaltimetype *t
 </FUNCTION>
 <FUNCTION>
+<NAME>cal_component_get_organizer</NAME>
+<RETURNS>void  </RETURNS>
+CalComponent *comp, CalComponentOrganizer *organizer
+</FUNCTION>
+<FUNCTION>
+<NAME>cal_component_set_organizer</NAME>
+<RETURNS>void  </RETURNS>
+CalComponent *comp, CalComponentOrganizer *organizer
+</FUNCTION>
+<FUNCTION>
 <NAME>cal_component_get_percent</NAME>
 <RETURNS>void  </RETURNS>
 CalComponent *comp, int **percent
@@ -383,6 +470,16 @@ CalComponent *comp, int **priority
 CalComponent *comp, int *priority
 </FUNCTION>
 <FUNCTION>
+<NAME>cal_component_get_recurid</NAME>
+<RETURNS>void  </RETURNS>
+CalComponent *comp, CalComponentRange **recur_id
+</FUNCTION>
+<FUNCTION>
+<NAME>cal_component_set_recurid</NAME>
+<RETURNS>void  </RETURNS>
+CalComponent *comp, CalComponentRange *recur_id
+</FUNCTION>
+<FUNCTION>
 <NAME>cal_component_get_rdate_list</NAME>
 <RETURNS>void  </RETURNS>
 CalComponent *comp, GSList **period_list
@@ -473,6 +570,16 @@ CalComponent *comp, const char **url
 CalComponent *comp, const char *url
 </FUNCTION>
 <FUNCTION>
+<NAME>cal_component_get_attendee_list</NAME>
+<RETURNS>void  </RETURNS>
+CalComponent *comp, GSList **attendee_list
+</FUNCTION>
+<FUNCTION>
+<NAME>cal_component_set_attendee_list</NAME>
+<RETURNS>void  </RETURNS>
+CalComponent *comp, GSList *attendee_list
+</FUNCTION>
+<FUNCTION>
 <NAME>cal_component_event_dates_match</NAME>
 <RETURNS>gboolean  </RETURNS>
 CalComponent *comp1, CalComponent *comp2
@@ -532,6 +639,11 @@ int *sequence
 <RETURNS>void  </RETURNS>
 GSList *text_list
 </FUNCTION>
+<FUNCTION>
+<NAME>cal_component_free_attendee_list</NAME>
+<RETURNS>void  </RETURNS>
+GSList *attendee_list
+</FUNCTION>
 <STRUCT>
 <NAME>CalComponentAlarm</NAME>
 </STRUCT>
@@ -615,11 +727,6 @@ CalComponent *comp
 CalComponent *comp, const char *auid
 </FUNCTION>
 <FUNCTION>
-<NAME>cal_component_free_alarm_uids</NAME>
-<RETURNS>void  </RETURNS>
-GList *alarm_uids
-</FUNCTION>
-<FUNCTION>
 <NAME>cal_component_alarms_free</NAME>
 <RETURNS>void  </RETURNS>
 CalComponentAlarms *alarms
@@ -630,6 +737,11 @@ CalComponentAlarms *alarms
 void
 </FUNCTION>
 <FUNCTION>
+<NAME>cal_component_alarm_clone</NAME>
+<RETURNS>CalComponentAlarm  *</RETURNS>
+CalComponentAlarm *alarm
+</FUNCTION>
+<FUNCTION>
 <NAME>cal_component_alarm_get_uid</NAME>
 <RETURNS>const char  *</RETURNS>
 CalComponentAlarm *alarm
@@ -767,12 +879,12 @@ time_t t
 <FUNCTION>
 <NAME>time_week_begin</NAME>
 <RETURNS>time_t  </RETURNS>
-time_t t
+time_t t, int week_start_day
 </FUNCTION>
 <FUNCTION>
 <NAME>time_week_end</NAME>
 <RETURNS>time_t  </RETURNS>
-time_t t
+time_t t, int week_start_day
 </FUNCTION>
 <FUNCTION>
 <NAME>time_day_begin</NAME>
diff --git a/help/devel/calendar/cal-util/tmpl/cal-component.sgml b/help/devel/calendar/cal-util/tmpl/cal-component.sgml
index 004e48674e..0bd957e9c2 100644
--- a/help/devel/calendar/cal-util/tmpl/cal-component.sgml
+++ b/help/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/help/devel/calendar/cal-util/tmpl/evolution-cal-util-unused.sgml b/help/devel/calendar/cal-util/tmpl/evolution-cal-util-unused.sgml
index 93625da7df..98c3ac55dd 100644
--- a/help/devel/calendar/cal-util/tmpl/evolution-cal-util-unused.sgml
+++ b/help/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/help/devel/calendar/cal-util/tmpl/timeutil.sgml b/help/devel/calendar/cal-util/tmpl/timeutil.sgml
index 2b197ad685..2e7e15988d 100644
--- a/help/devel/calendar/cal-util/tmpl/timeutil.sgml
+++ b/help/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: 
 
 
diff --git a/help/devel/evolution-devel-guide.sgml b/help/devel/evolution-devel-guide.sgml
index 10c779ce0c..c089c5b885 100644
--- a/help/devel/evolution-devel-guide.sgml
+++ b/help/devel/evolution-devel-guide.sgml
@@ -13,12 +13,6 @@
 <!ENTITY cal-util SYSTEM "calendar/cal-util/sgml/cal-util.sgml">
 <!ENTITY timeutil SYSTEM "calendar/cal-util/sgml/timeutil.sgml">
 
-<!-- ENTITY importer-public-reference SYSTEM "importer/public-reference.sgml">
-<!-- ENTITY importer-private-reference SYSTEM "importer/private-reference.sgml">
-<!-- ENTITY EvolutionImporter SYSTEM "importer/sgml/evolution-importer.sgml">
-<!-- ENTITY EvolutionImporterClient SYSTEM "importer/sgml/evolution-importer-client.sgml">
-<!-- ENTITY EvolutionImporterListener SYSTEM "importer/sgml/evolution-importer-listener.sgml">
-
 <!ENTITY evolution-services-public-reference SYSTEM "executive-summary/public-reference.sgml">
 <!ENTITY evolution-services-private-reference SYSTEM "executive-summary/private-reference.sgml">
 <!ENTITY ExecutiveSummaryComponent SYSTEM "executive-summary/sgml/executive-summary-component.sgml">
@@ -34,6 +28,13 @@
 <!ENTITY Executive-Summary "<application>Executive Summary</application>">
 ]>
 
+<!-- ENTITY importer-public-reference SYSTEM "importer/public-reference.sgml" -->
+<!-- ENTITY importer-private-reference SYSTEM "importer/private-reference.sgml" -->
+<!-- ENTITY EvolutionImporter SYSTEM "importer/sgml/evolution-importer.sgml" -->
+<!-- ENTITY EvolutionImporterClient SYSTEM "importer/sgml/evolution-importer-client.sgml" -->
+<!-- ENTITY EvolutionImporterListener SYSTEM "importer/sgml/evolution-importer-listener.sgml" -->
+
+
 <book id="index">
   <bookinfo>
     <title>&Evolution; Developer's Guide</title>