URI filename documentation updates.

FossilOrigin-Name: 8885c8677b239d4cbef24b9409a1736e1ae97a3f

diff --git a/manifest b/manifest
index aa9682ca60d106d78b9b7a6733108faa0aac72c2..4d23d290beec60b6c5735e8fa7937e5b81f87844 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Have\sflags\spassed\sto\ssqlite3_open_v2()\sapply\sto\sthe\smain\sand\sany\sattached\sdatabases.\sAnd\schange\sthings\sso\sthat\sany\s"mode=xxx"\sor\s"cache=xxx"\soptions\sspecified\sas\spart\sof\sa\sURI\sfor\sthe\smain\sdatabase\sdo\snot\salso\sapply\sto\sattached\sdatabases.
-D 2011-05-10T18:39:10.068
+C URI\sfilename\sdocumentation\supdates.
+D 2011-05-11T19:00:10.252
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 7a4d9524721d40ef9ee26f93f9bd6a51dba106f2
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -179,7 +179,7 @@ F src/resolve.c 1c0f32b64f8e3f555fe1f732f9d6f501a7f05706
 F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
 F src/select.c d9d440809025a58547e39f4f268c2a296bfb56ff
 F src/shell.c 72e7e176bf46d5c6518d15ac4ad6847c4bb5df79
-F src/sqlite.h.in 6e1af9733864bacbb4b5b821290f5395319f3259
+F src/sqlite.h.in 901b70703bb444d2c13b085e2cd2258b6a707e94
 F src/sqlite3ext.h c90bd5507099f62043832d73f6425d8d5c5da754
 F src/sqliteInt.h b34bd64a7ade4808fcc301e0bb67ef5051ea49c6
 F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
@@ -935,7 +935,7 @@ F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 5bde568028216f5bbf76fa0b61bf5b736699f4b1
-R 109bc7e0fff78b0c6554d3e5815c2cd8
-U dan
-Z 5955a7caf010dc14908da2de85096565
+P 3e490915301216e242a5cdeb0febaff12ed53cb9
+R 40dc9cb79fe8b80783836d3c92828f73
+U drh
+Z 8f56eea92b6efe4821fb2550b72615e0

diff --git a/manifest.uuid b/manifest.uuid
index 2b5e8e05a9f0112b7b6ba9a33a6ad9fc6a2fb32e..adb44941100b9514517e3db0184be58198320ed8 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-3e490915301216e242a5cdeb0febaff12ed53cb9
\ No newline at end of file
+8885c8677b239d4cbef24b9409a1736e1ae97a3f
\ No newline at end of file

diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index c83d0d70d4bd9c2fbd834631c60bf16447a8058b..26dab45cfe4ca0ed8eaa3bbe609afe57aa5a55e2 100644 (file)
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -2366,7 +2366,7 @@ void sqlite3_progress_handler(sqlite3*, int, int(*)(void*), void*);
 ** sqlite3_open_v2() can take one of
 ** the following three values, optionally combined with the 
 ** [SQLITE_OPEN_NOMUTEX], [SQLITE_OPEN_FULLMUTEX], [SQLITE_OPEN_SHAREDCACHE],
-** and/or [SQLITE_OPEN_PRIVATECACHE] flags:)^
+** [SQLITE_OPEN_PRIVATECACHE], and/or [SQLITE_OPEN_URI] flags:)^
 **
 ** <dl>
 ** ^(<dt>[SQLITE_OPEN_READONLY]</dt>
@@ -2385,9 +2385,8 @@ void sqlite3_progress_handler(sqlite3*, int, int(*)(void*), void*);
 ** </dl>
 **
 ** If the 3rd parameter to sqlite3_open_v2() is not one of the
-** combinations shown above or one of the combinations shown above combined
-** with the [SQLITE_OPEN_NOMUTEX], [SQLITE_OPEN_FULLMUTEX],
-** [SQLITE_OPEN_SHAREDCACHE] and/or [SQLITE_OPEN_PRIVATECACHE] flags,
+** combinations shown above optionally combined with other
+** [SQLITE_OPEN_READONLY | SQLITE_OPEN_* bits]
 ** then the behavior is undefined.
 **
 ** ^If the [SQLITE_OPEN_NOMUTEX] flag is set, then the database connection
@@ -2419,27 +2418,36 @@ void sqlite3_progress_handler(sqlite3*, int, int(*)(void*), void*);
 ** on-disk database will be created.  ^This private database will be
 ** automatically deleted as soon as the database connection is closed.
 **
-** ^If URI filename interpretation is enabled, and the filename argument
+** [[URI filenames in sqlite3_open()]] <h3>URI Filenames</h3>
+**
+** ^If [URI filename] interpretation is enabled, and the filename argument
 ** begins with "file:", then the filename is interpreted as a URI. ^URI
 ** filename interpretation is enabled if the [SQLITE_OPEN_URI] flag is
 ** is set in the fourth argument to sqlite3_open_v2(), or if it has
 ** been enabled globally using the [SQLITE_CONFIG_URI] option with the
-** [sqlite3_config()] method. 
+** [sqlite3_config()] method or by the [SQLITE_USE_URI] compile-time option.
+** As of SQLite version 3.7.7, URI filename interpretation is turned off
+** by default, but future releases of SQLite might enable URI filename
+** intepretation by default.  See "[URI filenames]" for additional
+** information.
 **
-** URI filenames are parsed according to RFC 1738. If the URI contains an
-** 'authority', then it must be either an empty string or the string 
+** URI filenames are parsed according to RFC 3986. ^If the URI contains an
+** authority, then it must be either an empty string or the string 
 ** "localhost". ^If the authority is not an empty string or "localhost", an 
-** error is returned to the caller. ^The 'fragment' component of a URI, if 
-** present, is always ignored.
-**
-** ^SQLite uses the 'path' component of the URI as the path to the database file
-** to open. ^If the path begins with a '/' character, then it is interpreted as
-** an absolute path. ^If it does not begin with a '/', it is interpreted as a 
-** relative path. ^On windows, the first component of an absolute path 
+** error is returned to the caller. ^The fragment component of a URI, if 
+** present, is ignored.
+**
+** ^SQLite uses the path component of the URI as the name of the disk file
+** which contains the database. ^If the path begins with a '/' character, 
+** then it is interpreted as an absolute path. ^If the path does not begin 
+** with a '/' (meaning that the authority section is omitted from the URI)
+** then the path is interpreted as a relative path. 
+** ^On windows, the first component of an absolute path 
 ** is a drive specification (e.g. "C:").
 **
+** [[core URI query parameters]]
 ** The query component of a URI may contain parameters that are interpreted
-** either by SQLite itself, or by a [sqlite3_vfs | custom VFS implementation].
+** either by SQLite itself, or by a [VFS | custom VFS implementation].
 ** SQLite interprets the following three query parameters:
 **
 ** <ul>
@@ -2475,9 +2483,11 @@ void sqlite3_progress_handler(sqlite3*, int, int(*)(void*), void*);
 ** </ul>
 **
 ** ^Specifying an unknown parameter in the query component of a URI is not an
-** error.
+** error.  Future versions of SQLite might understand additional query
+** parameters.  See "[query parameters with special meaning to SQLite]" for
+** additional information.
 **
-** URI filename examples:
+** [[URI filename examples]] <h3>URI filename examples</h3>
 **
 ** <table border="1" align=center cellpadding=5>
 ** <tr><th> URI filenames <th> Results