Update versions for 3.3.

Update message catalogs
Correct the documentation of View/Edit data. Fixes #3604
2026-10-27 23:20:05 -05:00 · 2018-09-03 10:11:34 +01:00 · 2018-09-03 10:09:10 +01:00 · 2018-08-31 19:02:26 +05:30 · 2018-08-30 13:59:44 +01:00 · 2018-08-30 12:30:00 +05:30
657 changed files with 71600 additions and 30511 deletions
@@ -36,8 +36,10 @@ runtime/pgAdmin4_resource.rc
 runtime/release/
 runtime/ui_BrowserWindow.h
 web/config_local.py
+web/geckodriver.log
 web/regression/test_config.json
 node_modules/
 web/pgAdmin/static/js/generated
 web/pgadmin/static/js/generated
-web/yarn-error.log
+web/yarn-error.log
+/web/cacert.pem
@@ -1,193 +1,242 @@
@ECHO off
 SETLOCAL
-REM
-REM ****************************************************************
+
 SET WD=%CD%
 SET "PGBUILDPATH=%WD%\win-build"
+
 SET CMDOPTION=""
 IF "%1" == "clean"  SET CMDOPTION="VALID"
 IF "%1" == "x86"    SET CMDOPTION="VALID"

-IF NOT %CMDOPTION%=="VALID"  ( GOTO USAGE )
+IF NOT %CMDOPTION%=="VALID" (
+    GOTO USAGE
+)
+
 SET ARCHITECTURE=%1

 IF "%ARCHITECTURE%"=="clean" (
-    GOTO CLEAN_RELEASE
-    GOTO EXIT
+    CALL :CLEAN
+    EXIT /B %ERRORLEVEL%
 )

-REM Main Functions

-CALL :SET_PGADMIN4_ENVIRONMENT
-IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+REM Main build sequence
+CALL :SET_ENVIRONMENT
+CALL :VALIDATE_ENVIRONMENT || EXIT /B 1
+CALL :CLEAN || EXIT /B 1
+CALL :CREATE_VIRTUAL_ENV || EXIT /B 1
+CALL :CREATE_RUNTIME_ENV || EXIT /B 1
+CALL :CREATE_PYTHON_ENV || EXIT /B 1
+CALL :CLEANUP_ENV || EXIT /B 1
+CALL :CREATE_INSTALLER || EXIT /B 1
+CALL :SIGN_INSTALLER || EXIT /B 1

-CALL :VALIDATE_ENVIRONMENT
+EXIT /B %ERRORLEVEL%
+REM Main build sequence Ends

-CALL :CLEAN_RELEASE

-CALL :CREATE_VIRTUAL_ENV
-IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+:CLEAN
+    ECHO Removing build directory...
+    IF EXIST "%PGBUILDPATH%" RD "%PGBUILDPATH%" /S /Q > nul || EXIT /B 1

-CALL :CREATE_RUNTIME_ENV
-IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+    ECHO Removing temp build directory...
+    IF EXIST "%WD%\pkg\win32\Output" rd "%WD%\pkg\win32\Output" /S /Q > nul || EXIT /B 1

-CALL :CREATE_PYTHON_ENV
-IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+    ECHO Removing installer configuration script...
+    IF EXIST DEL /q "%WD%\pkg\win32\installer.iss" > nul || EXIT /B 1

-CALL :CLEANUP_ENV
-IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+    EXIT /B 0

-CALL :CREATE_INSTALLER
-IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%

-CALL :SIGN_INSTALLER
-IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
-
-CD %WD%
-GOTO EXIT
-REM Main function Ends
-
-:CLEAN_RELEASE
-    ECHO Calling clean target...
-    IF EXIST "%PGBUILDPATH%" rd "%PGBUILDPATH%" /S /Q
-
-    FOR /R "%WD%" %%f in (*.pyc *.pyo) do DEL /q "%%f" > nul
-    IF EXIST "%WD%\pkg\win32\Output" rd "%WD%\pkg\win32\Output" /S /Q
-    IF EXIST DEL /q "%WD%\pkg\win32\installer.iss" > nul
-    CD %WD%
-    GOTO:eof
-
-:SET_PGADMIN4_ENVIRONMENT
+:SET_ENVIRONMENT
+    ECHO Configuring the environment...
    IF "%PYTHON_HOME%" == ""   SET "PYTHON_HOME=C:\Python27"
    IF "%PYTHON_DLL%" == ""    SET "PYTHON_DLL=C:\Windows\SysWOW64\python27.dll"
    IF "%QTDIR%" == ""         SET "QTDIR=C:\Qt\5.9.1\mingw53_32"
+    IF "%MAKE%" == ""          SET "MAKE=mingw32-make.exe"
    IF "%PGDIR%" == ""         SET "PGDIR=C:\Program Files (x86)\PostgreSQL\10"
    IF "%INNOTOOL%" == ""      SET "INNOTOOL=C:\Program Files (x86)\Inno Setup 5"
-    IF "%YARNDIR%" == ""       SET "YARNDIR=C:\Program Files\Yarn"
-    IF "%NODEJSDIR%" == ""     SET "NODEJSDIR=C:\Program Files\nodejs"
-    IF "%VCDIR%" == ""         SET "VCDIR=C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC"
    IF "%VCREDIST%" == ""      SET "VCREDIST=C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\redist\1033\vcredist_x86.exe"
    IF "%SIGNTOOL%" == ""      SET "SIGNTOOL=C:\Program Files\Microsoft SDKs\Windows\v7.1A\Bin\signtool.exe"
-    SET "VCREDISTNAME=vcredist_x86.exe"

-    GOTO:eof
+    REM Set VCREDISTNAME (the filename)
+    for /f "delims=" %%i in ("%VCREDIST%") do set "VCREDISTNAME=%%~nxi"

-:VALIDATE_ENVIRONMENT
-    REM SET the variables IF not available in windows environment
+    REM Set additional variables we need
    SET "QMAKE=%QTDIR%\bin\qmake.exe"
-    SET "VIRTUALENV=venv"
-    SET "TARGETINSTALLER=%WD%\dist"
-    SET "VCREDIST=%VCDIR%\redist\1033\%VCREDISTNAME%"
+    FOR /F "tokens=4,5 delims=. " %%a IN ('%QMAKE% -v ^| findstr /B /C:"Using Qt version "') DO SET QT_VERSION=%%a.%%b

-    FOR /F "tokens=3" %%a IN ('findstr /C:"APP_RELEASE =" %WD%\web\config.py')    DO SET APP_RELEASE=%%a
-    FOR /F "tokens=3" %%a IN ('findstr /C:"APP_REVISION =" %WD%\web\config.py')   DO SET APP_REVISION_VERSION=%%a
-    FOR /F "tokens=3" %%a IN ('findstr /C:"APP_SUFFIX =" %WD%\web\config.py')     DO SET APP_SUFFIX_VERSION=%%a
+    SET "VIRTUALENV=venv"
+    SET "TARGET_DIR=%WD%\dist"
+
+    FOR /F "tokens=3" %%a IN ('findstr /C:"APP_RELEASE =" %WD%\web\config.py')    DO SET APP_MAJOR=%%a
+    FOR /F "tokens=3" %%a IN ('findstr /C:"APP_REVISION =" %WD%\web\config.py')   DO SET APP_MINOR=%%a
+    FOR /F "tokens=3" %%a IN ('findstr /C:"APP_SUFFIX =" %WD%\web\config.py')     DO SET APP_VERSION_SUFFIX=%%a
    REM remove single quote from the string
-    SET APP_SUFFIX_VERSION=%APP_SUFFIX_VERSION:'=%
+    SET APP_VERSION_SUFFIX=%APP_VERSION_SUFFIX:'=%
    SET APP_NAME=""
    FOR /F "tokens=2* DELims='" %%a IN ('findstr /C:"APP_NAME =" web\config.py')   DO SET APP_NAME=%%a
    FOR /f "tokens=1 DELims=." %%G IN ('%PYTHON_HOME%/python.exe -c "print('%APP_NAME%'.lower().replace(' ', ''))"') DO SET APP_SHORTNAME=%%G
-    FOR /F "tokens=4,5 delims=. " %%a IN ('%QMAKE% -v ^| findstr /B /C:"Using Qt version "') DO SET QT_VERSION=%%a.%%b
-    
-    SET INSTALLERNAME=%APP_SHORTNAME%-%APP_RELEASE%.%APP_REVISION_VERSION%-%APP_SUFFIX_VERSION%-%ARCHITECTURE%.exe
-    IF "%APP_SUFFIX_VERSION%" == "" SET INSTALLERNAME=%APP_SHORTNAME%-%APP_RELEASE%.%APP_REVISION_VERSION%-%ARCHITECTURE%.exe
+    SET APP_VERSION=%APP_MAJOR%.%APP_MINOR%
+    SET INSTALLERNAME=%APP_SHORTNAME%-%APP_MAJOR%.%APP_MINOR%-%APP_VERSION_SUFFIX%-%ARCHITECTURE%.exe
+    IF "%APP_VERSION_SUFFIX%" == "" SET INSTALLERNAME=%APP_SHORTNAME%-%APP_MAJOR%.%APP_MINOR%-%ARCHITECTURE%.exe

-    SET PGADMIN4_VERSION=v%APP_RELEASE%
-    SET PGADMIN4_APP_VERSION=%APP_RELEASE%.%APP_REVISION_VERSION%
-
-    ECHO ****************************************************************
-    ECHO                        S U M M A R Y
-    ECHO ****************************************************************
-    ECHO Target mode = x86
-    ECHO INNOTOOL    = %INNOTOOL%
-    ECHO VCDIR       = %VCDIR%
-    ECHO VCDIST      = %VCREDIST%
-    ECHO SIGNTOOL    = %SIGNTOOL%
-    ECHO QTDIR       = %QTDIR%
-    ECHO QMAKE       = %QMAKE%
-    ECHO QT_VERSION  = %QT_VERSION%
-    ECHO YARNDIR     = %YARNDIR%
-    ECHO NODEJSDIR   = %NODEJSDIR%
-    ECHO PYTHON_HOME = %PYTHON_HOME%
-    ECHO PYTHON_DLL  = %PYTHON_DLL%
-    ECHO PGDIR       = %PGDIR%
-    ECHO ****************************************************************
-
-    REM Check IF path SET in enviroments really exist or not ?
-    IF NOT EXIST "%INNOTOOL%"          GOTO err_handle_inno
-    IF NOT EXIST "%VCDIR%"             GOTO err_handle_visualstudio
-    IF NOT EXIST "%VCREDIST%"          GOTO err_handle_visualstudio_dist
-    IF NOT EXIST "%QTDIR%"             GOTO err_handle_qt
-    IF NOT EXIST "%QMAKE%"             GOTO err_handle_qt
-    IF NOT EXIST "%PYTHON_HOME%"       GOTO err_handle_python
-    IF NOT EXIST "%PYTHON_DLL%"        GOTO err_handle_python
-    IF NOT EXIST "%PGDIR%"             GOTO err_handle_pg
-    IF NOT EXIST "%YARNDIR%"           GOTO err_handle_yarn
-    IF NOT EXIST "%NODEJSDIR%"         GOTO err_handle_nodejs
-
-    REM get Python version ex. 2.7.1 will get as 27
+    REM get Python version for the runtime build ex. 2.7.1 will be 27
    FOR /f "tokens=1 DELims=." %%G IN ('%PYTHON_HOME%/python.exe -c "import sys; print(sys.version.split(' ')[0])"') DO SET PYTHON_MAJOR=%%G
    FOR /f "tokens=2 DELims=." %%G IN ('%PYTHON_HOME%/python.exe -c "import sys; print(sys.version.split(' ')[0])"') DO SET PYTHON_MINOR=%%G
    SET "PYTHON_VERSION=%PYTHON_MAJOR%%PYTHON_MINOR%"

