Add latest changes from gitlab-org/security/gitlab@14-2-stable-ee

2 files changed, 2 insertions, 2 deletions

diff --git a/doc/development/import_export.md b/doc/development/import_export.md
index bc1927fffde..2a29df380de 100644
--- a/doc/development/import_export.md
+++ b/doc/development/import_export.md
@@ -259,7 +259,7 @@ Only include the following attributes for the models specified:
 included_attributes:
   user:
     - :id
-    - :email
+    - :public_email
   # ...
 ```
 
diff --git a/doc/user/project/settings/import_export.md b/doc/user/project/settings/import_export.md
index a0718e875d7..52e064ef66e 100644
--- a/doc/user/project/settings/import_export.md
+++ b/doc/user/project/settings/import_export.md
@@ -44,7 +44,7 @@ Note the following:
 - Group members are exported as project members, as long as the user has
   a maintainer or administrator role in the group where the exported project lives.
 - Project members with the [Owner role](../../permissions.md) are imported as Maintainers.
-- Imported users can be mapped by their primary email on self-managed instances, if an administrative user (not an owner) does the import.
+- Imported users can be mapped by their public email on self-managed instances, if an administrative user (not an owner) does the import.
   Otherwise, a supplementary comment is left to mention that the original author and
   the MRs, notes, or issues are owned by the importer.
   - For project migration imports performed over GitLab.com Groups, preserving author information is