From: drh <drh@noemail.net>
Date: Wed, 13 Jan 2016 18:06:08 +0000 (+0000)
Subject: Add documentation for the SQLITE_FCNTL_JOURNAL_POINTER file-control.
X-Git-Tag: version-3.11.0~155^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fheads%2Ffile-control-journal;p=thirdparty%2Fsqlite.git

Add documentation for the SQLITE_FCNTL_JOURNAL_POINTER file-control.

FossilOrigin-Name: 807c5aee2e5e5c01eb33688a199755c345c3664e
---

diff --git a/manifest b/manifest
index 183b7bbcf7..8ad71efa12 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sthe\sexperimental\sSQLITE_FCNTL_JOURNAL_POINTER\sfile\scontrol\sfor\sobtaining\nthe\ssqlite3_file\spointer\sassociated\swith\sa\srollback\sjournal\sor\sWAL\sfile.
-D 2016-01-08T02:27:01.544
+C Add\sdocumentation\sfor\sthe\sSQLITE_FCNTL_JOURNAL_POINTER\sfile-control.
+D 2016-01-13T18:06:08.461
 F Makefile.in 7c8cc4c2f0179efc6fa9492141d1fb65f4807054
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc e45d8b9b56dfa3f2cd860b2c28bd9d304513b042
@@ -335,7 +335,7 @@ F src/resolve.c a83b41104e6ff69855d03cd0aaa09e93927ec39f
 F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
 F src/select.c f8fded11fc443a9f5a73cc5db069d06b34460e2f
 F src/shell.c ed71dc7679e6f087a3f1ea3f9dae4b0fae7209c3
-F src/sqlite.h.in f18858fc9440fd3c399b733057d12c53a2360d11
+F src/sqlite.h.in 214476a62012e578f42133a9a3b4f97a9aa421a3
 F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
 F src/sqlite3ext.h dfbe62ffd95b99afe2140d8c35b180d11924072d
 F src/sqliteInt.h 987b46b1d8089155caecbdb14b78850ae1e198ff
@@ -1406,10 +1406,7 @@ F tool/vdbe_profile.tcl 246d0da094856d72d2c12efec03250d71639d19f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P af5c7714e993f060841f1e893f754ddf3870e6d0
-R 1ed70ce93210d32572be9b1ea5c549df
-T *branch * file-control-journal
-T *sym-file-control-journal *
-T -sym-trunk *
+P a02ace9a746ff02fc1a5969bf13939b568624f93
+R 0f2c35be54361ea831426d444981cf27
 U drh
-Z 34b65576034eb21a6f6ec3e5456f3b6a
+Z f9a8aaf9aacff558b761ee4baaf7cc0d
diff --git a/manifest.uuid b/manifest.uuid
index 8d6b249f6a..a1eb8cfe4f 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a02ace9a746ff02fc1a5969bf13939b568624f93
\ No newline at end of file
+807c5aee2e5e5c01eb33688a199755c345c3664e
\ No newline at end of file
diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index 2f61704a2d..59b30cdd3a 100644
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -794,8 +794,13 @@ struct sqlite3_io_methods {
 ** <li>[[SQLITE_FCNTL_FILE_POINTER]]
 ** The [SQLITE_FCNTL_FILE_POINTER] opcode is used to obtain a pointer
 ** to the [sqlite3_file] object associated with a particular database
-** connection.  See the [sqlite3_file_control()] documentation for
-** additional information.
+** connection.  See also [SQLITE_FCNTL_JOURNAL_POINTER].
+**
+** <li>[[SQLITE_FCNTL_JOURNAL_POINTER]]
+** The [SQLITE_FCNTL_JOURNAL_POINTER] opcode is used to obtain a pointer
+** to the [sqlite3_file] object associated with the journal file (either
+** the [rollback journal] or the [write-ahead log]) for a particular database
+** connection.  See also [SQLITE_FCNTL_FILE_POINTER].
 **
 ** <li>[[SQLITE_FCNTL_SYNC_OMITTED]]
 ** No longer in use.