From: mlcreech Date: Fri, 7 Mar 2008 03:20:31 +0000 (+0000) Subject: Trivial documentation fixes (CVS 4836) X-Git-Tag: version-3.6.10~1341 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b279941f7309608571c1ba21d13d9f537281a584;p=thirdparty%2Fsqlite.git Trivial documentation fixes (CVS 4836) FossilOrigin-Name: 9819cefbd7032fe6884c6c891e8e399000e0821f --- diff --git a/manifest b/manifest index 65f6c06e71..3f84dbd7c4 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\smissing\sprefix\s&\sexec_prefix\sto\sMakefile\s-\sfixes\s#2979.\s(CVS\s4835) -D 2008-03-07T02:20:57 +C Trivial\sdocumentation\sfixes\s(CVS\s4836) +D 2008-03-07T03:20:32 F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7 F Makefile.in d521464011d6965bbda1b699f1850c6e33141c73 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 @@ -139,7 +139,7 @@ F src/random.c 02ef38b469237482f1ea14a78b2087cfbaec48bd F src/select.c d0a1e01a2a6c05bd60324e843c7e4581d3605950 F src/server.c 087b92a39d883e3fa113cae259d64e4c7438bc96 F src/shell.c 22297fffa6f00a6c6d44020fa13b1184a1bb372d -F src/sqlite.h.in b8158aa606f0b39426d63132ae0530d91c021abb +F src/sqlite.h.in 140a7c2f8a74b52d5e42b714bd79ce4c5df21538 F src/sqlite3ext.h 50c70a894ffe8e6ada5948c89b91db0a80a6b2a7 F src/sqliteInt.h 6b9ee2df064c05b53c33eadc2e15bb2b23d60c89 F src/sqliteLimit.h ee4430f88f69bf63527967bb35ca52af7b0ccb1e @@ -623,7 +623,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5 -P 6ebce3b798c60050fb3c583d805570bb06837108 -R 5a209571ae05392be15c187e2628a20a +P 4cda019b63e8ba9f1101fb296a7d745c69e84e00 +R c15bb445f4066eaf2e9cf0566419d3fb U mlcreech -Z dc5ddeca7e7a10617e051ee18db0b672 +Z 485b426fb4816fce857c16a85c39d37f diff --git a/manifest.uuid b/manifest.uuid index d5aa98579b..b9c3a00ec6 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -4cda019b63e8ba9f1101fb296a7d745c69e84e00 \ No newline at end of file +9819cefbd7032fe6884c6c891e8e399000e0821f \ No newline at end of file diff --git a/src/sqlite.h.in b/src/sqlite.h.in index 66b3c06ec9..caf5f1ee9f 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.289 2008/03/03 18:47:28 drh Exp $ +** @(#) $Id: sqlite.h.in,v 1.290 2008/03/07 03:20:32 mlcreech Exp $ */ #ifndef _SQLITE3_H_ #define _SQLITE3_H_ @@ -132,7 +132,7 @@ int sqlite3_libversion_number(void); ** ** SQLite can be compiled with or without mutexes. When ** the SQLITE_THREADSAFE C preprocessor macro is true, mutexes -** are enabled and SQLite is threadsafe. When that macro os false, +** are enabled and SQLite is threadsafe. When that macro is false, ** the mutexes are omitted. Without the mutexes, it is not safe ** to use SQLite from more than one thread. ** @@ -434,7 +434,7 @@ int sqlite3_exec( ** {F10225} Extended result code names contain two or more "_" characters. ** ** {F10226} The numeric value of an extended result code contains the -** numeric value of its corresponding primary result code it +** numeric value of its corresponding primary result code in ** its least significant 8 bits. */ #define SQLITE_IOERR_READ (SQLITE_IOERR | (1<<8)) @@ -453,7 +453,7 @@ int sqlite3_exec( /* ** CAPI3REF: Flags For File Open Operations {F10230} ** -** These bit values are intended for use in then +** These bit values are intended for use in the ** 3rd parameter to the [sqlite3_open_v2()] interface and ** in the 4th parameter to the xOpen method of the ** [sqlite3_vfs] object. @@ -520,12 +520,12 @@ int sqlite3_exec( ** CAPI3REF: Synchronization Type Flags {F10260} ** ** When SQLite invokes the xSync() method of an -** [sqlite3_io_methods] object it uses a combination of the +** [sqlite3_io_methods] object it uses a combination of ** these integer values as the second argument. ** ** When the SQLITE_SYNC_DATAONLY flag is used, it means that the ** sync operation only needs to flush data to mass storage. Inode -** information need not be flushed. The SQLITE_SYNC_NORMAL means +** information need not be flushed. The SQLITE_SYNC_NORMAL flag means ** to use normal fsync() semantics. The SQLITE_SYNC_FULL flag means ** to use Mac OS-X style fullsync instead of fsync(). */ @@ -553,7 +553,7 @@ struct sqlite3_file { ** CAPI3REF: OS Interface File Virtual Methods Object {F11120} ** ** Every file opened by the [sqlite3_vfs] xOpen method contains a pointer to -** an instance of the this object. This object defines the +** an instance of this object. This object defines the ** methods used to perform various operations against the open file. ** ** The flags argument to xSync may be one of [SQLITE_SYNC_NORMAL] or @@ -651,7 +651,7 @@ struct sqlite3_io_methods { ** interface. ** ** The [SQLITE_FCNTL_LOCKSTATE] opcode is used for debugging. This -** opcode cases the xFileControl method to write the current state of +** opcode causes the xFileControl method to write the current state of ** the lock (one of [SQLITE_LOCK_NONE], [SQLITE_LOCK_SHARED], ** [SQLITE_LOCK_RESERVED], [SQLITE_LOCK_PENDING], or [SQLITE_LOCK_EXCLUSIVE]) ** into an integer that the pArg argument points to. This capability @@ -693,7 +693,7 @@ typedef struct sqlite3_mutex sqlite3_mutex; ** in a thread-safe way. The [sqlite3_vfs_find()] interface ** searches the list. ** -** The pNext field is the only fields in the sqlite3_vfs +** The pNext field is the only field in the sqlite3_vfs ** structure that SQLite will ever modify. SQLite will only access ** or modify this field while holding a particular static mutex. ** The application should never modify anything within the sqlite3_vfs @@ -731,12 +731,12 @@ typedef struct sqlite3_mutex sqlite3_mutex; ** ** The file I/O implementation can use the object type flags to ** changes the way it deals with files. For example, an application -** that does not care about crash recovery or rollback, might make -** the open of a journal file a no-op. Writes to this journal are -** also a no-op. Any attempt to read the journal return SQLITE_IOERR. -** Or the implementation might recognize the a database file will -** be doing page-aligned sector reads and writes in a random order -** and set up its I/O subsystem accordingly. +** that does not care about crash recovery or rollback might make +** the open of a journal file a no-op. Writes to this journal would +** also be no-ops, and any attempt to read the journal would return +** SQLITE_IOERR. Or the implementation might recognize that a database +** file will be doing page-aligned sector reads and writes in a random +** order and set up its I/O subsystem accordingly. ** ** SQLite might also add one of the following flags to the xOpen ** method: @@ -753,7 +753,7 @@ typedef struct sqlite3_mutex sqlite3_mutex; ** for exclusive access. This flag is set for all files except ** for the main database file. {END} ** -** {F11148} At least szOsFile bytes of memory is allocated by SQLite +** {F11148} At least szOsFile bytes of memory are allocated by SQLite ** to hold the [sqlite3_file] structure passed as the third ** argument to xOpen. {END} The xOpen method does not have to ** allocate the structure; it should just fill it in. @@ -765,7 +765,7 @@ typedef struct sqlite3_mutex sqlite3_mutex; ** to test to see if a file is at least readable. {END} The file can be a ** directory. ** -** {F11150} SQLite will always allocate at least mxPathname+1 byte for +** {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 @@ -779,7 +779,7 @@ typedef struct sqlite3_mutex sqlite3_mutex; ** The xRandomness() function attempts to return nBytes bytes ** of good-quality randomness into zOut. The return value is ** the actual number of bytes of randomness obtained. The -** xSleep() method cause the calling thread to sleep for at +** xSleep() method causes the calling thread to sleep for at ** least the number of microseconds given. The xCurrentTime() ** method returns a Julian Day Number for the current date and ** time. @@ -814,7 +814,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 -** the kind of what kind of permissions the xAccess method is +** what kind of permissions the xAccess method is ** 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 @@ -855,7 +855,7 @@ int sqlite3_extended_result_codes(sqlite3*, int onoff); ** as an undeclared column named ROWID, OID, or _ROWID_ as long as those ** names are not also used by explicitly declared columns. If ** the table has a column of type INTEGER PRIMARY KEY then that column -** is another an alias for the rowid. +** is another alias for the rowid. ** ** This routine returns the rowid of the most recent ** successful INSERT into the database from the database connection @@ -895,7 +895,7 @@ int sqlite3_extended_result_codes(sqlite3*, int onoff); ** ** LIMITATIONS: ** -** {U12232} If separate thread does a new insert on the same +** {U12232} If a separate thread does a new insert on the same ** database connection while the [sqlite3_last_insert_rowid()] ** function is running and thus changes the last insert rowid, ** then the value returned by [sqlite3_last_insert_rowid()] is @@ -915,7 +915,7 @@ sqlite3_int64 sqlite3_last_insert_rowid(sqlite3*); ** triggers are not counted. Use the [sqlite3_total_changes()] function ** to find the total number of changes including changes caused by triggers. ** -** A "row changes" is a change to a single row of a single table +** A "row change" is a change to a single row of a single table ** caused by an INSERT, DELETE, or UPDATE statement. Rows that ** are changed as side effects of REPLACE constraint resolution, ** rollback, ABORT processing, DROP TABLE, or by any other @@ -987,7 +987,7 @@ int sqlite3_changes(sqlite3*); ** SQLite implements the command "DELETE FROM table" without ** a WHERE clause by dropping and recreating the table. (This is much ** faster than going -** through and deleting individual elements form the table.) Because of +** through and deleting individual elements from the table.) Because of ** this optimization, the change count for "DELETE FROM table" will be ** zero regardless of the number of elements that were originally in the ** table. To get an accurate count of the number of rows deleted, use