- Pin Electron to v35.4.0 as the v36 is not working on many OS.

- Pin html-to-image to v1.11.11 as latest version breaks ERD image downloads.

.github/workflows/run-feature-tests-epas.yml

@@ -21,7 +21,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        pgver: [12, 13, 14, 15, 16]
+        pgver: [13, 14, 15, 16, 17]
 
     runs-on: ubuntu-22.04
 
@@ -35,7 +35,12 @@ jobs:
       - name: Install platform dependencies
         run: |
           sudo apt update
-          sudo apt install -y libpq-dev libffi-dev libssl-dev libkrb5-dev zlib1g-dev edb-as${{ matrix.pgver }}-server edb-as${{ matrix.pgver }}-server-pldebugger edb-as${{ matrix.pgver }}-pgagent
+          sudo apt install -y libpq-dev libffi-dev libssl-dev libkrb5-dev zlib1g-dev edb-as${{ matrix.pgver }}-server edb-as${{ matrix.pgver }}-server-pldebugger
+
+      - name: Install pgagent on Linux
+        if: ${{ matrix.os == 'ubuntu-22.04' &&  matrix.pgver <= 16 }}
+        run: |
+          sudo apt install -y edb-as${{ matrix.pgver }}-pgagent
 
       - name: Create the tablespace directory
         run: |
@@ -56,7 +61,9 @@ jobs:
             sleep 2
           done
 
-          psql -U enterprisedb -d postgres -p 58${{ matrix.pgver }} -c 'CREATE EXTENSION IF NOT EXISTS pgagent;'
+      - name: Create pgagent extension on Linux
+        if: ${{ matrix.os == 'ubuntu-22.04' &&  matrix.pgver <= 16 }}
+        run: psql -U enterprisedb -d postgres -p 58${{ matrix.pgver }} -c 'CREATE EXTENSION IF NOT EXISTS pgagent;'
 
       - name: Install Python dependencies
         run: make install-python-testing

.github/workflows/run-feature-tests-pg.yml

@@ -20,7 +20,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        pgver: [12, 13, 14, 15, 16]
+        pgver: [13, 14, 15, 16, 17]
 
     runs-on: ubuntu-22.04
 
@@ -32,6 +32,18 @@ jobs:
           sudo sh -c 'echo "deb https://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
           wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add -
 
+      - name: Uninstall PostgreSQL if already present
+        run: |
+          if [ -n "$(ls /etc/postgresql/*/*/postgresql.conf 2>/dev/null)" ]; then
+            # Extract the major version from pg_config
+            installed_pg_version=$( pg_config --version | cut -d ' ' -f 2 | cut -d '.' -f 1 )
+            echo "Installed PostgreSQL version: $installed_pg_version"
+            if [ $installed_pg_version != ${{ matrix.pgver }} ]; then
+              sudo pg_dropcluster $installed_pg_version main --stop
+              sudo apt-get -y remove "postgresql-${installed_pg_version}"
+            fi
+          fi
+
       - name: Install platform dependencies
         run: |
           sudo apt update
@@ -119,7 +131,7 @@ jobs:
                 "comment": "PostgreSQL ${{ matrix.pgver }} Server",
                 "db_username": "postgres",
                 "host": "/var/run/postgresql",
-                "db_password": "postgres",
+                "db_password": "",
                 "db_port": 59${{ matrix.pgver }},
                 "maintenance_db": "postgres",
                 "sslmode": "prefer",

.github/workflows/run-python-tests-epas.yml

@@ -32,7 +32,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-22.04, windows-latest]
-        pgver: [12, 13, 14, 15, 16]
+        pgver: [13, 14, 15, 16, 17]
 
     runs-on: ${{ matrix.os }}
 
@@ -48,7 +48,12 @@ jobs:
         if: ${{ matrix.os == 'ubuntu-22.04' }}
         run: |
           sudo apt update
-          sudo apt install -y libpq-dev libffi-dev libssl-dev libkrb5-dev zlib1g-dev edb-as${{ matrix.pgver }}-server edb-as${{ matrix.pgver }}-server-pldebugger edb-as${{ matrix.pgver }}-pgagent
+          sudo apt install -y libpq-dev libffi-dev libssl-dev libkrb5-dev zlib1g-dev edb-as${{ matrix.pgver }}-server edb-as${{ matrix.pgver }}-server-pldebugger edb-as${{ matrix.pgver }}-postgis34
+
+      - name: Install pgagent on Linux
+        if: ${{ matrix.os == 'ubuntu-22.04' &&  matrix.pgver <= 16 }}
+        run: |
+          sudo apt install -y edb-as${{ matrix.pgver }}-pgagent
 
       - name: Install platform dependencies on Windows
         if: ${{ matrix.os == 'windows-latest' }}
@@ -77,7 +82,7 @@ jobs:
         shell: cmd
 
       - name: Add edb_job_scheduler into config file.
-        if: ${{ matrix.os == 'ubuntu-22.04' &&  matrix.pgver == 16 }}
+        if: ${{ matrix.os == 'ubuntu-22.04' &&  matrix.pgver >= 16 }}
         run: |
           sudo sed -i "s/shared_preload_libraries = '/shared_preload_libraries = '\$libdir\/edb_job_scheduler,/g" /etc/edb-as/${{ matrix.pgver }}/main/postgresql.conf
           sudo su -c "echo \"edb_job_scheduler.database_list = 'test_dbms_job_scheduler'\" >> /etc/edb-as/${{ matrix.pgver }}/main/postgresql.conf"
@@ -96,8 +101,14 @@ jobs:
             >&2 echo "EPAS is unavailable - sleeping for 2 seconds"
             sleep 2
           done
-          
-          psql -U enterprisedb -d postgres -p 58${{ matrix.pgver }} -c 'CREATE EXTENSION IF NOT EXISTS pgagent;'
+
+      - name: Create pgagent extension on Linux
+        if: ${{ matrix.os == 'ubuntu-22.04' &&  matrix.pgver <= 16 }}
+        run: psql -U enterprisedb -d postgres -p 58${{ matrix.pgver }} -c 'CREATE EXTENSION IF NOT EXISTS pgagent;'
+      
+      - name: Create postgis extension on Linux
+        if: ${{ matrix.os == 'ubuntu-22.04' }}
+        run: psql -U enterprisedb -d postgres -p 58${{ matrix.pgver }} -c 'CREATE EXTENSION IF NOT EXISTS postgis;'
 
       - name: Install Python dependencies on Linux
         if: ${{ matrix.os == 'ubuntu-22.04' }}

.github/workflows/run-python-tests-pg.yml

@@ -21,7 +21,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [macos-latest, ubuntu-22.04, windows-latest]
-        pgver: [12, 13, 14, 15, 16]
+        pgver: [13, 14, 15, 16, 17]
 
     runs-on: ${{ matrix.os }}
 
@@ -34,11 +34,24 @@ jobs:
           sudo sh -c 'echo "deb https://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
           wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add -
 
+      - name: Uninstall PostgreSQL if already present on linux
+        if: ${{ matrix.os == 'ubuntu-22.04' }}
+        run: |
+          if [ -n "$(ls /etc/postgresql/*/*/postgresql.conf 2>/dev/null)" ]; then
+            # Extract the major version from pg_config
+            installed_pg_version=$( pg_config --version | cut -d ' ' -f 2 | cut -d '.' -f 1 )
+            echo "Installed PostgreSQL version: $installed_pg_version"
+            if [ $installed_pg_version != ${{ matrix.pgver }} ]; then
+              sudo pg_dropcluster $installed_pg_version main --stop
+              sudo apt-get -y remove "postgresql-${installed_pg_version}"
+            fi
+          fi
+
       - name: Install platform dependencies on Linux
         if: ${{ matrix.os == 'ubuntu-22.04' }}
         run: |
           sudo apt update
-          sudo apt install -y libpq-dev libffi-dev libssl-dev libkrb5-dev zlib1g-dev postgresql-${{ matrix.pgver }} postgresql-${{ matrix.pgver }}-pldebugger pgagent
+          sudo apt install -y libpq-dev libffi-dev libssl-dev libkrb5-dev zlib1g-dev postgresql-${{ matrix.pgver }} postgresql-${{ matrix.pgver }}-pldebugger pgagent postgresql-${{ matrix.pgver }}-postgis-3
 
       - name: Install platform dependencies on macOS
         if: ${{ matrix.os == 'macos-latest' }}
@@ -46,7 +59,7 @@ jobs:
           brew install postgresql@${{ matrix.pgver }}
           echo "/opt/homebrew/opt/postgresql@${{ matrix.pgver }}/bin" >> $GITHUB_PATH
 
