1) Preserve the settings set by the user in the import/export data dialog. Fixes #7428

2) Fixed the JSON editor issue of hiding the first record. Fixes #7520

docs/en_US/import_export_data.rst

@@ -8,39 +8,36 @@ Use the *Import/Export data* dialog to copy data from a table to a file, or copy
 data from a file into a table.
 
 The *Import/Export data* dialog organizes the import/export of data through the
-*Options* and *Columns* tabs.
+*General*, *Options* and *Columns* tabs.
+
+.. image:: images/import_export_general.png
+    :alt: Import Export data dialog general tab
+    :align: center
+
+Use the fields in the *General* tab to specify import and export preferences:
+
+* Move the *Import/Export* switch to the *Import* position to specify that the
+  server should import data to a table from a file. The default is *Import*.
+
+* Enter the name of the source or target file in the *Filename* field.
+  Optionally, select the *Browser* icon (ellipsis) to the right to navigate
+  into a directory and select a file.
+
+* Use the drop-down listbox in the *Format* field to specify the file type.
+  Select:
+
+  * *binary* for a .bin file.
+  * *csv* for a .csv file.
+  * *text* for a .txt file.
+
+* Use the drop-down listbox in the *Encoding* field to specify the type of
+  character encoding.
 
 .. image:: images/import_export_options.png
     :alt: Import Export data dialog options tab
     :align: center
 
-Use the fields in the *Options* tab to specify import and export preferences:
-
-* Move the *Import/Export* switch to the *Import* position to specify that the
-  server should import data to a table from a file. The default is *Export*.
-
-* Use the fields in the *File Info* field box to specify information about the
-  source or target file:
-
-   * Enter the name of the source or target file in the *Filename* field.
-     Optionally, select the *Browser* icon (ellipsis) to the right to navigate
-     into a directory and select a file.
-   * Use the drop-down listbox in the *Format* field to specify the file type.
-     Select:
-
-     * *binary* for a .bin file.
-     * *csv* for a .csv file.
-     * *text* for a .txt file.
-
-   * Use the drop-down listbox in the *Encoding* field to specify the type of
-     character encoding.
-
-.. image:: images/import_export_miscellaneous.png
-    :alt: Import Export data dialog miscellaneous tab
-    :align: center
-
-* Use the fields in the *Miscellaneous* field box to specify additional
-  information:
+* Use the fields in the *Options* tab to specify additional information:
 
    * Move the *OID* switch to the *Yes* position to include the *OID* column.
      The *OID* is a system-assigned value that may not be modified. The default
@@ -57,6 +54,8 @@ Use the fields in the *Options* tab to specify import and export preferences:
      be a single quote or a double quote.
    * Specify a character that should appear before a data character that matches
      the *QUOTE* value in the *Escape* field.
+   * Use the *NULL Strings* field to specify a string that will represent a null
+     value within the source or target file.
 
 Click the *Columns* tab to continue.
 
@@ -71,9 +70,8 @@ or exported:
   columns from the drop-down listbox. To delete a selection, click the *x* to
   the left of the column name. Click an empty spot inside the field to access
   the drop-down list.
-* Use the *NULL Strings* field to specify a string that will represent a null
-  value within the source or target file.
-* If enabled, click inside the *Not null columns* field to select one or more
+
+* If enabled, click inside the *NOT NULL columns* field to select one or more
   columns that will not be checked for a NULL value. To delete a column, click
   the *x* to the left of the column name.
 

docs/en_US/release_notes_6_12.rst

@@ -23,11 +23,13 @@ Housekeeping
 Bug fixes
 *********
 
+  | `Issue #7428 <https://redmine.postgresql.org/issues/7428>`_ -  Preserve the settings set by the user in the import/export data dialog.
   | `Issue #7471 <https://redmine.postgresql.org/issues/7471>`_ -  Ensure that the splash screen can be moved.
   | `Issue #7508 <https://redmine.postgresql.org/issues/7508>`_ -  Fixed an issue where comments on indexes are not displayed.
   | `Issue #7512 <https://redmine.postgresql.org/issues/7512>`_ -  Ensure that notices should not disappear from the messages tab.
   | `Issue #7517 <https://redmine.postgresql.org/issues/7517>`_ -  Enable the start debugging button once execution is completed.
   | `Issue #7518 <https://redmine.postgresql.org/issues/7518>`_ -  Ensure that dashboard graph API is not called after the panel has been closed.
   | `Issue #7519 <https://redmine.postgresql.org/issues/7519>`_ -  Ensure that geometry should be shown for all the selected cells.
+  | `Issue #7520 <https://redmine.postgresql.org/issues/7520>`_ -  Fixed the JSON editor issue of hiding the first record.
   | `Issue #7522 <https://redmine.postgresql.org/issues/7522>`_ -  Added support for Azure PostgreSQL deployment in server mode.
   | `Issue #7523 <https://redmine.postgresql.org/issues/7523>`_ -  Fixed typo error for Statistics on the table header.