-    IF NOT EXIST "%PYTHON_HOME%\Scripts\virtualenv.exe" GOTO err_handle_pythonvirtualenv
+    EXIT /B 0
+
+
+:VALIDATE_ENVIRONMENT
+    ECHO ****************************************************************
+    ECHO                        S U M M A R Y
+    ECHO ****************************************************************
+    ECHO Build path:                %PGBUILDPATH%
+    ECHO Output directory:          %TARGET_DIR%
+    ECHO Installer name:            %INSTALLERNAME%
+    ECHO.
+    ECHO Python home:               %PYTHON_HOME%
+    ECHO Python DLL:                %PYTHON_DLL%
+    ECHO Python version:            %PYTHON_VERSION%
+    ECHO Python major version:      %PYTHON_MAJOR%
+    ECHO Python minor version:      %PYTHON_MINOR%
+    ECHO.
+    ECHO Qt home:                   %QTDIR%
+    ECHO qmake executable:          %QMAKE%
+    ECHO Qt version:                %QT_VERSION%
+    ECHO.
+    ECHO PostgreSQL home:           %PGDIR%
+    ECHO.
+    ECHO VC++ redistributable:      %VCREDIST%
+    ECHO VC++ redistributable file: %VCREDISTNAME%
+    ECHO.
+    ECHO innotool executable:       %INNOTOOL%
+    ECHO signtool executable:       %SIGNTOOL%
+    ECHO.
+    ECHO App major version:         %APP_MAJOR%
+    ECHO App minor version:         %APP_MINOR%
+    ECHO App version:               %APP_VERSION%
+    ECHO App version suffix:        %APP_VERSION_SUFFIX%
+    ECHO App short name:            %APP_SHORTNAME%
+    ECHO App name:                  %APP_NAME%
+    ECHO ****************************************************************
+
+    ECHO Checking the environment...
+    IF NOT EXIST "%INNOTOOL%" (
+        ECHO !INNOTOOL! does not exist
+        ECHO Please install Innotool and set the INNOTOOL environment variable.
+        EXIT /B 1
+    )
+
+    IF NOT EXIST "%VCREDIST%" (
+        ECHO !VCREDIST! does not exist
+        ECHO Please install Microsoft Visual studio and set the VCREDIST environment variable.
+        EXIT /B 1
+    )
+
+    IF NOT EXIST "%QTDIR%" (
+        ECHO !QTDIR! does not exist.
+        ECHO Please install Qt and set the QTDIR environment variable.
+        EXIT /B 1
+    )
+
+    IF NOT EXIST "%QMAKE%" (
+        ECHO !QMAKE! does not exist.
+        ECHO Please install Qt and set the QTDIR environment variable.
+        EXIT /B 1
+    )
+
+    IF NOT EXIST "%PYTHON_HOME%" (
+        ECHO !PYTHON_HOME! does not exist.
+        ECHO Please install Python and set the PYTHON_HOME environment variable.
+        EXIT /B 1
+    )
+
+    IF NOT EXIST "%PYTHON_DLL%" (
+        ECHO !PYTHON_DLL! does not exist.
+        ECHO Please install Python and set the PYTHON_DLL environment variable.
+        EXIT /B 1
+    )
+
+    IF NOT EXIST "%PGDIR%" (
+        ECHO !PGDIR! does not exist.
+        ECHO Please install PostgreSQL and set the PGDIR environment variable.
+        EXIT /B 1
+    )
+
+    IF NOT EXIST "%PYTHON_HOME%\Scripts\virtualenv.exe" (
+        ECHO !PYTHON_HOME!\Scripts\virtualenv.exe does not exist.
+        ECHO Please install the virtualenv package in Python.
+        EXIT /B 1
+    )
+
+    SET "PATH=%PGDIR%\bin;%PATH%"
+
+    EXIT /B 0

-    SET PATH=%PGDIR%;%PGDIR%\bin;%QTDIR%\..\..\Tools\mingw530_32\bin;%NODEJSDIR%;%YARNDIR%\bin;%PATH%;
-    GOTO:eof

 :CREATE_VIRTUAL_ENV
-    ECHO Creating Virtual Enviroment...
+    ECHO Creating virtual environment...
    IF NOT EXIST "%PGBUILDPATH%"  MKDIR "%PGBUILDPATH%"
+    
+    REM If we're using VC++, and this is Python 3.6+, we need a hack for PyCrypto
+    IF "%MAKE%" == "nmake" (
+        IF %PYTHON_VERSION% GEQ 36 SET CL=-FI"%VCINSTALLDIR%\INCLUDE\stdint.h"
+    )

    CD "%PGBUILDPATH%"
    "%PYTHON_HOME%\Scripts\virtualenv.exe" "%VIRTUALENV%"
-    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%

-    ECHO Activating Virtual Enviroment -  %PGBUILDPATH%\%VIRTUALENV%\Scripts\activate...
-    CALL "%PGBUILDPATH%\%VIRTUALENV%\Scripts\activate"
-    SET PATH=%PGDIR%\bin;%PATH%
+    XCOPY /S /I /E /H /Y "%PYTHON_HOME%\DLLs" "%PGBUILDPATH%\%VIRTUALENV%\DLLs" > nul || EXIT /B 1
+    XCOPY /S /I /E /H /Y "%PYTHON_HOME%\Lib" "%PGBUILDPATH%\%VIRTUALENV%\Lib" > nul || EXIT /B 1
+
+    ECHO Activating virtual environment -  %PGBUILDPATH%\%VIRTUALENV%...
+    CALL "%PGBUILDPATH%\%VIRTUALENV%\Scripts\activate" || EXIT /B 1

    ECHO Installing dependencies...
-    pip install -r "%WD%\requirements.txt"
-    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
-    pip install sphinx
-    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
-    ECHO Virtual Environment created successfully.
+    CALL pip install -r "%WD%\requirements.txt" || EXIT /B 1
+    CALL pip install sphinx || EXIT /B 1

-    ECHO Deactivating Virtual Enviroment - %PGBUILDPATH%\%VIRTUALENV%\Scripts\deactivate...
-    CALL "%PGBUILDPATH%\%VIRTUALENV%\Scripts\deactivate"
+    REM If we're using VC++, and this is Python 3.6+, we need to remove the hack
+    REM above or it will break qmake. Sigh.
+    IF "%MAKE%" == "nmake" (
+        IF %PYTHON_VERSION% GEQ 36 SET CL=
+    )

    CD %WD%
-    GOTO:eof
+    EXIT /B 0
+

 :CREATE_RUNTIME_ENV
-    ECHO Compiling source code...
-    MKDIR "%PGBUILDPATH%\runtime" > nul
+    MKDIR "%PGBUILDPATH%\runtime"

-    REM --- Processing WEB ---
    CD "%WD%\web"

-    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+    ECHO Installing javascript dependencies...
+    CALL yarn install || EXIT /B 1

-    ECHO Install Javascript dependencies
-    call yarn install
-    ECHO Bundle all Javascript
-    call yarn run bundle
+    ECHO Bundling javascript...
+    CALL yarn run bundle || EXIT /B 1

-    REM Remove any cache
-    RD /Q /S "%WD%\web\pgadmin\static\js\generated\.cache"
+    ECHO Removing webpack caches...
+    RD /Q /S "%WD%\web\pgadmin\static\js\generated\.cache" 1> nul 2>&1

-    XCOPY /S /I /E /H /Y "%WD%\web" "%PGBUILDPATH%\web" > nul
-    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+    ECHO Copying web directory...
+    XCOPY /S /I /E /H /Y "%WD%\web" "%PGBUILDPATH%\web" > nul || EXIT /B 1

-    REM Clean up .pyc, .pyo, pgadmin4.db, config_local.py
-    ECHO Cleaning up unnecessary files...
-    FOR /R "%PGBUILDPATH%\web" %%f in (*.pyc *.pyo) do DEL /q "%%f"
-    FOR /R "%PGBUILDPATH%\web" %%f in (tests feature_tests __pycache__ node_modules) do RD /Q /S "%%f"
-    RD /Q /S "%PGBUILDPATH%\web\regression"
-    RD /Q /S "%PGBUILDPATH%\web\tools"
-    DEL /q "%PGBUILDPATH%\web\pgadmin4.db"
-    DEL /q "%PGBUILDPATH%\web\config_local.py"
+    ECHO Cleaning up unnecessary .pyc and .pyo files...
+    FOR /R "%PGBUILDPATH%\web" %%f in (*.pyc *.pyo) do DEL /q "%%f" 1> nul 2>&1
+    ECHO Removing tests, Python caches and node modules...
+    FOR /R "%PGBUILDPATH%\web" %%f in (tests feature_tests __pycache__ node_modules) do RD /Q /S "%%f" 1> nul 2>&1
+    ECHO Removing the test framework...
+    RD /Q /S "%PGBUILDPATH%\web\regression" 1> nul 2>&1
+    ECHO Removing tools...
+    RD /Q /S "%PGBUILDPATH%\web\tools" 1> nul 2>&1
+    ECHO Removing any existing configurations...
+    DEL /q "%PGBUILDPATH%\web\pgadmin4.db" 1> nul 2>&1
+    DEL /q "%PGBUILDPATH%\web\config_local.py" 1> nul 2>&1
    
    ECHO Creating config_distro.py
    ECHO SERVER_MODE = False > "%PGBUILDPATH%\web\config_distro.py"
@@ -197,261 +246,154 @@ REM Main function Ends
    ECHO     'ppas': '' >> "%PGBUILDPATH%\web\config_distro.py"
    ECHO } >> "%PGBUILDPATH%\web\config_distro.py"

-    ECHO Activating Virtual Enviroment -  %PGBUILDPATH%\%VIRTUALENV%\Scripts\activate...
-    CALL "%PGBUILDPATH%\%VIRTUALENV%\Scripts\activate"
-
    ECHO Building docs...
    MKDIR "%PGBUILDPATH%\docs\en_US\html"
-    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
-
    CD "%WD%\docs\en_US"
-    "%PGBUILDPATH%\%VIRTUALENV%\Scripts\python.exe" build_code_snippet.py
-    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
-
-    "%PGBUILDPATH%\%VIRTUALENV%\Scripts\sphinx-build.exe"   "%WD%\docs\en_US" "%PGBUILDPATH%\docs\en_US\html"
-    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+    CALL "%PGBUILDPATH%\%VIRTUALENV%\Scripts\python.exe" build_code_snippet.py || EXIT /B 1
+    CALL "%PGBUILDPATH%\%VIRTUALENV%\Scripts\sphinx-build.exe"   "%WD%\docs\en_US" "%PGBUILDPATH%\docs\en_US\html" || EXIT /B 1

    ECHO Removing Sphinx
-    pip uninstall -y sphinx Pygments alabaster colorama docutils imagesize requests snowballstemmer
+    CALL pip uninstall -y sphinx Pygments alabaster colorama docutils imagesize requests snowballstemmer

-    ECHO Fixing backports.csv - adding missing __init__.py
-    type nul >> "%PGBUILDPATH%\%VIRTUALENV%\Lib\site-packages\backports\__init__.py"
+    IF %PYTHON_MAJOR% == 2 (
+        ECHO Fixing backports.csv for Python 2 by adding missing __init__.py
+        type nul >> "%PGBUILDPATH%\%VIRTUALENV%\Lib\site-packages\backports\__init__.py"
+    )
+    
+    IF %PYTHON_MAJOR% == 3 (
+        ECHO Fixing PyCrypto module for Python 3...
+        CALL "%PYTHON_HOME%\python" "%WD%\pkg\win32\replace.py" "-i" "%PGBUILDPATH%\%VIRTUALENV%\Lib\site-packages\Crypto\Random\OSRNG\nt.py" "-o" "%PGBUILDPATH%\%VIRTUALENV%\Lib\site-packages\Crypto\Random\OSRNG\nt.py.new" "-s" "import winrandom" -r "from . import winrandom"
+        MOVE /Y "%PGBUILDPATH%\%VIRTUALENV%\Lib\site-packages\Crypto\Random\OSRNG\nt.py.new" "%PGBUILDPATH%\%VIRTUALENV%\Lib\site-packages\Crypto\Random\OSRNG\nt.py"
+    )

    ECHO Assembling runtime environment...
    CD "%WD%\runtime"
