Merge "Merge reviewed headers" into tizen_2.1

1 files changed, 19 insertions, 19 deletions

diff --git a/inc/FSclCalendarbook.h b/inc/FSclCalendarbook.h
index 81188f9..5d0abfc 100644
--- a/inc/FSclCalendarbook.h
+++ b/inc/FSclCalendarbook.h
@@ -637,7 +637,7 @@ public:
 	 * @exception	E_INVALID_ARG			Either of the following conditions has occurred: @n

 	 *										- The specified @c pageNo or @c countPerPage is less than @c 1. @n

 	 *										- The start time is later than the end date. @n

-	 *										- The start or end time is not in a valid range. @n

+	 *										- The start or end time is out of the valid range. @n

 	 *										 The valid range of the date can be referenced from GetMaxDateTime() and GetMinDateTime().

 	 * @exception	E_SYSTEM				The method cannot proceed due to a severe system error.

 	 * @remarks		The specific error code can be accessed using the GetLastResult() method.

@@ -649,12 +649,12 @@ public:
 	 * @if OSPCOMPAT

 	 * @page	CompCalendarbookGetTodosNPage Compatibility for GetTodosN()

 	 * @section	CompCalendarbookGetTodosNPageIssueSection Issues

-	 *           Implementing this method in OSP compatible applications has the following issues:   @n

+	 *           Implementing this method in OSP compatible applications has the following issues: @n

 	 *			-# If the start date of a to-do is not in the time range of start/end parameters, @n

 	 *			the to-do is not retrieved even though the due date is in the time range.

 	 *

 	 * @section	CompCalendarbookGetTodosNPageSolutionSection Resolutions

-	 * 			This issue has been resolved in Tizen.  @n

+	 * 			This issue has been resolved in Tizen. @n

 	 *			-# The to-do will be retrieved if the due date is in the range of start/end parameters.

 	 * @endif

 	 */

@@ -688,7 +688,7 @@ public:
 	 * @exception	E_PRIVILEGE_DENIED		The application does not have the privilege to call this method.

 	 * @exception	E_INVALID_ARG			Either of the following conditions has occurred: @n

 	 * 										- The start time is later than the end date. @n

-	 *										- The start or end time is not in a valid range. @n

+	 *										- The start or end time is out of the valid range. @n

 	 *										The valid range of the date can be referenced from GetMaxDateTime() and GetMinDateTime().

 	 * @exception	E_SYSTEM				The method cannot proceed due to a severe system error.

 	 * @remarks		The specific error code can be accessed using the GetLastResult() method.

@@ -699,12 +699,12 @@ public:
 	 * @if OSPCOMPAT

 	 * @page	CompCalendarbookGetTodoCountPage Compatibility for GetTodoCount()

 	 * @section	CompCalendarbookGetTodoCountPageIssueSection Issues

-	 *           Implementing this method in OSP compatible applications has the following issues:   @n

+	 *           Implementing this method in OSP compatible applications has the following issues: @n

 	 *			-# If the start date of a to-do is not in the time range of start/end parameters, @n

 	 *			the to-do is not counted even though the due date is in the time range.

 	 *

 	 * @section	CompCalendarbookGetTodoCountPageSolutionSection Resolutions

-	 * 			This issue has been resolved in Tizen.  @n

+	 * 			This issue has been resolved in Tizen. @n

 	 *			-# The to-do will be counted if the due date is in the range of start/end parameters.

 	 * @endif

 	 */

@@ -722,7 +722,7 @@ public:
 	 * @privilege	%http://tizen.org/privilege/calendar.read

 	 *

 	 * @return		A list containing all of the matched CalEvent instances, @n

-	 *				else an empty list if there are no matched instances or @c null if an exception occurs @n

+	 *				else an empty list if there are no matched instances, or @c null if an exception occurs @n

 	 *				The results are listed in the following order: all day events, and other events. @n

 	 *				The results with the same property of all day event are ordered by their start time.

 	 * @param[in]	start				The start of the time range

@@ -740,7 +740,7 @@ public:
 	 *									- The specified @c pageNo or @c countPerPage is less than @c 1. @n

 	 *									- The specified @c category is invalid. @n

 	 *									- The start time is later than the end date. @n

-	 *									- The start or end time is not in a valid range. @n

+	 *									- The start or end time is out of the valid range. @n

 	 *									The valid range of the date can be referenced from GetMaxDateTime() and GetMinDateTime().

 	 * @exception	E_SYSTEM			The method cannot proceed due to a severe system error.

 	 * @remarks		The specific error code can be accessed using the GetLastResult() method.

@@ -784,7 +784,7 @@ public:
 	 *									- The specified @c pageNo or @c countPerPage is less than @c 1. @n

 	 *									- The specified @c category is invalid. @n

 	 *									- The start time is later than the end date. @n

-	 *									- The start or end time is not in a valid range. @n

+	 *									- The start or end time is out of the valid range. @n

 	 *									The valid range of the date can be referenced from GetMaxDateTime() and GetMinDateTime().

 	 * @exception	E_SYSTEM				The method cannot proceed due to a severe system error.

 	 * @remarks		IRecordListener::OnRecordsReceivedN(), Calendarbook::GetEventInstancesN()

