From: larrybr <larrybr@noemail.net>
Date: Sun, 17 Apr 2022 21:03:44 +0000 (+0000)
Subject: Get docs caught up with the .shxload change.
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3d430307ed4eaa983a5376d96a54a7f4a100981e;p=thirdparty%2Fsqlite.git

Get docs caught up with the .shxload change.

FossilOrigin-Name: e21964480f68152d1c1607f75895354241ec3ea7247f1ee3c2a20c454beec919
---

diff --git a/doc/tcl_extension_intro.md b/doc/tcl_extension_intro.md
index 21a1cbb157..1b01472d57 100644
--- a/doc/tcl_extension_intro.md
+++ b/doc/tcl_extension_intro.md
@@ -69,11 +69,17 @@ To manually get a Tcl-extended-shell started,
 and have been placed where the shell and OS loader can find them),
 either of these inputs is needed:<br>
 ```
+  From a running shell:
     sqlite3x
-    .load tclshext -shext
+    .shxload tclshext
  or
-    sqlite3x -cmd '.load tclshext -shext'
+  At shell invocation:
+    sqlite3x -cmd '.shxload tclshext'
 ```
+(footnote: A directory path may need to be prepended to the extension's
+name for the OS loader to find it unless it is in one of the locations
+designated to the loader as a candidate for dynamic libraries. How such
+designation is made is beyond the scope of this introduction.)
 Provided this results in another prompt without any error message(s),
 the Tcl-extended shell is ready to go.
 For brevity, the shell in this state will be called "sqlite3xt".
diff --git a/manifest b/manifest
index e36cbbcc5e..94c6b0f3db 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Move\sshell\sextension\sload\sfunctionality\sinto\sits\sown\s.shxload\scommand\sfor\susage\sand\scode\ssimplicity.
-D 2022-04-17T19:22:42.509
+C Get\sdocs\scaught\sup\swith\sthe\s.shxload\schange.
+D 2022-04-17T21:03:44.016
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -42,7 +42,7 @@ F doc/json-enhancements.md e356fc834781f1f1aa22ee300027a270b2c960122468499bf347b
 F doc/lemon.html efc0cd2345d66905505d98f862e1c571512def0ceb5b016cb658fd4918eb76a3
 F doc/pager-invariants.txt 27fed9a70ddad2088750c4a2b493b63853da2710
 F doc/shell_extend.html c2ce1584bd976613c984a0b7ea4680ef2d2c0ab0642540d730e0a899648e2294
-F doc/tcl_extension_intro.md ae73513f2443c65bdae35a733fdc5f3cef7c8674e7915b1e4355dd6af8a8ae23
+F doc/tcl_extension_intro.md 216e29662703881e25c857875d6b2b3cba0dfd93c1f718ec27a3bb79b0049066
 F doc/trusted-schema.md 33625008620e879c7bcfbbfa079587612c434fa094d338b08242288d358c3e8a
 F doc/vdbesort-memory.md 4da2639c14cd24a31e0af694b1a8dd37eaf277aff3867e9a8cc14046bc49df56
 F doc/vfs-shm.txt e101f27ea02a8387ce46a05be2b1a902a021d37a
@@ -558,7 +558,7 @@ F src/resolve.c 18d99e7146852d6064559561769fcca0743eb32b14a97da6dbed373a30ee0e76
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c 7c106b3f36d483242b0a9c696614cd53d6f29e1ac81da6a3f0e9ea92f4211cc3
 F src/shell.c.in 80745b0842e8becc6dc6934e7c2e4d31928108285ce4d1199466042509b5fd9f
-F src/shext_linkage.h 41e7e665fffd125b38b8211dc650233d4fe54941acd8177f23d3deb9d6f70154
+F src/shext_linkage.h 0fe0dd831eb1e77b7ae8bc37e80811546531f82b17ef998e08960646cbaf5191
 F src/sqlite.h.in 2a35f62185eb5e7ecc64a2f68442b538ce9be74f80f28a00abc24837edcf1c17
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h f49e28c25bd941e79794db5415fdf7b202deb3bc072ed6f1ed273d578703684e
@@ -1954,8 +1954,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P b73928befb013622a369bf8f9904b5aeca626a5598884b4030229a33f684960f
-R 2c7fd3e4c92debe95d6c8ccc2dc84824
+P e2c8c88b4b4f2c23c42fb1fdb86c0ade2992ce2e5d7f23b06af0e9ea3eb6a4f9
+R a001ab8d5cbb84e92f76cff880c699db
 U larrybr
-Z bbb8449a12e35ee62f13674b7218bc2e
+Z 4d88560e97e58ace681807509ccccdb9
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index b2b2293f8f..cbdb29a182 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e2c8c88b4b4f2c23c42fb1fdb86c0ade2992ce2e5d7f23b06af0e9ea3eb6a4f9
\ No newline at end of file
+e21964480f68152d1c1607f75895354241ec3ea7247f1ee3c2a20c454beec919
\ No newline at end of file
diff --git a/src/shext_linkage.h b/src/shext_linkage.h
index 5e9b936e02..8e7f01b332 100644
--- a/src/shext_linkage.h
+++ b/src/shext_linkage.h
@@ -414,11 +414,11 @@ AGGTYPE_BEGIN(ShellExtensionLink) {
   void (*extensionDestruct)(void *pvExtObj);
   void *pvExtensionObject;
 
-  /* If extra arguments were provided to the .load command, they are
+  /* If extra arguments were provided to the .shxload command, they are
    * available through these two members. Only azLoadArgs[0] through
    * azLoadArgs[nLoadArgs-1] may be referenced. (That may be none.)
    * If an extension keeps the argument values, copies must be made
-   * as the pointers in azLoadArgs[] become invalid after loading.
+   * because the pointers in azLoadArgs[] become invalid after loading.
    */
   int nLoadArgs;
   char **azLoadArgs;