From 4c919dc537349cb3bb1436208ea66e15163bef44 Mon Sep 17 00:00:00 2001
From: crazywoola <427733928@qq.com>
Date: Sun, 18 Feb 2024 09:47:35 +0800
Subject: [PATCH] resolve conflict

---
 .../install-self-hosted/environments.md       | 30 +++++++++++------
 .../install-self-hosted/environments.md       | 32 +++++++++++--------
 2 files changed, 40 insertions(+), 22 deletions(-)

diff --git a/en/getting-started/install-self-hosted/environments.md b/en/getting-started/install-self-hosted/environments.md
index bfb5e12..6f1b2a0 100644
--- a/en/getting-started/install-self-hosted/environments.md
+++ b/en/getting-started/install-self-hosted/environments.md
@@ -316,18 +316,30 @@ Notion integration configuration, variables can be obtained by applying for Noti
 
 #### Mail related configuration
 
-*   MAIL\_TYPE
+*   MAIL_TYPE
+    * resend
+        *   MAIL_DEFAULT_SEND_FROM  
+          The sender's email name, such as: no-reply [no-reply@dify.ai](mailto:no-reply@dify.ai), not mandatory.
+        *   RESEND_API_KEY  
+          API-Key for the Resend email provider, can be obtained from API-Key.
+    * smtp
+        *   SMTP_SERVER  
+          SMTP server address
+        *   SMTP_PORT  
+            SMTP server port number
+        *   SMTP_USERNAME  
+            SMTP username
+        *   SMTP_PASSWORD  
+            SMTP password
+        *   SMTP_USE_TLS  
+            Whether to use TLS, default is false
+        *   MAIL_DEFAULT_SEND_FROM  
+            The sender's email name, such as: no-reply [no-reply@dify.ai](mailto:no-reply@dify.ai), not mandatory.
 
-    The type of mail provider, currently only supports: resend (https://resend.com). If left empty, no mail will be sent.
-*   MAIL\_DEFAULT\_SEND\_FROM
+    
 
-    The sender's email name, such as: no-reply [no-reply@dify.ai](mailto:no-reply@dify.ai), not mandatory.
-*   RESEND\_API\_KEY
 
-    API-Key for the Resend email provider, can be obtained from API-Key.
-*   RESEND_API_URL
-
-    Resend API endpoint provided by the email provider, the default value is 'https://api.resend.com' when this Key is not configured. Please do not set it as an empty string value when configuring this Key.
+   
 
 #### Third-Party Authorization Settings
 
diff --git a/zh_CN/getting-started/install-self-hosted/environments.md b/zh_CN/getting-started/install-self-hosted/environments.md
index f456282..96fd3d7 100644
--- a/zh_CN/getting-started/install-self-hosted/environments.md
+++ b/zh_CN/getting-started/install-self-hosted/environments.md
@@ -309,19 +309,25 @@ Notion 集成配置，变量可通过申请 Notion integration 获取：[https:/
 * NOTION\_CLIENT\_SECRET
 
 #### 邮件相关配置
-
-*   MAIL\_TYPE
-
-    邮件提供商类型，当前仅支持：`resend`（[https://resend.com](https://resend.com)），留空则不发送邮件。
-*   MAIL\_DEFAULT\_SEND\_FROM
-
-    发件人邮箱名称，如：`no-reply <no-reply@dify.ai>`，非必填。
-*   RESEND\_API\_KEY
-
-    Resend 邮件提供商 API-Key，可前往 [API-Key](https://resend.com/api-keys) 获取。
-*   RESEND\_API\_URL
-
-    Resend 邮件提供商提供的 API endpoint，不配置此 Key 时默认值为 'https://api.resend.com', 配置上此 Key 请不要设置为空字符串值。
+*   MAIL_TYPE
+    * resend
+        *   MAIL_DEFAULT_SEND_FROM  
+          发件人的电子邮件名称，例如：no-reply [no-reply@dify.ai](mailto:no-reply@dify.ai)，非必需。
+        *   RESEND_API_KEY  
+          用于 Resend 邮件提供程序的 API 密钥，可以从 API 密钥获取。
+    * smtp
+        *   SMTP_SERVER  
+          SMTP 服务器地址
+        *   SMTP_PORT  
+            SMTP 服务器端口号
+        *   SMTP_USERNAME  
+            SMTP 用户名
+        *   SMTP_PASSWORD  
+            SMTP 密码
+        *   SMTP_USE_TLS  
+            是否使用 TLS，默认为 false
+        *   MAIL_DEFAULT_SEND_FROM  
+            发件人的电子邮件名称，例如：no-reply [no-reply@dify.ai](mailto:no-reply@dify.ai)，非必需。
 
 #### 第三方授权设置