-    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%

-    CALL "%QMAKE%" "DEFINES+=PGADMIN4_USE_WEBKIT"
-    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+    ECHO Running qmake...
+    CALL "%QMAKE%" || EXIT /B 1

-    CALL mingw32-make.exe clean
-    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+    ECHO Cleaning the build directory...
+    CALL %MAKE% clean || EXIT /B 1

-    CALL mingw32-make.exe
-    IF ERRORLEVEL 1 GOTO ERR_HANDLER
+    ECHO Running make...
+    CALL %MAKE% || EXIT /B 1

-    REM Copy binary to Release Folder
-    copy "%WD%\runtime\release\pgAdmin4.exe" "%PGBUILDPATH%\runtime"
-    IF ERRORLEVEL 1 GOTO ERR_HANDLER
-
-    REM Copy QT dependences
-    copy "%QTDIR%\bin\Qt5Core.dll"   "%PGBUILDPATH%\runtime"
-    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
-    copy "%QTDIR%\bin\Qt5Gui.dll"    "%PGBUILDPATH%\runtime"
-    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
-    copy "%QTDIR%\bin\Qt5Widgets.dll" "%PGBUILDPATH%\runtime"
-    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
-    copy "%QTDIR%\bin\Qt5Network.dll" "%PGBUILDPATH%\runtime"
-    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
-
-    copy "%QTDIR%\bin\libgcc_s_dw2-1.dll" "%PGBUILDPATH%\runtime"
-    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
-    copy "%QTDIR%\bin\libstdc++-6.dll" "%PGBUILDPATH%\runtime"
-    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
-    copy "%QTDIR%\bin\libwinpthread-1.dll" "%PGBUILDPATH%\runtime"
-    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
-    MKDIR "%PGBUILDPATH%\runtime\platforms"
-    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
-    copy "%QTDIR%\plugins\platforms\qwindows.dll" "%PGBUILDPATH%\runtime\platforms" > nul
-    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+    ECHO Staging pgAdmin4.exe...
+    COPY "%WD%\runtime\release\pgAdmin4.exe" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1

+    ECHO Staging Qt components...
+    COPY "%QTDIR%\bin\Qt5Core.dll"   "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
+    COPY "%QTDIR%\bin\Qt5Gui.dll"    "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
+    COPY "%QTDIR%\bin\Qt5Widgets.dll" "%PGBUILDPATH%\runtime" > nul  || EXIT /B 1
+    COPY "%QTDIR%\bin\Qt5Network.dll" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
+    IF EXIST "%QTDIR%\bin\libgcc_s_dw2-1.dll" COPY "%QTDIR%\bin\libgcc_s_dw2-1.dll" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
+    IF EXIST "%QTDIR%\bin\libstdc++-6.dll" COPY "%QTDIR%\bin\libstdc++-6.dll" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
+    IF EXIST "%QTDIR%\bin\libwinpthread-1.dll" COPY "%QTDIR%\bin\libwinpthread-1.dll" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
+    MKDIR "%PGBUILDPATH%\runtime\platforms" > nul || EXIT /B 1
+    COPY "%QTDIR%\plugins\platforms\qwindows.dll" "%PGBUILDPATH%\runtime\platforms" > nul || EXIT /B 1
    ECHO [Paths] > "%PGBUILDPATH%\runtime\qt.conf"
    ECHO Plugins=plugins >> "%PGBUILDPATH%\runtime\qt.conf"

-    copy "%PGDIR%\bin\libpq.dll" "%PGBUILDPATH%\runtime"
-    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
-    copy "%PGDIR%\bin\ssleay32.dll" "%PGBUILDPATH%\runtime"
-    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
-    copy "%PGDIR%\bin\libeay32.dll" "%PGBUILDPATH%\runtime"
-    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
-    copy "%PGDIR%\bin\libintl-*.dll" "%PGBUILDPATH%\runtime"
-    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
-    copy "%PGDIR%\bin\libiconv-*.dll" "%PGBUILDPATH%\runtime"
-    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
-    copy "%PGDIR%\bin\zlib1.dll" "%PGBUILDPATH%\runtime"
-    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
-    copy "%PGDIR%\bin\pg_dump.exe" "%PGBUILDPATH%\runtime"
-    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
-    copy "%PGDIR%\bin\pg_dumpall.exe" "%PGBUILDPATH%\runtime"
-    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
-    copy "%PGDIR%\bin\pg_restore.exe" "%PGBUILDPATH%\runtime"
-    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
-    copy "%PGDIR%\bin\psql.exe" "%PGBUILDPATH%\runtime"
-    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+    ECHO Staging PostgreSQL components...
+    COPY "%PGDIR%\bin\libpq.dll" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
+    COPY "%PGDIR%\bin\ssleay32.dll" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
+    COPY "%PGDIR%\bin\libeay32.dll" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
+    IF EXIST "%PGDIR%\bin\libintl-*.dll" COPY "%PGDIR%\bin\libintl-*.dll" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
+    IF EXIST "%PGDIR%\bin\libiconv-*.dll" COPY "%PGDIR%\bin\libiconv-*.dll" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
+    IF EXIST "%PGDIR%\bin\zlib.dll" COPY "%PGDIR%\bin\zlib.dll" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
+    IF EXIST "%PGDIR%\bin\zlib1.dll" COPY "%PGDIR%\bin\zlib1.dll" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
+    COPY "%PGDIR%\bin\pg_dump.exe" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
+    COPY "%PGDIR%\bin\pg_dumpall.exe" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1L%
+    COPY "%PGDIR%\bin\pg_restore.exe" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
+    COPY "%PGDIR%\bin\psql.exe" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1

-    MKDIR "%PGBUILDPATH%\installer"
-    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
-    copy "%VCREDIST%" "%PGBUILDPATH%\installer" > nul
-    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
-
-    ECHO Runtime built successfully.
+    ECHO Staging VC++ runtime...
+    MKDIR "%PGBUILDPATH%\installer" || EXIT /B 1
+    COPY "%VCREDIST%" "%PGBUILDPATH%\installer" > nul || EXIT /B 1

    CD %WD%
-    GOTO:eof
+    EXIT /B 0
+    

 :CREATE_PYTHON_ENV
-    copy %PYTHON_DLL% "%PGBUILDPATH%\runtime"  > nul
-    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+    ECHO Staging Python...
+    COPY %PYTHON_DLL% "%PGBUILDPATH%\runtime"  > nul || EXIT /B 1
+    COPY %PYTHON_HOME%\python.exe "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
+    COPY %PYTHON_HOME%\pythonw.exe "%PGBUILDPATH%\runtime" > nul || EXIT /B 1

-    REM Copy Python interpretor as it's needed to run background processes
-    copy %PYTHON_HOME%\python.exe "%PGBUILDPATH%\runtime"  > nul
-    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
-    copy %PYTHON_HOME%\pythonw.exe "%PGBUILDPATH%\runtime"  > nul
-    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+    ECHO Cleaning up unnecessary .pyc and .pyo files...
+    FOR /R "%PGBUILDPATH%\%VIRTUALENV%" %%f in (*.pyc *.pyo) do DEL /q "%%f" 1> nul 2>&1
+    ECHO Removing tests...
+    FOR /R "%PGBUILDPATH%\%VIRTUALENV%\Lib" %%f in (test tests) do RD /Q /S "%%f" 1> nul 2>&1
+    ECHO Removing TCL...
+    RD /Q /S "%PGBUILDPATH%\%VIRTUALENV%\tcl" 1> nul 2>&1

-    XCOPY /S /I /E /H /Y "%PYTHON_HOME%\DLLs" "%PGBUILDPATH%\%VIRTUALENV%\DLLs" > nul
-    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
-    XCOPY /S /I /E /H /Y "%PYTHON_HOME%\Lib" "%PGBUILDPATH%\%VIRTUALENV%\Lib" > nul
-    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+    EXIT /B 0

-    ECHO Cleaning up unnecessary files...
-    FOR /R "%PGBUILDPATH%\%VIRTUALENV%" %%f in (*.pyc *.pyo) do DEL /q "%%f"
-    FOR /R "%PGBUILDPATH%\%VIRTUALENV%\Lib" %%f in (test tests) do RD /Q /S "%%f"
-    RD /Q /S "%PGBUILDPATH%\%VIRTUALENV%\tcl"
-
-    CD %WD%
-    GOTO:eof

 :CREATE_INSTALLER
    ECHO Preparing for creation of windows installer...
-    IF NOT EXIST "%TARGETINSTALLER%" MKDIR "%TARGETINSTALLER%"
+    IF NOT EXIST "%TARGET_DIR%" MKDIR "%TARGET_DIR%"

-    copy "%WD%\pkg\win32\Resources\pgAdmin4.ico" "%PGBUILDPATH%"
-    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+    ECHO Copying icon file...
+    COPY "%WD%\pkg\win32\Resources\pgAdmin4.ico" "%PGBUILDPATH%" > nul || EXIT /B 1

-    CD "%WD%"
-    CD pkg
-    CD win32
+    CD "%WD%\pkg\win32"

-    "%PYTHON_HOME%\python" "%WD%\pkg\win32\replace.py" "-i" "%WD%\pkg\win32\installer.iss.in" "-o" "%WD%\pkg\win32\installer.iss.in_stage1" "-s" MYAPP_NAME -r """%APP_NAME%"""
-    "%PYTHON_HOME%\python" "%WD%\pkg\win32\replace.py" "-i" "%WD%\pkg\win32\installer.iss.in_stage1" "-o" "%WD%\pkg\win32\installer.iss.in_stage2" "-s" MYAPP_FULLVERSION -r """%PGADMIN4_APP_VERSION%"""
-    "%PYTHON_HOME%\python" "%WD%\pkg\win32\replace.py" "-i" "%WD%\pkg\win32\installer.iss.in_stage2" "-o" "%WD%\pkg\win32\installer.iss.in_stage3" "-s" MYAPP_VERSION -r """%PGADMIN4_VERSION%"""
+    ECHO Processing installer configuration script...
+    CALL "%PYTHON_HOME%\python" "%WD%\pkg\win32\replace.py" "-i" "%WD%\pkg\win32\installer.iss.in" "-o" "%WD%\pkg\win32\installer.iss.in_stage1" "-s" MYAPP_NAME -r """%APP_NAME%"""
+    CALL "%PYTHON_HOME%\python" "%WD%\pkg\win32\replace.py" "-i" "%WD%\pkg\win32\installer.iss.in_stage1" "-o" "%WD%\pkg\win32\installer.iss.in_stage2" "-s" MYAPP_FULLVERSION -r """%APP_VERSION%"""
+    CALL "%PYTHON_HOME%\python" "%WD%\pkg\win32\replace.py" "-i" "%WD%\pkg\win32\installer.iss.in_stage2" "-o" "%WD%\pkg\win32\installer.iss.in_stage3" "-s" MYAPP_VERSION -r """v%APP_MAJOR%"""

-    set ARCMODE=
+    SET ARCMODE=
    IF "%ARCHITECTURE%"=="amd64" (
        set ARCMODE="x64"
    )
-    "%PYTHON_HOME%\python" "%WD%\pkg\win32\replace.py" "-i" "%WD%\pkg\win32\installer.iss.in_stage3" "-o" "%WD%\pkg\win32\installer.iss.in_stage4" "-s" MYAPP_ARCHITECTURESMODE -r """%ARCMODE%"""
-    "%PYTHON_HOME%\python" "%WD%\pkg\win32\replace.py" "-i" "%WD%\pkg\win32\installer.iss.in_stage4" "-o" "%WD%\pkg\win32\installer.iss" "-s" MYAPP_VCDIST -r """%VCREDISTNAME%"""
-
+    CALL "%PYTHON_HOME%\python" "%WD%\pkg\win32\replace.py" "-i" "%WD%\pkg\win32\installer.iss.in_stage3" "-o" "%WD%\pkg\win32\installer.iss.in_stage4" "-s" MYAPP_ARCHITECTURESMODE -r """%ARCMODE%"""
+    CALL "%PYTHON_HOME%\python" "%WD%\pkg\win32\replace.py" "-i" "%WD%\pkg\win32\installer.iss.in_stage4" "-o" "%WD%\pkg\win32\installer.iss" "-s" MYAPP_VCDIST -r """%VCREDISTNAME%"""

