From: drh <drh@noemail.net>
Date: Thu, 4 Apr 2013 01:54:10 +0000 (+0000)
Subject: Updates to the file-control documentation.  No changes to code.
X-Git-Tag: version-3.7.17~112
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=67f7c780f305ea6717448f68d2a4b64c03567337;p=thirdparty%2Fsqlite.git

Updates to the file-control documentation.  No changes to code.

FossilOrigin-Name: 51fab480d0487107709e6c9e00bc0512b82ef1aa
---

diff --git a/manifest b/manifest
index b53e120abe..30005c082d 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Increase\sthe\sversion\snumber\sto\s3.7.17.
-D 2013-04-04T00:51:14.877
+C Updates\sto\sthe\sfile-control\sdocumentation.\s\sNo\schanges\sto\scode.
+D 2013-04-04T01:54:10.804
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in aafa71d66bab7e87fb2f348152340645f79f0244
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -176,7 +176,7 @@ F src/resolve.c 9079da7d59aed2bb14ec8315bc7f720dd85b5b65
 F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
 F src/select.c 01540bcd3df3c8f1187158e77986028b1c667258
 F src/shell.c 319b7791cee6c763b60fde1b590bfaf62613cf37
-F src/sqlite.h.in faeb6b3470193e599d79289f77f984b8a78136e1
+F src/sqlite.h.in 5fdc866a06ac82fd3c6ccb9f59a100151a36568c
 F src/sqlite3.rc fea433eb0a59f4c9393c8e6d76a6e2596b1fe0c0
 F src/sqlite3ext.h 7183ab832e23db0f934494f16928da127a571d75
 F src/sqliteInt.h 1664dc5ad6f8d4dab871416628aa3271044d66c0
@@ -1044,7 +1044,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
-P fff2be60779571c8fb89158db976ec3755e9a223
-R 31e6af012b822f077ea81ef26342c1b3
+P 5c8c5a2a12f3f5e29c91c4d16e8b4afd4307354e
+R 88aa21f5b7ea257c6d372937f19d04ff
 U drh
-Z 4751dcf9197532f06483d5731e95cbb0
+Z 1441bae4ec4fe09d305292864aa8123c
diff --git a/manifest.uuid b/manifest.uuid
index c01513bb51..556e99572e 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5c8c5a2a12f3f5e29c91c4d16e8b4afd4307354e
\ No newline at end of file
+51fab480d0487107709e6c9e00bc0512b82ef1aa
\ No newline at end of file
diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index a4fb1a8a9a..74cecbcf22 100644
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -868,7 +868,8 @@ struct sqlite3_io_methods {
 ** it is able to override built-in [PRAGMA] statements.
 **
 ** <li>[[SQLITE_FCNTL_BUSYHANDLER]]
-** ^This file-control may be invoked by SQLite on the database file handle
+** ^The [SQLITE_FCNTL_BUSYHANDLER]
+** file-control may be invoked by SQLite on the database file handle
 ** shortly after it is opened in order to provide a custom VFS with access
 ** to the connections busy-handler callback. The argument is of type (void **)
 ** - an array of two (void *) values. The first (void *) actually points
@@ -879,7 +880,8 @@ struct sqlite3_io_methods {
 ** current operation.
 **
 ** <li>[[SQLITE_FCNTL_TEMPFILENAME]]
-** ^Application can invoke this file-control to have SQLite generate a
+** ^Application can invoke the [SQLITE_FCNTL_TEMPFILENAME] file-control
+** to have SQLite generate a
 ** temporary filename using the same algorithm that is followed to generate
 ** temporary filenames for TEMP tables and other internal uses.  The
 ** argument should be a char** which will be filled with the filename
@@ -887,10 +889,14 @@ struct sqlite3_io_methods {
 ** invoke [sqlite3_free()] on the result to avoid a memory leak.
 **
 ** <li>[[SQLITE_FCNTL_MMAP_LIMIT]]
-** The argument is assumed to pointer to a value of type sqlite3_int64 that
+** The [SQLITE_FCNTL_MMAP_LIMIT] file control is used to query or set the
+** maximum number of bytes that will be used for memory-mapped I/O.
+** The argument is a pointer to a value of type sqlite3_int64 that
 ** is an advisory maximum number of bytes in the file to memory map.  The
 ** pointer is overwritten with the old value.  The limit is not changed if
-** the original value pointed to is negative.
+** the originally pointed to is negative, and so the current limit can be
+** queried by passing in a pointer to a negative number.  This file-control
+** is used internally to implement [PRAGMA mmap_limit].
 **
 ** </ul>
 */
@@ -1646,11 +1652,10 @@ struct sqlite3_mem_methods {
 ** is the default maximum number of bytes of process address space that
 ** should be used for accessing each database file using memory mapping.
 ** The default setting can be overridden by each database connection using
-** either the [PRAGMA mmap_limit] command or the "mmaplimit" query parameter
-** on the [URI filename] when opening the databaes file or by using the
+** either the [PRAGMA mmap_limit] command, or by using the
 ** [SQLITE_FCNTL_MMAP_LIMIT] file control.  The value set here overrides the
-** compile-time default that is set using the [SQLITE_DEFAULT_MMAP_LIMIT]
-** compile-time option.  If the argument to this option is negative, then
+** compile-time default that is set using [SQLITE_DEFAULT_MMAP_LIMIT].
+** If the argument to this option is negative, then
 ** the memory map limit is set to the compile-time default.
 ** </dl>
 */