Stop mis-advertising wide characters as Unicode support

6 files changed, 15 insertions, 14 deletions

diff --git a/ChangeLog b/ChangeLog
index 428a4b1..9d65cc6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,6 +20,7 @@ NOTE: uriparser is looking for help with a few things:
       Thanks for the patch to Shehzan Mohammed!
   * Fixed: Addressed MSVC compile warning about lack of /EHsc when compiling
       the C++ test suite code (GitHub #102)
+  * Fixed: Stopped misadvertising wide characters as Unicode support
   * Added: CMake option URIPARSER_WARNINGS_AS_ERRORS=(ON|OFF)
       to turn compile warnings into errors, defaults to "OFF" (GitHub #102)
   * Improved: pkg-config: Use ${prefix} and ${exec_prefix} to ease
@@ -512,7 +513,7 @@ NOTE: uriparser is looking for help with a few things:
 2007-03-26 -- 0.3.0
 
   * Added: New API, old marked deprecated
-  * Added: Unicode support (think wchar_t)
+  * Added: Added support for wide strings (think wchar_t)
   * Added: Doxygen code documentation
   * Added: Test suite using CppTest
   * Changed: Library code is now licensed under the new BSD license.
diff --git a/README.md b/README.md
index 5cfe5ff..087fa5e 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ URI parsing and handling library
 written in C89 ("ANSI C").
 uriparser is cross-platform,
 fast,
-supports Unicode, and
+supports both `char` and `wchar_t`, and
 is licensed under the [New BSD license](https://github.com/uriparser/uriparser/blob/master/COPYING).
 
 To learn more about uriparser,
diff --git a/doc/Mainpage.txt b/doc/Mainpage.txt
index 6ea1116..869caa8 100644
--- a/doc/Mainpage.txt
+++ b/doc/Mainpage.txt
@@ -11,7 +11,7 @@
  *   - <a href="#filenames">Filenames and URIs</a>
  *   - <a href="#normalization">Normalizing URIs</a>
  *   - <a href="#querystrings">Working with query strings</a>
- * - <a href="#chartypes">Ansi and Unicode</a>
+ * - <a href="#chartypes">Narrow Strings and Wide Strings</a>
  * - <a href="#autoconf">Autoconf Check</a>
  *
  *
@@ -281,15 +281,15 @@
  * @endcode
  *
  *
- * @section chartypes Ansi and Unicode
+ * @section chartypes Narrow Strings and Wide Strings
  * uriparser comes with two versions of every structure and function:
- * one handling Ansi text (char *) and one working with Unicode text (wchar_t *),
+ * one handling narrow strings (<code>char *</code>) and one working with wide strings (<code>wchar_t *</code>),
  * for instance
- * - uriParseSingleUriA() for Ansi and
- * - uriParseSingleUriW() for Unicode.
+ * - uriParseSingleUriA() for <code>char *</code>
+ * - uriParseSingleUriW() for <code>wchar_t *</code>.
  *
- * This tutorial only shows the usage of the Ansi editions but
- * their Unicode counterparts work in the very same way.
+ * This tutorial only shows the usage of the narrow string editions but
+ * their wide string counterparts work in the very same way.
  *
  *
  * @section autoconf Autoconf Check
diff --git a/include/uriparser/UriDefsConfig.h b/include/uriparser/UriDefsConfig.h
index 6262b8c..51bc93e 100644
--- a/include/uriparser/UriDefsConfig.h
+++ b/include/uriparser/UriDefsConfig.h
@@ -59,15 +59,15 @@
 /* No encoding at all */
 #  error URI_NO_ANSI and URI_NO_UNICODE cannot go together.
 # else
-/* Unicode only */
+/* Wide strings only */
 #  define URI_ENABLE_UNICODE  1
 # endif
 #else
 # ifdef URI_NO_UNICODE
-/* ANSI only */
+/* Narrow strings only */
 #  define URI_ENABLE_ANSI     1
 # else
-/* Both ANSI and Unicode */
+/* Both narrow and wide strings */
 #  define URI_ENABLE_ANSI     1
 #  define URI_ENABLE_UNICODE  1
 # endif
diff --git a/include/uriparser/UriDefsUnicode.h b/include/uriparser/UriDefsUnicode.h
index 08e4728..01421f5 100644
--- a/include/uriparser/UriDefsUnicode.h
+++ b/include/uriparser/UriDefsUnicode.h
@@ -39,7 +39,7 @@
 
 /**
  * @file UriDefsUnicode.h
- * Holds definitions for the Unicode pass.
+ * Holds definitions for the wide string pass.
  * NOTE: This header is included N times, not once.
  */
 
diff --git a/test/test.cpp b/test/test.cpp
index fd8d6d9..4b156a4 100644
--- a/test/test.cpp
+++ b/test/test.cpp
@@ -311,7 +311,7 @@ TEST(UriSuite, TestUri) {
 		ASSERT_TRUE(0 == uriParseUriA(&stateA, "//user:pass@localhost/one/two/three"));
 		uriFreeUriMembersA(&uriA);
 
-		// ANSI and Unicode
+		// Both narrow and wide string version
 		ASSERT_TRUE(0 == uriParseUriA(&stateA, "http://www.example.com/"));
 		uriFreeUriMembersA(&uriA);
 		ASSERT_TRUE(0 == uriParseUriW(&stateW, L"http://www.example.com/"));