diff --git a/manifest b/manifest
index 3942be98f3..309d77d5d0 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sa\stest\scase\sof\spreparing\sa\sstatement\swith\san\snBytes\sparameter\sof\s0\nand\swhere\sthe\sprevious\sbyte\sof\sthe\sstring\sis\szero.\s\sTicket\s#3134.\s(CVS\s5156)
-D 2008-05-23T14:49:49
+C Fixed\svarious\stypos,\sspelling,\sgrammar,\sand\sformatting\smistakes.\s\sTicket\s#3124.\s(CVS\s5157)
+D 2008-05-23T17:21:09
F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7
F Makefile.in 79aeba12300a54903f1b1257c1e7c190234045dd
F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -130,7 +130,7 @@ F src/printf.c f2d4f6c5b0ec24b643e85fe60258adad8b1f6acc
F src/random.c 2b2db2de4ab491f5a14d3480466f8f4b5a5db74a
F src/select.c da43ce3080112aa77863e9c570c1df19a892acb8
F src/shell.c a12ea645271b7876c8f080146f48e20b00d367ec
-F src/sqlite.h.in 7bbf0c2359fd1de3e337a5ed614b17ddac1b18da
+F src/sqlite.h.in bd32c7e159cf5f18f7de32d7e53a61e7218d4b53
F src/sqlite3ext.h faacd0e6a81aabee0861c6d7883c9172e74ef5b3
F src/sqliteInt.h 70a2b0bf856bbdb86b10d994ea863f6591ab7144
F src/sqliteLimit.h f435e728c6b620ef7312814d660a81f9356eb5c8
@@ -636,7 +636,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P 2d2c53e5058412a5f484ac2ca5bcef596aed2a7b
-R d5354c2350726260a7fbdf53312cdb32
-U drh
-Z 65ba60bec746e8c3fc476890f017c4c4
+P 846a69acb59403438696000b4ffd588ab42b2f95
+R 8d33bdff8a616328f5fd78e7f84c8843
+U shane
+Z ffb4343d0f8907272f977c577a7ffada
diff --git a/manifest.uuid b/manifest.uuid
index 9c2e1fcd9c..6dc34e1756 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-846a69acb59403438696000b4ffd588ab42b2f95
\ No newline at end of file
+77d5a7aa1c7ea715298228ed2dbd0497cacbd0e4
\ No newline at end of file
diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index 7a1666b03d..397b67ba47 100644
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -30,7 +30,7 @@
** the version number) and changes its name to "sqlite3.h" as
** part of the build process.
**
-** @(#) $Id: sqlite.h.in,v 1.317 2008/05/21 15:01:21 shane Exp $
+** @(#) $Id: sqlite.h.in,v 1.318 2008/05/23 17:21:09 shane Exp $
*/
#ifndef _SQLITE3_H_
#define _SQLITE3_H_
@@ -296,7 +296,7 @@ typedef int (*sqlite3_callback)(void*,int,char**, char**);
** the actions of the interface shall be the same as if the
** S parameter where an empty string.
**
-** {F12104} The return value of [sqlite3_exec()] shall be SQLITE_OK if all
+** {F12104} The return value of [sqlite3_exec()] shall be [SQLITE_OK] if all
** SQL statements run successfully and to completion.
**
** {F12105} The return value of [sqlite3_exec()] shall be an appropriate
@@ -772,7 +772,7 @@ typedef struct sqlite3_mutex sqlite3_mutex;
** allocate the structure; it should just fill it in.
**
** {F11149} The flags argument to xAccess() may be [SQLITE_ACCESS_EXISTS]
-** to test for the existance of a file,
+** to test for the existence of a file,
** or [SQLITE_ACCESS_READWRITE] to test to see
** if a file is readable and writable, or [SQLITE_ACCESS_READ]
** to test to see if a file is at least readable. {END} The file can be a
@@ -781,7 +781,7 @@ typedef struct sqlite3_mutex sqlite3_mutex;
** {F11150} SQLite will always allocate at least mxPathname+1 bytes for
** the output buffers for xGetTempname and xFullPathname. {F11151} The exact
** size of the output buffer is also passed as a parameter to both
-** methods. {END} If the output buffer is not large enough, SQLITE_CANTOPEN
+** methods. {END} If the output buffer is not large enough, [SQLITE_CANTOPEN]
** should be returned. As this is handled as a fatal error by SQLite,
** vfs implementations should endeavor to prevent this by setting
** mxPathname to a sufficiently large value.
@@ -828,7 +828,7 @@ struct sqlite3_vfs {
** {F11191} These integer constants can be used as the third parameter to
** the xAccess method of an [sqlite3_vfs] object. {END} They determine
** what kind of permissions the xAccess method is
-** looking for. {F11192} With SQLITE_ACCESS_EXISTS, the xAccess method
+** looking for. {F11192} With [SQLITE_ACCESS_EXISTS], the xAccess method
** simply checks to see if the file exists. {F11193} With
** SQLITE_ACCESS_READWRITE, the xAccess method checks to see
** if the file is both readable and writable. {F11194} With
@@ -984,7 +984,7 @@ sqlite3_int64 sqlite3_last_insert_rowid(sqlite3*);
**
** {U12252} If a separate thread makes changes on the same database connection
** while [sqlite3_changes()] is running then the value returned
-** is unpredictable and unmeaningful.
+** is unpredictable and not meaningful.
*/
int sqlite3_changes(sqlite3*);
@@ -1029,7 +1029,7 @@ int sqlite3_changes(sqlite3*);
**
** {U12264} If a separate thread makes changes on the same database connection
** while [sqlite3_total_changes()] is running then the value
-** returned is unpredictable and unmeaningful.
+** returned is unpredictable and not meaningful.
*/
int sqlite3_total_changes(sqlite3*);
@@ -1178,7 +1178,7 @@ int sqlite3_complete16(const void *sql);
**
** {F12312} The default busy handler for new database connections is NULL.
**
-** {F12314} When two or more database connection share a common cache,
+** {F12314} When two or more database connection share a [sqlite3_enable_shared_cache | common cache],
** the busy handler for the database connection currently using
** the cache is invoked when the cache encounters a lock.
**
@@ -1186,7 +1186,7 @@ int sqlite3_complete16(const void *sql);
** interface that provoked the locking event will return
** [SQLITE_BUSY].
**
-** {F12318} SQLite will invokes the busy handler with two argument which
+** {F12318} SQLite will invokes the busy handler with two arguments which
** are a copy of the pointer supplied by the 3rd parameter to
** [sqlite3_busy_handler()] and a count of the number of prior
** invocations of the busy handler for the same locking event.
@@ -1292,7 +1292,7 @@ int sqlite3_busy_timeout(sqlite3*, int ms);
**
** After the calling function has finished using the result, it should
** pass the pointer to the result table to sqlite3_free_table() in order to
-** release the memory that was malloc-ed. Because of the way the
+** release the memory that was malloced. Because of the way the
** [sqlite3_malloc()] happens within sqlite3_get_table(), the calling
** function must not try to call [sqlite3_free()] directly. Only
** [sqlite3_free_table()] is able to release the memory properly and safely.
@@ -1371,7 +1371,7 @@ void sqlite3_free_table(char **result);
**
** These routines all implement some additional formatting
** options that are useful for constructing SQL statements.
-** All of the usual printf formatting options apply. In addition, there
+** All of the usual printf() formatting options apply. In addition, there
** is are "%q", "%Q", and "%z" options.
**
** The %q option works like %s in that it substitutes a null-terminated
@@ -1458,7 +1458,7 @@ char *sqlite3_snprintf(int,char*,const char*, ...);
** The SQLite core uses these three routines for all of its own
** internal memory allocation needs. "Core" in the previous sentence
** does not include operating-system specific VFS implementation. The
-** windows VFS uses native malloc and free for some operations.
+** Windows VFS uses native malloc() and free() for some operations.
**
** The sqlite3_malloc() routine returns a pointer to a block
** of memory at least N bytes in length, where N is the parameter.
@@ -1516,10 +1516,10 @@ char *sqlite3_snprintf(int,char*,const char*, ...);
** is no longer provided. Only built-in memory allocators can be
** used.
**
-** The windows OS interface layer calls
+** The Windows OS interface layer calls
** the system malloc() and free() directly when converting
** filenames between the UTF-8 encoding used by SQLite
-** and whatever filename encoding is used by the particular windows
+** and whatever filename encoding is used by the particular Windows
** installation. Memory allocation errors are detected, but
** they are reported back as [SQLITE_CANTOPEN] or
** [SQLITE_IOERR] rather than [SQLITE_NOMEM].
@@ -1556,7 +1556,7 @@ char *sqlite3_snprintf(int,char*,const char*, ...);
**
** {F17321} When [sqlite3_realloc(P,N)] returns a non-NULL pointer, it first
** copies the first K bytes of content from P into the newly allocated
-** where K is the lessor of N and the size of the buffer P.
+** where K is the lesser of N and the size of the buffer P.
**
** {F17322} When [sqlite3_realloc(P,N)] returns a non-NULL pointer, it first
** releases the buffer P.
@@ -1595,7 +1595,7 @@ void sqlite3_free(void*);
**
** {F17373} The [sqlite3_memory_highwater()] routine returns the maximum
** value of [sqlite3_memory_used()]
-** since the highwater mark was last reset.
+** since the high-water mark was last reset.
**
** {F17374} The values returned by [sqlite3_memory_used()] and
** [sqlite3_memory_highwater()] include any overhead
@@ -1603,10 +1603,10 @@ void sqlite3_free(void*);
** but not overhead added by the any underlying system library
** routines that [sqlite3_malloc()] may call.
**
-** {F17375} The memory highwater mark is reset to the current value of
+** {F17375} The memory high-water mark is reset to the current value of
** [sqlite3_memory_used()] if and only if the parameter to
** [sqlite3_memory_highwater()] is true. The value returned
-** by [sqlite3_memory_highwater(1)] is the highwater mark
+** by [sqlite3_memory_highwater(1)] is the high-water mark
** prior to the reset.
*/
sqlite3_int64 sqlite3_memory_used(void);
@@ -1619,7 +1619,7 @@ sqlite3_int64 sqlite3_memory_highwater(int resetFlag);
** select random ROWIDs when inserting new records into a table that
** already uses the largest possible ROWID. The PRNG is also used for
** the build-in random() and randomblob() SQL functions. This interface allows
-** appliations to access the same PRNG for other purposes.
+** applications to access the same PRNG for other purposes.
**
** A call to this routine stores N bytes of randomness into buffer P.
**
@@ -1794,7 +1794,7 @@ int sqlite3_set_authorizer(
** INVARIANTS:
**
** {F12551} The second parameter to an
-** [sqlite3_set_authorizer | authorizer callback is always an integer
+** [sqlite3_set_authorizer | authorizer callback] is always an integer
** [SQLITE_COPY | authorizer code] that specifies what action
** is being authorized.
**
@@ -1857,7 +1857,7 @@ int sqlite3_set_authorizer(
** various times when an SQL statement is being run by [sqlite3_step()].
** The callback returns a UTF-8 rendering of the SQL statement text
** as the statement first begins executing. Additional callbacks occur
-** as each triggersubprogram is entered. The callbacks for triggers
+** as each triggered subprogram is entered. The callbacks for triggers
** contain a UTF-8 SQL comment that identifies the trigger.
**
** The callback function registered by sqlite3_profile() is invoked
@@ -1948,7 +1948,7 @@ void *sqlite3_profile(sqlite3*,
** then the progress callback is never invoked. {END}
**
** {F12916} Every call to [sqlite3_progress_handler()]
-** overwrites any previously registere progress handler.
+** overwrites any previously registered progress handler.
**
** {F12917} If the progress handler callback is NULL then no progress
** handler is invoked.
@@ -1985,7 +1985,7 @@ void sqlite3_progress_handler(sqlite3*, int, int(*)(void*), void*);
** to [sqlite3_close()] when it is no longer required.
**
** The [sqlite3_open_v2()] interface works like [sqlite3_open()]
-** except that it acccepts two additional parameters for additional control
+** except that it accepts two additional parameters for additional control
** over the new database connection. The flags parameter can be
** one of:
**
@@ -2028,7 +2028,7 @@ void sqlite3_progress_handler(sqlite3*, int, int(*)(void*), void*);
** fourth parameter is a NULL pointer then the default [sqlite3_vfs]
** object is used.
**
-** Note to windows users: The encoding used for the filename argument
+** Note to Windows users: The encoding used for the filename argument
** of [sqlite3_open()] and [sqlite3_open_v2()] must be UTF-8, not whatever
** codepage is currently defined. Filenames containing international
** characters must be converted to UTF-8 prior to passing them into
@@ -2088,7 +2088,7 @@ void sqlite3_progress_handler(sqlite3*, int, int(*)(void*), void*);
** in sqlite3_open_v2()?
**
** {F12719} If the filename is NULL or an empty string, then a private,
-** ephermeral on-disk database will be created.
+** ephemeral on-disk database will be created.
**
** Parameter Output Type Description
@@ -4888,7 +4888,7 @@ void sqlite3_reset_auto_extension(void);
** to be experimental. The interface might change in incompatible ways.
** If this is a problem for you, do not use the interface at this time.
**
-** When the virtual-table mechanism stablizes, we will declare the
+** When the virtual-table mechanism stabilizes, we will declare the
** interface fixed, support it indefinitely, and remove this comment.
*/
@@ -5118,7 +5118,7 @@ int sqlite3_declare_vtab(sqlite3*, const char *zCreateTable);
** before this API is called, a new function is created. The implementation
** of the new function always causes an exception to be thrown. So
** the new function is not good for anything by itself. Its only
-** purpose is to be a place-holder function that can be overloaded
+** purpose is to be a placeholder function that can be overloaded
** by virtual tables.
**
** This API should be considered part of the virtual table interface,
@@ -5200,7 +5200,7 @@ typedef struct sqlite3_blob sqlite3_blob;
** {F17821} If an error occurs during evaluation of [sqlite3_blob_open(D,...)]
** then subsequent calls to [sqlite3_errcode(D)],
** [sqlite3_errmsg(D)], and [sqlite3_errmsg16(D)] will return
-** information approprate for that error.
+** information appropriate for that error.
*/
int sqlite3_blob_open(
sqlite3*,
@@ -5304,7 +5304,7 @@ int sqlite3_blob_bytes(sqlite3_blob *);
** {F17868} If an error occurs during evaluation of [sqlite3_blob_read(P,...)]
** then subsequent calls to [sqlite3_errcode(D)],
** [sqlite3_errmsg(D)], and [sqlite3_errmsg16(D)] will return
-** information approprate for that error, where D is the
+** information appropriate for that error, where D is the
** database handle that was used to open blob handle P.
*/
int sqlite3_blob_read(sqlite3_blob *, void *Z, int N, int iOffset);
@@ -5359,7 +5359,7 @@ int sqlite3_blob_read(sqlite3_blob *, void *Z, int N, int iOffset);
** {F17888} If an error occurs during evaluation of [sqlite3_blob_write(D,...)]
** then subsequent calls to [sqlite3_errcode(D)],
** [sqlite3_errmsg(D)], and [sqlite3_errmsg16(D)] will return
-** information approprate for that error.
+** information appropriate for that error.
*/
int sqlite3_blob_write(sqlite3_blob *, const void *z, int n, int iOffset);
@@ -5448,7 +5448,7 @@ int sqlite3_vfs_unregister(sqlite3_vfs*);
** that does no real locking and is appropriate for use in
** a single-threaded application. The SQLITE_MUTEX_OS2,
** SQLITE_MUTEX_PTHREAD, and SQLITE_MUTEX_W32 implementations
-** are appropriate for use on os/2, unix, and windows.
+** are appropriate for use on OS/2, Unix, and Windows.
**
** If SQLite is compiled with the SQLITE_MUTEX_APPDEF preprocessor
** macro defined (with "-DSQLITE_MUTEX_APPDEF=1"), then no mutex
@@ -5510,7 +5510,7 @@ int sqlite3_vfs_unregister(sqlite3_vfs*);
** The sqlite3_mutex_enter() and sqlite3_mutex_try() routines attempt
** to enter a mutex. {F17024} If another thread is already within the mutex,
** sqlite3_mutex_enter() will block and sqlite3_mutex_try() will return
-** SQLITE_BUSY. {F17025} The sqlite3_mutex_try() interface returns SQLITE_OK
+** SQLITE_BUSY. {F17025} The sqlite3_mutex_try() interface returns [SQLITE_OK]
** upon successful entry. {F17026} Mutexes created using
** SQLITE_MUTEX_RECURSIVE can be entered multiple times by the same thread.
** {F17027} In such cases the,
@@ -5619,7 +5619,7 @@ int sqlite3_file_control(sqlite3*, const char *zDbName, int op, void*);
**
** The sqlite3_test_control() interface is used to read out internal
** state of SQLite and to inject faults into SQLite for testing
-** purposes. The first parameter a operation code that determines
+** purposes. The first parameter is an operation code that determines
** the number, meaning, and operation of all subsequent parameters.
**
** This interface is not for use by applications. It exists solely
@@ -5639,7 +5639,7 @@ int sqlite3_test_control(int op, ...);
** These constants are the valid operation code parameters used
** as the first argument to [sqlite3_test_control()].
**
-** These parameters and their meansing are subject to change
+** These parameters and their meanings are subject to change
** without notice. These values are for testing purposes only.
** Applications should not use any of these parameters or the
** [sqlite3_test_control()] interface.