Resolve conflicts

docs/changelog.md

@@ -2,6 +2,10 @@
 icon: material/alert-decagram
 ---
 
+#### 1.12.1
+
+* Fixes and improvements
+
 #### 1.12.0
 
 * Refactor DNS servers **1**

docs/migration.md

@@ -351,14 +351,15 @@ DNS servers are refactored for better performance and scalability.
         ```json
         {
           "dns": {
-            "servers": [
+            "rules": [
               {
-                "type": "predefined",
-                "responses": [
-                  {
-                    "rcode": "REFUSED"
-                  }
-                ]
+                "domain": [
+                  "example.com"
+                ],
+                // other rules
+                
+                "action": "predefined",
+                "rcode": "REFUSED"
               }
             ]
           }
@@ -1187,4 +1188,4 @@ which will disrupt the existing `process_path` use cases in Windows.
         }
       }
     }
-    ```
+    ```

docs/migration.zh.md

@@ -8,7 +8,7 @@ icon: material/arrange-bring-forward
 
 DNS 服务器已经重构。
 
-!!! info "饮用"
+!!! info "引用"
 
     [DNS 服务器](/configuration/dns/server/) /
     [旧 DNS 服务器](/configuration/dns/server/legacy/)
@@ -351,14 +351,15 @@ DNS 服务器已经重构。
         ```json
         {
           "dns": {
-            "servers": [
+            "rules": [
               {
-                "type": "predefined",
-                "responses": [
-                  {
-                    "rcode": "REFUSED"
-                  }
-                ]
+                "domain": [
+                  "example.com"
+                ],
+                // 其它规则
+                
+                "action": "predefined",
+                "rcode": "REFUSED"
               }
             ]
           }