Merge branch 'master' into patch-12

content/self-host/pro/console/_index.en.md

@@ -26,16 +26,4 @@ Non-administrator users can also login to browser their device and logs, change
 
 ## Windows EXE
 
-For Windows clients, you can leave out the custom server configuration and put the configuration information in the `RustDesk.exe` filename instead. As shown above, please go to the console welcome page and click on `Windows EXE`. **`Client >= 1.1.9 required`**。
-
-## Device access permissions
-
-There are two ways to associate a device with a user:
-- Via console device page
-- Log in to the specified user account on the client side
-
-The following two situations will prevent the device from being accessed:
-- Make device `disabled` in console devices page
-- Make user `disable` in console user page
-
-The associated device can only be accessed by user devices of the same user or user group, or in correct cross-group settings.
+For Windows clients, you can leave out the custom server configuration and put the configuration information in the `RustDesk.exe` filename instead. As shown above, please go to the console welcome page and click on `Windows EXE`. **`Client >=1.1.9 Required`**。

content/self-host/pro/console/_index.zh-tw.md

@@ -28,16 +28,3 @@ weight: 10
 ## Windows EXE
 
 For Windows clients, you can leave out the custom server configuration and put the configuration information in the `RustDesk.exe` filename instead. As shown above, please go to the console welcome page and click on `Windows EXE`. **`Client >=1.1.9 Required`**。
-
-## 裝置存取權限
-
-若要將裝置與使用者關聯，有兩種方法：
-
-- 透過控制台裝置頁面
-- 在客戶端登入指定的使用者帳號
-
-以下兩種情況將使裝置無法存取：
-- 在控制台的裝置頁面停用裝置
-- 在控制台的使用者頁面停用使用者
-
-關聯裝置僅能被同使用者或使用者群組的裝置存取，或擁有正確的跨群組設定。

content/self-host/pro/permissions/_index.en.md

@@ -0,0 +1,26 @@
+---
+title: Permission Control
+weight: 15
+---
+
+
+## Device access permissions
+There are two ways to associate a device with a user:
+- Via console device page
+- Log in to the specified user account on the client side
+
+The following two situations will prevent the device from being accessed:
+- Make device `disabled` in console devices page
+- Make user `disable` in console user page
+
+The associated device can only be accessed by the devices of the same user or user group, or in correct cross-group settings.
+
+## Cross group settings
+
+Please go to group page in the web console, click on `Edit` to edit cross group settings as below.
+
+Your modifications to `Access with other groups` take effect immediately without requiring you to click the `OK` button.
+
+Both `Can access to` and `Can be accessed from` serve almost the same function, we provide both options for your convenience. However, this may cause some confusion.
+
+![](/docs/en/self-host/pro/permissions/images/crossgrp.png)