From: drh <drh@noemail.net>
Date: Fri, 22 Jul 2016 20:20:53 +0000 (+0000)
Subject: Add requirements marks to the sqlite3_expanded_sql() documentation.
X-Git-Tag: version-3.14.0~57^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dec8bc0eb49b5af519ead428296dbfce884ae1cb;p=thirdparty%2Fsqlite.git

Add requirements marks to the sqlite3_expanded_sql() documentation.

FossilOrigin-Name: 409535e6dfc307f26ea3d9f51be51c439b6d7b22
---

diff --git a/manifest b/manifest
index fdc8e8e54c..a198d7e20b 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C The\ssqlite3_expanded_sql()\sfunction\scompiles,\sbut\salways\sreturns\sNULL,\swhen\nthe\sSQLITE_OMIT_TRACE\scompile-time\soption\sis\sused.
-D 2016-07-15T10:01:06.596
+C Add\srequirements\smarks\sto\sthe\ssqlite3_expanded_sql()\sdocumentation.
+D 2016-07-22T20:20:53.758
 F Makefile.in 6c20d44f72d4564f11652b26291a214c8367e5db
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc d66d0395c38571aab3804f8db0fa20707ae4609a
@@ -385,7 +385,7 @@ F src/resolve.c cca3aa77b95706df5d635a2141a4d1de60ae6598
 F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
 F src/select.c f3c6e9065fb34f6a23af27ec7f1f717ffbfc2ee4
 F src/shell.c a8a9e392a6a2777fabf5feb536931cb190f235e5
-F src/sqlite.h.in aad252c428329522c4146a8da236e92496b15de5
+F src/sqlite.h.in f1e866f8b789391ba7f77f71164e51b7f8b4b111
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 46f300b6e300e0fa916d7d58c44b53415b8471a9
 F src/sqliteInt.h 48cd97eb134665348393dfe277b4c14d1085bfc7
@@ -1506,7 +1506,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P d2b1fa55e8809ffc25a25f256349b8d08beadab5
-R 62f79e8e18332d747e11f9ca2d1624d9
+P 53c25ebe34e6776a12260078852973b1d581d20f
+R d9d54b2d05c15d2014a2ffa7a3228fb1
 U drh
-Z 83a3df8e5ff251b53fc0f846b015b7e8
+Z 3464c79040c125df7d1b54a6ef5c52ad
diff --git a/manifest.uuid b/manifest.uuid
index 84bd71ab4a..5369a8751e 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-53c25ebe34e6776a12260078852973b1d581d20f
\ No newline at end of file
+409535e6dfc307f26ea3d9f51be51c439b6d7b22
\ No newline at end of file
diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index 2a34fb8e9d..5c4c373b80 100644
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -3503,14 +3503,14 @@ int sqlite3_prepare16_v2(
 ** string containing the SQL text of prepared statement P with
 ** [bound parameters] expanded.
 **
-** For example, if a prepared statement is created using the SQL
+** ^(For example, if a prepared statement is created using the SQL
 ** text "SELECT $abc,:xyz" and if parameter $abc is bound to integer 2345
 ** and parameter :xyz is unbound, then sqlite3_sql() will return
 ** the original string, "SELECT $abc,:xyz" but sqlite3_expanded_sql()
-** will return "SELECT 2345,NULL".
+** will return "SELECT 2345,NULL".)^
 **
-** The [SQLITE_TRACE_SIZE_LIMIT] setting limits the size of a 
-** bound parameter expansion.  If SQLite is built with the
+** ^The [SQLITE_TRACE_SIZE_LIMIT] setting limits the size of a 
+** bound parameter expansion.  ^If SQLite is built with the
 ** [SQLITE_OMIT_TRACE] compile-time option then the sqlite3_expanded_sql()
 ** interface is non-functional and always returns NULL.
 **