Clarification of documentation on sqlite3_backup.

FossilOrigin-Name: 31d5e9b42e5c96207187dcde1cbbb1e79f26fca2

diff --git a/manifest b/manifest
index 00a911ceec03aa0c1eab8f6acbbe904c4eed132e..ff068474f42e2cd179406ed42312e2310b8acc4f 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C New\stest\scases\sand\srequirements\smarks\sfor\sPRAGMA\sindex_info,\sindex_xinfo,\nand\sindex_list.
-D 2015-03-05T15:34:15.760
+C Clarification\sof\sdocumentation\son\ssqlite3_backup.
+D 2015-03-06T03:31:58.777
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 2f643d6968dfc0b82d2e546a0525a39079f9e928
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -232,7 +232,7 @@ F src/resolve.c f4d79e31ffa5820c2e3d1740baa5e9b190425f2b
 F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
 F src/select.c e46cef4c224549b439384c88fc7f57ba064dad54
 F src/shell.c cce82ca26392578a4a1ee927dfe55ea3411c7c92
-F src/sqlite.h.in 6ef96b67f33911454cf9deff72036abdcf98ea71
+F src/sqlite.h.in 01d70ea11cfc033f2026e725f22c39936e9ea3d1
 F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
 F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
 F src/sqliteInt.h fae682c2b4dfbe489b134d74521c41c088f16ab1
@@ -1240,7 +1240,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P fc543c2c5ced30a7dc3a05b0c1ad80fdc838df8e
-R db9f4f2755acee2cbbb8badacd04c339
+P e5b13634d9794e4c75378cea89b64c5ecc5aa3e5
+R 2fcf8a15273b53b5f7ba658720892ca0
 U drh
-Z 2b5470d505e73b65c2166edb9eeee198
+Z 07edb104d96caf5f091f46d1d6c18f99

diff --git a/manifest.uuid b/manifest.uuid
index f4c97618c5da8f3995c86440bb5807267a85788c..691bf89a4de0d49aec4257b9e001d5a6bbe09928 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e5b13634d9794e4c75378cea89b64c5ecc5aa3e5
\ No newline at end of file
+31d5e9b42e5c96207187dcde1cbbb1e79f26fca2
\ No newline at end of file

diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index 46d89bef05477b66cc59bacc0aa0b79d2fed2de0..130c5fb73fe7f0f792654e9a39e14ed695ddfb34 100644 (file)
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -6980,20 +6980,20 @@ typedef struct sqlite3_backup sqlite3_backup;
 ** is not a permanent error and does not affect the return value of
 ** sqlite3_backup_finish().
 **
-** [[sqlite3_backup__remaining()]] [[sqlite3_backup_pagecount()]]
+** [[sqlite3_backup_remaining()]] [[sqlite3_backup_pagecount()]]
 ** <b>sqlite3_backup_remaining() and sqlite3_backup_pagecount()</b>
 **
-** ^Each call to sqlite3_backup_step() sets two values inside
-** the [sqlite3_backup] object: the number of pages still to be backed
-** up and the total number of pages in the source database file.
-** The sqlite3_backup_remaining() and sqlite3_backup_pagecount() interfaces
-** retrieve these two values, respectively.
-**
-** ^The values returned by these functions are only updated by
-** sqlite3_backup_step(). ^If the source database is modified during a backup
-** operation, then the values are not updated to account for any extra
-** pages that need to be updated or the size of the source database file
-** changing.
+** ^The sqlite3_backup_remaining() routine returns the number of pages still
+** to be backed up at the conclusion of the most recent sqlite3_backup_step().
+** ^The sqlite3_backup_pagecount() routine returns the total number of pages
+** in the source database at the conclusion of the most recent
+** sqlite3_backup_step().
+** ^(The values returned by these functions are only updated by
+** sqlite3_backup_step(). If the source database is modified in a way that
+** changes the size of the source database or the number of pages remaining,
+** those changes are not reflected in the output of sqlite3_backup_pagecount()
+** and sqlite3_backup_remaining() until after the next
+** sqlite3_backup_step().)^
 **
 ** <b>Concurrent Usage of Database Handles</b>
 **