Merge branch 'selectable-export-fields' of https://github.com/cocoroc…

…ho/django-import-export into selectable-export-fields

docs/admin_integration.rst

@@ -37,7 +37,7 @@ dropdown in the UI.
 .. figure:: _static/images/django-import-export-change.png
 
    A screenshot of the change view with Import and Export buttons.
-   
+
 Importing
 ---------
 
@@ -154,7 +154,7 @@ Enabling export functionality means that a UI button will automatically be prese
 When clicked, the user will be directed into the export workflow.
 
 Export is a two step process.  When the 'export' button is clicked, the user will be directed to a new screen,
-where 'resource' and 'file format' can be selected.
+where 'fields', 'resource' and 'file format' can be selected.
 
 .. _export_confirm:
 

docs/release_notes.rst

@@ -91,6 +91,16 @@ selected items using an export admin action.  However this meant that the export
 possible to select the export resource.  This has been fixed in v4 so that export workflow is now present when
 exporting via the Admin UI action.  For more information see :ref:`export documentation<export_via_admin_action>`.
 
+Export selected fields
+----------------------
+
+The :ref:`export 'confirm' page<export_confirm>` now includes selectable fields for export.
+If you wish to revert to the previous (v3) version of the export confirm screen, add a
+:attr:`~import_export.admin.ExportMixin.export_form_class` declaration to your Admin class subclass, for example::
+
+  class BookAdmin(ImportExportModelAdmin):
+    export_form_class = ExportForm
+
 Success message
 ---------------
 

import_export/admin.py

@@ -581,8 +581,8 @@ class ExportMixin(BaseExportMixin, ImportExportMixinBase):
     """
     Export mixin.
 
-    This is intended to be mixed with django.contrib.admin.ModelAdmin
-    https://docs.djangoproject.com/en/dev/ref/contrib/admin/
+    This is intended to be mixed with
+    `ModelAdmin <https://docs.djangoproject.com/en/stable/ref/contrib/admin/>`_.
     """
 
     #: template for change_list view
@@ -591,9 +591,9 @@ class ExportMixin(BaseExportMixin, ImportExportMixinBase):
     export_template_name = "admin/import_export/export.html"
     #: export data encoding
     to_encoding = None
-    #: form class to use for the initial export step
-    #: Use :class:`~import_export.forms.ExportForm` if you would
-    #: like to disable selectable fields feature
+    #: Form class to use for the initial export step.
+    #: Assign to :class:`~import_export.forms.ExportForm` if you would
+    #: like to disable selectable fields feature.
     export_form_class = SelectableFieldsExportForm
 
     def get_urls(self):