-      - name: Uninstall PostgreSQL if already present
+      - name: Uninstall PostgreSQL if already present on windows
         if: ${{ matrix.os == 'windows-latest' }}
         run: |
           if exist "C:\Program Files\PostgreSQL\{{ matrix.pgver }}\uninstall-postgresql.exe" (
@@ -100,6 +113,7 @@ jobs:
 
           psql -U postgres -p 59${{ matrix.pgver }} -c 'CREATE EXTENSION pgagent;'
           psql -U postgres -p 59${{ matrix.pgver }} -c 'CREATE EXTENSION pldbgapi;'
+          psql -U postgres -p 59${{ matrix.pgver }} -c 'CREATE EXTENSION postgis;'
 
       - name: Start PostgreSQL on macOS
         if: ${{ matrix.os == 'macos-latest' }}

Dockerfile

@@ -2,7 +2,7 @@
 #
 # pgAdmin 4 - PostgreSQL Tools
 #
-# Copyright (C) 2013 - 2024, The pgAdmin Development Team
+# Copyright (C) 2013 - 2025, The pgAdmin Development Team
 # This software is released under the PostgreSQL Licence
 #
 #########################################################################
@@ -173,12 +173,12 @@ COPY --from=env-builder /venv /venv
 COPY --from=tool-builder /usr/local/pgsql /usr/local/
 COPY --from=pg17-builder /usr/local/lib/libpq.so.5.17 /usr/lib/
 COPY --from=pg17-builder /usr/lib/libzstd.so.1.5.6 /usr/lib/
-COPY --from=pg17-builder /usr/lib/liblz4.so.1.9.4 /usr/lib/
+COPY --from=pg17-builder /usr/lib/liblz4.so.1.10.0 /usr/lib/
 
 RUN ln -s libpq.so.5.17 /usr/lib/libpq.so.5 && \
     ln -s libpq.so.5.17 /usr/lib/libpq.so && \
     ln -s libzstd.so.1.5.6 /usr/lib/libzstd.so.1 && \
-    ln -s liblz4.so.1.9.4 /usr/lib/liblz4.so.1
+    ln -s liblz4.so.1.10.0 /usr/lib/liblz4.so.1
 
 WORKDIR /pgadmin4
 ENV PYTHONPATH=/pgadmin4
@@ -208,7 +208,7 @@ RUN apk add --no-cache \
         libedit \
         libldap \
         libcap && \
-    /venv/bin/python3 -m pip install --no-cache-dir gunicorn==22.0.0 && \
+    /venv/bin/python3 -m pip install --no-cache-dir gunicorn==23.0.0 && \
     find / -type d -name '__pycache__' -exec rm -rf {} + && \
     useradd -r -u 5050 -g root -s /sbin/nologin pgadmin && \
     mkdir -p /run/pgadmin /var/lib/pgadmin && \
@@ -222,7 +222,7 @@ RUN apk add --no-cache \
     echo "pgadmin ALL = NOPASSWD: /usr/sbin/postfix start" > /etc/sudoers.d/postfix && \
     echo "pgadminr ALL = NOPASSWD: /usr/sbin/postfix start" >> /etc/sudoers.d/postfix
 
-USER pgadmin
+USER 5050
 
 # Finish up
 VOLUME /var/lib/pgadmin

LICENSE

@@ -4,7 +4,7 @@ pgAdmin 4
 This software is released under the PostgreSQL licence.
 
 -------------------------------------------------------------------------------
-Copyright (C) 2013 - 2024, The pgAdmin Development Team
+Copyright (C) 2013 - 2025, The pgAdmin Development Team
 
 Permission to use, copy, modify, and distribute this software and its
 documentation for any purpose, without fee, and without a written agreement is

Make.bat

@@ -52,7 +52,7 @@ REM Main build sequence Ends
 
 :SET_ENVIRONMENT
     ECHO Configuring the environment...
-    IF "%PGADMIN_PYTHON_DIR%" == ""   SET "PGADMIN_PYTHON_DIR=C:\Python312"
+    IF "%PGADMIN_PYTHON_DIR%" == ""   SET "PGADMIN_PYTHON_DIR=C:\Python313"
     IF "%PGADMIN_KRB5_DIR%" == ""     SET "PGADMIN_KRB5_DIR=C:\Program Files\MIT\Kerberos"
     IF "%PGADMIN_POSTGRES_DIR%" == "" SET "PGADMIN_POSTGRES_DIR=C:\Program Files\PostgreSQL\17"
     IF "%PGADMIN_INNOTOOL_DIR%" == "" SET "PGADMIN_INNOTOOL_DIR=C:\Program Files (x86)\Inno Setup 6"
@@ -284,6 +284,7 @@ REM Main build sequence Ends
 
     REM WGET
     FOR /f "tokens=*" %%i IN ('npm info electron version') DO SET "ELECTRON_VERSION=%%i"
+    SET ELECTRON_VERSION="35.4.0"
     :GET_NW
         wget https://github.com/electron/electron/releases/download/v%ELECTRON_VERSION%/electron-v%ELECTRON_VERSION%-win32-x64.zip -O "%TMPDIR%\electron-v%ELECTRON_VERSION%-win32-x64.zip"
         IF %ERRORLEVEL% NEQ 0 GOTO GET_NW

Makefile

@@ -2,7 +2,7 @@
 #
 # pgAdmin 4 - PostgreSQL Tools
 #
-# Copyright (C) 2013 - 2024, The pgAdmin Development Team
+# Copyright (C) 2013 - 2025, The pgAdmin Development Team
 # This software is released under the PostgreSQL Licence
 #
 #########################################################################

README.md

@@ -15,33 +15,51 @@ and ReactJS, HTML5 with CSS for the client side processing and UI.
 Although developed using web technologies, pgAdmin 4 can be deployed either on
 a web server using a browser, or standalone on a workstation. The runtime/
 subdirectory contains an Electron based runtime application intended to allow this,
-which will execute the Python server and display the UI.
+which will fork a Python server process and display the UI.
 
-## Building the Runtime
+## Prerequisites
+1. Install Node.js 20 and above (https://nodejs.org/en/download)
+2. yarn (https://yarnpkg.com/getting-started/install)
+3. Python 3.8 and above (https://www.python.org/downloads/)
+4. PostgreSQL server (https://www.postgresql.org/download)
 
-To build the runtime, the following packages must be installed:
+Start by enabling Corepack, if it isn't already;
+this will add the yarn binary to your PATH:
+```bash
+corepack enable
+```
 
-* NodeJS 16+
-* Yarn
+# Building the Web Assets
 
-Change into the runtime directory, and run *yarn install*. This will install the
-dependencies required.
+pgAdmin is dependent on a number of third party Javascript libraries. These,
+along with it's own Javascript code, CSS code and images must be
+compiled into a "bundle" which is transferred to the browser for execution
+and rendering. This is far more efficient than simply requesting each
+asset as it's needed by the client.
 
-In order to use the runtime in a development environment, you'll need to copy
-*dev_config.json.in* file to *dev_config.json*, and edit the paths to the Python
-executable and *pgAdmin.py* file, otherwise the runtime will use the default
-paths it would expect to find in the standard package for your platform.
-
-You can then execute the runtime by running something like:
+To create the bundle, you will need the 'yarn' package management tool to be
+installed. Then, you can run the following commands on a *nix system to
+download the required packages and build the bundle:
 
 ```bash
-yarn run start
+$ cd $PGADMIN4_SRC
+$ make install-node
+$ make bundle
+```
+
+On Windows systems (where "make" is not available), the following commands
+can be used:
+
+```
+C:\> cd $PGADMIN4_SRC\web
+C:\$PGADMIN4_SRC\web> yarn install
+C:\$PGADMIN4_SRC\web> yarn run bundle
 ```
 
 # Configuring the Python Environment
 
 In order to run the Python code, a suitable runtime environment is required.
-Python version 3.7 and later are currently supported. It is recommended that a
+Python version 3.8 and later are currently supported. It is recommended that a
 Python Virtual Environment is setup for this purpose, rather than using the
 system Python environment. On Linux and Mac systems, the process is fairly
 simple - adapt as required for your distribution:
@@ -63,7 +81,7 @@ simple - adapt as required for your distribution:
    so update that to the latest:
 
    ```bash
-   $ pip install --upgrade pip
+   (venv) $ pip install --upgrade pip
    ```
 
 4. Ensure that a PostgreSQL installation's bin/ directory is in the path (so
@@ -88,36 +106,44 @@ simple - adapt as required for your distribution:
    configuration may look like:
 
     ```python
-    from config import *
+   import os
+   import logging
 
-    # Debug mode
-    DEBUG = True
+   # Change pgAdmin data directory
+   DATA_DIR = '/Users/myuser/.pgadmin_dev'
 
-    # App mode
-    SERVER_MODE = True
+   #Change pgAdmin server and port
+   DEFAULT_SERVER = '127.0.0.1'
+   DEFAULT_SERVER_PORT = 5051
 
-    # Enable the test module
-    MODULE_BLACKLIST.remove('test')
+   # Switch between server and desktop mode
+   SERVER_MODE = True
 
-    # Log
-    CONSOLE_LOG_LEVEL = DEBUG
-    FILE_LOG_LEVEL = DEBUG
+   #Change pgAdmin config DB path in case external DB is used.
+   CONFIG_DATABASE_URI="postgresql://postgres:postgres@localhost:5436/pgadmin"
 
-    DEFAULT_SERVER = '127.0.0.1'
+   #Setup SMTP
+   MAIL_SERVER = 'smtp.gmail.com'
+   MAIL_PORT = 465
+   MAIL_USE_SSL = True
+   MAIL_USERNAME = 'user@gmail.com'
+   MAIL_PASSWORD = 'xxxxxxxxxx'
 
-    UPGRADE_CHECK_ENABLED = True
+   # Change log level
+   CONSOLE_LOG_LEVEL = logging.INFO
+   FILE_LOG_LEVEL = logging.INFO
 
-    # Use a different config DB for each server mode.
-    if SERVER_MODE == False:
-        SQLITE_PATH = os.path.join(
-            DATA_DIR,
-            'pgadmin4-desktop.db'
-        )
-    else:
-        SQLITE_PATH = os.path.join(
-            DATA_DIR,
-            'pgadmin4-server.db'
-        )
+   # Use a different config DB for each server mode.
+   if SERVER_MODE == False:
+     SQLITE_PATH = os.path.join(
+         DATA_DIR,
+         'pgadmin4-desktop.db'
+     )
+   else:
+     SQLITE_PATH = os.path.join(
+         DATA_DIR,
+         'pgadmin4-server.db'
+     )
    ```
 
    This configuration allows easy switching between server and desktop modes
@@ -137,9 +163,9 @@ simple - adapt as required for your distribution:
    (venv) $ python3 $PGADMIN4_SRC/web/pgAdmin4.py
    ```
 
-   Whilst it is possible to automatically run setup in desktop mode by running
-   the runtime, that will not work in server mode as the runtime doesn't allow
-   command line interaction with the setup program.
+Whilst it is possible to automatically run setup in desktop mode by running
+the runtime, that will not work in server mode as the runtime doesn't allow
+command line interaction with the setup program.
 
 At this point you will be able to run pgAdmin 4 from the command line in either
 server or desktop mode, and access it from a web browser using the URL shown in
@@ -148,49 +174,6 @@ the terminal once pgAdmin has started up.
 Setup of an environment on Windows is somewhat more complicated unfortunately,
 please see *pkg/win32/README.txt* for complete details.
 
-# Building the Web Assets
-
-pgAdmin is dependent on a number of third party Javascript libraries. These,
-along with it's own Javascript code, SCSS/CSS code and images must be
-compiled into a "bundle" which is transferred to the browser for execution
-and rendering. This is far more efficient than simply requesting each
-asset as it's needed by the client.
-
-To create the bundle, you will need the 'yarn' package management tool to be
-installed. Then, you can run the following commands on a *nix system to
-download the required packages and build the bundle:
-
-```bash
-(venv) $ cd $PGADMIN4_SRC
-(venv) $ make install-node
-(venv) $ make bundle
-```
-
-On Windows systems (where "make" is not available), the following commands
-can be used:
-
-```
-C:\> cd $PGADMIN4_SRC\web
-C:\$PGADMIN4_SRC\web> yarn install
-C:\$PGADMIN4_SRC\web> yarn run bundle
-```
-
-# Creating pgAdmin themes
-
-To create a pgAdmin theme, you need to create a directory under
-*web/pgadmin/static/scss/resources*.
-Copy the sample file *_theme.variables.scss.sample* to the new directory and
-rename it to *_theme.variables.scss*. Change the desired hexadecimal values of
-the colors and bundle pgAdmin. You can also add a preview image in the theme
-directory with the name as *\<dir name>_preview.png*. It is recommended that the
-preview image should not be larger in size as it may take time to load on slow
-networks. Run the *yarn run bundle* and you're good to go. No other changes are
-required, pgAdmin bundle will read the directory and create other required
-entries to make them available in preferences.
-
-The name of the theme is derived from the directory name. Underscores (_) and
-hyphens (-) will be replaced with spaces and the result will be camel cased.
-
 # Building the documentation
 
 In order to build the docs, an additional Python package is required in the
@@ -210,6 +193,21 @@ The docs can then be built using the Makefile in *$PGADMIN4_SRC*, e.g.
 
 The output can be found in *$PGADMIN4_SRC/docs/en_US/_build/html/index.html*
 
+## Building the Runtime
+Change into the runtime directory, and run *yarn install*. This will install the
+dependencies required.
+
+In order to use the runtime in a development environment, you'll need to copy
+*dev_config.json.in* file to *dev_config.json*, and edit the paths to the Python
+executable and *pgAdmin.py* file, otherwise the runtime will use the default
+paths it would expect to find in the standard package for your platform.
+
+You can then execute the runtime by running something like:
+
+```bash
+yarn run start
+```
+
 # Building packages
 
 Most packages can be built using the Makefile in $PGADMIN4_SRC, provided all

SECURITY.md

@@ -0,0 +1,82 @@
+# Security Policy
+
+## Supported Versions
+
+Only the latest version receives security updates. Users are encouraged to upgrade to the latest stable release.
+
+
+## Reporting a Vulnerability
+
+We take security seriously and appreciate your efforts to responsibly disclose vulnerabilities. If you believe you have found a vulnerability, please follow the guidelines below to submit a report.
+
+### **What to Include in Your Report**
+To help us quickly understand and address the issue, please include the following sections in your report:
+
+#### 1. **Summary**
+   - A brief description of the vulnerability.
+
+#### 2. **Affected Versions**
+   - The version(s) of the project affected by the vulnerability.
+   - Example: "Affects versions 3.4.0 to 3.6.23."
+
+#### 3. **Details**
+   - A detailed explanation of the vulnerability, including:
+     - How to reproduce the issue (step-by-step instructions).
+     - The code or component where the vulnerability exists.
+     - The expected vs. actual behavior.
+
+#### 4. **Proof of Concept (PoC)**
+   - Provide a proof of concept to demonstrate the vulnerability. This could be:
+     - Code snippets.
+     - Screenshots or videos.
+     - A minimal reproducible example.
+
+#### 5. **Patches (if applicable)**
+   - If you have a suggested fix or patch, include it in your report.
+   - Example: "Sanitize user input using `DOMPurify`."
+
+#### 6. **Impact**
+   - Describe the potential impact of the vulnerability, such as:
+     - Remote Code Execution.
+     - CSRF.
+     - Data exposure.
+     - Denial of service.
+
+
+
+### **What to Expect**
+- **Acknowledgement**: You will receive an acknowledgement of your report within **48 hours**.
+- **Timeline**: We will provide a timeline for investigating and addressing the issue.
+- **Updates**: You will receive regular updates on the progress of the vulnerability resolution.
+- **CVE ID**: If the vulnerability is confirmed, we will request a CVE ID to acknowledge the issue officially and include it in the release notes.
+
+
+### **Out of Scope**
+The following issues are considered out of scope for security reports:
+- Vulnerabilities in outdated or unsupported versions.
+- Issues related to non-security-impacting bugs or feature requests.
+- Vulnerabilities requiring physical access to the device or social engineering.
+
+
+
+## Security Updates
+
+We are committed to providing timely security updates for supported versions. Here’s our process:
+1. **Assessment**:
+   - All reported vulnerabilities are assessed for severity and impact.
+2. **Patch Development**:
+   - Patches are developed and tested in a private repository to prevent premature disclosure.
+3. **Release**:
+   - Security patches are released as soon as possible, along with a detailed advisory.
+
+
+
+## Acknowledgments
+
+We deeply appreciate the efforts of security researchers and users who help us improve the security of our project.
+
+
+
+## Contact
+
+For any questions or concerns regarding security, please contact us at `security@pgadmin.org`.

docs/en_US/code_review.rst

@@ -16,7 +16,7 @@ review process for any changes submitted for inclusion in pgAdmin.
   bulk updates every year). The start date should always be 2013, and the end year
   the current year, e.g.
 
-    Copyright (C) 2013 - 2024, The pgAdmin Development Team
+    Copyright (C) 2013 - 2025, The pgAdmin Development Team
 
 * Ensure there's a blank line immediately following any copyright headers.
 

docs/en_US/coding_standards.rst

@@ -120,7 +120,7 @@ with the required file header is shown below::
     #
     # pgAdmin 4 - PostgreSQL Tools
     #
-    # Copyright (C) 2013 - 2024, The pgAdmin Development Team
+    # Copyright (C) 2013 - 2025, The pgAdmin Development Team
     # This software is released under the PostgreSQL Licence
     #
     ##########################################################################

docs/en_US/container_deployment.rst

@@ -53,11 +53,11 @@ The default binary paths set in the container are as follows:
 .. code-block:: bash
 
     DEFAULT_BINARY_PATHS = {
+        'pg-17': '/usr/local/pgsql-17',
         'pg-16': '/usr/local/pgsql-16',
         'pg-15': '/usr/local/pgsql-15',
         'pg-14': '/usr/local/pgsql-14',
-        'pg-13': '/usr/local/pgsql-13',
-        'pg-12': '/usr/local/pgsql-12'
+        'pg-13': '/usr/local/pgsql-13'
     }
 
 this may be changed in the :ref:`preferences`.
@@ -134,6 +134,14 @@ Override the default file path for the server definition list. See the
 /pgadmin4/servers.json mapped file below for more information. See the format
 of the `Servers JSON file <https://www.pgadmin.org/docs/pgadmin4/latest/import_export_servers.html#json-format>`_.
 
+**PGADMIN_REPLACE_SERVERS_ON_STARTUP**
+
+*Default: null*
+
+By default, the server definitions are only loaded on first launch, i.e. when initializing the configuration database. See PGADMIN_SERVER_JSON_FILE above.
+
+If this variable is set to True, the server definitions will be replaced on every launch. This can be used to declaratively manage the server definitions.
+
 **PGADMIN_PREFERENCES_JSON_FILE**
 
 *Default: /pgadmin4/preferences.json*

docs/en_US/directory_dialog.rst

@@ -0,0 +1,87 @@
+.. _directory_dialog:
+
+*************************
+`Directory Dialog`:index:
+*************************
+
+Use the Directory dialog to create an alias for a file system directory path.
+To create directories, you must have the CREATE ANY DIRECTORY system privilege.
+When you create a directory, you are automatically granted READ and WRITE privileges
+on the directory, and you can grant READ and WRITE privileges to other users and roles.
+The superuser can also grant these privileges to other users and roles.
+
+Please note that directories are supported when connected to EDB Postgres Advanced Server.
+For more information about using directories, please see the EDB Postgres Advanced Server Guide, available at:
+
+   https://www.enterprisedb.com/docs/epas/latest/epas_compat_sql/
+
+
+The *Directory* dialog organizes the definition of a directory through the
+following tabs: *General*, *Definition*, *Security*, and *SQL*.
+The *SQL* tab displays the SQL code generated by dialog selections.
+
+.. image:: images/directory_general.png
+    :alt: Directory general tab
+    :align: center
+
+Use the fields on the *General* tab to specify directory attributes:
+
+* Use the *Name* field to add a directory alias name. This name will be displayed in the object explorer.
+* Select the owner of the directory from the drop-down listbox in the *Owner*
+  field.
+
+Click the *Definition* tab to continue.
+
+.. image:: images/directory_definition.png
+    :alt: Directory dialog definition tab
+    :align: center
+
+* Use the *Location* field to specify a fully qualified directory path represented
+  by the alias name. The CREATE DIRECTORY command doesn't create the operating system directory.
+  The physical directory must be created independently using operating system commands.
+
+Click the *Security* tab to continue.
+
+.. image:: images/directory_security.png
+    :alt: Directory dialog security tab
+    :align: center
+
+NOTE:- This *Security* tab will be only available for EPAS 17.
+
+Use the *Security* tab to assign privileges for the directory.
+
+Use the *Privileges* panel to assign security privileges. Click the *Add* icon
+(+) to assign a set of privileges:
+
+* Select the name of the role from the drop-down listbox in the *Grantee* field.
+* The current user, who is the default grantor for granting the privilege, is displayed in the *Grantor* field.
+* Click inside the *Privileges* field. Check the boxes to the left of one or
+  more privileges to grant the selected privileges to the specified user.
+
+Click the *Add* icon to assign additional sets of privileges; to discard a
+privilege, click the trash icon to the left of the row and confirm deletion in
+the *Delete Row* popup.
+
+Click the *SQL* tab to continue.
+
+Your entries in the *Directory* dialog generate a SQL command (see an example
+below). Use the *SQL* tab for review; revisit or switch tabs to make any changes
+to the SQL command.
+
+Example
+*******
+
+The following is an example of the sql command generated by user selections in
+the *Directory* dialog:
+
+.. image:: images/directory_sql.png
+    :alt: Directory dialog sql tab
+    :align: center
+
+The example shown demonstrates creating a directory named *test1*. It has a
+*location* value equal to */home/test_dir*.
+
+* Click the *Info* button (i) to access online help.
+* Click the *Save* button to save work.
+* Click the *Close* button to exit without saving work.
+* Click the *Reset* button to restore configuration parameters.

docs/en_US/erd_tool.rst

@@ -207,6 +207,22 @@ The table node shows table details in a graphical representation:
 * you can click on the node and drag to move on the canvas.
 * Upon double click on the table node or by clicking the edit button from the toolbar, the table dialog opens where you can change the table details. Refer :ref:`table dialog <table_dialog>` for information on different fields.
 
+The One to One Link Dialog
+***************************
+
+.. image:: images/erd_11_dialog.png
+    :alt: ERD tool 1-1 dialog
+    :align: center
+
+The one to one link dialog allows you to:
+
+* Add a one to one relationship between two tables.
+* *Local Table* is the table that references a table and has the *one* end point.
+* *Local Column* the column that references.
+* *Select Constraint* To implement one to one relationship, the *Local Column* must have primaty key or unique constraint. The default is a unique constraint. Please note that this field is visible only when the selected *Local Column* does not have either of the mentioned constraints.
+* *Referenced Table* is the table that is being referred and has the *one* end point.
+* *Referenced Column* the column that is being referred.
+
 The One to Many Link Dialog
 ***************************
 

docs/en_US/export_data_using_query.rst

@@ -0,0 +1,91 @@
+.. _export_data_using_query:
+
+***************************************
+`Export Data Using Query Dialog`:index:
+***************************************
+
+Use the *Export Data Using Query* dialog to copy data to a file.
+
+The *Export Data Using Query* dialog organizes the export of data through the
+*General*, *Options* and *Query* tabs.
+
+.. image:: images/export_query_general.png
+    :alt: Export data using query dialog general tab
+    :align: center
+
+Use the fields in the *General* tab to specify export preferences:
+
+* Enter the name of the target file in the *Filename* field.
+  Optionally, select the *Browse* icon (ellipsis) to the right to navigate
+  into a directory and select a file.
+
+* Use the drop-down listbox in the *Format* field to specify the file type.
+  Select:
+
+  * *binary* for a .bin file.
+  * *csv* for a .csv file.
+  * *text* for a .txt file.
+
+* Use the drop-down listbox in the *Encoding* field to specify the type of
+  character encoding.
+
+.. image:: images/export_query_options.png
+    :alt: Export data using query dialog options tab
+    :align: center
+
+* Use the fields in the *Options* tab to specify additional information:
+
+   * Move the *Header* switch to the *Yes* position to include the table header
+     with the data rows. If you include the table header, the first row of the
+     file will contain the column names.
+   * If you are exporting data, specify the delimiter that will separate the
+     columns within the target file in the *Delimiter* field. The separating
+     character can be a colon, semicolon, a vertical bar, or a tab.
+   * Specify a quoting character used in the *Quote* field. Quoting can be
+     applied to string columns only (i.e. numeric columns will not be quoted)
+     or all columns regardless of data type. The character used for quoting can
+     be a single quote or a double quote.
+   * Specify a character that should appear before a data character that matches
+     the *QUOTE* value in the *Escape* field.
+   * Use the *NULL String* field to specify a string that will represent a null
+     value within the source or target file.
+
+Click the *Query* tab to continue.
+
+.. image:: images/export_query.png
+    :alt: Export data using query dialog query tab
+    :align: center
+
+Use the fields in the *Query* tab to write the query that will be exported:
+
+* Use the *Export Data Query* field to specifies A SELECT, VALUES, INSERT, UPDATE,
+  DELETE, or MERGE command whose results are to be copied .
+
+* Use *Force Quote columns* field to forces quoting to be used for all non-NULL
+  values in each specified column. NULL output is never quoted. This is a creatable
+  select control. If you would like to quote all columns then provide only '*' in
+  the field.
+
+After completing the *Export Data Using Query* dialog, click the *OK* button to
+perform the export. pgAdmin will notify you when the background
+process completes:
+
+.. image:: images/export_query_complete.png
+    :alt: Export data using query completion notification
+    :align: center
+
+
+Use the *View Processes* button on the notification to open the *Process
+Watcher* and review detailed information about the execution of the command
+that performed the export:
+
+Use the **End Process** button to end the Export process.
+
+.. image:: images/export_query_pw.png
+    :alt: Export data using query process watcher
+    :align: center
+
+.. note:: If you are running *pgAdmin* in *Server Mode* you can click on the |sm_icon| icon in the process watcher window to open the file location in the Storage Manager. You can use the :ref:`Storage Manager <storage_manager>` to download the exported file on the client machine .
+
+
+.. |sm_icon| image:: images/sm_icon.png

docs/en_US/import_export_data.rst

@@ -33,18 +33,29 @@ Use the fields in the *General* tab to specify import and export preferences:
 * Use the drop-down listbox in the *Encoding* field to specify the type of
   character encoding.
 
+* use the drop-down listbox in the *On Error* field to specify how to behave
+  when encountering an error converting a columns input value into its data type.
+  An error_action value of stop means fail the command, while ignore means discard
+  the input row and continue with the next one. The default is stop. This option is
+  available from PG/EPAS version 17 and above.
+
+* use the drop-down listbox in the *Log Verbosity* field to specify the amount
+  of messages emitted by a COPY command: default or verbose. This is currently
+  used in Import only when ON_ERROR option is set to ignore. This option is
+  available from PG/EPAS version 17 and above.
+
 .. image:: images/import_export_options.png
     :alt: Import Export data dialog options tab
     :align: center
 
 * Use the fields in the *Options* tab to specify additional information:
 
-   * Move the *OID* switch to the *Yes* position to include the *OID* column.
-     The *OID* is a system-assigned value that may not be modified. The default
-     is *No*.
    * Move the *Header* switch to the *Yes* position to include the table header
      with the data rows. If you include the table header, the first row of the
      file will contain the column names.
+   * Move the *Freeze* switch to the *Yes* position to requests copying the
+     data with rows already frozen, just as they would be after running the
+     VACUUM FREEZE command.
    * If you are exporting data, specify the delimiter that will separate the
      columns within the target file in the *Delimiter* field. The separating
      character can be a colon, semicolon, a vertical bar, or a tab.
@@ -54,8 +65,11 @@ Use the fields in the *General* tab to specify import and export preferences:
      be a single quote or a double quote.
    * Specify a character that should appear before a data character that matches
      the *QUOTE* value in the *Escape* field.
-   * Use the *NULL Strings* field to specify a string that will represent a null
+   * Use the *NULL String* field to specify a string that will represent a null
      value within the source or target file.
+   * Use the *Default String* field to specify a string that will represent a default value.
+     Each time the string is found in the input file, the default value of the corresponding
+     column will be used. This option is available from PG/EPAS version 16 and above.
 
 Click the *Columns* tab to continue.
 
@@ -71,29 +85,39 @@ or exported:
   the left of the column name. Click an empty spot inside the field to access
   the drop-down list.
 
+* If enabled, click inside the *Force Quote columns* field to forces quoting
+  to be used for all non-NULL values in each specified column. NULL output is
+  never quoted. To delete a column, click the *x* to the left of the column name.
+
 * If enabled, click inside the *NOT NULL columns* field to select one or more
   columns that will not be checked for a NULL value. To delete a column, click
   the *x* to the left of the column name.
 
+* If enabled, click inside the *NULL columns* field to match the specified columns
+  values against the null string, even if it has been quoted, and if a match is
+  found set the value to NULL. To delete a column, click the *x* to the left of the
+  column name.
+
 After completing the *Import/Export data* dialog, click the *OK* button to
-perform the import or export.  pgAdmin will inform you when the background
+perform the import or export. pgAdmin will notify you when the background
 process completes:
 
 .. image:: images/import_export_complete.png
     :alt: Import Export data completion notification
     :align: center
 
-Use the **Stop Process** button to stop the Import/Export process.
 
-Use the *Click here for details* link on the notification to open the *Process
+Use the *View Processes* button on the notification to open the *Process
 Watcher* and review detailed information about the execution of the command
 that performed the import or export:
 
+Use the **End Process** button to end the Import/Export process.
+
 .. image:: images/import_export_pw.png
     :alt: Import Export data process watcher
     :align: center
 
-.. note:: If you are running *pgAdmin* in *Server Mode* you can click on the |sm_icon| icon in the process watcher window to open the file location in the Storage Manager. You can use the :ref:`Storage Manager <storage_manager>` to download the backup file on the client machine .
+.. note:: If you are running *pgAdmin* in *Server Mode* you can click on the |sm_icon| icon in the process watcher window to open the file location in the Storage Manager. You can use the :ref:`Storage Manager <storage_manager>` to download the exported file on the client machine .
 
 
 .. |sm_icon| image:: images/sm_icon.png

docs/en_US/import_export_servers.rst

@@ -148,41 +148,50 @@ The following example shows both a minimally defined and a fully defined server:
                 "Port": 5432,
                 "Username": "postgres",
                 "Host": "localhost",
-                "SSLMode": "prefer",
-                "MaintenanceDB": "postgres"
+                "MaintenanceDB": "postgres",
+                "ConnectionParameters": {
+                    "sslmode": "prefer",
+                    "connect_timeout": 10
+                }
             },
             "2": {
                 "Name": "Fully Defined Server",
                 "Group": "Server Group 2",
                 "Host": "host.domain.com",
-                "HostAddr": "192.168.1.2",
                 "Port": 5432,
                 "MaintenanceDB": "postgres",
                 "Username": "postgres",
                 "Role": "my_role_name",
-                "SSLMode": "require",
                 "Comment": "This server has every option configured in the JSON",
                 "DBRestriction": "live_db test_db",
-                "PassFile": "/path/to/pgpassfile",
-                "SSLCert": "/path/to/sslcert.crt",
-                "SSLKey": "/path/to/sslcert.key",
-                "SSLRootCert": "/path/to/sslroot.crt",
-                "SSLCrl": "/path/to/sslcrl.crl",
-                "SSLCompression": 1,
                 "Shared": false,
                 "SharedUsername": "postgres",
                 "BGColor": "#ff9900",
                 "FGColor": "#000000",
                 "Service": "postgresql-10",
-                "Timeout": 60,
                 "UseSSHTunnel": 1,
                 "TunnelHost": "192.168.1.253",
                 "TunnelPort": 22,
                 "TunnelUsername": "username",
-                "TunnelAuthentication": 0,
+                "TunnelAuthentication": 1,
+                "TunnelIdentityFile": "/Users/<user>/.ssh/id_rsa.pub",
+                "TunnelKeepAlive": 30,
                 "PasswordExecCommand": "echo 'test'",
-                "PasswordExecExpiration": 100
+                "PasswordExecExpiration": 100,
+                "KerberosAuthentication": true,
+                "ConnectionParameters": {
+                    "sslmode": "prefer",
+                    "connect_timeout": 10,
+                    "passfile": "/Users/<user>/.pgpass",
+                    "sslcert": "/Users/<user>/.ssh/cert"
+                },
+                "Tags": [
+                    {
+                        "color": "#EC0BB4",
+                        "text": "Development"
+                    }
+                ],
+                "PostConnectionSQL": "set timezone='America/New_York'"
             }
         }
-    }
-
+    }

docs/en_US/keyboard_shortcuts.rst

@@ -1,6 +1,6 @@
-****************************
-`Keyboard Shortcuts`:index::
-****************************
+***************************
+`Keyboard Shortcuts`:index:
+***************************
 
 Keyboard shortcuts are provided in pgAdmin to allow easy access to specific
 functions. Alternate shortcuts can be configured through File > Preferences if

docs/en_US/licence.rst

@@ -13,7 +13,7 @@ documentation is attributed to the
 
 .. topic:: pgAdmin 4
 
-    Copyright (C) 2013 - 2024, The pgAdmin Development Team
+    Copyright (C) 2013 - 2025, The pgAdmin Development Team
 
     Permission to use, copy, modify, and distribute this software and its
     documentation for any purpose, without fee, and without a written agreement is

docs/en_US/management_basics.rst

@@ -14,6 +14,7 @@ granting user privileges, and performing VACUUM, ANALYZE and REINDEX functions.
    add_restore_point_dialog
    change_password_dialog
    grant_wizard
+   export_data_using_query
    import_export_data
    maintenance_dialog
    storage_manager

docs/en_US/managing_cluster_objects.rst

@@ -20,4 +20,5 @@ database, right-click on the *Databases* node, and select *Create Database...*
    tablespace_dialog
    replica_nodes_dialog
    pgd_replication_group_dialog
-   role_reassign_dialog
+   role_reassign_dialog
+   directory_dialog

docs/en_US/menu_bar.rst

@@ -103,44 +103,46 @@ The Tools Menu
 
 Use the *Tools* menu to access the following options (in alphabetical order):
 
-+---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
-| Option                    | Action                                                                                                                                    |
-+===========================+===========================================================================================================================================+
-| *ERD Tool*                | Click to open the :ref:`ERD Tool <erd_tool>` and start designing your database.                                                           |
-+---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
-| *Grant Wizard...*         | Click to access the :ref:`Grant Wizard <grant_wizard>` tool.                                                                              |
-+---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
-| *PSQL Tool*               | Click to open the :ref:`PSQL Tool <psql_tool>` and start PSQL in the current database context.                                            |
-+---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
-| *Query tool*              | Click to open the :ref:`Query tool <query_tool>` for the currently selected object.                                                       |
-+---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
-| *Schema Diff*             | Click to open the :ref:`Schema Diff <schema_diff_feature>` and start comparing two database or two schema.                                |
-+---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
-| *Backup Globals...*       | Click to open the :ref:`Backup Globals... <backup_globals_dialog>` dialog to backup cluster objects.                                      |
-+---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
-| *Backup Server...*        | Click to open the :ref:`Backup Server... <backup_server_dialog>` dialog to backup a server.                                               |
-+---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
-| *Backup...*               | Click to open the :ref:`Backup... <backup_dialog>` dialog to backup database objects.                                                     |
-+---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
-| *Restore...*              | Click to access the :ref:`Restore <restore_dialog>` dialog to restore database files from a backup.                                       |
-+---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
-| *Import/Export Data...*   | Click to open the :ref:`Import/Export data... <import_export_data>` dialog to import or export data from a table.                         |
-+---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
-| *Maintenance...*          | Click to open the :ref:`Maintenance... <maintenance_dialog>` dialog to VACUUM, ANALYZE, REINDEX, or CLUSTER.                              |
-+---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
-| *Search Objects...*       | Click to open the :ref:`Search Objects... <search_objects>` and start searching any kind of objects in a database.                        |
-+---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
-| *Add named restore point* | Click to open the :ref:`Add named restore point... <add_restore_point_dialog>` dialog to take a point-in-time snapshot of the current     |
-|                           | server state.                                                                                                                             |
-+---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
-| *Pause replay of WAL*     | Click to pause the replay of the WAL log.                                                                                                 |
-+---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
-| *Resume replay of WAL*    | Click to resume the replay of the WAL log.                                                                                                |
-+---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
-| *Reload Configuration...* | Click to update configuration files without restarting the server.                                                                        |
-+---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
-| *Storage Manager*         | Click to open the :ref:`Storage Manager <storage_manager>` to upload, delete, or download the backup files.                               |
-+---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
++------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
+| Option                       | Action                                                                                                                                    |
++==============================+===========================================================================================================================================+
+| *ERD Tool*                   | Click to open the :ref:`ERD Tool <erd_tool>` and start designing your database.                                                           |
++------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
+| *Grant Wizard...*            | Click to access the :ref:`Grant Wizard <grant_wizard>` tool.                                                                              |
++------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
+| *PSQL Tool*                  | Click to open the :ref:`PSQL Tool <psql_tool>` and start PSQL in the current database context.                                            |
++------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
+| *Query tool*                 | Click to open the :ref:`Query tool <query_tool>` for the currently selected object.                                                       |
++------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
+| *Schema Diff*                | Click to open the :ref:`Schema Diff <schema_diff_feature>` and start comparing two database or two schema.                                |
++------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
+| *Backup Globals...*          | Click to open the :ref:`Backup Globals... <backup_globals_dialog>` dialog to backup cluster objects.                                      |
++------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
+| *Backup Server...*           | Click to open the :ref:`Backup Server... <backup_server_dialog>` dialog to backup a server.                                               |
++------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
+| *Backup...*                  | Click to open the :ref:`Backup... <backup_dialog>` dialog to backup database objects.                                                     |
++------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
+| *Restore...*                 | Click to access the :ref:`Restore <restore_dialog>` dialog to restore database files from a backup.                                       |
++------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
+| *Export Data Using Query...* | Click to open the :ref:`Export Data Using Query... <export_data_using_query>` dialog to export data from a table using query.             |
++------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
+| *Import/Export Data...*      | Click to open the :ref:`Import/Export data... <import_export_data>` dialog to import or export data from a table.                         |
++------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
+| *Maintenance...*             | Click to open the :ref:`Maintenance... <maintenance_dialog>` dialog to VACUUM, ANALYZE, REINDEX, or CLUSTER.                              |
++------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
+| *Search Objects...*          | Click to open the :ref:`Search Objects... <search_objects>` and start searching any kind of objects in a database.                        |
++------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
+| *Add named restore point*    | Click to open the :ref:`Add named restore point... <add_restore_point_dialog>` dialog to take a point-in-time snapshot of the current     |
+|                              | server state.                                                                                                                             |
++------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
+| *Pause replay of WAL*        | Click to pause the replay of the WAL log.                                                                                                 |
++------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
+| *Resume replay of WAL*       | Click to resume the replay of the WAL log.                                                                                                |
++------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
+| *Reload Configuration...*    | Click to update configuration files without restarting the server.                                                                        |
++------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
+| *Storage Manager*            | Click to open the :ref:`Storage Manager <storage_manager>` to upload, delete, or download the backup files.                               |
++------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
 
 The Help Menu
 *************

docs/en_US/mfa.rst

@@ -27,7 +27,7 @@ modify the values for the following parameters.
 
    "MFA_ENABLED","The default value for this parameter is True.
    To disable 2FA, set the value to *False*"
-   "SUPPORTED_MFA_LIST", "Set the authentication methods to be supported "
+   "MFA_SUPPORTED_METHODS", "Set the authentication methods to be supported e.g. email, authenticator"
    "MFA_EMAIL_SUBJECT", "<APP_NAME> - Verification Code e.g. pgAdmin 4 -
    Verification Code"
    "MFA_FORCE_REGISTRATION", "Force the user to configure the authentication

docs/en_US/oauth2.rst

@@ -34,12 +34,12 @@ and modify the values for the following parameters:
     "OAUTH2_AUTHORIZATION_URL", "Endpoint for user authorization"
     "OAUTH2_SERVER_METADATA_URL", "Server metadata url for your OAuth2 provider"
     "OAUTH2_API_BASE_URL", "Oauth2 base URL endpoint to make requests simple, ex: *https://api.github.com/*"
-    "OAUTH2_USERINFO_ENDPOINT", "User Endpoint, ex: *user* (for github) and *userinfo* (for google)"
+    "OAUTH2_USERINFO_ENDPOINT", "User Endpoint, ex: *user* (for github, or *user/emails* if the user's email address is private) and *userinfo* (for google),"
     "OAUTH2_SCOPE", "Oauth scope, ex: 'openid email profile'. Note that an 'email' claim is required in the resulting profile."
     "OAUTH2_ICON", "The Font-awesome icon to be placed on the oauth2 button,  ex: fa-github"
     "OAUTH2_BUTTON_COLOR", "Oauth2 button color"
     "OAUTH2_USERNAME_CLAIM", "The claim which is used for the username. If the value is empty
-    the email is used as username, but if a value is provided, the claim has to exist. Ex: *oid* (for AzureAD)"
+    the email is used as username, but if a value is provided, the claim has to exist. Ex: *oid* (for AzureAD), *email* (for Github)"
     "OAUTH2_AUTO_CREATE_USER", "Set the value to *True* if you want to automatically
     create a pgAdmin user corresponding to a successfully authenticated Oauth2 user.
     Please note that password is not stored in the pgAdmin database."

docs/en_US/preferences.rst

@@ -6,7 +6,14 @@
 ***************************
 
 Use options on the *Preferences* dialog to customize the behavior of the client.
-To open the *Preferences* dialog, select *Preferences* from the *File* menu.
+To open the *Preferences* dialog, select *Preferences* from the *File* menu or
+click on the *Settings* button at the bottom left corner in case of Workspace
+layout.
+
+.. image:: images/preferences_menu.png
+    :alt: Preferences menu
+    :align: center
+
 The left pane of the *Preferences* dialog displays a tree control; each node of
 the tree control provides access to options that are related to the node under
 which they are displayed.
@@ -266,21 +273,46 @@ The Miscellaneous Node
 
 Expand the *Miscellaneous* node to specify miscellaneous display preferences.
 
-.. image:: images/preferences_misc_user_language.png
-    :alt: Preferences dialog user language section
+.. image:: images/preferences_misc_file_downloads.png
+    :alt: Preferences dialog file downloads section
     :align: center
 
-* Use the *User language* drop-down listbox to select the display language for
+Use the fields on the *File Downloads* panel to manage file downloads related preferences.
+
+* When the *Automatically open downloaded files?* switch is set to *True*
+  the downloaded file will automatically open in the system's default
+  application associated with that file type.
+
+* When the *Prompt for the download location?* switch is set to *True*
+  a prompt will appear after clicking the download button, allowing you
+  to choose the download location.
+
+**Note:** File Downloads related settings are applicable and visible only in desktop mode.
+
+Use the fields on the *User Interface* panel to set the user interface related preferences.
+
+.. image:: images/preferences_misc_user_interface.png
+    :alt: Preferences dialog user interface section
+    :align: center
+
+* Use the *Language* drop-down listbox to select the display language for
   the client.
 
-.. image:: images/preferences_misc_themes.png
-    :alt: Preferences dialog themes section
-    :align: center
+* Use the *Layout* drop-down listbox to select the layout for the client.
+  pgAdmin offers two options: the Classic layout, a longstanding and familiar
+  design, and the Workspace layout, which provides distraction free dedicated
+  areas for the Query Tool, PSQL, and Schema Diff tools. 'Workspace' layout is
+  the default layout, but user can change it to 'Classic'.
+
+* When the *Open the Query Tool/PSQL in their respective workspaces* switch is set to *True*
+  then all Query Tool/PSQL tabs will open in their respective workspaces. By default,
+  this setting is False, meaning that Query Tool/PSQL tabs will open in the currently
+  active workspace (either the default or the workspace selected at the time of opening).
 
 * Use the *Themes* drop-down listbox to select the theme for pgAdmin. You'll also get a preview just below the
   drop down. You can also submit your own themes,
   check `here <https://github.com/pgadmin-org/pgadmin4/blob/master/README.md>`_ how.
-  Currently we support Standard, Dark and High Contrast and System theme. Selecting System option will follow
+  Currently we support Light, Dark, High Contrast and System theme. Selecting System option will follow
   your computer's settings.
 
 The Paths Node
@@ -385,6 +417,14 @@ Use the fields on the *Editor* panel to change settings of the query editor.
 * When the *Code folding?* switch is set to *False*, the editor will disable
   code folding. Disabling will improve editor performance with large files.
 
+* Use the *Font family* field to be used for all SQL editors. The specified
+  font should already be installed on your system. If the font is not found,
+  the editor will fall back to the default font, Source Code Pro.
+
+* When the *Font ligatures?* switch is set to *True*, ligatures will be
+  enabled in SQL text boxes and editors provided the configured font family
+  supports them.
+
 * Use the *Font size* field to specify the font size that will be used in text
   boxes and editors.
 
@@ -460,6 +500,9 @@ Use the fields on the *Options* panel to manage editor preferences.
   editor will prompt the user to saved unsaved data when exiting the data
   editor.
 
+* When the *Open the file in a new tab?* switch is set to *True*, the
+  editor will open the new file in new tab of the Query Tool.
+
 * When the *Prompt to save unsaved query changes?* switch is set to *True*, the
   editor will prompt the user to saved unsaved query modifications when exiting
   the Query Tool.
@@ -499,6 +542,9 @@ preferences for copied data.
   setting won't have any effect.
 * Specify the number of records to fetch in one batch. Changing this value will
   override DATA_RESULT_ROWS_PER_PAGE setting from config file.
+* Use the *Max column data display length* to specify the maximum number of
+  characters to be visible in the data output cell. If the data is larger 
+  than this value, it will be truncated.
 * Use the *Result copy field separator* drop-down listbox to select the field
   separator for copied data.
 * Use the *Result copy quote character* drop-down listbox to select the quote
@@ -652,7 +698,7 @@ The following is an typical example for preferences.json :
                 "browser:display:show_system_objects":  true,
                 "browser:display:show_user_defined_templates": true,
                 "browser:display:confirm_on_refresh_close": false,
-                "misc:themes:theme": "dark",
+                "misc:user_interface:theme": "dark",
 
             }
     }

