Resolve conflict

Signed-off-by: Sanjula Ganepola <Sanjula.Ganepola@ibm.com>

Author: SanjulaGanepola

.astro/settings.json

@@ -1,5 +1,5 @@
 {
 	"_variables": {
-		"lastUpdateCheck": 1756135576916
+		"lastUpdateCheck": 1756490224047
 	}
 }

src/content/docs/dev/api.md

@@ -65,4 +65,54 @@ export function loadBase(): CodeForIBMi|undefined {
 export function getInstance(): Instance|undefined {
   return (baseExtension && baseExtension.isActive && baseExtension.exports ? baseExtension.exports.instance : undefined);
 }
-```
+```
+
+## Outside of VS Code
+
+**This is not production ready**.
+
+<details>
+<summary>Click to expand</summary>
+
+On the main branch of vscode-ibmi, the IBM i API is written so it is can be portable and used outside of the VS Code namespace (this is how the vitest tests work). Until we publish the API as a standalone package, you will need to manually import the API.
+
+After using `npm i github:codefori/vscode-ibmi`, you will need to cleanup/remove everything but the `src/api` directory.
+
+```ts
+//#webpack.config.js
+
+function prepareIbmiApi() {
+  const ibmiApi = path.join(__dirname, `node_modules`, `vscode-ibmi`, `src`, `api`);
+  const ibmiPackage = path.join(__dirname, `node_modules`, `vscode-ibmi`, `src`);
+
+  const checkDirectory = (dir) => {
+    if (fs.existsSync(dir)) {
+      const files = fs.readdirSync(dir);
+      files.forEach(file => {
+        const filePath = path.join(dir, file);
+        const stat = fs.lstatSync(filePath);
+        const canDelete = !ibmiApi.startsWith(filePath) && !filePath.startsWith(ibmiApi);
+        if (stat.isDirectory()) {
+          // If the directory is not the api directory, delete it
+          if (canDelete) {
+            fs.rmdirSync(filePath, { recursive: true });
+            // console.log(`Deleted directory: ${filePath}`);
+          } else {
+            checkDirectory(filePath);
+          }
+        } else if (stat.isFile()) {
+          if (canDelete) {
+            fs.unlinkSync(filePath);
+            // console.log(`Deleted file: ${filePath}`);
+          }
+        }
+      });
+    }
+  }
+
+  checkDirectory(ibmiPackage);
+}
+```
+
+You will also need to enable `allowTsInNodeModules: true` with `ts-loader` in webpack.
+</details>

src/content/docs/developing/debug/index.mdx

@@ -1,5 +1,5 @@
 ---
-title: Guide 
+title: Guide
 ---
 import { Aside, CardGrid, Card, Icon, Tabs, TabItem } from '@astrojs/starlight/components';
 
@@ -91,12 +91,12 @@ To make use of the Debug Service, you need the following PTFs:
 
 * Java 11 information:
    * `/QOpenSys/QIBM/ProdData/JavaVM/jdk11/64bit`
-   * [IBM documentation for PTFs](https://www.ibm.com/support/pages/download-installation-and-usage-java-11-ibm-i-os)   
+   * [IBM documentation for PTFs](https://www.ibm.com/support/pages/download-installation-and-usage-java-11-ibm-i-os)
 
-<Aside type="danger">
-   Two defective PTF's are included in IBM i 7.5 [Java PTF Group SF99955 level 15](http://www.ibm.com/support/docview.wss?uid=nas4SF99955), released on 2025-07-03: **SJ05893 and SJ05889**.
-   
-   After applying these PTFs, the debug service will no longer start. Please remove these PTFs for the debug service to work again.
+<Aside type="note">
+   IBM i 7.5 Java PTF Group SF99955 level 15 and IBM i 7.4 Java PTF Group SF99665 level 28 contained two defective PTF's for Java 11. These PTF's has now been superceded by newer PTF's included in PTF Group SF99955 level 16 for 7.5 and PTF Group SF99665 level 29 for 7.4.
+
+   For more information, read [this IBM Support document](https://www.ibm.com/support/pages/node/7239287)
 </Aside>
 
 </TabItem>
@@ -109,7 +109,7 @@ To make use of the Debug Service, you need the following PTFs:
    * 7.3 PTF SJ02996
 * Java 11 is required via LPP 5770JV1 Option 19 (not Java from Yum)
    * `/QOpenSys/QIBM/ProdData/JavaVM/jdk11/64bit`
-   * [IBM documentation for PTFs](https://www.ibm.com/support/pages/download-installation-and-usage-java-11-ibm-i-os)   
+   * [IBM documentation for PTFs](https://www.ibm.com/support/pages/download-installation-and-usage-java-11-ibm-i-os)
 * 5770WDS option 60 is required
    * Workstation Tools - Base
 
@@ -122,7 +122,7 @@ To make use of the Debug Service, you need the following PTFs:
    * IBM i 7.3 PTF SI85976 and SI82198
 * Java 11 is required via LPP 5770JV1 Option 19 (not Java from Yum)
    * `/QOpenSys/QIBM/ProdData/JavaVM/jdk11/64bit`
-   * [IBM documentation for PTFs](https://www.ibm.com/support/pages/download-installation-and-usage-java-11-ibm-i-os)   
+   * [IBM documentation for PTFs](https://www.ibm.com/support/pages/download-installation-and-usage-java-11-ibm-i-os)
 * 5770WDS option 60 is required
    * Workstation Tools - Base
 
@@ -144,15 +144,15 @@ After you have installed the PTFs, the connection inside of Visual Studio Code w
 ## Configuring & starting the service
 
 This must be done with user that has *ALLOBJ and *SYSADM privlages.
-Below are the base requirements to configure the certificate: 
+Below are the base requirements to configure the certificate:
 - Master key 1 is set (this can be done in Navigator for IBM i under Security > Cryptographic Services Key Management > Manage Master Keys)
 - *SYSTEM store is populated with a valid certificate (this can be done in Digital Certificate Manager)
 
 1. On Navigator for IBM i, go to Network > Servers > TCP/IP Servers
 2. Scroll down to System Debugger and right click
 3. Hover over Stop Instance, select Debug Service
 ![](image-4.png)
-4. Right click System Debugger again, select Regenerate Debug Service Trust Store 
+4. Right click System Debugger again, select Regenerate Debug Service Trust Store
 ![](image-3.png)
 5. Enter in the password for the *SYSTEM store, click OK
 ![](image-1.png)

src/content/docs/extensions/db2i/images/examplesAdd.png

@@ -77,6 +77,22 @@ update: select * from sample.employee;
 
 Enter the value `null` to set a column to *null*. If the column cannot accept at least 4 characters, then `-` (a dash) may be used.
 
+### Binding parameters
+
+It is possible to bind to SQL parameters inside of SQL statements - both `?` markers and named parameters (e.g. `:param1`) are supported - by using the `bind:` prefix. `bind:` is followed by a list of strings or numbers, either space or comma separated. When executing the prefix, it will find the most previous statement in the document to bind to.
+
+```sql
+select * from employee where empno = ?;
+
+bind: '000010';
+bind: '000020';
+
+select * from employee where empno = ? and workdept = ?;
+
+bind: '000010', 'A00';
+bind: '000020', 'A00';
+```
+
 ## Syntax checking
 
 When connected to an IBM i, the syntax checker has the following options:
@@ -119,6 +135,21 @@ The Db2 for i extension adds a view called Schema Browser which allows the user
 
 If you are using the Schema Browser to browse objects, you are able to use the 'View contents' icon when hovering over a table, view, or alias to cause a basic SQL select statement to be generated and executed.
 
+
+## Using Examples
+
+The Examples view provides users with a set of SQL example scripts that can be used as a learning tool or as a starting point for their own SQL scripts. These examples are grouped into categories to make it easy to find what you are looking for. You can hover over any example to get a preview of the SQL script or click on it to open a copy which you can freely edit.
+
+![](./images/examplesPreview.png)
+
+On top of the built-in examples, users can also add specific directories containing their own SQL examples using the `Add...` button under the `Custom Examples Directories` submenu on the Examples view. All SQL files in the specified directories and at most one subdirectory level deeper will be picked up. By default, the folder name will be the category and the file name will be the name of the example. This can be customized by optionally including a comment in the file with the tags `category` and `description`.
+
+![](./images/examplesAdd.png)
+
+Once you have added a custom examples directory, you can quickly save new examples to that directory using the `Save As New Example` button in the Examples view.
+
+![](./images/examplesSave.png)
+
 ## SQL Error Logging Facility (SELF)
 
 SQL Error Logging Facility (SELF) offers a comprehensive view that can help users understand specific SQL errors or warnings. The SELF view can be accessed through the IBM i panel next to the Results View. 

src/content/docs/extensions/db2i/images/examplesPreview.png

@@ -1,16 +1,31 @@
 ---
-title: Connection 
+title: Connection
 ---
 
 import { Aside } from '@astrojs/starlight/components';
 
 Multiple connections can be defined and some settings are specific to a connection and can be saved for the connection and later reloaded.
 
+### Read only mode
+
+When checked, you can not change any content on the server, run any actions on the server or open any terminal.
+You can only browse the content of the server, and members and streamfiles will always be opened in readonly mode.
+
+<Aside type="note">
+    This setting can be controlled by the IBM i system administrator in the [system settings](../system/).
+</Aside>
+
+<Aside type="danger">
+    This setting can only protect against changes from Code for IBM i. It will not protect against changes from any other interface or application.
+
+    Configuration of IBM i object security on the server is advised!
+</Aside>
+
 ### Current library
 
 The library which will be set as the current library during compilation.
 
-You can change the current library with the 'Change build library' command (F1 -> Change build library).
+You can change the current library with the 'Change Current Library' command in the Command Palette (F1).
 
 ### Home Directory
 
@@ -20,15 +35,15 @@ Home directory for user. This directory is also the root for the IFS browser.
 
 Temporary library. Stores temporary objects used by Code for i. Will be created automatically if it does not exist. Cannot be QTEMP. Default value is `ILEDITOR`.
 
-<Aside type="danger">
+<Aside type="note">
     If your IBM i runs replication software, there is no need to replicate the temporary library. Your sysadmin may add it to the list of objects to be ignored.
 </Aside>
 
 ### Temporary IFS directory
 
 Temporary IFS directory. Stores temporary IFS files used by Code for i. Will be created automatically if it does not exist. Must be in root or QOpenSys filesystem. Default value is `/tmp`.
 
-<Aside type="danger">
+<Aside type="note">
     If your IBM i runs replication software, there is no need to replicate the temporary directory. Your sysadmin may add it to the list of path to be ignored.
 </Aside
 >

src/content/docs/extensions/db2i/images/examplesSave.png

@@ -8,10 +8,10 @@ As of Code for IBM i 2.16.3, the extension supports system-wide settings that ca
 
 All configuration files related to VS Code settings should be stored under `/etc/vscode/` in the IFS.
 
-![](./settings_json.png)
-
 ### Code for IBM i settings
 
+![](./settings_json.png)
+
 The path is `/etc/vscode/settings.json`. The top level is a JSON object that can contain different properties. Below is a table for the first level of properties. If sub-properties are not described here, refer to the content assist while working on the file.
 
 | Property   | Description |