From 3bb050aba0d1ee7358e6250df2f44fce1d62d775 Mon Sep 17 00:00:00 2001
From: "Steven R. Loomis" <srl@icu-project.org>
Date: Sat, 28 Jun 2008 07:08:51 +0000
Subject: [PATCH] ICU-6404 last header changes

X-SVN-Rev: 24318
---
 icu4c/source/Doxyfile.in              |  6 ++++++
 icu4c/source/common/unicode/ustring.h |  6 ++++++
 icu4c/source/i18n/unicode/decimfmt.h  | 12 +++---------
 icu4c/source/i18n/unicode/dtitvfmt.h  |  1 -
 icu4c/source/i18n/unicode/msgfmt.h    |  1 +
 icu4c/source/i18n/unicode/tblcoll.h   |  1 +
 6 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/icu4c/source/Doxyfile.in b/icu4c/source/Doxyfile.in
index 4bb29f4f7ce..b4c72c5fed1 100644
--- a/icu4c/source/Doxyfile.in
+++ b/icu4c/source/Doxyfile.in
@@ -67,6 +67,12 @@ GENERATE_DEPRECATEDLIST= YES
 ENABLED_SECTIONS       = 
 MAX_INITIALIZER_LINES  = 30
 SHOW_USED_FILES        = YES
+
+# docset
+GENERATE_DOCSET        = NO
+DOCSET_FEEDNAME        = "ICU @VERSION@"
+DOCSET_BUNDLE_ID       = org.icu-project.icu4c
+
 #---------------------------------------------------------------------------
 # configuration options related to warning and progress messages
 #---------------------------------------------------------------------------
diff --git a/icu4c/source/common/unicode/ustring.h b/icu4c/source/common/unicode/ustring.h
index 0636b38a709..12411ef6d99 100644
--- a/icu4c/source/common/unicode/ustring.h
+++ b/icu4c/source/common/unicode/ustring.h
@@ -70,6 +70,11 @@
  * Jitterbug 2145 and its icu mailing list proposal on 2002-sep-18.
  */
 
+/**
+ * \defgroup ustring_ustrlen String Length
+ * \ingroup ustring_strlen
+ */
+/*@{*/
 /**
  * Determine the length of an array of UChar.
  *
@@ -79,6 +84,7 @@
  */
 U_STABLE int32_t U_EXPORT2
 u_strlen(const UChar *s);
+/*@}*/
 
 /**
  * Count Unicode code points in the length UChar code units of the string.
diff --git a/icu4c/source/i18n/unicode/decimfmt.h b/icu4c/source/i18n/unicode/decimfmt.h
index 296906fb7d7..16714321f43 100644
--- a/icu4c/source/i18n/unicode/decimfmt.h
+++ b/icu4c/source/i18n/unicode/decimfmt.h
@@ -1,6 +1,6 @@
 /*
 ********************************************************************************
-*   Copyright (C) 1997-2006, International Business Machines
+*   Copyright (C) 1997-2008, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 ********************************************************************************
 *
@@ -1185,10 +1185,7 @@ public:
      * @see #setPadCharacter
      * @see #getPadCharacterString
      * @see #setPadPosition
-     * @see #kPadBeforePrefix
-     * @see #kPadAfterPrefix
-     * @see #kPadBeforeSuffix
-     * @see #kPadAfterSuffix
+     * @see #EPadPosition
      * @stable ICU 2.0
      */
     virtual EPadPosition getPadPosition(void) const;
@@ -1206,10 +1203,7 @@ public:
      * @see #setPadCharacter
      * @see #getPadCharacterString
      * @see #getPadPosition
-     * @see #kPadBeforePrefix
-     * @see #kPadAfterPrefix
-     * @see #kPadBeforeSuffix
-     * @see #kPadAfterSuffix
+     * @see #EPadPosition
      * @stable ICU 2.0
      */
     virtual void setPadPosition(EPadPosition padPos);
diff --git a/icu4c/source/i18n/unicode/dtitvfmt.h b/icu4c/source/i18n/unicode/dtitvfmt.h
index 78512c26445..238443712c0 100644
--- a/icu4c/source/i18n/unicode/dtitvfmt.h
+++ b/icu4c/source/i18n/unicode/dtitvfmt.h
@@ -89,7 +89,6 @@ U_NAMESPACE_BEGIN
  * the field pattern length is ignored and the best match, which is defined 
  * in date time patterns, will be returned without honor the field pattern
  * letter length in skeleton.
- * </ol>
  *
  * <P>
  * The calendar fields we support for interval formatting are:
diff --git a/icu4c/source/i18n/unicode/msgfmt.h b/icu4c/source/i18n/unicode/msgfmt.h
index cbc6c033fec..67e17cf0ef8 100644
--- a/icu4c/source/i18n/unicode/msgfmt.h
+++ b/icu4c/source/i18n/unicode/msgfmt.h
@@ -511,6 +511,7 @@ public:
      * nor should the ponter of other object .  The pointer and its 
      * contents remain valid only until the next call to any method
      * of this class is made with this object. 
+     * @param formatName the name or number specifying a format
      * @param status  output param set to success/failure code.
      * @draft ICU 4.0
      */
diff --git a/icu4c/source/i18n/unicode/tblcoll.h b/icu4c/source/i18n/unicode/tblcoll.h
index cf5a81aebaa..2fdd63b03d3 100644
--- a/icu4c/source/i18n/unicode/tblcoll.h
+++ b/icu4c/source/i18n/unicode/tblcoll.h
@@ -804,6 +804,7 @@ protected:
     * Used internally by registraton to define the requested and valid locales.
     * @param requestedLocale the requsted locale
     * @param validLocale the valid locale
+    * @param actualLocale the actual locale
     * @internal
     */
     virtual void setLocales(const Locale& requestedLocale, const Locale& validLocale, const Locale& actualLocale);