docs/en_US/processes.rst

@@ -42,7 +42,7 @@ Process Watcher
 
 The Process Watcher logs all the activity associated with the process/task and provides
 additional information for troubleshooting
-Use the **Stop Process** button to stop the Backup process.
+Use the **End Process** button to end the process.
 
 .. note:: If you are running *pgAdmin* in *Server Mode* you can click on the |sm_icon| icon in the process watcher window to open the file location in the Storage Manager. You can use the :ref:`Storage Manager <storage_manager>` to download the backup file on the client machine .
 

docs/en_US/psql_tool.rst

@@ -27,4 +27,44 @@ mode, but is disabled by default in Server mode. This is because users can run
 arbitrary shell commands through psql which may be considered a security risk in
 some deployments. System Administrators can enable the use of the PSQL tool in
 the pgAdmin configuration by setting the *ENABLE_PSQL* option to *True*; see
-:ref:`config_py` for more information.
+:ref:`config_py` for more information.
+
+PSQL Tool in Workspace Layout
+******************************
+
+The workspace layout offers a distraction-free, dedicated area for the PSQL Tool.
+When the PSQL Tool workspace is accessed, the Welcome page opens by default.
+
+**Note**: In the Workspace layout, all PSQL tabs open within the PSQL Tool workspace.
+
+In the classic UI, users must connect to a database server and navigate to the
+database node before using the PSQL Tool. However, with the introduction of the
+Workspace layout and Welcome page, users can seamlessly connect to any ad-hoc
+server, even if it is not registered in the Object Explorer.
+
+.. image:: images/psql_workspace.png
+    :alt: PSQL tool workspace
+    :align: center
+
+* Select *Existing Server* from the dropdown to connect to a server already
+  listed in the Object Explorer. It is optional.
+* Provide the *Server Name* for ad-hoc servers.
+* Specify the IP address of the server host, or the fully qualified domain
+  name in the *Host name/address* field.
+* Enter the listener port number of the server host in the *Port* field.
+* Use the *Database* field to specify the name of the database to which
+  the client will connect.
+* Use the *User* field to specify the name of a user that will be used when
+  authenticating with the server.
+* Use the *Password* field to provide a password that will be supplied when
+  authenticating with the server.
+* Use the *Role* field to specify the name of a role that has privileges that
+  will be conveyed to the client after authentication with the server.
+* Use the *Service* field to specify the service name. For more information,
+  see
+  `Section 33.16 of the Postgres documentation <https://www.postgresql.org/docs/current/libpq-pgservice.html>`_.
+* Use the fields in the *Connection Parameters* to configure the connection parameters.
+
+After filling in all the required fields, click the Connect & Open PSQL Tool
+button to launch the PSQL Tool with the provided server details. If the password
+is not supplied, you will be prompted to enter it.

