From 1b88d738fe42960d11ab04e6ae0c3b99f15d4fb0 Mon Sep 17 00:00:00 2001
From: Markus Scherer <markus.icu@gmail.com>
Date: Thu, 7 Nov 2002 01:57:18 +0000
Subject: [PATCH] ICU-2336 fix some comments about UTF-7

X-SVN-Rev: 10178
---
 icu4c/source/common/ucnv_u7.c           | 11 ++++++-----
 icu4c/source/data/mappings/convrtrs.txt |  2 ++
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/icu4c/source/common/ucnv_u7.c b/icu4c/source/common/ucnv_u7.c
index 1611a2c6800..fc59efefe50 100644
--- a/icu4c/source/common/ucnv_u7.c
+++ b/icu4c/source/common/ucnv_u7.c
@@ -22,14 +22,13 @@
 
 /* UTF-7 -------------------------------------------------------------------- */
 
-/* ### TODO: in convrtrs.txt and user guide, document version option (=1 for escaping set O characters) */
-/* TODO: version=1 is not really for IMAP, fix documentation; consider version=2 for IMAP */
+/* ### TODO: in user guide, document version option (=1 for escaping set O characters) */
 /*
- * UTF-7 is a stateful encoding of Unicode, somewhat like UTF7.
- * It is defined in RFC 2152  http://www.imc.org/rfc2152 .
+ * UTF-7 is a stateful encoding of Unicode.
+ * It is defined in RFC 2152. (http://www.ietf.org/rfc/rfc2152.txt)
  * It was intended for use in Internet email systems, using in its bytewise
  * encoding only a subset of 7-bit US-ASCII.
- * UTF-7 is deprecated in favor of UTF-8/16/32 and UTF7, but still
+ * UTF-7 is deprecated in favor of UTF-8/16/32 and SCSU, but still
  * occasionally used.
  *
  * For converting Unicode to UTF-7, the RFC allows to encode some US-ASCII
@@ -40,6 +39,8 @@
  * By choosing the option "version=1", set O will be escaped instead.
  * For example:
  *     utf7Converter=ucnv_open("UTF-7,version=1");
+ *
+ * For details about email headers see RFC 2047.
  */
 
 /*
diff --git a/icu4c/source/data/mappings/convrtrs.txt b/icu4c/source/data/mappings/convrtrs.txt
index da5e3e25c03..84918cef21e 100644
--- a/icu4c/source/data/mappings/convrtrs.txt
+++ b/icu4c/source/data/mappings/convrtrs.txt
@@ -144,6 +144,8 @@ UTF32_OppositeEndian
 # By choosing the option "version=1", set O will be escaped instead.
 # For example:
 #     utf7Converter=ucnv_open("UTF-7,version=1");
+#
+# For details about email headers see RFC 2047.
 UTF-7 { IANA* MIME* }           cp65000
 
 SCSU { IANA* }