+    ECHO Cleaning up...
    DEL /s "%WD%\pkg\win32\installer.iss.in_stage*" > nul
-    ECHO Creating windows installer... using INNO tool

-    CALL "%INNOTOOL%\ISCC.exe" /q "%WD%\pkg\win32\installer.iss"
-    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+    ECHO Creating windows installer using INNO tool...
+    CALL "%INNOTOOL%\ISCC.exe" /q "%WD%\pkg\win32\installer.iss" || EXIT /B 1

-    MOVE "%WD%\pkg\win32\Output\Setup.exe" "%TARGETINSTALLER%\%INSTALLERNAME%"
-    IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
+    ECHO Renaming installer...
+    MOVE "%WD%\pkg\win32\Output\Setup.exe" "%TARGET_DIR%\%INSTALLERNAME%" > nul || EXIT /B 1

-    ECHO "Location - %TARGETINSTALLER%\%INSTALLERNAME%"
+    ECHO Location - %TARGET_DIR%\%INSTALLERNAME%
    ECHO Installer generated successfully.

    CD %WD%
-    GOTO:eof
+    EXIT /B 0
+

 :SIGN_INSTALLER
    ECHO Attempting to sign the installer...
-    "%SIGNTOOL%" sign  /t http://timestamp.verisign.com/scripts/timstamp.dll "%TARGETINSTALLER%\%INSTALLERNAME%"
+    CALL "%SIGNTOOL%" sign  /t http://timestamp.verisign.com/scripts/timstamp.dll "%TARGET_DIR%\%INSTALLERNAME%"
    IF %ERRORLEVEL% NEQ 0 (
-        ECHO
+        ECHO.
        ECHO ************************************************************
        ECHO * Failed to sign the installer
        ECHO ************************************************************
        PAUSE
    )

-    CD %WD%
-    GOTO:eof
+    EXIT /B 0
+

 :CLEANUP_ENV
-    ECHO Cleaning up private environment...
-    rd "%PGBUILDPATH%\%VIRTUALENV%\Include" /S /Q
-    DEL /s "%PGBUILDPATH%\%VIRTUALENV%\pip-selfcheck.json"
+    ECHO Cleaning the build environment...
+    RD "%PGBUILDPATH%\%VIRTUALENV%\Include" /S /Q 1> nul 2>&1
+    DEL /s "%PGBUILDPATH%\%VIRTUALENV%\pip-selfcheck.json" 1> nul 2>&1

-    ECHO Cleaned up private environment successfully.
-    CD %WD%
-    GOTO:eof
+    EXIT /B 0

-:err_handle_inno
-    ECHO %INNOTOOL% does not exist
-    ECHO Please Install Innotool and SET INNOTOOL enviroment Variable.
-    ECHO SET "INNOTOOL=<PATH>"
-    exit /B 1
-    GOTO EXIT
-
-:err_handle_visualstudio
-    ECHO %VCDIR% does not exist
-    ECHO Please Install Microsoft Visual studio and SET the VCDIR enviroment Variable.
-    ECHO SET "VCDIR=<PATH>"
-    exit /B 1
-    GOTO EXIT
-
-:err_handle_visualstudio_dist
-    ECHO %VCREDIST% does not exist
-    ECHO Please Install Microsoft Visual studio and SET the VCDIST enviroment Variable.
-    ECHO SET "VCDIST=<PATH>"
-    exit /B 1
-    GOTO EXIT
-
-
-:err_handle_python
-    ECHO %PYTHON_HOME% does not exist, or
-    ECHO PYTHON_VERSION is not SET, or
-    ECHO %PYTHON_DLL% does not exist.
-    ECHO Please install Python and SET the PYTHON_HOME enviroment Variable.
-    ECHO SET "PYTHON_VERSION=<VERSION NUMBER>"
-    ECHO SET "PYTHON_HOME=<PATH>"
-    ECHO SET "PYTHON_DLL=<PATH>"
-    exit /B 1
-    GOTO EXIT
-
-:err_handle_qt
-    ECHO %QTDIR% does not exist.
-    ECHO Please Install QT SDK and SET the QTDIR enviroment variable.
-    ECHO SET "QTDIR=<PATH>"
-    exit /B 1
-    GOTO EXIT
-
-:err_handle_yarn
-    ECHO %YARNDIR% does not exist.
-	ECHO Please Install YARN and SET the YARNDIR enviroment variable.
-	ECHO SET "YARNDIR=<YARN PATH>"
-    exit /B 1
-    GOTO EXIT
-
-:err_handle_nodejs
-    ECHO %NODEJSDIR% does not exist.
-	ECHO Please Install NodeJs and SET the NODEJSDIR enviroment variable.
-	ECHO SET "NODEJSDIR=<NODEJS PATH>"
-    exit /B 1
-    GOTO EXIT
-
-:err_handle_pg
-    ECHO %PGDIR% does not exist.
-    ECHO Please Install Postgres and SET enviroment Variable
-    ECHO SET "PGDIR=<PATH>"
-    exit /B 1
-    GOTO EXIT
-
-:err_handle_pythonvirtualenv
-    ECHO Python virtualenv is missing @ location - %PYTHON_HOME%\Scripts\virtualenv.exe
-    exit /B 1
-    GOTO EXIT
-
-:ERR_HANDLER
-    ECHO.
-    ECHO Aborting build!
-    CD %WD%
-    exit /B 1
-    GOTO EXIT

 :USAGE
-    ECHO Invalid command line options....
+    ECHO Invalid command line options.
    ECHO Usage: "Make.bat <x86 | clean>"
    ECHO.
-    exit /B 1
-    GOTO EXIT

-:EXIT
+    EXIT /B 1

@@ -54,6 +54,10 @@ runtime:

 # Include all clean sub-targets in clean
 clean: clean-appbundle clean-docker clean-dist clean-docs clean-node clean-pip clean-src clean-runtime