docs/en_US/query_tool.rst

@@ -41,6 +41,47 @@ The Query Tool features two panels:
   server messages related to the query's execution and any asynchronous
   notifications received from the server.
 
+Query Tool in Workspace Layout
+******************************
+
+The workspace layout offers a distraction-free, dedicated area for the Query Tool.
+When the Query Tool workspace is accessed, the Welcome page opens by default.
+
+**Note**: In the Workspace layout, all Query Tool and View/Edit Data tabs open within the Query Tool workspace.
+
+In the classic UI, users must connect to a database server and navigate to the
+database node before using the Query Tool. However, with the introduction of the
+Workspace layout and Welcome page, users can seamlessly connect to any ad-hoc
+server, even if it is not registered in the Object Explorer.
+
+.. image:: images/query_tool_workspace.png
+    :alt: Query tool workspace
+    :align: center
+
+* Select *Existing Server* from the dropdown to connect to a server already
+  listed in the Object Explorer. It is optional.
+* Provide the *Server Name* for ad-hoc servers.
+* Specify the IP address of the server host, or the fully qualified domain
+  name in the *Host name/address* field.
+* Enter the listener port number of the server host in the *Port* field.
+* Use the *Database* field to specify the name of the database to which
+  the client will connect.
+* Use the *User* field to specify the name of a user that will be used when
+  authenticating with the server.
+* Use the *Password* field to provide a password that will be supplied when
+  authenticating with the server.
+* Use the *Role* field to specify the name of a role that has privileges that
+  will be conveyed to the client after authentication with the server.
+* Use the *Service* field to specify the service name. For more information,
+  see
+  `Section 33.16 of the Postgres documentation <https://www.postgresql.org/docs/current/libpq-pgservice.html>`_.
+* Use the fields in the *Connection Parameters* to configure the connection parameters.
+
+After filling in all the required fields, click the Connect & Open Query Tool
+button to launch the Query Tool with the provided server details. If the password
+is not supplied, you will be prompted to enter it.
+
+
 Toolbar
 *******
 