@@ -803,7 +803,7 @@ public:
 	 * @privilege	%http://tizen.org/privilege/calendar.read

 	 *

 	 * @return		A list containing all the CalEvent instances, @n

-	 *				else an empty list if there are no events or @c null if an exception occurs @n

+	 *				else an empty list if there are no events, or @c null if an exception occurs @n

 	 *				The results are listed in the order of their event ID.

 	 * @exception	E_SUCCESS				The method is successful.

 	 * @exception	E_PRIVILEGE_DENIED		The application does not have the privilege to call this method.

@@ -823,7 +823,7 @@ public:
 	 * @privilege	%http://tizen.org/privilege/calendar.read

 	 *

 	 * @return		A list containing all the CalTodo instances, @n

-	 *				else an empty list if there are no to-dos or @c null if an exception occurs @n

+	 *				else an empty list if there are no to-dos, or @c null if an exception occurs @n

 	 *				The results are listed in the order of their to-do ID.

 	 * @exception	E_SUCCESS				The method is successful.

 	 * @exception	E_PRIVILEGE_DENIED		The application does not have the privilege to call this method.

@@ -843,7 +843,7 @@ public:
 	 * @privilege	%http://tizen.org/privilege/calendar.read

 	 *

 	 * @return		A list containing all the Calendar instances, @n

-	 *				else an empty list if there are no calendars or @c null if an exception occurs @n

+	 *				else an empty list if there are no calendars, or @c null if an exception occurs @n

 	 *				The results are listed in the order of their calendar ID.

 	 * @exception	E_SUCCESS				The method is successful.

 	 * @exception	E_PRIVILEGE_DENIED		The application does not have the privilege to call this method.

@@ -863,7 +863,7 @@ public:
 	 * @privilege	%http://tizen.org/privilege/calendar.read

 	 *

 	 * @return		A list containing the CalEventChangeInfo instances, @n

-	 *				else an empty list if there are no events or @c null if an exception occurs @n

+	 *				else an empty list if there are no events, or @c null if an exception occurs @n

 	 *				The results are listed in the order of their version.

 	 * @param[in]	version					The version

 	 * @param[out]	latestVersion			The latest change version among the changed events

@@ -886,7 +886,7 @@ public:
 	 * @privilege	%http://tizen.org/privilege/calendar.read

 	 *

 	 * @return		A list containing the CalTodoChangeInfo instances, @n

-	 *				else an empty list if there are no to-dos or @c null if an exception occurs @n

+	 *				else an empty list if there are no to-dos, or @c null if an exception occurs @n

 	 *				The results are listed in the order of their version.

 	 * @param[in]	version					The version

 	 * @param[out]	latestVersion			The latest change version among the changed to-dos

@@ -1100,7 +1100,7 @@ public:
 	 * @privilege	%http://tizen.org/privilege/calendar.read

 	 *

 	 * @return		A list of searched results (the list of CalEvent, CalTodo, Calendar, or CalEventInstance), @n

-	 *						else an empty list if there is no searched result or @c null if an exception occurs

+	 *						else an empty list if there is no searched result, or @c null if an exception occurs

 	 * @param[in]	filter		The filter that specifies the search condition @n If the filter is empty, all items that are specified by the type of this filter will be searched.

 	 * @param[in]	propertySortedBy		The property for sorting @n The searched results are ordered by the values of this property.

 	 * @param[in]	sortOrder		The order for sorting

@@ -1141,12 +1141,12 @@ public:
 

 	/**

 	 * Parses the events from specific vCalendar file. @n

-	 * This method supports to parse for vCalendar version 1.0 and 2.0 (iCalendar).

+	 * The %ParseEventsFromVcalendarN() method supports to parse for vCalendar version 1.0 and 2.0 (iCalendar).

 	 *

 	 * @since	2.0

 	 *

 	 * @return		A list containing the CalEvent instances, @n

-	 *				else an empty list if there are no events or @c null if an exception occurs

+	 *				else an empty list if there are no events, or @c null if an exception occurs

 	 * @param[in]	vCalFilePath			The path of the vCalendar file

 	 * @exception	E_SUCCESS				The method is successful.

 	 * @exception	E_INVALID_ARG			The specified @c vCalFilePath is invalid.

@@ -1162,12 +1162,12 @@ public:
 

 	/**

 	 * Parses the to-dos from specific vCalendar file. @n

-	 * This method supports to parse for vCalendar version 1.0 and 2.0 (iCalendar).

+	 * The %ParseTodosFromVcalendarN() method supports to parse for vCalendar version 1.0 and 2.0 (iCalendar).

 	 *

 	 * @since	2.0

 	 *

 	 * @return		A list containing the CalTodo instances, @n

-	 *				else an empty list if there are no to-dos or @c null if an exception occurs

+	 *				else an empty list if there are no to-dos, or @c null if an exception occurs

 	 * @param[in]	vCalFilePath			The path of the vCalendar file

 	 * @exception	E_SUCCESS				The method is successful.

 	 * @exception	E_INVALID_ARG			The specified @c vCalFilePath is invalid.