From: drh <drh@noemail.net>
Date: Sat, 12 Sep 2015 19:27:41 +0000 (+0000)
Subject: Fix API documentation typos.  Emphasize that the sqlite3_config() routine is
X-Git-Tag: version-3.9.0~113
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2e25a000196aff155f3bbcac1a361cd0b92f5ec5;p=thirdparty%2Fsqlite.git

Fix API documentation typos.  Emphasize that the sqlite3_config() routine is
not threadsafe.

FossilOrigin-Name: 786333e05a75406bbd0b5c9c7beb8f16022eabec
---

diff --git a/manifest b/manifest
index eb8d534263..2ada10a8c9 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Import\scommon\schanges\sfrom\sthe\smutex\sinitialization\sbranch.
-D 2015-09-12T18:57:45.818
+C Fix\sAPI\sdocumentation\stypos.\s\sEmphasize\sthat\sthe\ssqlite3_config()\sroutine\sis\nnot\sthreadsafe.
+D 2015-09-12T19:27:41.193
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in f85066ce844a28b671aaeeff320921cd0ce36239
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -342,7 +342,7 @@ F src/resolve.c 3126f7694b8ce0f97282d7dd3a5198b8fa18dce9
 F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
 F src/select.c c17613385bc6b095c421b1f30548814f5fd8a9b2
 F src/shell.c 6332ef06db1390ef812cfdff1fc97b4fd76cdd42
-F src/sqlite.h.in dbaf8c3796e80221de4395b5f4f872abddb5f89f
+F src/sqlite.h.in b7386d2bae6a43ba35be56e0d495b8725998101e
 F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
 F src/sqlite3ext.h 64350bf36833a56ad675e27392a913f417c5c308
 F src/sqliteInt.h b3e590f374b376a793b93e2387b8d5aca0fc92c4
@@ -1386,7 +1386,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 86781093bdb4c4fdedd228cb1c8961db48a483bb
-R 65cef7a212785e2c4ed01bbc55ee07c1
-U mistachkin
-Z 122b4ea017ab904cde327a85d32df791
+P 334720c01722478af0d3dfd6fe8bafd88ba09f49
+R 584c0e6cff093a89c297ea7dca4357da
+U drh
+Z 4de500fe7cfddcd5498eea834d793093
diff --git a/manifest.uuid b/manifest.uuid
index 62601ecd30..1ca4768f53 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-334720c01722478af0d3dfd6fe8bafd88ba09f49
\ No newline at end of file
+786333e05a75406bbd0b5c9c7beb8f16022eabec
\ No newline at end of file
diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index d5b4f4e92d..93a624c93a 100644
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -124,7 +124,7 @@ extern "C" {
 ** but are associated with the library instead of the header file.  ^(Cautious
 ** programmers might include assert() statements in their application to
 ** verify that values returned by these interfaces match the macros in
-** the header, and thus insure that the application is
+** the header, and thus ensure that the application is
 ** compiled with matching library and header files.
 **
 ** <blockquote><pre>
@@ -374,7 +374,7 @@ typedef int (*sqlite3_callback)(void*,int,char**, char**);
 ** Restrictions:
 **
 ** <ul>
-** <li> The application must insure that the 1st parameter to sqlite3_exec()
+** <li> The application must ensure that the 1st parameter to sqlite3_exec()
 **      is a valid and open [database connection].
 ** <li> The application must not close the [database connection] specified by
 **      the 1st parameter to sqlite3_exec() while sqlite3_exec() is running.
@@ -1367,9 +1367,11 @@ int sqlite3_os_end(void);
 ** applications and so this routine is usually not necessary.  It is
 ** provided to support rare applications with unusual needs.
 **
-** The sqlite3_config() interface is not threadsafe.  The application
-** must insure that no other SQLite interfaces are invoked by other
-** threads while sqlite3_config() is running.  Furthermore, sqlite3_config()
+** <b>The sqlite3_config() interface is not threadsafe. The application
+** must ensure that no other SQLite interfaces are invoked by other
+** threads while sqlite3_config() is running.</b>
+**
+** The sqlite3_config() interface
 ** may only be invoked prior to library initialization using
 ** [sqlite3_initialize()] or after shutdown by [sqlite3_shutdown()].
 ** ^If sqlite3_config() is called after [sqlite3_initialize()] and before