docs/en_US/query_tool_toolbar.rst

@@ -29,7 +29,8 @@ File Options
    +----------------------+---------------------------------------------------------------------------------------------------+----------------+
    | Icon                 | Behavior                                                                                          | Shortcut       |
    +======================+===================================================================================================+================+
-   | *Open File*          | Click the *Open File* icon to display a previously saved query in the SQL Editor.                 | Cmd/Ctrl + O   |
+   | *Open File*          | Click the *Open File* icon to display a previously saved query in the same tab of the SQL Editor. |                |
+   |                      | To open the file in a new tab, select *Open in a new tab?* option from the dropdown.              | Cmd/Ctrl + O   |
    +----------------------+---------------------------------------------------------------------------------------------------+----------------+
    | *Save File*          | Click the *Save* icon to perform a quick-save of a previously saved query, or to access the       | Cmd/Ctrl + S   |
    |                      | *Save* menu:                                                                                      |                |

docs/en_US/release_notes.rst

@@ -12,6 +12,11 @@ notes for it.
    :maxdepth: 1
 
 
+   release_notes_9_4
+   release_notes_9_3
+   release_notes_9_2
+   release_notes_9_1
+   release_notes_9_0
    release_notes_8_14
    release_notes_8_13
    release_notes_8_12

docs/en_US/release_notes_9_0.rst

