Improve the template for the initial forge admin contact mail

swh/web/add_forge_now/assets/forge-admin-email.ejs

@@ -4,28 +4,32 @@
   License: GNU Affero General Public License version 3, or any later version
   See top-level LICENSE file for more information
 %>
-Dear forge administrator,
+Hello <%= forgeAdmin %>,
 
 The mission of Software Heritage is to collect, preserve and share all
-the publicly available source code (see
-https://www.softwareheritage.org for more information).
+the publicly available source code: https://www.softwareheritage.org
 
-We just received a request to add the forge hosted at <%= forgeUrl %>
+We have received a request to add the forge hosted at the URL below
 to the list of software origins that are archived, and it is our
-understanding that you are the contact person for this forge.
+understanding that you are or know the contact person for this forge.
+
+<%= forgeUrl %>
 
 In order to archive the forge contents, we will have to periodically
 pull the public repositories it contains and clone them into the
-Software Heritage archive.
+Software Heritage archive. FAQs for our processes are available:
+
+https://docs.softwareheritage.org/user/faq/#add-forge-now
+https://www.softwareheritage.org/faq/
 
 Please let us know if there are any technical issues to consider before
- we launch the archival of the public repositories hosted on your
- infrastructure.(use "Reply all" to ensure our system will process
- your answer properly)
+we launch the archival of the public repositories hosted on your
+infrastructure. Please use "Reply all" to ensure our system will
+process your answer properly.
 
 In the absence of an answer to this message, we will start to archive
-your forge in the coming weeks (only the publicly accessible
-repositories will be archived)
+your forge in the coming weeks. Only the publicly accessible
+repositories will be archived.
 
 Thank you in advance for your help.
 

swh/web/add_forge_now/assets/request-dashboard.js

@@ -118,7 +118,7 @@ function contactForgeAdmin(event) {
   // select email template according to the status:
   let emailText = '';
   if (forgeRequest.status === 'PENDING') {
-    emailText = encodeURIComponent(initialEmailTempate({'forgeUrl': forgeRequest.forge_url}).trim().replace(/\n/g, '\r\n'));
+    emailText = encodeURIComponent(initialEmailTempate({'forgeUrl': forgeRequest.forge_url, 'forgeAdmin': forgeRequest.forge_contact_name}).trim().replace(/\n/g, '\r\n'));
   }
   if (forgeRequest.status === 'FIRST_ORIGIN_LOADED') {
     emailText = encodeURIComponent(successEmailTempate({'forgeUrl': encodeURIComponent(forgeRequest.forge_url)}).trim().replace(/\n/g, '\r\n'));