Merge branch 'rustdesk:master' into master

content/self-host/install/_index.en.md

@@ -55,6 +55,10 @@ If `--net=host` works fine, the `-p` options are not used. If on Windows, leave
 **Please remove `--net=host` if you are having connection problems on your platform.**
 {{% /notice %}}
 
+{{% notice note %}}
+If you can not see logs with `-td`, you can see logs via `docker logs hbbs`. Or you can run with `-it`, `hbbs/hbbr` will not run as daemon mode.
+{{% /notice %}}
+
 ### Docker-Compose examples
 For running the docker files with the docker-compose.yml as described here you need to have [**docker-compose**](https://docs.docker.com/compose/) installed.
 ```yaml

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

@@ -5,7 +5,7 @@ weight: 100
 
 Self-host Pro is built on the open source version, but with more features.
 
-- OIDC and ldap login
+- OIDC, ldap, 2FA (email verification)
 - Address book
 - Rename 
 - Log management
@@ -31,7 +31,7 @@ Copy and paste the above command into your linux terminal which take care of eve
 `curl -s https://raw.githubusercontent.com/rustdesk/rustdesk-server-pro/main/install.sh | bash`
 
 {{% notice note %}}
-Don't forget to get your license from [https://rustdesk.com/pricing.html](https://rustdesk.com/pricing.html), you will be required to enter license in the web console.
+Don't forget to get your license from [https://rustdesk.com/pricing.html](https://rustdesk.com/pricing.html), check [license](/docs/en/self-host/pro/license) page for more details.
 {{% /notice %}}
 
 ### Manual Installation

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

@@ -0,0 +1,21 @@
+---
+title: License
+weight: 15
+---
+
+## Buy license
+Please get your license from https://rustdesk.com/pricing.html, enter the correct email address in the Stripe checkout page. The license will be sent to your email once payment is done successfully.
+
+![](/docs/en/self-host/pro/license/images/stripe.jpg)
+
+## Set license
+you will be required to enter license in the web console, or change license later.
+
+ | Set license | Change license |
+ | -- | -- |
+ ![](/docs/en/self-host/pro/license/images/set.png) | ![](/docs/en/self-host/pro/license/images/change.png) |
+
+## Invocie and Migration
+The license can be only used on one machine (for hbbs only, hbbr does not require license), if you wanna migrate to the other machine, or if you wanna download invoice, please go to [https://rustdesk.com/self-host/account/](https://rustdesk.com/self-host/account/). Log in with the email address used in Stripe checkout page, unbind the old machine you wanna migrate from as below, new machine will be registered automatically when you set license in web console.
+
+![](/docs/en/self-host/pro/license/images/unbind.jpg)

content/self-host/pro/strategy/_index.de.md

@@ -23,9 +23,11 @@ Administratoren können je nach Bedarf verschiedene Strategien `Aktivieren` oder
 
 Jedes Gerät kann nur mit einer Strategie verwaltet werden. Administratoren können die Verwaltungsstrategie eines Geräts über die Option `Geräte bearbeiten` ändern. Standardmäßig verwenden alle Geräte die Standardstrategie. Administratoren können Geräte hinzufügen oder löschen und deren Verwaltungsstrategien ändern. Wenn ein Gerät gelöscht wird, wird es wieder mit der Standardstrategie verwaltet.
 
-In der Schnittstelle zur Geräteverwaltung wird der linke Bereich zum Filtern von Geräten verwendet. Die in der rechten Spalte ausgewählten Geräte werden von der aktuellen Strategie verwaltet. Geräte, die nicht angemeldet sind, werden in der Gruppe `Null` angezeigt.
+In der Schnittstelle zur Geräteverwaltung wird der linke Bereich zum Filtern von Geräten verwendet. Die in der rechten Spalte ausgewählten Geräte werden von der aktuellen Strategie verwaltet. Geräte, die nicht angemeldet sind, werden in der Gruppe `-` angezeigt.
 
-![](/docs/en/self-host/pro/strategy/images/edit_devices.png)
+|  Benutzergruppe  |  Ungebundene Geräte  |
+| :--------------: | :------------: |
+|  ![](/docs/en/self-host/pro/strategy/images/edit_devices_group.png)    |  ![](/docs/en/self-host/pro/strategy/images/edit_devices_unbinded.png)    |
 
 ### Strategie-Synchronisation
 

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

@@ -23,9 +23,11 @@ Administrators can `Enable` or `Disable` different strategies as needed. By defa
 
 Each device can only be managed by one strategy. Administrators can change the management strategy of a device by the `Edit Devices` option. By default, all devices use the default strategy. Administrators can add or delete devices and change their management strategies. If a device is deleted, it will be managed by the default strategy again.
 
-In the device management interface, the left-hand area is used to filter devices, and the devices selected in the right-hand column will be managed by the current strategy. Devices that are not logged in will be displayed in the `null` group.
+In the device management interface, the left-hand area is used to filter devices, and the devices selected in the right-hand column will be managed by the current strategy. Devices that are not logged in will be displayed in the `-` group.
 
-![](/docs/en/self-host/pro/strategy/images/edit_devices.png)
+|  User Group  | Unbinded Devices |
+| :--------------: | :------------: |
+|  ![](/docs/en/self-host/pro/strategy/images/edit_devices_group.png)    |  ![](/docs/en/self-host/pro/strategy/images/edit_devices_unbinded.png)    |
 
 ### Strategy Synchronization
 

content/self-host/pro/strategy/_index.zh-cn.md

@@ -22,9 +22,11 @@ RustDesk 提供了一个默认策略，管理员可以在此基础上进行修
 ### 管理设备
 
 每个设备只能被一种策略管理。管理员可以通过`编辑设备`来更改设备的管理策略。默认情况下，所有设备都使用默认策略。管理员可以通过添加或删除设备，更改设备的管理策略。如果设备被删除，它将重新被默认策略管理。
-在设备管理界面中，左侧区域用于筛选设备，右侧列中被选中的设备将会受到当前策略的管理。未登录的设备将会显示在`null`组中。
+在设备管理界面中，左侧区域用于筛选设备，右侧列中被选中的设备将会受到当前策略的管理。未登录的设备将会显示在`-`组中。
 
-![](/docs/en/self-host/pro/strategy/images/edit_devices.png)
+|  用户组  |  未绑定设备  |
+| :--------------: | :------------: |
+|  ![](/docs/en/self-host/pro/strategy/images/edit_devices_group.png)    |  ![](/docs/en/self-host/pro/strategy/images/edit_devices_unbinded.png)    |
 
 ### 策略同步