1. Added new backup/restore options for PostgreSQL 11. Fixes #3503

2. Ensure backup should work with '--data-only' and '--schema-only' for any format. Fixes #3347
3. Added supported "Dump Options" for "pg_dumpall" which was not there since pgAdmin 3.
4. Fixed issue where "--clean" should not clubbed with "--data-only" while taking backup.
5. Fixed "--oids" should not clubbed with "--inserts" or "--column-inserts" while taking backup.

docs/en_US/backup_dialog.rst

@@ -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
 

docs/en_US/backup_server_dialog.rst

@@ -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.
 

docs/en_US/release_notes_3_3.rst

@@ -10,6 +10,7 @@ This release contains a number of features and fixes reported since the release
 Features
 ********
 
+| `Feature #3503 <https://redmine.postgresql.org/issues/3503>`_ - Added new backup/restore options for PostgreSQL 11. Added dump options for 'pg_dumpall'.
 | `Feature #3553 <https://redmine.postgresql.org/issues/3553>`_ - Add a Spanish translation.
 
 Bug fixes
@@ -17,6 +18,7 @@ Bug fixes
 
 | `Bug #3136 <https://redmine.postgresql.org/issues/3136>`_ - Stabilise feature tests for continuous running on CI systems.
 | `Bug #3325 <https://redmine.postgresql.org/issues/3325>`_ - Fix sort/filter dialog issue where it incorrectly requires ASC/DESC.
+| `Bug #3347 <https://redmine.postgresql.org/issues/3347>`_ - Ensure backup should work with '--data-only' and '--schema-only' for any format.
 | `Bug #3407 <https://redmine.postgresql.org/issues/3407>`_ - Fix keyboard shortcuts layout in the preferences panel.
 | `Bug #3461 <https://redmine.postgresql.org/issues/3461>`_ - Ensure that refreshing a node also updates the Property list.
 | `Bug #3528 <https://redmine.postgresql.org/issues/3528>`_ - Handle connection errors properly in the query tool.

docs/en_US/restore_dialog.rst

@@ -49,6 +49,8 @@ Click the *Restore options* tab to continue. Use the fields on the *Restore opti
    * 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 *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/restore_queries.png
     :alt: Restore dialog queries section