+	rm -rf web/pgadmin/static/js/generated/*
+	rm -rf web/pgadmin/static/js/generated/.cache
+	rm -rf web/pgadmin/static/css/generated/*
+	rm -rf web/pgadmin/static/css/generated/.cache

 clean-runtime:
 	cd runtime && make clean
@@ -88,6 +92,8 @@ docs:
 docs-pdf:
 	LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 $(MAKE) -C docs/en_US -f Makefile.sphinx latexpdf

+messages: msg-extract msg-update msg-compile
+
 msg-compile:
 	cd web && pybabel compile --statistics -d pgadmin/translations

@@ -80,6 +80,7 @@ Create a migration file with the following command:

 This will create a file in: $PGADMIN4_SRC/web/migrations/versions/ .
 Add any changes to the 'upgrade' function.
+Increment the SCHEMA_VERSION in $PGADMIN4_SRC/web/pgadmin/model/__init__.py file.

 There is no need to increment the SETTINGS_SCHEMA_VERSION.

@@ -3,15 +3,15 @@
 echo "EXECUTING: Build docs"
 echo

-cd $WORKSPACE
+cd ${WORKSPACE}

-. $WORKSPACE/pgadmin-venv/bin/activate
+. ${WORKSPACE}/pgadmin-venv/bin/activate

 SPHINX_VER=""
-if [ "$PYTHON_VERSION" = "2.6" -o "$PYTHON_VERSION" = "3.3" ]; then
+if [ "${PYTHON_VERSION}" = "2.6" -o "${PYTHON_VERSION}" = "3.3" ]; then
    SPHINX_VER="==1.4.9"
 fi

-$WORKSPACE/pgadmin-venv/bin/pip install Sphinx$SPHINX_VER || { echo 'ERROR: Failed to install Sphinx to build the docs.' ; exit 1; }
+${WORKSPACE}/pgadmin-venv/bin/pip install Sphinx${SPHINX_VER} || { echo 'ERROR: Failed to install Sphinx to build the docs.' ; exit 1; }

 make docs || { echo 'ERROR: Failed to build the documentation.' ; exit 1; }
@@ -3,15 +3,15 @@
 echo "EXECUTING: Build PIP wheel"
 echo

-cd $WORKSPACE
+cd ${WORKSPACE}

-. $WORKSPACE/pgadmin-venv/bin/activate
+. ${WORKSPACE}/pgadmin-venv/bin/activate

 SPHINX_VER=""
-if [ "$PYTHON_VERSION" = "2.6" -o "$PYTHON_VERSION" = "3.3" ]; then
+if [ "${PYTHON_VERSION}" = "2.6" -o "${PYTHON_VERSION}" = "3.3" ]; then
    SPHINX_VER="==1.4.9"
 fi

-$WORKSPACE/pgadmin-venv/bin/pip install Sphinx$SPHINX_VER || { echo 'ERROR: Failed to install Sphinx to build the PIP wheel.' ; exit 1; }
+${WORKSPACE}/pgadmin-venv/bin/pip install Sphinx${SPHINX_VER} || { echo 'ERROR: Failed to install Sphinx to build the PIP wheel.' ; exit 1; }

 make pip || { echo 'ERROR: Failed to build the PIP wheel.' ; exit 1; }
@@ -4,13 +4,13 @@ echo "EXECUTING: Build runtime - QT4"
 echo

 if [ ${PYTHON_VERSION:0:1} == "3" ]; then
-    CONFIG=/usr/local/python-$PYTHON_VERSION/bin/python3-config
+    CONFIG=/usr/local/python-${PYTHON_VERSION}/bin/python3-config
 else
-    CONFIG=/usr/local/python-$PYTHON_VERSION/bin/python-config
+    CONFIG=/usr/local/python-${PYTHON_VERSION}/bin/python-config
 fi

-cd $WORKSPACE/runtime
+cd ${WORKSPACE}/runtime

 make clean
-PATH=/usr/local/python-$PYTHON_VERSION/bin:$PATH PYTHON_CONFIG=$CONFIG /bin/qmake-qt4 || { echo 'ERROR: Failed to run the QT4 qmake step.' ; exit 1; }
+PATH=/usr/local/python-${PYTHON_VERSION}/bin:$PATH PYTHON_CONFIG=${CONFIG} /bin/qmake-qt4 || { echo 'ERROR: Failed to run the QT4 qmake step.' ; exit 1; }
 make all || { echo 'ERROR: Failed to build the QT4 runtime.' ; exit 1; }
@@ -4,13 +4,13 @@ echo "EXECUTING: Build runtime - QT5"
 echo

 if [ ${PYTHON_VERSION:0:1} == "3" ]; then
-    CONFIG=/usr/local/python-$PYTHON_VERSION/bin/python3-config
+    CONFIG=/usr/local/python-${PYTHON_VERSION}/bin/python3-config
 else
-    CONFIG=/usr/local/python-$PYTHON_VERSION/bin/python-config
+    CONFIG=/usr/local/python-${PYTHON_VERSION}/bin/python-config
 fi

-cd $WORKSPACE/runtime
+cd ${WORKSPACE}/runtime

 make clean
-PATH=/usr/local/python-$PYTHON_VERSION/bin:$PATH PYTHON_CONFIG=$CONFIG /bin/qmake-qt5 DEFINES+=PGADMIN4_USE_WEBKIT || { echo 'ERROR: Failed to run the QT5 qmake step.' ; exit 1; }
+PATH=/usr/local/python-${PYTHON_VERSION}/bin:$PATH PYTHON_CONFIG=${CONFIG} /bin/qmake-qt5 DEFINES+=PGADMIN4_USE_WEBKIT || { echo 'ERROR: Failed to run the QT5 qmake step.' ; exit 1; }
 make all || { echo 'ERROR: Failed to build the QT4 runtime.' ; exit 1; }
@@ -3,15 +3,15 @@
 echo "EXECUTING: Build Tarballs"
 echo

-cd $WORKSPACE
+cd ${WORKSPACE}

-. $WORKSPACE/pgadmin-venv/bin/activate
+. ${WORKSPACE}/pgadmin-venv/bin/activate

 SPHINX_VER=""
-if [ "$PYTHON_VERSION" = "2.6" -o "$PYTHON_VERSION" = "3.3" ]; then
+if [ "${PYTHON_VERSION}" = "2.6" -o "${PYTHON_VERSION}" = "3.3" ]; then
    SPHINX_VER="==1.4.9"
 fi

-$WORKSPACE/pgadmin-venv/bin/pip install Sphinx$SPHINX_VER || { echo 'ERROR: Failed to install Sphinx to build the tarballs.' ; exit 1; }
-cd $WORKSPACE/
+${WORKSPACE}/pgadmin-venv/bin/pip install Sphinx${SPHINX_VER} || { echo 'ERROR: Failed to install Sphinx to build the tarballs.' ; exit 1; }
+cd ${WORKSPACE}/
 make src || { echo 'ERROR: Failed to build the tarballs.' ; exit 1; }
@@ -1,11 +1,11 @@
 #!/bin/sh

-$WORKSPACE/ci/create_config.sh || { echo 'ERROR: Failed to create the configuration.' ; exit 1; }
-$WORKSPACE/ci/run_python_tests.sh || { echo 'ERROR: Error detected when running the Python tests.' ; exit 1; }
-$WORKSPACE/ci/run_jasmine_tests.sh || { echo 'ERROR: Error detected when running the Jasmine tests.' ; exit 1; }
-$WORKSPACE/ci/build_docs.sh || { echo 'ERROR: Failed to build the documentation.' ; exit 1; }
-$WORKSPACE/ci/build_runtime_qt4.sh || { echo 'ERROR: Failed to build the QT4 runtime.' ; exit 1; }
-$WORKSPACE/ci/build_runtime_qt5.sh || { echo 'ERROR: Failed to build the QT5 runtime.' ; exit 1; }
-$WORKSPACE/ci/update_messages.sh || { echo 'ERROR: Failed to update translation message catalogs.' ; exit 1; }
-$WORKSPACE/ci/build_pip_wheel.sh || { echo 'ERROR: Failed to build the PIP wheel.' ; exit 1; }
-$WORKSPACE/ci/build_tarballs.sh || { echo 'ERROR: Failed to build the tarballs.' ; exit 1; }
+${WORKSPACE}/ci/create_config.sh || { echo 'ERROR: Failed to create the configuration.' ; exit 1; }
+${WORKSPACE}/ci/run_python_tests.sh || { echo 'ERROR: Error detected when running the Python tests.' ; exit 1; }
+${WORKSPACE}/ci/run_jasmine_tests.sh || { echo 'ERROR: Error detected when running the Jasmine tests.' ; exit 1; }
+${WORKSPACE}/ci/build_docs.sh || { echo 'ERROR: Failed to build the documentation.' ; exit 1; }
+${WORKSPACE}/ci/build_runtime_qt4.sh || { echo 'ERROR: Failed to build the QT4 runtime.' ; exit 1; }
+${WORKSPACE}/ci/build_runtime_qt5.sh || { echo 'ERROR: Failed to build the QT5 runtime.' ; exit 1; }
+${WORKSPACE}/ci/update_messages.sh || { echo 'ERROR: Failed to update translation message catalogs.' ; exit 1; }
+${WORKSPACE}/ci/build_pip_wheel.sh || { echo 'ERROR: Failed to build the PIP wheel.' ; exit 1; }
+${WORKSPACE}/ci/build_tarballs.sh || { echo 'ERROR: Failed to build the tarballs.' ; exit 1; }
@@ -3,13 +3,13 @@
 echo "EXECUTING: Create pgAdmin config"
 echo

-cd $WORKSPACE
+cd ${WORKSPACE}

-cp $JENKINS_HOME/pgadmin-configs/config_local.py $WORKSPACE/web/config_local.py || { echo 'ERROR: Failed to create config_local.py.' ; exit 1; }
-echo LOG_FILE = \"$WORKSPACE/var/pgadmin4.log\" >> $WORKSPACE/web/config_local.py || { echo 'ERROR: Failed to create config_local.py.' ; exit 1; }
-echo SESSION_DB_PATH = \"$WORKSPACE/var/sessions\" >> $WORKSPACE/web/config_local.py || { echo 'ERROR: Failed to create config_local.py.' ; exit 1; }
-echo STORAGE_DIR = \"$WORKSPACE/var/storage\" >> $WORKSPACE/web/config_local.py || { echo 'ERROR: Failed to create config_local.py.' ; exit 1; }
-echo SQLITE_PATH = \"$WORKSPACE/var/pgadmin4.db\" >> $WORKSPACE/web/config_local.py || { echo 'ERROR: Failed to create config_local.py.' ; exit 1; }
-echo TEST_SQLITE_PATH = \"$WORKSPACE/var/pgadmin4.db\" >> $WORKSPACE/web/config_local.py || { echo 'ERROR: Failed to create config_local.py.' ; exit 1; }
+cp ${JENKINS_HOME}/pgadmin-configs/config_local.py ${WORKSPACE}/web/config_local.py || { echo 'ERROR: Failed to create config_local.py.' ; exit 1; }
+echo LOG_FILE = \"${WORKSPACE}/var/pgadmin4.log\" >> ${WORKSPACE}/web/config_local.py || { echo 'ERROR: Failed to create config_local.py.' ; exit 1; }
+echo SESSION_DB_PATH = \"${WORKSPACE}/var/sessions\" >> ${WORKSPACE}/web/config_local.py || { echo 'ERROR: Failed to create config_local.py.' ; exit 1; }
+echo STORAGE_DIR = \"${WORKSPACE}/var/storage\" >> ${WORKSPACE}/web/config_local.py || { echo 'ERROR: Failed to create config_local.py.' ; exit 1; }
+echo SQLITE_PATH = \"${WORKSPACE}/var/pgadmin4.db\" >> ${WORKSPACE}/web/config_local.py || { echo 'ERROR: Failed to create config_local.py.' ; exit 1; }
+echo TEST_SQLITE_PATH = \"${WORKSPACE}/var/pgadmin4.db\" >> ${WORKSPACE}/web/config_local.py || { echo 'ERROR: Failed to create config_local.py.' ; exit 1; }

-cp $JENKINS_HOME/pgadmin-configs/test_config.json $WORKSPACE/web/regression/test_config.json || { echo 'ERROR: Failed to copy the test configuration.' ; exit 1; }
+cp ${JENKINS_HOME}/pgadmin-configs/test_config.json ${WORKSPACE}/web/regression/test_config.json || { echo 'ERROR: Failed to copy the test configuration.' ; exit 1; }
@@ -13,25 +13,25 @@ export DISPLAY=:99
 echo "Creating Python ${PYTHON_VERSION} virtual environment..."
 echo

-cd $WORKSPACE/
+cd ${WORKSPACE}/

 PYTHON_SUFFIX=""

-if [[ "$PYTHON_VERSION" == 3* ]]; then
+if [[ "${PYTHON_VERSION}" == 3* ]]; then
    PYTHON_SUFFIX="3"
 fi

-if [ "$PYTHON_VERSION" == 2.6 -o "$PYTHON_VERSION" == 3.3 ]; then
-    /usr/bin/virtualenv --no-wheel -p /usr/local/python-$PYTHON_VERSION/bin/python$PYTHON_SUFFIX $WORKSPACE/pgadmin-venv || { echo 'ERROR: Failed to create the Python virtual environment.' ; exit 1; }
-    . $WORKSPACE/pgadmin-venv/bin/activate || { echo 'ERROR: Failed to activate the Python virtual environment.' ; exit 1; }
-    $WORKSPACE/pgadmin-venv/bin/pip install wheel==0.29.0 || { echo 'ERROR: Failed to install wheel 0.29.0.' ; exit 1; }
+if [ "${PYTHON_VERSION}" == 2.6 -o "${PYTHON_VERSION}" == 3.3 ]; then
+    /usr/bin/virtualenv --no-wheel -p /usr/local/python-${PYTHON_VERSION}/bin/python${PYTHON_SUFFIX} ${WORKSPACE}/pgadmin-venv || { echo 'ERROR: Failed to create the Python virtual environment.' ; exit 1; }
+    . ${WORKSPACE}/pgadmin-venv/bin/activate || { echo 'ERROR: Failed to activate the Python virtual environment.' ; exit 1; }
+    ${WORKSPACE}/pgadmin-venv/bin/pip install wheel==0.29.0 || { echo 'ERROR: Failed to install wheel 0.29.0.' ; exit 1; }
 else
-    /usr/bin/virtualenv -p /usr/local/python-$PYTHON_VERSION/bin/python$PYTHON_SUFFIX $WORKSPACE/pgadmin-venv || { echo 'ERROR: Failed to create the Python virtual environment.' ; exit 1; }
-    . $WORKSPACE/pgadmin-venv/bin/activate || { echo 'ERROR: Failed to activate the Python virtual environment.' ; exit 1; }
+    /usr/bin/virtualenv -p /usr/local/python-${PYTHON_VERSION}/bin/python${PYTHON_SUFFIX} ${WORKSPACE}/pgadmin-venv || { echo 'ERROR: Failed to create the Python virtual environment.' ; exit 1; }
+    . ${WORKSPACE}/pgadmin-venv/bin/activate || { echo 'ERROR: Failed to activate the Python virtual environment.' ; exit 1; }
 fi

-$WORKSPACE/pgadmin-venv/bin/pip install -r requirements.txt || { echo 'ERROR: Failed to install the application requirements.' ; exit 1; }
-$WORKSPACE/pgadmin-venv/bin/pip install -r web/regression/requirements.txt || { echo 'ERROR: Failed to install the regression test requirements.' ; exit 1; }
+${WORKSPACE}/pgadmin-venv/bin/pip install -r requirements.txt || { echo 'ERROR: Failed to install the application requirements.' ; exit 1; }
+${WORKSPACE}/pgadmin-venv/bin/pip install -r web/regression/requirements.txt || { echo 'ERROR: Failed to install the regression test requirements.' ; exit 1; }

 cd web
 /usr/bin/yarn install || { echo 'ERROR: Failed to install the required Javascript modules.' ; exit 1; }
@@ -41,9 +41,9 @@ cd ../
 echo "Running regression tests..."
 echo

-$WORKSPACE/pgadmin-venv/bin/python $WORKSPACE/web/regression/runtests.py  --pkg feature_tests || { echo 'ERROR: Error detected when running the Feature tests.' ; exit 1; }
+${WORKSPACE}/pgadmin-venv/bin/python ${WORKSPACE}/web/regression/runtests.py  --pkg feature_tests || { echo 'ERROR: Error detected when running the Feature tests.' ; exit 1; }

 echo "Cleaning up..."
 echo

-kill $FB_PID
+kill ${FB_PID}
@@ -3,7 +3,7 @@
 echo "EXECUTING: Jasmine tests"
 echo

-cd $WORKSPACE/web/
+cd ${WORKSPACE}/web/

 /usr/bin/yarn install || { echo 'ERROR: Failed to install the required Javascript modules.' ; exit 1; }
 /usr/bin/yarn run linter  || { echo 'ERROR: Failed to lint the Javascript code.' ; exit 1; }
@@ -6,25 +6,25 @@ echo
 echo "Creating Python ${PYTHON_VERSION} virtual environment..."
 echo

-cd $WORKSPACE/
+cd ${WORKSPACE}/

 PYTHON_SUFFIX=""

-if [[ "$PYTHON_VERSION" == 3* ]]; then
+if [[ "${PYTHON_VERSION}" == 3* ]]; then
    PYTHON_SUFFIX="3"
 fi

-if [ "$PYTHON_VERSION" == 2.6 -o "$PYTHON_VERSION" == 3.3 ]; then
-    /usr/bin/virtualenv --no-wheel -p /usr/local/python-$PYTHON_VERSION/bin/python$PYTHON_SUFFIX $WORKSPACE/pgadmin-venv || { echo 'ERROR: Failed to create the Python virtual environment.' ; exit 1; }
-    . $WORKSPACE/pgadmin-venv/bin/activate || { echo 'ERROR: Failed to activate the Python virtual environment.' ; exit 1; }
-    $WORKSPACE/pgadmin-venv/bin/pip install wheel==0.29.0 || { echo 'ERROR: Failed to install wheel 0.29.0.' ; exit 1; }
+if [ "${PYTHON_VERSION}" == 2.6 -o "${PYTHON_VERSION}" == 3.3 ]; then
+    /usr/bin/virtualenv --no-wheel -p /usr/local/python-${PYTHON_VERSION}/bin/python${PYTHON_SUFFIX} ${WORKSPACE}/pgadmin-venv || { echo 'ERROR: Failed to create the Python virtual environment.' ; exit 1; }
+    . ${WORKSPACE}/pgadmin-venv/bin/activate || { echo 'ERROR: Failed to activate the Python virtual environment.' ; exit 1; }
+    ${WORKSPACE}/pgadmin-venv/bin/pip install wheel==0.29.0 || { echo 'ERROR: Failed to install wheel 0.29.0.' ; exit 1; }
 else
-    /usr/bin/virtualenv -p /usr/local/python-$PYTHON_VERSION/bin/python$PYTHON_SUFFIX $WORKSPACE/pgadmin-venv || { echo 'ERROR: Failed to create the Python virtual environment.' ; exit 1; }
-    . $WORKSPACE/pgadmin-venv/bin/activate || { echo 'ERROR: Failed to activate the Python virtual environment.' ; exit 1; }
+    /usr/bin/virtualenv -p /usr/local/python-${PYTHON_VERSION}/bin/python${PYTHON_SUFFIX} ${WORKSPACE}/pgadmin-venv || { echo 'ERROR: Failed to create the Python virtual environment.' ; exit 1; }
+    . ${WORKSPACE}/pgadmin-venv/bin/activate || { echo 'ERROR: Failed to activate the Python virtual environment.' ; exit 1; }
 fi

-$WORKSPACE/pgadmin-venv/bin/pip install -r requirements.txt || { echo 'ERROR: Failed to install the application requirements.' ; exit 1; }
-$WORKSPACE/pgadmin-venv/bin/pip install -r web/regression/requirements.txt || { echo 'ERROR: Failed to install the regression test requirements.' ; exit 1; }
+${WORKSPACE}/pgadmin-venv/bin/pip install -r requirements.txt || { echo 'ERROR: Failed to install the application requirements.' ; exit 1; }
+${WORKSPACE}/pgadmin-venv/bin/pip install -r web/regression/requirements.txt || { echo 'ERROR: Failed to install the regression test requirements.' ; exit 1; }

 echo "Running PEP-8 checks..."
 echo
@@ -34,5 +34,5 @@ make check-pep8 || { echo 'ERROR: Error detected when running the Python PEP-8 c
 echo "Running regression tests..."
 echo

-$WORKSPACE/pgadmin-venv/bin/python $WORKSPACE/web/regression/runtests.py  --exclude feature_tests || { echo 'ERROR: Error detected when running the Python tests.' ; exit 1; }
+${WORKSPACE}/pgadmin-venv/bin/python ${WORKSPACE}/web/regression/runtests.py  --exclude feature_tests || { echo 'ERROR: Error detected when running the Python tests.' ; exit 1; }

@@ -3,9 +3,9 @@
 echo "EXECUTING: Compile messages"
 echo

-cd $WORKSPACE/web
+cd ${WORKSPACE}/web

-. $WORKSPACE/pgadmin-venv/bin/activate || { echo 'ERROR: Failed to activate the Python virtual environment.' ; exit 1; }
+. ${WORKSPACE}/pgadmin-venv/bin/activate || { echo 'ERROR: Failed to activate the Python virtual environment.' ; exit 1; }

 pybabel extract -F babel.cfg -o pgadmin/messages.pot pgadmin || { echo 'ERROR: Failed to extract messages from the source code.' ; exit 1; }

@@ -1,8 +1,8 @@
 .. _add_restore_point_dialog:

-**********************************
-The Add named restore point Dialog
-**********************************
+***************************************
+`Add named restore point Dialog`:index:
+***************************************

 Use the *Add named restore point* dialog to take a named snapshot of the state of the server for use in a recovery file. To create a named restore point, the server's postgresql.conf file must specify a *wal_level* value of *archive*, *hot_standby*, or *logical*.  You must be a database superuser to create a restore point.

@@ -1,8 +1,8 @@
 .. _backup_and_restore:

-******************
-Backup and Restore
-******************
+***************************
+`Backup and Restore`:index:
+***************************

 A powerful, but user-friendly Backup and Restore tool provides an easy way to use pg_dump, pg_dumpall, and pg_restore to take backups and create copies of databases or database objects for use in a development environment.

@@ -1,8 +1,8 @@
 .. _backup_dialog:

-*****************
-The Backup Dialog
-*****************
+**********************
+`Backup Dialog`:index:
+**********************

 Using the *pg_dump* utility, *pgAdmin* provides an easy way to create a backup in a plain-text or archived format.  You can then use a client application (like *psql* or the *Query Tool*) to restore a plain-text backup file, or use the Postgres *pg_restore* utility to restore an archived backup. The *pg_dump* utility must have read access to all database objects that you want to back up.

@@ -58,13 +58,15 @@ Click the *Dump options* tab to continue. Use the box fields in the *Dump option

 * Move switches in the **Do not save** field box to select the objects that will not be included in the backup.

-   * Move the switch next to *Owner* to the *Yes* position to include commands that set object ownership.
+   * Move the switch next to *Owner* to the *Yes* position to exclude commands that set object ownership.

-   * Move the switch next to *Privilege* to the *Yes* position to include commands that create access privileges.
+   * Move the switch next to *Privilege* to the *Yes* position to exclude commands that create access privileges.

-   * Move the switch next to *Tablespace* to the *Yes* position to include tablespaces.
+   * Move the switch next to *Tablespace* to the *Yes* position to exclude tablespaces.

-   * Move the switch next to *Unlogged table data* to the *Yes* position to include the contents of unlogged tables.
+   * Move the switch next to *Unlogged table data* to the *Yes* position to exclude the contents of unlogged tables.
+
+   * Move the switch next to *Comments* to the *Yes* position to exclude commands that set the comments. **Note:** This option is visible only for database server greater than or equal to 11.

 .. image:: images/backup_queries.png
    :alt: Queries option on backup dialog
@@ -79,6 +81,8 @@ Click the *Dump options* tab to continue. Use the box fields in the *Dump option

   * Move the switch next to *Include DROP DATABASE statement* to the *Yes* position to include a command in the backup that will drop any existing database object with the same name before recreating the object during a backup.

+   * Move the switch next to *Load Via Partition Root* to the *Yes* position, so when dumping a COPY or INSERT statement for a partitioned table, target the root of the partitioning hierarchy which contains it rather than the partition itself. **Note:** This option is visible only for database server greater than or equal to 11.
+
 .. image:: images/backup_disable.png
    :alt: Disable option on backup dialog

@@ -1,8 +1,8 @@
 .. _backup_globals_dialog:

-*************************
-The Backup Globals Dialog
-*************************
+******************************
+`Backup Globals Dialog`:index:
+******************************

 Use the *Backup Globals* dialog to create a plain-text script that recreates all of the database objects within a cluster, and the global objects that are shared by those databases. Global objects include tablespaces, roles, and object properties. You can use the pgAdmin *Query Tool* to play back a plain-text script, and recreate the objects in the backup.

@@ -1,8 +1,8 @@
 .. _backup_server_dialog:

-*************************
-The Backup Server Dialog
-*************************
+*****************************
+`Backup Server Dialog`:index:
+*****************************

 Use the *Backup Server* dialog to create a plain-text script that will recreate the selected server. You can use the pgAdmin *Query Tool* to play back a plain-text script, and recreate the server.

@@ -12,12 +12,66 @@ Use the *Backup Server* dialog to create a plain-text script that will recreate
 Use the fields in the *General* tab to specify the following:

 * Enter the name of the backup file in the *Filename* field.  Optionally, select the *Browser* icon (ellipsis) to the right to navigate into a directory and select a file that will contain the archive.
+* Use the *Encoding* drop-down listbox to select the character encoding method that should be used for the archive. **Note:** This option is visible only for database server greater than or equal to 11.
 * Use the drop-down listbox next to *Role name* to specify a role with connection privileges on the selected server.  The role will be used for authentication during the backup.

-Move switches in the *Miscellaneous* box to specify the type of statements that should be included in the backup.
+.. image:: images/backup_server_objects.png
+    :alt: Type of objects option on backup server dialog

-* Move the *Verbose messages* switch to the *No* position to exclude status messages from the backup. The default is *Yes*.
-* Move the *Force double quote on identifiers* switch to the *Yes* position to name identifiers without changing case. The default is *No*.
+* Move switches in the **Type of objects** field box to specify details about the type of objects that will be backed up.
+
+   * Move the switch next to *Only data* to the *Yes* position to limit the back up to data.
+
+   * Move the switch next to *Only schema* to limit the back up to schema-level database objects.
+
+.. image:: images/backup_server_do_not_save.png
+    :alt: Do not save option on backup server dialog
+
+* Move switches in the **Do not save** field box to select the objects that will not be included in the backup.
+
+   * Move the switch next to *Owner* to the *Yes* position to exclude commands that set object ownership.
+
+   * Move the switch next to *Privilege* to the *Yes* position to exclude commands that create access privileges.
+
+   * Move the switch next to *Tablespace* to the *Yes* position to exclude tablespaces.
+
+   * Move the switch next to *Unlogged table data* to the *Yes* position to exclude the contents of unlogged tables.
+
+   * Move the switch next to *Comments* to the *Yes* position to exclude commands that set the comments. **Note:** This option is visible only for database server greater than or equal to 11.
+
+.. image:: images/backup_server_queries.png
+    :alt: Queries option on backup server dialog
+
+* Move switches in the **Queries** field box to specify the type of statements that should be included in the backup.
+
+   * Move the switch next to *Use Column Inserts* to the *Yes* position to dump the data in the form of INSERT statements and include explicit column names.  Please note: this may make restoration from backup slow.
+
+   * Move the switch next to *Use Insert commands* to the *Yes* position to dump the data in the form of INSERT statements rather than using a COPY command.  Please note: this may make restoration from backup slow.
+
+   * Move the switch next to *Include DROP DATABASE statement* to the *Yes* position to include a command in the backup that will drop any existing database object with the same name before recreating the object during a backup.
+
+
+.. image:: images/backup_server_disable.png
+    :alt: Disable option on backup server dialog
+
+* Move switches in the **Disable** field box to specify the type of statements that should be excluded from the backup.
+
+   * Move the switch next to *Trigger* (active when creating a data-only backup) to the *Yes* position to include commands that will disable triggers on the target table while the data is being loaded.
+
+   * Move the switch next to *$ quoting* to the *Yes* position to enable dollar quoting within function bodies; if disabled, the function body will be quoted using SQL standard string syntax.
+
+.. image:: images/backup_server_miscellaneous.png
+    :alt: Miscellaneous option on backup server dialog
+
+* Move switches in the **Miscellaneous** field box to specify miscellaneous backup options.
+
+   * Move the switch next to *With OIDs* to the *Yes* position to include object identifiers as part of the table data for each table.
+
+   * Move the switch next to *Verbose messages* to the *No* position to instruct *pg_dump* to exclude verbose messages.
+
+   * Move the switch next to *Force double quotes on identifiers* to the *Yes* position to force the quoting of all identifiers.
+
+   * Move the switch next to *Use SET SESSION AUTHORIZATION* to the *Yes* position to include a statement that will use a SET SESSION AUTHORIZATION command to determine object ownership (instead of an ALTER OWNER command).

 Click the *Backup* button to build and execute a command based on your selections; click the *Cancel* button to exit without saving work.

@@ -1,8 +1,8 @@
 .. _browser:

-********************
-The pgAdmin 4 Client
-********************
+*****************************
+`The pgAdmin 4 Client`:index:
+*****************************

 pgAdmin 4 supports all PostgreSQL features, from writing simple SQL queries to developing complex databases. It is designed to query an active database (in real-time), allowing you to stay current with modifications and implementations.

@@ -1,8 +1,8 @@
 .. _cast_dialog:

-***************
-The Cast Dialog
-***************
+********************
+`Cast Dialog`:index:
+********************

 Use the *Cast* dialog to define a cast. A cast specifies how to convert a value from one data type to another.

@@ -1,8 +1,8 @@
 .. _change_password_dialog:

-**************************
-The Change Password Dialog
-**************************
+*******************************
+`Change Password Dialog`:index:
+*******************************

 It is a good policy to routinely change your password to protect data, even in what you may consider a 'safe' environment. In the workplace, failure to apply an appropriate password policy could leave you in breach of Data Protection laws.

@@ -1,8 +1,8 @@
 .. _change_user_password:

-*******************************
-The Change User Password Dialog
-*******************************
+************************************
+`Change User Password Dialog`:index:
+************************************

 It is a good policy to routinely change your password to protect data, even in what you may consider a 'safe' environment. In the workplace, failure to apply an appropriate password policy could leave you in breach of Data Protection laws.

@@ -1,8 +1,8 @@
 .. _check_dialog:

-****************
-The Check Dialog
-****************
+*********************
+`Check Dialog`:index:
+*********************

 Use the *Check* dialog to define or modify a check constraint. A check constraint specifies an expression that produces a Boolean result that new or updated rows must satisfy for an insert or update operation to succeed.

@@ -0,0 +1,19 @@
+.. _clear_saved_passwords:
+
+******************************
+`Clear Saved Passwords`:index:
+******************************
+
+Use *Clear Saved Password* functionality to clear the saved password for the database server.
+
+.. image:: images/clear_saved_password.png
+
+*Clear Saved Password* shows in the context menu for the selected server as well as under the *Object* menu on the top menu bar.
+
+Use *Clear SSH Tunnel Password* functionality to clear the saved password of SSH Tunnel to connect to the database server.
+
+.. image:: images/clear_tunnel_password.png
+
+*Clear SSH Tunnel Password* shows in the context menu for the selected server as well as under the *Object* menu on the top menu bar.
+
+**Note:** It will be enabled/visible when the password for the selected database server is already saved.
@@ -1,8 +1,8 @@
 .. _code_overview:

-*************
-Code Overview
-*************
+**********************
+`Code Overview`:index:
+**********************

 The bulk of pgAdmin is a Python web application written using the Flask framework
 on the backend, and HTML5 with CSS3, Bootstrap and jQuery on the front end. A
@@ -1,8 +1,8 @@
 .. _code_review:

-*****************
-Code Review Notes
-*****************
+**************************
+`Code Review Notes`:index:
+**************************

 This document lists a number of standard items that will be checked during the
 review process for any patches submitted for inclusion in pgAdmin.
@@ -1,8 +1,8 @@
 .. _coding_standards:

-****************
-Coding Standards
-****************
+*************************
+`Coding Standards`:index:
+*************************

 pgAdmin uses multiple technologies and multiple languages, each of which have 
 their own coding standards.
@@ -1,8 +1,8 @@
 .. _collation_dialog:

-********************
-The Collation Dialog
-********************
+*************************
+`Collation Dialog`:index:
+*************************

 Use the *Collation* dialog to define a collation. A collation is an SQL schema object that maps a SQL name to operating system locales. To create a collation, you must have a CREATE privilege on the destination schema.

@@ -1,8 +1,8 @@
 .. _column_dialog:

-*****************
-The Column Dialog
-*****************
+**********************
+`Column Dialog`:index:
+**********************

 Use the *Column* dialog to add a column to an existing table or modify a column definition.

@@ -1,8 +1,8 @@
 .. _connect_error:

-******************
-`Connection error`
-******************
+*************************
+`Connection error`:index:
+*************************

 When connecting to a PostgreSQL server, you may get an error message. If you encounter an error message, please review the message  carefully; each error message attempts to incorporate the information you'll need to resolve the problem.  For more details about specific errors, please locate the error message in the list below:

@@ -1,8 +1,8 @@
 .. _connect_to_server:

-*****************
-Connect to server
-*****************
+**************************
+`Connect to server`:index:
+**************************

 Use the *Connect to Server* dialog to authenticate with a defined server and access the objects stored on the server through the pgAdmin tree control. To access the dialog, right click on the server name in the *pgAdmin* tree control, and select *Connect Server...* from the context menu.

@@ -14,6 +14,16 @@ Provide authentication information for the selected server:
 * Use the *Password* field to provide the password of the user that is associated with the defined server.
 * Check the box next to *Save Password* to instruct the server to save the password for future connections; if you save the password, you will not be prompted when reconnecting to the database server with this server definition.

+In case of SSH Tunneling, *Connect to Server* dialog will prompt for SSH Tunnel and Database server passwords if not already saved.
+
+.. image:: images/connect_to_tunneled_server.png
+    :alt: Connect to server dialog
+
+Provide authentication information for the selected server:
+
+ * Use the *Password* field to provide the password of the user that is associated with the defined server.
+ * Check the box next to respective *Save Password* to instruct the server to save the password for future connections; if you save the password, you will not be prompted when reconnecting to the database server with this server definition.
+
 The pgAdmin client displays a message in a green status bar in the lower right corner when the server connects successfully.

 If you receive an error message while attempting a connection, verify that your network is allowing the pgAdmin host and the host of the database server to communicate. For detailed information about a specific error message, please see the :ref:`Connection Error <connect_error>` help page.
@@ -1,8 +1,8 @@
 .. _connecting:

-**********************
-Connecting to a Server
-**********************
+*******************************
+`Connecting to a Server`:index:
+*******************************

 Before you can use the pgAdmin client to manage the objects that reside on your Postgres server, you must define a connection to the server.  You can (optionally) use the *Server Group* dialog to create server groups to organize the server connections within the tree control for easier management. To open the *Server Group* dialog, right-click on the *Servers* node of the tree control, and select *Server Group* from the *Create* menu.

@@ -1,8 +1,8 @@
 .. _contributions:

-*****************************
-pgAdmin Project Contributions
-*****************************
+**************************************
+`pgAdmin Project Contributions`:index:
+**************************************

 pgAdmin is an open-source project that invites you to get involved in the development process.  For more information about contributing to the pgAdmin project, contact the developers on the pgAdmin mailing list pgadmin-hackers@postgresql.org to discuss any ideas you might have for enhancements or bug fixes.

@@ -1,8 +1,8 @@
 .. _database_dialog:

-*******************
-The Database Dialog
-*******************
+************************
+`Database Dialog`:index:
+************************

 Use the *Database* dialog to define or modify a database. To create a database, you must be a database superuser or have the CREATE privilege.

@@ -1,8 +1,8 @@
 .. _debugger:

-******************
-`pgAdmin Debugger`
-******************
+*************************
+`pgAdmin Debugger`:index:
+*************************

 .. image:: images/debug_main.png
    :alt: Debugger page
@@ -1,8 +1,8 @@
 .. _deployment:

-******************
-pgAdmin Deployment
-******************
+***************************
+`pgAdmin Deployment`:index:
+***************************

 Pre-compiled and configured installation packages for pgAdmin 4 are available for a number of desktop environments; we recommend using an installer whenever possible.  If you are interested in learning more about the project, or if a pgAdmin installer is not available for your environment, the pages listed below will provide detailed information about creating a custom deployment.  

@@ -1,8 +1,8 @@
 .. _desktop_deployment:

-******************
-Desktop Deployment
-******************
+***************************
+`Desktop Deployment`:index:
+***************************

 pgAdmin may be deployed as a desktop application by configuring the application
 to run in desktop mode and then utilising the desktop runtime to host the
@@ -14,7 +14,7 @@ additional instances of pgAdmin are launched, a new browser tab will be opened
 and be served by the existing instance of the server in order to minimise system
 resource utilisation. Clicking the icon in the system tray will present a menu
 offering options to open a new pgAdmin window, configure the runtime, view the
-server log and shutdown the server.
+server log and shut down the server.

 .. note:: Pre-compiled and configured installation packages are available for
     a number of platforms. These packages should be used by end-users whereever
@@ -68,7 +68,7 @@ semi-colon character, for example:
 .. code-block:: bash

     /Users/dpage/.virtualenvs/pgadmin4/lib/python2.7/site-packages/;/Users/dpage/python-libs/
-    
+
 The configuration settings are stored using the QSettings class in Qt, which
 will use an INI file on Unix systems (~/.config/pgadmin/pgadmin4.conf),
 a plist file on Mac OS X (~/Library/Preferences/org.pgadmin.pgadmin4.plist),
@@ -81,13 +81,10 @@ The configuration settings:
 +==========================+====================+===============================================================+
 | ApplicationPath          | String             | The directory containing pgAdmin4.py                          |
 +--------------------------+--------------------+---------------------------------------------------------------+
+| BrowserCommand           | String             | An alternate command to run instead of the default browser.   |
+--------------------------+--------------------+---------------------------------------------------------------+
 | ConnectionTimeout        | Integer            | The number of seconds to wait for application server startup. |
 +--------------------------+--------------------+---------------------------------------------------------------+
 | PythonPath               | String             | The Python module search path                                 |
 +--------------------------+--------------------+---------------------------------------------------------------+
-| Browser/Geometry         | Binary             | The runtime window's size/shape                               |
-+--------------------------+--------------------+---------------------------------------------------------------+
-| Browser/WindowState      | Binary             | The runtime window's state                                    |
-+--------------------------+--------------------+---------------------------------------------------------------+
-| Browser/Zoom             | String             | The runtime window's zoom level (zoom % / 100)                |
-+--------------------------+--------------------+---------------------------------------------------------------+
+
@@ -1,8 +1,8 @@
 .. _developer_tools:

-***************
-Developer Tools
-***************
+************************
+`Developer Tools`:index:
+************************

 The pgAdmin *Tools* menu displays a list of powerful developer tools that you can use to execute and analyze complex SQL commands, manage data, and debug PL/SQL code.

@@ -1,8 +1,8 @@
 .. _domain_constraint_dialog:

-*****************************
-The Domain Constraints Dialog
-*****************************
+**********************************
+`Domain Constraints Dialog`:index:
+**********************************

 Use the *Domain Constraints* dialog to create or modify a domain constraint. A domain constraint confirms that the values provided for a domain meet a defined criteria. The *Domain Constraints* dialog implements options of the ALTER DOMAIN command.

@@ -1,8 +1,8 @@
 .. _domain_dialog:

-*****************
-The Domain Dialog
-*****************
+**********************
+`Domain Dialog`:index:
+**********************

 Use the *Domain* dialog to define a domain. A domain is a data type definition that may constrain permissible values. Domains are useful when you are creating multiple tables that contain comparable columns; you can create a domain that defines constraints that are common to the columns and re-use the domain definition when creating the columns, rather than individually defining each set of constraints.

@@ -38,7 +38,7 @@ Hover over an icon to display a tooltip that describes the icon's functionality.
 +----------------------+---------------------------------------------------------------------------------------------------+-------------+
 | *Paste Row*          | Click the *Paste Row* icon to paste the content that is currently on the clipboard.               |             |
 +----------------------+---------------------------------------------------------------------------------------------------+-------------+
-| *Delete Row*         | Use the *Delete Row* icon to add a new row in the output panel.                                   |             |
+| *Delete Row*         | Use the *Delete Row* icon to delete all the selected rows from the output panel.                  |             |
 +----------------------+---------------------------------------------------------------------------------------------------+-------------+
 | *Filter*             | Click the *Filter* icon to open a dialog that allows you to write and apply a filter for the      |             |
 |                      | content currently displayed in the output panel.  Click the down arrow to open the *Filter* drop- |             |
@@ -67,7 +67,7 @@ Hover over an icon to display a tooltip that describes the icon's functionality.
 +----------------------+---------------------------------------------------------------------------------------------------+-------------+
 | *Stop*               | Click the *Stop* icon to cancel the execution of the currently running query.                     |             |
 +----------------------+---------------------------------------------------------------------------------------------------+-------------+
-| *Clear query window* | Use the *Clear query window* drop-down menu to erase the contents of the *History* tab.           |             |
+| *Clear History*      | Use the *Clear History* drop-down menu to erase the contents of the *History* tab.                |             |
 +----------------------+---------------------------------------------------------------------------------------------------+-------------+
 | *Download as CSV*    | Click the *Download as CSV* icon to download the result set of the current query to a             | F8          |
 |                      | comma-separated list. You can control the CSV settings through                                    |             |
@@ -95,6 +95,28 @@ To delete a row, press the *Delete* toolbar button.  A popup will open, asking y

 To commit the changes to the server, select the *Save* toolbar button.  Modifications to a row are written to the server automatically when you select a different row.

+**Geometry Data Viewer**
+
+If PostGIS is installed, you can view GIS objects in a map by selecting row(s) and clicking the 'View Geometry' button in the column. If no rows are selected, the entire data set will be rendered:
+
+.. image:: images/geometry_viewer.png
+    :alt: Geometry Viewer Button
+
+You can adjust the layout by dragging the title of the panel. To view the properties of the geometries directly in map, just click the specific geometry:
+
+.. image:: images/geometry_viewer_property_table.png
+    :alt: Geometry Viewer Property Table
+
+Notes:
+
+- *Supported data types:* The Geometry Viewer supports 2D and 3DM geometries in EWKB format including `Point, LineString, Polygon MultiPoint, MultiLineString, MultiPolygon and GeometryCollection`.
+
+- *SRIDs:* If there are geometries with different SRIDs in the same column, the viewer will render geometries with the same SRID in the map. If SRID=4326 the OSM tile layer will be added into the map.
+
+- *Data size:* For performance reasons, the viewer will render no more than 100000 geometries, totaling up to 20MB.
+
+- *Internet access:* An internet connection is required for the Geometry Viewer to function correctly.
+
 **Sort/Filter options dialog**

 You can access *Sort/Filter options dialog* by clicking on Sort/Filter button. This allows you to specify an SQL Filter to limit the data displayed and data sorting options in the edit grid window:
@@ -120,4 +142,3 @@ To delete a row from the grid, click the trash icon.
 * Click the *Help* button (?) to access online help.
 * Click the *Ok* button to save work.
 * Click the *Close* button to discard current changes and close the dialog.
-
@@ -1,8 +1,8 @@
 .. _event_trigger_dialog:

-************************
-The Event Trigger Dialog
-************************
+*****************************
+`Event Trigger Dialog`:index:
+*****************************

 Use the *Domain Trigger* dialog to define an event trigger. Unlike regular triggers, which are attached to a single table and capture only DML events, event triggers are global to a particular database and are capable of capturing DDL events.  Like regular triggers, event triggers can be written in any procedural language that includes event trigger support, or in C, but not in SQL.

@@ -1,8 +1,8 @@
 .. _exclusion_constraint_dialog:

-*******************************
-The Exclusion constraint Dialog
-*******************************
+************************************
+`Exclusion constraint Dialog`:index:
+************************************

 Use the *Exclusion constraint* dialog to define or modify the behavior of an exclusion constraint. An exclusion constraint guarantees that if any two rows are compared on the specified column or expression (using the specified operator), at least one of the operator comparisons will return false or null.

@@ -48,6 +48,8 @@ Use the fields in the *Columns* tab to to specify the column(s) to which the con
 * Use the *NULLs order* column to specify the placement of NULL values (when sorted).  Specify *FIRST* or *LAST*.
 * Use the drop-down list next to *Operator* to specify a comparison or conditional operator.

+Use *Include columns* field to specify columns for *INCLUDE* clause of the constraint. This option is available in Postgres 11 and later.
+
 Click the *SQL* tab to continue.

 Your entries in the *Exclusion Constraint* 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.
@@ -1,8 +1,8 @@
 .. _extension_dialog:

-********************
-The Extension Dialog
-********************
+*************************
+`Extension Dialog`:index:
+*************************

 Use the *Extension* dialog to install a new extension into the current database. An extension is a collection of SQL objects that add targeted functionality to your Postgres installation.  The *Extension* dialog adds the functionality of an extension to the current database only; you must register the extension in each database that use the extension.  Before you load an extension into a database, you should confirm that any pre-requisite files are installed.

@@ -1,8 +1,8 @@
 .. _foreign_data_wrapper_dialog:

-*******************************
-The Foreign Data Wrapper Dialog
-*******************************
+************************************
+`Foreign Data Wrapper Dialog`:index:
+************************************

 Use the *Foreign Data Wrapper* dialog to create or modify a foreign data wrapper. A foreign data wrapper is an adapter between a Postgres database and data stored on another data source.

@@ -1,8 +1,8 @@
 .. _foreign_key_dialog:

-**********************
-The Foreign key Dialog
-**********************
+***************************
+`Foreign key Dialog`:index:
+***************************

 Use the *Foreign key* dialog to specify the behavior of a foreign key constraint. A foreign key constraint maintains referential integrity between two tables.  A foreign key constraint cannot be defined between a temporary table and a permanent table.

@@ -1,8 +1,8 @@
 .. _foreign_server_dialog:

-*************************
-The Foreign Server Dialog
-*************************
+******************************
+`Foreign Server Dialog`:index:
+******************************

 Use the *Foreign Server* dialog to create a foreign server. A foreign server typically encapsulates connection information that a foreign-data wrapper uses to access an external data resource. Each foreign data wrapper may connect to a different foreign server; in the *pgAdmin* tree control, expand the node of the applicable foreign data wrapper to launch the *Foreign Server* dialog.

@@ -1,8 +1,8 @@
 .. _foreign_table_dialog:

-************************
-The Foreign Table Dialog
-************************
+*****************************
+`Foreign Table Dialog`:index:
+*****************************

 Use the *Foreign Table* dialog to define a foreign table in the current database. Foreign tables define the structure of an external data source that resides on a foreign server.

@@ -1,8 +1,8 @@
 .. _fts_configuration_dialog:

-****************************
-The FTS Configuration dialog
-****************************
+*********************************
+`FTS Configuration dialog`:index:
+*********************************

 Use the *FTS Configuration* dialog to configure a full text search. A text search configuration specifies a text search parser that can divide a string into tokens, along with dictionaries that can identify searchable tokens.

@@ -1,8 +1,8 @@
 .. _fts_dictionary_dialog:

-*************************
-The FTS Dictionary Dialog
-*************************
+******************************
+`FTS Dictionary Dialog`:index:
+******************************

 Use the *FTS Dictionary* dialog to create a full text search dictionary. You can use a predefined templates or create a new dictionary with custom parameters.

@@ -1,8 +1,8 @@
 .. _fts_parser_dialog:

-*********************
-The FTS Parser Dialog
-*********************
+**************************
+`FTS Parser Dialog`:index:
+**************************

 Use the *FTS Parser* dialog to create a new text search parser. A text search parser defines a method for splitting a text string into tokens and assigning types (categories) to the tokens.

@@ -1,8 +1,8 @@
 .. _fts_template_dialog:

-***********************
-The FTS Template Dialog
-***********************
+****************************
+`FTS Template Dialog`:index:
+****************************

 Use the *FTS Template* dialog to create a new text search template. A text search template defines the functions that implement text search dictionaries.

@@ -1,8 +1,8 @@
 .. _function_dialog:

-*******************
-The Function Dialog
-*******************
+************************
+`Function Dialog`:index:
+************************

 Use the *Function* dialog to define a function.  If you drop and then recreate a function, the new function is not the same entity as the old; you must drop existing rules, views, triggers, etc. that refer to the old function.

@@ -1,8 +1,8 @@
 .. _getting_started:

-***************
-Getting Started
-***************
+************************
+`Getting Started`:index:
+************************

 Pre-compiled and configured installation packages for pgAdmin 4 are available
 for a number of desktop environments; we recommend using an installer
@@ -1,8 +1,8 @@
 .. _grant_wizard:

-************
-Grant Wizard
-************
+*********************
+`Grant Wizard`:index:
+*********************

 The *Grant Wizard* tool is a graphical interface that allows you to manage the privileges of one or more database objects in a point-and-click environment. A search box, dropdown lists, and checkboxes facilitate quick selections of database objects, roles and privileges.

@@ -1,8 +1,8 @@
 .. _import_export_data:

-*****************************
-The Import/Export data Dialog
-*****************************
+**********************************
+`Import/Export data Dialog`:index:
+**********************************

 Use the *Import/Export data* dialog to copy data from a table to a file, or copy data from a file into a table.

@@ -1,8 +1,8 @@
 .. _index_dialog:

-****************
-The Index Dialog
-****************
+*********************
+`Index Dialog`:index:
+*********************

 Use the *Index* dialog to create an index on a specified table or materialized view.

@@ -55,6 +55,8 @@ Use the context-sensitive fields in the *Columns* panel to specify which column(

 * Use the drop-down listbox in the *Collation* field to select a collation to use for the index.

+Use *Include columns* field to specify columns for *INCLUDE* clause of the index. This option is available in Postgres 11 and later.
+
 Click the *SQL* tab to continue.

 Your entries in the *Index* 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.
@@ -1,6 +1,6 @@
-******************
-Keyboard Shortcuts
-******************
+***************************
+`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
@@ -1,8 +1,8 @@
 .. _language:

-*******************
-The Language Dialog
-*******************
+************************
+`Language Dialog`:index:
+************************

 Use the CREATE LANGUAGE dialog to register a new procedural language.

@@ -1,7 +1,7 @@
 .. _licence:

-*******
-Licence
-*******
+****************
+`Licence`:index:
+****************

 pgAdmin is released under the  `PostgreSQL Licence <http://www.postgresql.org/about/licence>`_, which is a  liberal Open Source licence similar to BSD or MIT, and approved by the Open  Source Initiative. The copyright for the project source code, website and documentation is attributed to the `pgAdmin Development Team <https://www.pgadmin.org/development/team.php>`_.
@@ -1,8 +1,8 @@
 .. _maintenance_dialog:

-**********************
-The Maintenance Dialog
-**********************
+***************************
+`Maintenance Dialog`:index:
+***************************

 Use the *Maintenance* dialog to VACUUM, ANALYZE, REINDEX or CLUSTER a database or selected database objects.

@@ -1,8 +1,8 @@
 .. _management_basics:

-*****************
-Management Basics      
-*****************
+**************************
+`Management Basics`:index:
+**************************

 pgAdmin provides point and click dialogs that help you perform server management functions.  Dialogs simplify tasks such as managing named restore points, granting user privileges, and performing VACUUM, ANALYZE and REINDEX functions.  

@@ -1,8 +1,8 @@
 .. _managing_cluster_objects:

-******************************
-Managing Cluster Level Objects 
-******************************
+***************************************
+`Managing Cluster Level Objects`:index:
+***************************************
   
 Some object definitions reside at the cluster level; pgAdmin 4 provides dialogs that allow you to create these objects, manage them, and control their relationships to each other.  To access a dialog that allows you to create a database object, right-click on the object type in the pgAdmin tree control, and select the *Create* option for that object.  For example, to create a new database, right-click on the *Databases* node, and select *Create Database...*    
   
@@ -1,8 +1,8 @@
 .. _managing_database_objects:

-*************************
-Managing Database Objects
-*************************
+**********************************
+`Managing Database Objects`:index:
+**********************************

 pgAdmin 4 provides simple but powerful dialogs that you can use to design and create database objects.  Each dialog contains a series of tabs that you use to describe the object that will be created by the dialog; the SQL tab displays the SQL command that the server will execute when creating the object.