ICU-8823 merge of r30620 from ICU-8777 - fix docs regarding {{{Etc/Unknown}}}

X-SVN-Rev: 30714
This commit is contained in:
Steven R. Loomis 2011-09-26 17:58:41 +00:00
parent f793270515
commit 53607e7a50
2 changed files with 8 additions and 7 deletions

View file

@ -139,10 +139,10 @@ public:
* Creates a <code>TimeZone</code> for the given ID.
* @param ID the ID for a <code>TimeZone</code>, such as "America/Los_Angeles",
* or a custom ID such as "GMT-8:00".
* @return the specified <code>TimeZone</code>, or the GMT zone if the given ID
* cannot be understood. Return result guaranteed to be non-null. If you
* require that the specific zone asked for be returned, check the ID of the
* return result.
* @return the specified <code>TimeZone</code>, or the GMT zone with ID
* <code>UCAL_UNKNOWN_ZONE_ID</code> ("Etc/Unknown") if the given ID cannot be understood.
* Return result guaranteed to be non-null. If you require that the specific zone asked
* for be returned, check the ID of the return result.
* @stable ICU 2.0
*/
static TimeZone* U_EXPORT2 createTimeZone(const UnicodeString& ID);

View file

@ -666,9 +666,9 @@ ucal_getNow(void);
* month, and day.
* <p>
* Note: When unknown TimeZone ID is specified, the UCalendar returned
* by the function is initialized with GMT ("Etc/GMT") without any
* errors/warnings. If you want to check if a TimeZone ID is valid,
* use ucal_getCanonicalTimeZoneID prior to this function.
* by the function is initialized with GMT zone with TimeZone ID <code>UCAL_UNKNOWN_ZONE_ID</code>
* ("Etc/Unknown") without any errors/warnings. If you want to check if a TimeZone ID is valid
* prior to this function, use <code>ucal_getCanonicalTimeZoneID</code>.
*
* @param zoneID The desired TimeZone ID. If 0, use the default time zone.
* @param len The length of zoneID, or -1 if null-terminated.
@ -680,6 +680,7 @@ ucal_getNow(void);
* and then pass the locale to ucal_open with UCAL_DEFAULT as the type.
* @param status A pointer to an UErrorCode to receive any errors
* @return A pointer to a UCalendar, or 0 if an error occurred.
* @see #UCAL_UNKNOWN_ZONE_ID
* @stable ICU 2.0
*/
U_STABLE UCalendar* U_EXPORT2