@@ -0,0 +1,56 @@
+***********
+Version 9.0
+***********
+
+Release date: 2025-02-06
+
+This release contains a number of bug fixes and new features since the release of pgAdmin 4 v8.14.
+
+Supported Database Servers
+**************************
+**PostgreSQL**: 13, 14, 15, 16 and 17
+
+**EDB Advanced Server**: 13, 14, 15, 16 and 17
+
+Bundled PostgreSQL Utilities
+****************************
+**psql**, **pg_dump**, **pg_dumpall**, **pg_restore**: 17.0
+
+
+New features
+************
+
+
+  | `Issue #6513 <https://github.com/pgadmin-org/pgadmin4/issues/6513>`_ -  Change button labels and color in delete confirmation dialog for all objects to improve UX.
+  | `Issue #7708 <https://github.com/pgadmin-org/pgadmin4/issues/7708>`_ -  Enhanced pgAdmin 4 with support for Workspace layouts.
+  | `Issue #8332 <https://github.com/pgadmin-org/pgadmin4/issues/8332>`_ -  Added the MAINTAIN privilege for PostgreSQL version 17 and above.
+  | `Issue #8391 <https://github.com/pgadmin-org/pgadmin4/issues/8391>`_ -  Add support for OAuth2 profile array response, which also takes care of the GitHub Private Email ID issue.
+
+Housekeeping
+************
+
+  | `Issue #8249 <https://github.com/pgadmin-org/pgadmin4/issues/8249>`_ -  Show the python version used for the pgAdmin server in the about dialog.
+
+Bug fixes
+*********
+
+  | `Issue #3273 <https://github.com/pgadmin-org/pgadmin4/issues/3273>`_ -  Change the logic of setval function, so that the next nextval of sequence will return exactly the specified value.
+  | `Issue #5204 <https://github.com/pgadmin-org/pgadmin4/issues/5204>`_ -  Fixed an issue where pgadmin cannot install into path with non ASCII characters.
+  | `Issue #6044 <https://github.com/pgadmin-org/pgadmin4/issues/6044>`_ -  Fixed an issue where filter dialog save fails when the PostgreSQL server/database connection is lost.
+  | `Issue #6968 <https://github.com/pgadmin-org/pgadmin4/issues/6968>`_ -  Fixed an issue where option key was not registering in PSQL tool.
+  | `Issue #8072 <https://github.com/pgadmin-org/pgadmin4/issues/8072>`_ -  Fixed an issue where Schema Diff not produce difference script for Index definition with where condition.
+  | `Issue #8142 <https://github.com/pgadmin-org/pgadmin4/issues/8142>`_ -  Correct the documentation for the MFA configuration.
+  | `Issue #8165 <https://github.com/pgadmin-org/pgadmin4/issues/8165>`_ -  Fixed an issue where error message from the database server need space between two sentences.
+  | `Issue #8199 <https://github.com/pgadmin-org/pgadmin4/issues/8199>`_ -  Fixed an issue where query tool throws utf-8 decode error when using cursor with binary data.
+  | `Issue #8208 <https://github.com/pgadmin-org/pgadmin4/issues/8208>`_ -  Allow deleting the entry while creating/adding new label to enumeration type.
+  | `Issue #8209 <https://github.com/pgadmin-org/pgadmin4/issues/8209>`_ -  Fixed an issue where properties dialog throwing an error for Materialized View.
+  | `Issue #8254 <https://github.com/pgadmin-org/pgadmin4/issues/8254>`_ -  Fix a formatting issue in View/Edit tool generated SQL where some filters are applied.
+  | `Issue #8255 <https://github.com/pgadmin-org/pgadmin4/issues/8255>`_ -  Fixed an issue where tooltip on a dropdown button is blocking access to dropdown menu.
+  | `Issue #8256 <https://github.com/pgadmin-org/pgadmin4/issues/8256>`_ -  Fix the error occurring while loading preferences on startup.
+  | `Issue #8273 <https://github.com/pgadmin-org/pgadmin4/issues/8273>`_ -  Fixed an issue where copying query tool output cell is not working if any SQL text is selected.
+  | `Issue #8299 <https://github.com/pgadmin-org/pgadmin4/issues/8299>`_ -  Ensure master password pop up is not shown on setting MASTER_PASSWORD_REQUIRED to false.
+  | `Issue #8309 <https://github.com/pgadmin-org/pgadmin4/issues/8309>`_ -  Remove the option "With no data (concurrently)" from Refresh MATERIALIZED VIEW context menu.
+  | `Issue #8320 <https://github.com/pgadmin-org/pgadmin4/issues/8320>`_ -  Fix an issue where wrong information is shown after using the filter on the Dashboard> State tab.
+  | `Issue #8365 <https://github.com/pgadmin-org/pgadmin4/issues/8365>`_ -  Fixed an issue where PSQL tool is not opening if database name have HTML characters in the name.
+  | `Issue #8369 <https://github.com/pgadmin-org/pgadmin4/issues/8369>`_ -  Fixed an issue where Default Privileges and Privileges not working correctly.
+  | `Issue #8408 <https://github.com/pgadmin-org/pgadmin4/issues/8408>`_ -  Fixed an issue where quotes were missing in the CREATE script for the tablespace.

docs/en_US/release_notes_9_1.rst

@@ -0,0 +1,44 @@
+***********
+Version 9.1
+***********
+
+Release date: 2025-02-28
+
+This release contains a number of bug fixes and new features since the release of pgAdmin 4 v9.0.
+
+Supported Database Servers
+**************************
+**PostgreSQL**: 13, 14, 15, 16 and 17
+
+**EDB Advanced Server**: 13, 14, 15, 16 and 17
+
+Bundled PostgreSQL Utilities
+****************************
+**psql**, **pg_dump**, **pg_dumpall**, **pg_restore**: 17.2
+
+
+New features
+************
+
+  | `Issue #1235 <https://github.com/pgadmin-org/pgadmin4/issues/1235>`_ -  Added an option to open the file in a new tab within the query tool.
+  | `Issue #5128 <https://github.com/pgadmin-org/pgadmin4/issues/5128>`_ -  Add support for one to one relationship in the ERD tool.
+  | `Issue #8436 <https://github.com/pgadmin-org/pgadmin4/issues/8436>`_ -  Enable the ability to close the 'Welcome' tab in the Query Tool/PSQL Workspace.
+
+Housekeeping
+************
+
+  | `Issue #8068 <https://github.com/pgadmin-org/pgadmin4/issues/8068>`_ -  Added support for Python 3.13
+
+Bug fixes
+*********
+
+  | `Issue #8181 <https://github.com/pgadmin-org/pgadmin4/issues/8181>`_ -  Fixed an issue where pgAdmin does not support pg_vector column length/precision.
+  | `Issue #8296 <https://github.com/pgadmin-org/pgadmin4/issues/8296>`_ -  Fixed an issue where pasting text containing JSON data into the query tool grid would result in incorrect parsing.
+  | `Issue #8341 <https://github.com/pgadmin-org/pgadmin4/issues/8341>`_ -  Fixed an issue where the query tool was not treating IDENTITY columns as columns with default values when inserting new rows.
+  | `Issue #8389 <https://github.com/pgadmin-org/pgadmin4/issues/8389>`_ -  Fixed an issue where the ERD tool fails to open a saved file containing parent-child relationship within the same table.
+  | `Issue #8410 <https://github.com/pgadmin-org/pgadmin4/issues/8410>`_ -  Fixed Docker image entrypoint.sh email validation.
+  | `Issue #8418 <https://github.com/pgadmin-org/pgadmin4/issues/8418>`_ -  Fixed an issue where the User Management and Change Password dialogs were hidden when selecting a menu while a workspace other than 'Default' was active.
+  | `Issue #8430 <https://github.com/pgadmin-org/pgadmin4/issues/8430>`_ -  Fixed an issue where the column order displayed was incorrect for exclusion constraints with multiple columns.
+  | `Issue #8435 <https://github.com/pgadmin-org/pgadmin4/issues/8435>`_ -  Ensure the saved passwords are decrypted with the correct encryption key for external authentication in server mode.
+  | `Issue #8439 <https://github.com/pgadmin-org/pgadmin4/issues/8439>`_ -  Fixed an issue where drop-down menus were hidden behind the dock.
+  | `Issue #8460 <https://github.com/pgadmin-org/pgadmin4/issues/8460>`_ -  Fixed an issue where deleting rows in the query tool would delete all rows in the table when 'Select All Remaining Rows' was used.

docs/en_US/release_notes_9_2.rst

@@ -0,0 +1,54 @@
+***********
+Version 9.2
+***********
+
+Release date: 2025-04-03
+
+This release contains a number of bug fixes and new features since the release of pgAdmin 4 v9.1.
+
+Supported Database Servers
+**************************
+**PostgreSQL**: 13, 14, 15, 16 and 17
+
+**EDB Advanced Server**: 13, 14, 15, 16 and 17
+
+Bundled PostgreSQL Utilities
+****************************
+**psql**, **pg_dump**, **pg_dumpall**, **pg_restore**: 17.2
+
+
+New features
+************
+
+  | `Issue #0392 <https://github.com/pgadmin-org/pgadmin4/issues/0392>`_ -  Added an ability to configure the font family for SQL editors.
+  | `Issue #4194 <https://github.com/pgadmin-org/pgadmin4/issues/4194>`_ -  Added support to automatically open a file after it is downloaded in the desktop mode.
+  | `Issue #4503 <https://github.com/pgadmin-org/pgadmin4/issues/4503>`_ -  Added support for post-connection SQL execution, which will be run automatically on each connection made to any database of the server.
+  | `Issue #5871 <https://github.com/pgadmin-org/pgadmin4/issues/5871>`_ -  Add support for restoring plain SQL database dumps.
+  | `Issue #8034 <https://github.com/pgadmin-org/pgadmin4/issues/8034>`_ -  Added support for creating Directory nodes in EPAS.
+  | `Issue #8449 <https://github.com/pgadmin-org/pgadmin4/issues/8449>`_ -  Change icon buttons to show tooltip even when disabled.
+  | `Issue #8540 <https://github.com/pgadmin-org/pgadmin4/issues/8540>`_ -  Add an option to load/replace the servers.json file on each container startup.
+  | `Issue #8574 <https://github.com/pgadmin-org/pgadmin4/issues/8574>`_ -  Open user management in a separate tab instead of a dialog to enhance UI/UX.
+
+Housekeeping
+************
+
+  | `Issue #8545 <https://github.com/pgadmin-org/pgadmin4/issues/8545>`_ -  Added Security.md file.
+
+Bug fixes
+*********
+
+  | `Issue #8316 <https://github.com/pgadmin-org/pgadmin4/issues/8316>`_ -  Ensure that modal dialogs are not triggered more than once to avoid duplicates.
+  | `Issue #8355 <https://github.com/pgadmin-org/pgadmin4/issues/8355>`_ -  Change session files garbage collection strategy.
+  | `Issue #8362 <https://github.com/pgadmin-org/pgadmin4/issues/8362>`_ -  Fixed an issue where pgAdmin should fallback to main screen if the last opened screen is disconnected.
+  | `Issue #8437 <https://github.com/pgadmin-org/pgadmin4/issues/8437>`_ -  Fixed an issue where the PSQL terminal displays keyname for non alphanumeric keys.
+  | `Issue #8462 <https://github.com/pgadmin-org/pgadmin4/issues/8462>`_ -  Fixed an issue where geometries in the geometry viewer will render partially when the container was resized.
+  | `Issue #8473 <https://github.com/pgadmin-org/pgadmin4/issues/8473>`_ -  Change the stop/terminate icon at all the places for better UX.
+  | `Issue #8479 <https://github.com/pgadmin-org/pgadmin4/issues/8479>`_ -  Fixed an issue where the Schema Diff was not displaying the difference query when a table had a UNIQUE NULLS NOT DISTINCT constraint.
+  | `Issue #8483 <https://github.com/pgadmin-org/pgadmin4/issues/8483>`_ -  Fixed an issue where the query tool data grid did not respect the default value for columns of domain type when the domain had a default value.
+  | `Issue #8514 <https://github.com/pgadmin-org/pgadmin4/issues/8514>`_ -  Ensure the newly added parameters in the server dialog are incorporated into the Import/Export Servers functionality.
+  | `Issue #8546 <https://github.com/pgadmin-org/pgadmin4/issues/8546>`_ -  Fixed an issue where updating the grantee was not correctly applying the privileges.
+  | `Issue #8577 <https://github.com/pgadmin-org/pgadmin4/issues/8577>`_ -  Fixed an issue where the upgrade_check API returned an unexpected keyword argument 'cafile' due to changes in the urllib package supporting Python v3.13.
+  | `Issue #8597 <https://github.com/pgadmin-org/pgadmin4/issues/8597>`_ -  Fixed an issue where delete/rename was done on wrong file after sorting in Storage Manager.
+  | `Issue #8602 <https://github.com/pgadmin-org/pgadmin4/issues/8602>`_ -  Fixed an XSS vulnerability issue in the Query Tool and View/Edit Data (CVE-2025-2946).
+  | `Issue #8603 <https://github.com/pgadmin-org/pgadmin4/issues/8603>`_ -  Fixed a remote code execution issue in the Query Tool and Cloud Deployment (CVE-2025-2945).
+  | `Issue #8623 <https://github.com/pgadmin-org/pgadmin4/issues/8623>`_ -  Fixed an issue where query tool is crashing on macOS 15.4 due to a locale issue.

