From: drh <drh@noemail.net>
Date: Sat, 4 Oct 2014 19:31:53 +0000 (+0000)
Subject: Tweaks to documentation on sqlite3_open() and sqlite3_bind().  No code changes.
X-Git-Tag: version-3.8.7~46
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=df868a4fbf0a0055ff3416c121c4c1ad5e675a15;p=thirdparty%2Fsqlite.git

Tweaks to documentation on sqlite3_open() and sqlite3_bind().  No code changes.

FossilOrigin-Name: b8f7f19dc06c59de2e194d83e6c052fb7d28c71d
---

diff --git a/manifest b/manifest
index ec8a762863..5ed0c93fb2 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Updates\sto\sdocumentation\sand\srequirements\smarks.\s\sNo\scode\schanges.
-D 2014-10-04T11:59:33.912
+C Tweaks\sto\sdocumentation\son\ssqlite3_open()\sand\ssqlite3_bind().\s\sNo\scode\schanges.
+D 2014-10-04T19:31:53.403
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -229,7 +229,7 @@ F src/resolve.c a3466128b52a86c466e47ac1a19e2174f7b5cf89
 F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
 F src/select.c f11533162b57ed5ed37f549add34cbcdf51f6712
 F src/shell.c 38f627b0885191357f55902a3ac199de90d79715
-F src/sqlite.h.in 7e5a6b5cce31f0b4844376566b9374fabc4985f9
+F src/sqlite.h.in 4a5e5158c189d2bcd45c7c4607c2c0eb6d25c153
 F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
 F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
 F src/sqliteInt.h 5a430c5443717d7c5e2c224f9dcc2534348dc3f6
@@ -1201,7 +1201,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P d2fc322728331ae2d147c8496129df5e3c655eb5
-R 48a7506351fd9c89c269926766fa27eb
+P 0f8102d71a0ee828629f037775ad86fe2a544120
+R 9fc77b39bf813ff4a1732fefd3521b90
 U drh
-Z 0614c4bed4c215b7b30b213ff48ceb06
+Z 7cb27b268889a7c66aa5ab31d2f83fa7
diff --git a/manifest.uuid b/manifest.uuid
index de0530ba8a..4a5b1c0284 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0f8102d71a0ee828629f037775ad86fe2a544120
\ No newline at end of file
+b8f7f19dc06c59de2e194d83e6c052fb7d28c71d
\ No newline at end of file
diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index d8e99c13e1..f1d4e406e8 100644
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -2664,9 +2664,9 @@ void sqlite3_progress_handler(sqlite3*, int, int(*)(void*), void*);
 ** an English language description of the error following a failure of any
 ** of the sqlite3_open() routines.
 **
-** ^The default encoding for the database will be UTF-8 if
-** sqlite3_open() or sqlite3_open_v2() is called and
-** UTF-16 in the native byte order if sqlite3_open16() is used.
+** ^The default encoding will be UTF-8 for databases created using
+** sqlite3_open() or sqlite3_open_v2().  ^The default encoding for databases
+** created using sqlite3_open16() will be UTF-16 in the native byte order.
 **
 ** Whether or not an error occurs when it is opened, resources
 ** associated with the [database connection] handle should be released by
@@ -3393,11 +3393,10 @@ typedef struct sqlite3_context sqlite3_context;
 ** contain embedded NULs.  The result of expressions involving strings
 ** with embedded NULs is undefined.
 **
-** ^The fifth argument to sqlite3_bind_blob(), sqlite3_bind_text(), and
-** sqlite3_bind_text16() is a destructor used to dispose of the BLOB or
+** ^The fifth argument to the BLOB and string binding interfaces
+** is a destructor used to dispose of the BLOB or
 ** string after SQLite has finished with it.  ^The destructor is called
-** to dispose of the BLOB or string even if the call to sqlite3_bind_blob(),
-** sqlite3_bind_text(), or sqlite3_bind_text16() fails.  
+** to dispose of the BLOB or string even if the call to bind API fails.
 ** ^If the fifth argument is
 ** the special value [SQLITE_STATIC], then SQLite assumes that the
 ** information is in static, unmanaged space and does not need to be freed.
@@ -3408,7 +3407,7 @@ typedef struct sqlite3_context sqlite3_context;
 ** ^The sixth argument to sqlite3_bind_text64() must be one of
 ** [SQLITE_UTF8], [SQLITE_UTF16], [SQLITE_UTF16BE], or [SQLITE_UTF16LE]
 ** to specify the encoding of the text in the third parameter.  If
-** the sixth argument to sqlite3_bind_text64() is not how of the
+** the sixth argument to sqlite3_bind_text64() is not one of the
 ** allowed values shown above, or if the text encoding is different
 ** from the encoding specified by the sixth parameter, then the behavior
 ** is undefined.