diff --git a/server_admin/topics/export-import.adoc b/server_admin/topics/export-import.adoc
index 5a725e5459..b987515a53 100755
--- a/server_admin/topics/export-import.adoc
+++ b/server_admin/topics/export-import.adoc
@@ -87,14 +87,20 @@ Examples:
 
 === Admin console export/import
 
-Import of most resources can be performed from the admin console.
-Exporting resources will be supported in future versions.
+Import of most resources can be performed from the admin console as well as export of most resources.
+Export of users is not supported.
 
-The files created during a "startup" export can be used to import from the admin UI.
+Note: Attributes containing secrets or private information will be masked in export file.
+
+The files created during a "startup" export can also be used to import from the admin UI.
 This way, you can export from one realm and import to another realm. Or, you can export from one server and import to another.
-Note: The admin console import allows just one realm per file.
+Note: The admin console export/import allows just one realm per file.
 
 
 WARNING: The admin console import allows you to "overwrite" resources if you choose.
 Use this feature with caution, especially on a production system.
 
+WARNING: The admin console export allows you to export clients, groups, and roles. If there is a great number of any of these
+assets in your realm, the operation may take some time to complete. During that time server may not be responsive to user requests.
+Use this feature with caution, especially on a production system.
+