docs/en_US/release_notes_9_3.rst

@@ -0,0 +1,48 @@
+***********
+Version 9.3
+***********
+
+Release date: 2025-04-30
+
+This release contains a number of bug fixes and new features since the release of pgAdmin 4 v9.2.
+
+Supported Database Servers
+**************************
+**PostgreSQL**: 13, 14, 15, 16 and 17
+
+**EDB Advanced Server**: 13, 14, 15, 16 and 17
+
+Bundled PostgreSQL Utilities
+****************************
+**psql**, **pg_dump**, **pg_dumpall**, **pg_restore**: 17.2
+
+
+New features
+************
+
+  | `Issue #2256 <https://github.com/pgadmin-org/pgadmin4/issues/2256>`_ -  Add support for type constructors for PostGIS spatial types.
+  | `Issue #2767 <https://github.com/pgadmin-org/pgadmin4/issues/2767>`_ -  Added ability to use SQL in the "DB Restriction" field.
+  | `Issue #7310 <https://github.com/pgadmin-org/pgadmin4/issues/7310>`_ -  Add support for custom roles and role permissions management in pgAdmin.
+  | `Issue #8629 <https://github.com/pgadmin-org/pgadmin4/issues/8629>`_ -  Added support for font ligatures.
+
+Housekeeping
+************
+
+
+Bug fixes
+*********
+
+  | `Issue #3688 <https://github.com/pgadmin-org/pgadmin4/issues/3688>`_ -  Add Cache-Control no-cache,no-store,must-revalidate header to dynamically generated utils.js file.
+  | `Issue #5266 <https://github.com/pgadmin-org/pgadmin4/issues/5266>`_ -  Fixed an issue where shift + click on rows/columns for range selection did not work in the query tool data output window.
+  | `Issue #8443 <https://github.com/pgadmin-org/pgadmin4/issues/8443>`_ -  Fixed an issue where the debugger hangs when stepping into nested function/procedure.
+  | `Issue #8497 <https://github.com/pgadmin-org/pgadmin4/issues/8497>`_ -  Fixed an issue where the scroll position in the Object Explorer was not retained when switching workspaces.
+  | `Issue #8556 <https://github.com/pgadmin-org/pgadmin4/issues/8556>`_ -  Ensure that graph data is updated even when the Dashboard tab is inactive.
+  | `Issue #8572 <https://github.com/pgadmin-org/pgadmin4/issues/8572>`_ -  Fixed an issue where Ctrl/Cmd+A in cell editor would select all rows.
+  | `Issue #8613 <https://github.com/pgadmin-org/pgadmin4/issues/8613>`_ -  Fixed an issue where drag and drop function with no parameters does not work.
+  | `Issue #8627 <https://github.com/pgadmin-org/pgadmin4/issues/8627>`_ -  Fixed an issue where changes to foreign key constraints were not detected in the schema diff.
+  | `Issue #8628 <https://github.com/pgadmin-org/pgadmin4/issues/8628>`_ -  Change the shortcut for canceling a running query as it conflicts with the shortcut to open a new query tool.
+  | `Issue #8630 <https://github.com/pgadmin-org/pgadmin4/issues/8630>`_ -  Fixed an issue where filtering on a view caused an error.
+  | `Issue #8632 <https://github.com/pgadmin-org/pgadmin4/issues/8632>`_ -  Fixed an issue where the query tool went blank when converting history dates to the appropriate locale format.
+  | `Issue #8636 <https://github.com/pgadmin-org/pgadmin4/issues/8636>`_ -  Ensure that the server list is alphabetically sorted in the Query Tool/PSQL workspace.
+  | `Issue #8651 <https://github.com/pgadmin-org/pgadmin4/issues/8651>`_ -  Fixed an issue where the user management tab is not opening in the classic layout.
+  | `Issue #8652 <https://github.com/pgadmin-org/pgadmin4/issues/8652>`_ -  Allow OAuth 2 login using the username claim if the email is absent from the user profile.

docs/en_US/release_notes_9_4.rst

@@ -0,0 +1,44 @@
+***********
+Version 9.4
+***********
+
+Release date: 2025-05-29
+
+This release contains a number of bug fixes and new features since the release of pgAdmin 4 v9.3.
+
+Supported Database Servers
+**************************
+**PostgreSQL**: 13, 14, 15, 16 and 17
+
+**EDB Advanced Server**: 13, 14, 15, 16 and 17
+
+Bundled PostgreSQL Utilities
+****************************
+**psql**, **pg_dump**, **pg_dumpall**, **pg_restore**: 17.2
+
+
+New features
+************
+
+  | `Issue #3369 <https://github.com/pgadmin-org/pgadmin4/issues/3369>`_ -  Enabled large file downloads for desktop users within the query tool.
+  | `Issue #8583 <https://github.com/pgadmin-org/pgadmin4/issues/8583>`_ -  Add all missing options to the Import/Export Data functionality, and update the syntax of the COPY command to align with the latest standards.
+  | `Issue #8681 <https://github.com/pgadmin-org/pgadmin4/issues/8681>`_ -  Add support for exporting table data based on a custom query.
+
+Housekeeping
+************
+
+
+Bug fixes
+*********
+
+  | `Issue #6510 <https://github.com/pgadmin-org/pgadmin4/issues/6510>`_ -  Fixed an issue where the result grid slowed down when any column contained a large amount of data.
+  | `Issue #6564 <https://github.com/pgadmin-org/pgadmin4/issues/6564>`_ -  Fix the issue where an error is displayed when a table is dropped while a query is running.
+  | `Issue #6968 <https://github.com/pgadmin-org/pgadmin4/issues/6968>`_ -  Fixed an issue where the options key was not working as expected in the PSQL tool.
+  | `Issue #7926 <https://github.com/pgadmin-org/pgadmin4/issues/7926>`_ -  Fixed an issue where correct error message not displayed when sql statement contains Arabic letters.
+  | `Issue #8595 <https://github.com/pgadmin-org/pgadmin4/issues/8595>`_ -  Enhance contrast for selected and hovered items in the Object Explorer to improve visibility and accessibility.
+  | `Issue #8607 <https://github.com/pgadmin-org/pgadmin4/issues/8607>`_ -  Fixed an issue where the query tool returns "cannot unpack non-iterable Response object" when running any query with a database name change.
+  | `Issue #8608 <https://github.com/pgadmin-org/pgadmin4/issues/8608>`_ -  Handle result grid data changes in View/Edit Data mode by automatically reconnecting to the server if a disconnection occurs.
+  | `Issue #8668 <https://github.com/pgadmin-org/pgadmin4/issues/8668>`_ -  Implement API fetch error display for select dropdown.
+  | `Issue #8711 <https://github.com/pgadmin-org/pgadmin4/issues/8711>`_ -  Fixed an issue where light theme briefly appears when pgAdmin loads or tools open, even when a dark or system UI theme is preferred.
+  | `Issue #8713 <https://github.com/pgadmin-org/pgadmin4/issues/8713>`_ -  Fixed issues related to column range selection using shift + click.
+  | `Issue #8760 <https://github.com/pgadmin-org/pgadmin4/issues/8760>`_ -  Fixed an issue where pgAdmin failed to focus when previously unfocused and then quit.

docs/en_US/resource_group_dialog.rst

@@ -13,7 +13,7 @@ connected to EDB Postgres Advanced Server; for more information about using
 resource groups, please see the EDB Postgres Advanced Server Guide, available
 at:
 
-   http://www.enterprisedb.com/
+   https://www.enterprisedb.com/docs/epas/latest/epas_compat_sql/
 
 Fields used to create a resource group are located on the *General* tab.  The
 *SQL* tab displays the SQL code generated by your selections on the *Resource

docs/en_US/restore_dialog.rst

@@ -27,6 +27,8 @@ restore process:
 
    * Select *Custom or tar* to restore from a custom archive file to create a
      copy of the backed-up object.
+   * Select *Plain* to restore a plain SQL backup. When selecting this option
+     all the other options will not be applicable.
    * Select *Directory* to restore from a compressed directory-format archive.
 
 * Enter the complete path to the backup file in the *Filename* field.

docs/en_US/schema_diff.rst

@@ -44,6 +44,18 @@ Use the :ref:`Preferences <preferences>` dialog to specify following:
  * *Schema Diff* should ignore the whitespaces while comparing string objects. Set *Ignore whitespaces* option to true.
  * *Schema Diff* should ignore the owner while comparing objects. Set *Ignore owner* option to true.
 
+Schema Diff in Workspace Layout
+*******************************
+
+The workspace layout offers a distraction-free, dedicated area for the Schema Diff.
+By default, the Schema Diff workspace button remains disabled until at least one Schema Diff tab is opened.
+
+**Note**: In the Workspace layout, all Schema Diff tabs open within the Schema Diff workspace.
+
+.. image:: images/schema_diff_workspace.png
+    :alt: schema diff workspace
+    :align: center
+
 
 The *Schema Diff* panel is divided into two panels; an Object Comparison panel
 and a DDL Comparison panel.

docs/en_US/sequence_dialog.rst

@@ -35,6 +35,9 @@ Click the *Definition* tab to continue.
 
 Use the fields in the *Definition* tab to define the sequence:
 
+* Use the *Current Value* field to specify the sequence object\'s current value.
+  The next nextval will return exactly the specified value, and sequence advancement
+  commences with the following nextval. *This field is only available in the edit mode*.
 * Use the *Increment* field to specify which value is added to the current
   sequence value to create a new value.
 * Provide a value in the *Start* field to specify the beginning value of the

docs/en_US/server_dialog.rst

@@ -195,19 +195,27 @@ Click the *Advanced* tab to continue.
 
 Use the fields in the *Advanced* tab to configure a connection:
 
-* Use the *DB restriction* field to provide a SQL restriction that will be used
-  against the pg_database table to limit the databases that you see. For
-  example, you might enter: *live_db test_db* so that only live_db and test_db
-  are shown in the pgAdmin browser. Separate entries with a comma or tab as you
-  type.
+* Specify the type of the database restriction that will be used to filter
+  out the databases for restriction in the *DB restriction type* field:
+
+    * Select the *Databases* option to specify the name of the databases
+      that will be used against the pg_database table to limit the databases
+      that you see. This is the default.
+    * Select the *SQL* option to provide a SQL restriction that will be used
+      against the pg_database table to limit the databases that you see.
+
+* Use the *DB restriction* field to provide a SQL restriction OR Database names
+  that will be used against the pg_database table to limit the databases that you see.
+  For example, you might enter: *live_db test_db* so that only live_db and test_db
+  are shown in the pgAdmin object explorer.
 * Use the *Password exec command* field to specify a shell command to be executed
   to retrieve a password to be used for SQL authentication. The ``stdout`` of the
   command will be used as the SQL password. This may be useful when the password
   should be generated as a transient authorization token instead of providing a
   password when connecting in `PAM authentication <https://www.postgresql.org/docs/current/auth-pam.html>`_ scenarios.
   You can pass server hostname, port and DB username to the password exec command as variable by providing placeholders
