ICU 56 update step 1

source/common/unicode/uconfig.h

Index: source/common/unicode/uconfig.h
diff --git a/source/common/unicode/uconfig.h b/source/common/unicode/uconfig.h
index 8df56e6e486d3db996d99bd50843f933f4dd542e..307d288f94ce21a431075b38e33803a87eb97d67 100644
--- a/source/common/unicode/uconfig.h
+++ b/source/common/unicode/uconfig.h
@@ -1,6 +1,6 @@
 /*  
 **********************************************************************
-*   Copyright (C) 2002-2014, International Business Machines
+*   Copyright (C) 2002-2015, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 **********************************************************************
 *   file name:  uconfig.h
@@ -135,6 +135,15 @@
 #endif
 
 /**
+ * \def UCONFIG_ENABLE_PLUGINS
+ * Determines whether to enable ICU plugins.
+ * @internal
+ */
+#ifndef UCONFIG_ENABLE_PLUGINS
+#define UCONFIG_ENABLE_PLUGINS 0
+#endif
+
+/**
  * \def U_ENABLE_DYLOAD
  * Whether to enable Dynamic loading in ICU.
  * @internal
@@ -152,7 +161,6 @@
 #define U_CHECK_DYLOAD 1
 #endif
 
-
 /**
  * \def U_DEFAULT_SHOW_DRAFT
  * Do we allow ICU users to use the draft APIs by default?
@@ -200,7 +208,7 @@
  * It does not turn off legacy conversion because that is necessary
  * for ICU to work on EBCDIC platforms (for the default converter).
  * If you want "only collation" and do not build for EBCDIC,
- * then you can define UCONFIG_NO_LEGACY_CONVERSION 1 as well.
+ * then you can define UCONFIG_NO_CONVERSION or UCONFIG_NO_LEGACY_CONVERSION to 1 as well.
  *
  * @stable ICU 2.4
  */
@@ -270,11 +278,18 @@
 #endif
 
 /**
- * This switch turns off all the converters NOT listed in
- * the encoding standard : http://encoding.spec.whatwg.org
+ * \def UCONFIG_ONLY_HTML_CONVERSION
+ * This switch turns off all of the converters NOT listed in
+ * the HTML encoding standard:
+ * http://www.w3.org/TR/encoding/#names-and-labels
+ *
+ * This is not possible on EBCDIC platforms
+ * because they need ibm-37 or ibm-1047 default converters.
+ *
+ * @draft ICU 55
  */
-#ifndef UCONFIG_NO_NON_HTML5_CONVERSION
-#define UCONFIG_NO_NON_HTML5_CONVERSION 0
+#ifndef UCONFIG_ONLY_HTML_CONVERSION
+#   define UCONFIG_ONLY_HTML_CONVERSION 0
 #endif
 
 /**
@@ -430,9 +445,6 @@
  */
 #ifndef UCONFIG_NO_FILTERED_BREAK_ITERATION
 #   define UCONFIG_NO_FILTERED_BREAK_ITERATION 0
-
-
-
 #endif
 
 #endif