diff --git a/manifest b/manifest
index 63d24a6a70..429e1bbe3b 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C i18n\schanges\s(CVS\s201)
-D 2001-04-05T15:57:13
+C :-)\s(CVS\s202)
+D 2001-04-05T16:25:53
F COPYRIGHT 74a8a6531a42e124df07ab5599aad63870fa0bd4
F Makefile.in 25791375ce9f4f5b57d4cab67f0d58d772c96451
F README 51f6a4e7408b34afa5bc1c0485f61b6a4efb6958
@@ -82,8 +82,8 @@ F tool/report1.txt 9eae07f26a8fc53889b45fc833a66a33daa22816
F www/arch.fig 4f246003b7da23bd63b8b0af0618afb4ee3055c8
F www/arch.png 8dae0766d42ed3de9ed013c1341a5792bcf633e6
F www/arch.tcl a40380c1fe0080c43e6cc5c20ed70731511b06be
-F www/c_interface.tcl 11be2d5826eb7d6efd629751d3b483c1ed78ba14
-F www/changes.tcl c6c8aa0fdd02d4dbc17803aa023279e0d3809ba5
+F www/c_interface.tcl ddca19005c47dd5a15882addc02fff5de83d8ed9
+F www/changes.tcl e9379e995e19486b352c82d54e87041153739fca
F www/crosscompile.tcl c99efacb3aefaa550c6e80d91b240f55eb9fd33e
F www/dynload.tcl 02eb8273aa78cfa9070dd4501dca937fb22b466c
F www/fileformat.tcl cfb7fba80b7275555281ba2f256c00734bcdd1c9
@@ -94,7 +94,7 @@ F www/opcode.tcl cb3a1abf8b7b9be9f3a228d097d6bf8b742c2b6f
F www/sqlite.tcl cb0d23d8f061a80543928755ec7775da6e4f362f
F www/tclsqlite.tcl 06f81c401f79a04f2c5ebfb97e7c176225c0aef2
F www/vdbe.tcl 0c8aaa529dd216ccbf7daaabd80985e413d5f9ad
-P 8b4c87e8cf08db8e8ace57dc8dc8d110d18f19ed
-R 80c18504638b99b08ae21db4afad8915
+P 8390f6521af0f1c5cd0298cc4a1dfa3f092c1e15
+R d248ed8781ae0c5dba14ccb218b35cd1
U drh
-Z 27516acdd74264a621463b7fd9bffc1d
+Z 67d07e427c448f5bf8d4cc1c19e29397
diff --git a/manifest.uuid b/manifest.uuid
index 8f38c635d9..9f3d377381 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8390f6521af0f1c5cd0298cc4a1dfa3f092c1e15
\ No newline at end of file
+04530e451662e298506d314ce014a2643f4ff813
\ No newline at end of file
diff --git a/www/c_interface.tcl b/www/c_interface.tcl
index 6236e7dbf6..19b4dd10db 100644
--- a/www/c_interface.tcl
+++ b/www/c_interface.tcl
@@ -1,7 +1,7 @@
#
# Run this Tcl script to generate the sqlite.html file.
#
-set rcsid {$Id: c_interface.tcl,v 1.13 2000/11/28 20:46:39 drh Exp $}
+set rcsid {$Id: c_interface.tcl,v 1.14 2001/04/05 16:25:53 drh Exp $}
puts {
@@ -78,6 +78,8 @@ void sqlite_busy_timeout(sqlite*, int ms);
const char sqlite_version[];
+const char sqlite_encoding[];
+
int sqlite_exec_printf(
sqlite*,
char *sql,
@@ -377,6 +379,23 @@ the SQLITE_VERSION macro against the sqlite_version
string constant to verify that the version number of the
header file and the library match.
+Library character encoding
+
+By default, SQLite assumes that all data uses a fixed-size
+8-bit character (iso8859). But if you give the --enable-utf8 option
+to the configure script, then the library assumes UTF-8 variable
+sized characters. This makes a difference for the LIKE and GLOB
+operators and the LENGTH() and SUBSTR() functions. The static
+string sqlite_encoding will be set to either "UTF-8" or
+"iso8859" to indicate how the library was compiled. In addition,
+the sqlite.h header file will define one of the
+macros SQLITE_UTF8 or SQLITE_ISO8859, as appropriate.
+
+Note that the character encoding mechanism used by SQLite cannot
+be changed at run-time. This is a compile-time option only. The
+sqlite_encoding character string just tells you how the library
+was compiled.
+
Changing the libraries response to locked files
The GDBM library supports database locks at the file level.
diff --git a/www/changes.tcl b/www/changes.tcl
index 5927ce52e6..cdb281b437 100644
--- a/www/changes.tcl
+++ b/www/changes.tcl
@@ -18,10 +18,13 @@ proc chng {date desc} {
}
chng {2001 Apr 5 (1.0.29)} {
-
The LIKE and GLOB operators now assume both operands are
- UTF-8 strings if the library is configured with the "--enable-utf8"
- option. If not configured for UTF-8 but using a version of TCL
- that supports UTF-8, then a conversion from UTF-8 to iso8859 and
+The library now assumes data is stored as UTF-8 if the --enable-utf8
+ option is given to configure. The default behavior is to assume
+ iso8859-x, as it has always done. This only makes a difference for
+ LIKE and GLOB operators and the LENGTH and SUBSTR functions.
+If the library is not configured for UTF-8 and the Tcl library
+ is one of the newer ones that uses UTF-8 internally,
+ then a conversion from UTF-8 to iso8859 and
back again is done inside the TCL interface.
}