Index: images/foreignlogos/expensify.png
==================================================================
--- images/foreignlogos/expensify.png
+++ images/foreignlogos/expensify.png
cannot compute difference between binary files

Index: pages/cli.in
==================================================================
--- pages/cli.in
+++ pages/cli.in
@@ -1204,11 +1204,11 @@
 provide a full-featured command-line shell:
 
 <ul>
 <li> [-DSQLITE_THREADSAFE=0]
 <li> [-DSQLITE_ENABLE_EXPLAIN_COMMENTS]
-<li> [-DSQLITE_USE_ZLIB]
+<li> [-DSQLITE_HAVE_ZLIB]
 <li> [-DSQLITE_INTROSPECTION_PRAGMAS]
 <li> [-DSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION]
 <li> [-DSQLITE_ENABLE_STMTVTAB]
 <li> [-DSQLITE_ENABLE_DBPAGE_VTAB]
 <li> [-DSQLITE_ENABLE_DBSTAT_VTAB]

Index: pages/compile.in
==================================================================
--- pages/compile.in
+++ pages/compile.in
@@ -1243,11 +1243,11 @@
   This option causes SQLite to issue extra [SQLITE_FCNTL_TRACE] file controls
   to provide supplementary information to the VFS.  The "vfslog.c" extension
   makes use of this to provide enhanced logs of VFS activity.
 }
 
-COMPILE_OPTION {SQLITE_USE_ZLIB} {
+COMPILE_OPTION {SQLITE_HAVE_ZLIB} {
   This option causes some extensions to link against the 
   [https://zlib.net|zlib compression library].
   <p>
   This option has no affect on the SQLite core.  It is only used by extensions.
   This is option is necessary for the commpression and decompression

Index: pages/datatype3.in
==================================================================
--- pages/datatype3.in
+++ pages/datatype3.in
@@ -325,11 +325,11 @@
 CREATE TABLE t1(a INT, b TEXT, c REAL);
 CREATE VIEW v1(x,y,z) AS SELECT b, a+c, 42 FROM t1 WHERE b!=11;
 </pre></blockquote>
 
 <p>The affinity of the v1.x column will be the same as the affinity
-of t1.b (INTEGER), since v1.x maps directly into t1.b.  But
+of t1.b (TEXT), since v1.x maps directly into t1.b.  But
 columns v1.y and v1.z both have no affinity, since those columns
 map into expression a+c and 42, and expressions always have no
 affinity.
 
 <p>When the [SELECT] statement that implements a [VIEW] or 

Index: pages/json1.in
==================================================================
--- pages/json1.in
+++ pages/json1.in
@@ -174,11 +174,11 @@
 
 <p>
 The json1 extension does not (currently) support a binary encoding
 of JSON.  Experiments have been unable to find a binary encoding
 that is significantly smaller or faster than a plain text encoding.
-(The present implementation parses JSON text at over 300 MB/s.)
+(The present implementation parses JSON text at over 1 GB/s.)
 All json1 functions currently throw an error if any of their
 arguments are BLOBs because BLOBs are reserved
 for a future enhancement in which BLOBs will store the binary encoding
 for JSON.
 

Index: pages/lang.in
==================================================================
--- pages/lang.in
+++ pages/lang.in
@@ -5055,12 +5055,17 @@
 
 <p>^The VACUUM command may change the [ROWID | ROWIDs] of entries in any
 tables that do not have an explicit [INTEGER PRIMARY KEY].
 </p>
 
-<p>^A VACUUM will fail if there is an open transaction, or if there are one or
-more active SQL statements when it is run.
+<p>^A VACUUM will fail if there is an open transaction on the database
+connection that is attempting to run the VACUUM.  ^Unfinalized SQL
+statements typically hold a read transaction open, so the VACUUM
+might fail if there are unfinalized SQL statements on the same connection.
+^VACUUM (but not VACUUM INTO) is a write operation and so if another
+database connection is holding a lock that prevents writes, then
+the VACUUM will fail.
 
 <p>^(An alternative to using the VACUUM command to
 reclaim space after data has been deleted is auto-vacuum mode, enabled using
 the [auto_vacuum] pragma.)^ ^When [auto_vacuum] is enabled for a database
 free pages may be reclaimed after deleting data, causing the file to shrink,

Index: pages/printf.in
==================================================================
--- pages/printf.in
+++ pages/printf.in
@@ -96,10 +96,16 @@
 
 <li><p>
 The order of the buffer pointer and buffer size parameters in the built-in
 snprintf() implementation is reversed from the order used in standard-library
 implementations.
+
+<li><p>
+The built-in printf() implementation does not handle posix positional referencing
+modifiers that allow the order of arguments to printf() to be different from the
+order of the %-substitutions.  In the built-in printf(), the order of the arguments
+must exactly match the order of the %-substitutions.
 </ol>
 
 <p>
 In spite of the disadvantages, the developers believe that having a built-in
 printf() implementation inside of SQLite is a net positive.

Index: pages/rescode.in
==================================================================
--- pages/rescode.in
+++ pages/rescode.in
@@ -224,11 +224,11 @@
   on a separate partition with much less space that the primary disk.
 }
 RESCODE SQLITE_CANTOPEN    14   {
   The SQLITE_CANTOPEN result code indicates that SQLite was unable to
   open a file.  The file in question might be a primary database file
-  or on of several [temporary disk files].
+  or one of several [temporary disk files].
 }
 RESCODE SQLITE_PROTOCOL    15   {
   The SQLITE_PROTOCOL result code indicates a problem with the file locking
   protocol used by SQLite.  The SQLITE_PROTOCOL error is currently only
   returned when using [WAL mode] and attempting to start a new transaction.