-  like ``%HOST%``, ``%PORT%`` and ``%USERNAME%`` which will be replace with the server connection information.
-  Example: ``/path/to/script --hostnmae %HOST% --port %PORT% --username %USERNAME%``
+  like ``%HOSTNAME%``, ``%PORT%`` and ``%USERNAME%`` which will be replace with the server connection information.
+  Example: ``/path/to/script --hostname %HOSTNAME% --port %PORT% --username %USERNAME%``
 * Use the *Password exec expiration* field to specify a maximum age, in seconds,
   of the password generated with a *Password exec command*. If not specified,
   the password will not expire until your pgAdmin session does.
@@ -225,14 +233,14 @@ Use the fields in the *Advanced* tab to configure a connection:
 
 .. note:: The Password exec option is only supported when pgAdmin is run in desktop mode.
 
-* Click the *Save* button to save your work.
-* Click the *Close* button to exit without saving your work.
-* Click the *Reset* button to return the values specified on the Server dialog
-  to their original condition.
+Click the *Post Connection SQL* tab to continue.
 
-.. toctree::
+.. image:: images/server_post_connection_sql.png
+    :alt: Server dialog post connection sql tab
+    :align: center
 
-    clear_saved_passwords
+* Use the *Post Connection SQL* field to write the SQL queries that will be
+  executed in autocommit mode for each connection made to any database on this server.
 
 
 Click the *Tags* tab to continue.
@@ -245,6 +253,15 @@ Use the table in the *Tags* tab to add tags. The tags will be shown on the right
 a server node label in the object explorer tree.
 
 Click on the *+* button to add a new tag. Some of the parameters are:
+  * *Text* field to specify the tag name.
+  * *Color* field to select the accent color of the tag.
 
-* *Text* field to specify the tag name.
-* *Color* field to select the accent color of the tag.
+
+* Click the *Save* button to save your work.
+* Click the *Close* button to exit without saving your work.
+* Click the *Reset* button to return the values specified on the Server dialog
+  to their original condition.
+
+.. toctree::
+
+    clear_saved_passwords

docs/en_US/user_interface.rst

@@ -32,7 +32,7 @@ the right pane.
 Select an icon from the *Quick Links* panel on the *Dashboard* tab to:
 
 * Click the *Add New Server* button to open the
-  :ref:`Create - Server dialog <server_dialog>` to add a new server definition.
+  :ref:`Register - Server dialog <server_dialog>` to add a new server definition.
 * Click the *Configure pgAdmin* button to open the
   :ref:`Preferences dialog <preferences>` to customize your pgAdmin client.
 

docs/en_US/user_management.rst

@@ -1,7 +1,7 @@
 .. _user_management:
 
 *******************************
-`User Management Dialog`:index:
+`User Management`:index:
 *******************************
 
 When invoking pgAdmin in desktop mode, a password is randomly generated, and
@@ -9,14 +9,19 @@ then ignored. If you install pgAdmin in server mode, you will be prompted for
 an administrator email and password for the pgAdmin client.
 
 When you authenticate with pgAdmin, the server definitions associated with that
-login role are made available in the tree control.  An administrative user can
-use the *User Management* dialog to:
+login role are made available in the tree control.
 
-* add or delete pgAdmin roles
-* assign privileges
-* manage the password associated with a role
+Users Tab
+*********
+An administrative user can use the *Users* tab to:
 
-.. image:: images/user.png
+* manage pgAdmin users
+* change users role
+* change password for a user
+* deactivate user
+* unlock a locked user
+
+.. image:: images/users.png
     :alt: pgAdmin user management window
     :align: center
 
@@ -26,7 +31,8 @@ the following criteria types: *Authentication source*, *Username*, or *Email*.
 For example, you can enter *ldap* in the search box and only the records having
 *ldap* as authentication source will be displayed in the *User Management* table.
 
-To add a user, click the Add (+) button at the top right corner.
+To add a user, click the Add (+) button at the top left corner. It will open a
+dialog where you can fill in details for the new user.
 
 .. image:: images/add_user.png
     :alt: pgAdmin user management window add new user
@@ -34,34 +40,30 @@ To add a user, click the Add (+) button at the top right corner.
 
 Provide information about the new pgAdmin role in the row:
 
-* Use the drop-down list box next to *Authentication source* field to select the
-  type of authentication that should be used for the user. If authentication
-  source is only 'internal' then *Authentication source* field
-  is disabled. Supported *Authentication source* are internal, ldap, kerberos,
-  oauth2 and webserver.
-* Click in the *Username* field, and provide a username for the user. This field
+* Use the *Authentication source* field to select the type of authentication that
+  should be used for the user. If authentication source in the pgAdmin server config
+  has 'internal' only then *Authentication source* field will be disabled. Supported
+  *Authentication source* are internal, ldap, kerberos, oauth2 and webserver.
+* Use the *Username* field to provide a username for the user. This field
   is enabled only when you select authentication source except *internal*. If you
-  select *internal* as authentication source, your email address is displayed in the
-  username field.
-* Click in the *Email* field, and provide an email address for the user.
-* Use the drop-down list box next to *Role* to select whether a user is an
-  *Administrator* or a *User*.
-
+  select *internal* as authentication source, your email address will be taken as
+  the username.
+* Use the *Email* field to provide an email address for the user. Email is a
+  mandatory field for authentication source *internal*.
+* Use the *Role* field to select whether a user is an *Administrator* or a *User*.
    * Select *Administrator* if the user will have administrative privileges
      within the pgAdmin client.
    * Select *User* to create a non-administrative user account.
-
-* Move the *Active* switch to the *No* position if the account is not currently
-  active; the default is *Yes*. Use this switch to disable account activity
-  without deleting an account.
+* Use the *Active* switch to enable or disable account activity without deleting an
+  account; by default it is enabled.
 * Use the *New password* field to provide the password associated with the user
   specified in the *Email* field. This field is disabled if you select any
   authentication source except *internal*.
 * Re-enter the password in the *Confirm password* field. This field is disabled
   if you select *ldap* as authentication source.
-* *Locked* switch is disabled by default when set to *False*. It is only enabled
-  when the user is locked by trying unsuccessful login attempts. Move the switch
-  to the *False* position if you want to unlock the account.
+* *Locked* switch cannot be changed if is turned off. It can only be changed
+  when the user is locked by trying unsuccessful login attempts. Turn off the
+  switch if you want to unlock the account.
 
 To discard a user, and revoke access to pgAdmin, click the trash icon to the
 left of the row and confirm deletion in the *Delete user?* dialog. If the user
@@ -72,9 +74,62 @@ dialog will appear to change the ownership of a shared server.
 Users with the *Administrator* role are able to add, edit and remove pgAdmin
 users, but otherwise have the same capabilities as those with the *User* role.
 
+* Click the *Refresh* button to get latest users list.
 * Click the *Help* button (?) to access online help.
-* Click the *Close* button to save work. You will be prompted to return to the
-  dialog if your selections cannot be saved.
+
+
+Roles Tab
+*********
+An administrative user can use the *Roles* tab to:
+
+* manage pgAdmin roles
+* delete roles
+
+.. image:: images/roles.png
+  :alt: pgAdmin roles management window
+  :align: center
+
+Use the *Search* field to specify criteria and review a list of roles
+that match the specified criteria. You can enter a value that matches
+the following criteria types: *Role Name* or *Description*.
+
+To add a role, click the Add (+) button at the top left corner. It will open a
+dialog where you can fill in details for the new role.
+
+.. image:: images/add_role.png
+  :alt: pgAdmin roles management window add new role
+  :align: center
+
+Provide information about the new pgAdmin role in the row:
+
+* Use the *Name* field to specify a unique name for the role.
+* Use the *Description* field to provide a brief description of the role.
+
+To delete a role, click the trash icon to the left of the row and confirm deletion
+in the *Delete role?* dialog. If the role is associated with any users or resources,
+you may need to reassign those associations before deletion.
+
+Roles allow administrators to group privileges and assign them to users more efficiently.
+This helps in managing permissions and access control within the pgAdmin client.
+
+* Click the *Refresh* button to get the latest roles list.
+* Click the *Help* button (?) to access online help.
+
+
+Permissions Tab
+***************
+An administrative user can use the *Permissions* tab to manage pgAdmin permissions for 
+a role.
+
+.. image:: images/permissions.png
+  :alt: pgAdmin permissions management window
+  :align: center
+
+* Filter permissions using the *Search* field by entering names that match the list.
+* Administrators can select permissions from the list of available permissions, and
+  choose to grant or revoke these permissions for specific roles.
+* The permissions are applied to the selected role immediately.
+
 
 
 Using 'setup.py' command line script
@@ -107,10 +162,11 @@ email and password. role and active will be optional fields.
 
     /path/to/python /path/to/setup.py add-user user1@gmail.com password
 
-    # to specify a role, admin and non-admin users:
+    # to specify a role, either you can use --admin for Administrator role or provide the
+    # role using --role. If both are provided --admin will be used:
 
     /path/to/python /path/to/setup.py add-user user1@gmail.com password --admin
-    /path/to/python /path/to/setup.py add-user user1@gmail.com password --nonadmin
+    /path/to/python /path/to/setup.py add-user user1@gmail.com password --role Users
 
     # to specify user's status
 
@@ -131,10 +187,11 @@ followed by email, password and authentication source. email, role and status wi
 
     /path/to/python /path/to/setup.py add-external-user ldapuser ldap --email user1@gmail.com
 
-    # to specify a role, admin and non-admin user:
+    # to specify a role, either you can use --admin for Administrator role or provide the
+    # role using --role. If both are provided --admin will be used:
 
     /path/to/python /path/to/setup.py add-external-user ldapuser ldap  --admin
-    /path/to/python /path/to/setup.py add-external-user ldapuser ldap  --nonadmin
+    /path/to/python /path/to/setup.py add-external-user ldapuser ldap  --role Users
 
     # to specify user's status
 
@@ -151,10 +208,11 @@ email address. password, role and active are updatable fields.
 
     /path/to/python /path/to/setup.py update-user user1@gmail.com --password new-password
 
-    # to specify a role, admin and non-admin user:
+    # to specify a role, either you can use --admin for Administrator role or provide the
+    # role using --role. If both are provided --admin will be used:
 
-    /path/to/python /path/to/setup.py update-user user1@gmail.com password --role --admin
-    /path/to/python /path/to/setup.py update-user user1@gmail.com password --role --nonadmin
+    /path/to/python /path/to/setup.py update-user user1@gmail.com password --admin
+    /path/to/python /path/to/setup.py update-user user1@gmail.com password --role Users
 
     # to specify user's status
 
@@ -171,17 +229,18 @@ followed by username and auth source. email, password, role and active are updat
 
     # to change email address:
 
-    /path/to/python /path/to/setup.py update-external-user ldap ldapuser --email newemail@gmail.com
+    /path/to/python /path/to/setup.py update-external-user ldapuser --auth-source ldap --email newemail@gmail.com
 
-    # to specify a role, admin and non-admin user:
+    # to specify a role, either you can use --admin for Administrator role or provide the
+    # role using --role. If both are provided --admin will be used:
 
-    /path/to/python /path/to/setup.py update-user user1@gmail.com password --role --admin
-    /path/to/python /path/to/setup.py update-user user1@gmail.com password --role --nonadmin
+    /path/to/python /path/to/setup.py update-external-user user1@gmail.com password --role --admin
+    /path/to/python /path/to/setup.py update-external-user user1@gmail.com password --role --role Users
 
     # to change user's status
 
-   /path/to/python /path/to/setup.py update-user ldap ldapuser --active
-   /path/to/python /path/to/setup.py update-user ldap ldapuser --inactive
+   /path/to/python /path/to/setup.py update-user ldapuser --auth-source ldap --active
+   /path/to/python /path/to/setup.py update-user ldapuser --auth-source ldap --inactive
 
 Delete User
 ***********

pkg/debian/README.md

@@ -5,8 +5,8 @@ Debian and Ubuntu.
 
 ## Supported platforms
 
-* Debian 9, 10 & 11 (testing)
-* Ubuntu 18.04, 20.04, 20.10
+* Debian 11 & 12
+* Ubuntu 22.04, 24.04 & 24.10
 
 ## Build configuration