Pull in the latest changes from trunk. Update the STAT3 documentation.

FossilOrigin-Name: 63fc3e4bea6a7f5dc34b2af83f30458eb10b8fe0
2011-09-21 00:09:41 +00:00
parent 72949adc95 9d56acdcfc
commit d3ed73406c
5 changed files with 36 additions and 24 deletions
@@ -156,7 +156,7 @@
 ** assertion will be triggered.
 **
 ** (Historical note:  There used to be several other options, but we've
-** pared it down to just these two.)
+** pared it down to just these three.)
 **
 ** If none of the above are defined, then set SQLITE_SYSTEM_MALLOC as
 ** the default.