Skip to content

Commit

Permalink
docs: update markdonw format
Browse files Browse the repository at this point in the history
  • Loading branch information
ysfscream committed Aug 30, 2023
1 parent 6d9a1db commit 8a24b23
Show file tree
Hide file tree
Showing 8 changed files with 28 additions and 29 deletions.
4 changes: 2 additions & 2 deletions docs/desktop/en/advanced/advanced-setting.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ When you create a new connection, you can configure the advanced settings and se

In the Advanced section, you can configure the MQTT protocol-related features.

The default value of the **MQTT Version** is `5.0` and you can configure the MQTT 5.0 specific features such as `Session Expiry Interval`, `Receive Maximum`, and `Topic Alias Maximum` (optional). You can also select other MQTT protocol versions from the drop-down list. Other optional values are `3.1` and `3.1.1`.
The default value of the **MQTT Version** is `5.0` and you can configure the MQTT 5.0 specific features such as `Session Expiry Interval`, `Receive Maximum`, and `Topic Alias Maximum` (optional). You can also select other MQTT protocol versions from the drop-down list. Other optional values are `3.1` and `3.1.1`.

For detailed information on the advanced settings, see [Advanced]. <!--To do: add links later-->

Expand All @@ -20,4 +20,4 @@ The `Last-Will-QoS` and `Last-Will-Retain` fields are preset with 0 and `False`,

![mqttx-willmessage](/images/mqttx-willmessage.png)

After completing the configuration, click the `Connect` button in the upper right corner to swiftly create a connection and connect to the MQTT Broker.
After completing the configuration, click the `Connect` button in the upper right corner to swiftly create a connection and connect to the MQTT Broker.
12 changes: 6 additions & 6 deletions docs/desktop/en/quick-start/get-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ You can also try the EMQX Cloud which is a fully managed, cloud-native MQTT Mess

### Self-Managed MQTT Broker

If you want to run an MQTT Broker locally, you are recommended to use [EMQX](https://www.emqx.com/en/products/emqx). It is the world’s most scalable and reliable MQTT messaging platform that can help you to connect, move and process your business data reliably in real time.
If you want to run an MQTT Broker locally, you are recommended to use [EMQX](https://www.emqx.com/en/products/emqx). It is the world’s most scalable and reliable MQTT messaging platform that can help you to connect, move and process your business data reliably in real time.

The easiest way to start and run EMQX is using Docker. Follow the steps below for download and installation.

Expand All @@ -50,27 +50,27 @@ This section demonstrates how to use the MQTTX Desktop to connect to the public

1. Start your MQTT Broker and MQTTX Desktop. You can create a new client connection in either of the following 3 ways:

- Click the **+** icon in the left navigation menu.
- Click the **+** icon in the left navigation menu.

- Click the **+ New Connection** button on the main pane.

- Click **+** -> **New Connection** in the **Connections** pane.

<img src="/Users/emqx/Documents/MQTTX/docs/desktop/en/quick-start/assets/new-connection.png" alt="new-connection" style="zoom:40%;" />

2. Enter the connection information of the MQTT broker in the **General** pane. To try a quick connection, you can just enter the name of the new connection, for example, `emqx_test,` and leave other options as default.
2. Enter the connection information of the MQTT broker in the **General** pane. To try a quick connection, you can just enter the name of the new connection, for example, `emqx_test,` and leave other options as default.

- If you are using a self-managed MQTT broker, you can replace the hostname with the actual IP, such as `127.0.0.1`.

::: tip
::: tip

For detailed information about the options in the **General** section, see [Create Connection with Generals Settings](../use-desktop/connect.md).

:::

<img src="./assets/mqttx-brokerinfo.png" alt="mqttx-brokerinfo" style="zoom:40%;" />

3. Click **Connect** at the upper right corner and now you have established an MQTT client connection named `emqx_test`.
3. Click **Connect** at the upper right corner and now you have established an MQTT client connection named `emqx_test`.

<img src="./assets/mqttx-connected.png" alt="mqttx-connected" style="zoom:40%;" />

Expand All @@ -90,7 +90,7 @@ This section demonstrates how to use the MQTTX Desktop to publish and subscribe

2. Create a new MQTT client connection with the name as `Publisher` by following the steps in [Connect to MQTT Broker](#connect-to-mqtt-broker).

3. In the **Connections** pane, make sure that the client connection `Publisher` is selected. In the publishing area at the lower right corner, enter `test` as the topic and leave the message payload and other options as default.
3. In the **Connections** pane, make sure that the client connection `Publisher` is selected. In the publishing area at the lower right corner, enter `test` as the topic and leave the message payload and other options as default.

Click the send button and a number appears on the connection `emqx_test`, indicating that a new message is received.

Expand Down
14 changes: 7 additions & 7 deletions docs/desktop/en/use-desktop/connect.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ When you create a new connection, in the **General** section of the **New** pane

## Broker Information

The broker information contains must-fill fields. The **Client ID**, **Host**, and **Port** are already filled with default values. You can modify them based on the actual broker information.
The broker information contains must-fill fields. The **Client ID**, **Host**, and **Port** are already filled with default values. You can modify them based on the actual broker information.

- **Name**: Enter a connection, for example `emqx_test`.

Expand Down Expand Up @@ -49,14 +49,14 @@ You can establish a secured connection between MQTTX and the broker by enabling

:::

- **CA signed server**: Verify the server through the Certificate Authority (CA) signed certificate.
- **CA signed server**: Verify the server through the Certificate Authority (CA) signed certificate.

- **Self signed**: Verify the server through self-signed certificates. When selected, you need to configure the certificates. For a one-way authentication, only your `CA File` needs to be selected. For two-way authentication, you also need to configure the `Client Certificate File` and `Client key file`.

- **Self signed**: Verify the server through self-signed certificates. When selected, you need to configure the certificates. For a one-way authentication, only your `CA File` needs to be selected. For two-way authentication, you also need to configure the `Client Certificate File` and `Client key file`.

- **CA File**: Select the CA file by clicking the folder icon.
- **Client Certificate File**: Select the client certificate file by clicking the folder icon.
- **Client key file**: Select the file by clicking the folder icon for two-way authentication.

<!--To do: update the screenshot-->

<img src="./assets/mqttx-certs.png" alt="mqttx-certs" style="zoom:40%;" />
Expand All @@ -65,7 +65,7 @@ You can establish a secured connection between MQTTX and the broker by enabling

In the Advanced section, you can configure the MQTT protocol-related features.

The default value of the **MQTT Version** is `5.0` and you can configure the MQTT 5.0 specific features such as `Session Expiry Interval`, `Receive Maximum`, and `Topic Alias Maximum` (optional). You can also select other MQTT protocol versions from the drop-down list. Other optional values are `3.1` and `3.1.1`.
The default value of the **MQTT Version** is `5.0` and you can configure the MQTT 5.0 specific features such as `Session Expiry Interval`, `Receive Maximum`, and `Topic Alias Maximum` (optional). You can also select other MQTT protocol versions from the drop-down list. Other optional values are `3.1` and `3.1.1`.

For detailed information on the advanced settings, see [Advanced]. <!--To do: add links later-->

Expand All @@ -79,4 +79,4 @@ The `Last-Will-QoS` and `Last-Will-Retain` fields are preset with 0 and `False`,

![mqttx-willmessage](/images/mqttx-willmessage.png)

After completing the configuration, click the `Connect` button in the upper right corner to swiftly create a connection and connect to the MQTT Broker.
After completing the configuration, click the `Connect` button in the upper right corner to swiftly create a connection and connect to the MQTT Broker.
2 changes: 1 addition & 1 deletion docs/desktop/en/use-desktop/pub-sub.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@ Through the `payload` option in the message bar, the messages can quickly be con

![mqttx-message](/images/mqttx-message.png)

So far, the testing of an `MQTT` message is completed.
So far, the testing of an `MQTT` message is completed.
4 changes: 2 additions & 2 deletions docs/desktop/zh/advanced/advanced-setting.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ When you create a new connection, you can configure the advanced settings and se

In the Advanced section, you can configure the MQTT protocol-related features.

The default value of the **MQTT Version** is `5.0` and you can configure the MQTT 5.0 specific features such as `Session Expiry Interval`, `Receive Maximum`, and `Topic Alias Maximum` (optional). You can also select other MQTT protocol versions from the drop-down list. Other optional values are `3.1` and `3.1.1`.
The default value of the **MQTT Version** is `5.0` and you can configure the MQTT 5.0 specific features such as `Session Expiry Interval`, `Receive Maximum`, and `Topic Alias Maximum` (optional). You can also select other MQTT protocol versions from the drop-down list. Other optional values are `3.1` and `3.1.1`.

For detailed information on the advanced settings, see [Advanced]. <!--To do: add links later-->

Expand All @@ -20,4 +20,4 @@ The `Last-Will-QoS` and `Last-Will-Retain` fields are preset with 0 and `False`,

![mqttx-willmessage](/images/mqttx-willmessage.png)

After completing the configuration, click the `Connect` button in the upper right corner to swiftly create a connection and connect to the MQTT Broker.
After completing the configuration, click the `Connect` button in the upper right corner to swiftly create a connection and connect to the MQTT Broker.
5 changes: 2 additions & 3 deletions docs/desktop/zh/quick-start/get-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ EMQX 提供全托管的云原生 MQTT 消息服务,能够通过可靠、实时
```bash
docker run -d --name emqx -p 1883:1883 -p 8083:8083 -p 8084:8084 -p 8883:8883 -p 18083:18083 emqx/emqx-enterprise:latest
```

2. 启动您的 Web 浏览器,输入 `http://localhost:18083/``localhost` 可以替换为您的 IP 地址)在地址栏中访问 [EMQX Dashboard](https://docs.emqx.com/zh/enterprise/v5.1/dashboard/introduction.html),您可以在此连接客户端或查看运行状态。

默认用户名和密码:`admin``public`
Expand All @@ -58,13 +58,12 @@ EMQX 提供全托管的云原生 MQTT 消息服务,能够通过可靠、实时

- 如果您使用的是自行部署的 MQTT 服务器,您可以将服务器地址替换为实际的 IP 地址,例如 `127.0.0.1`

::: tip
::: tip

关于**基础**部分中的选项的详细信息,请查看[使用基础设置创建连接](../use-desktop/connect.md)

:::


<img src="./assets/mqttx-brokerinfo.png" alt="mqttx-brokerinfo" style="zoom:40%;" />

3. 点击右上角的**连接**。至此,您已经建立了一个名为 `emqx_test` 的 MQTT 客户端连接。
Expand Down
14 changes: 7 additions & 7 deletions docs/desktop/zh/use-desktop/connect.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ When you create a new connection, in the **General** section of the **New** pane

## Broker Information

The broker information contains must-fill fields. The **Client ID**, **Host**, and **Port** are already filled with default values. You can modify them based on the actual broker information.
The broker information contains must-fill fields. The **Client ID**, **Host**, and **Port** are already filled with default values. You can modify them based on the actual broker information.

- **Name**: Enter a connection, for example `emqx_test`.

Expand Down Expand Up @@ -49,14 +49,14 @@ You can establish a secured connection between MQTTX and the broker by enabling

:::

- **CA signed server**: Verify the server through the Certificate Authority (CA) signed certificate.
- **CA signed server**: Verify the server through the Certificate Authority (CA) signed certificate.

- **Self signed**: Verify the server through self-signed certificates. When selected, you need to configure the certificates. For a one-way authentication, only your `CA File` needs to be selected. For two-way authentication, you also need to configure the `Client Certificate File` and `Client key file`.

- **Self signed**: Verify the server through self-signed certificates. When selected, you need to configure the certificates. For a one-way authentication, only your `CA File` needs to be selected. For two-way authentication, you also need to configure the `Client Certificate File` and `Client key file`.

- **CA File**: Select the CA file by clicking the folder icon.
- **Client Certificate File**: Select the client certificate file by clicking the folder icon.
- **Client key file**: Select the file by clicking the folder icon for two-way authentication.

<!--To do: update the screenshot-->

<img src="./assets/mqttx-certs.png" alt="mqttx-certs" style="zoom:40%;" />
Expand All @@ -65,7 +65,7 @@ You can establish a secured connection between MQTTX and the broker by enabling

In the Advanced section, you can configure the MQTT protocol-related features.

The default value of the **MQTT Version** is `5.0` and you can configure the MQTT 5.0 specific features such as `Session Expiry Interval`, `Receive Maximum`, and `Topic Alias Maximum` (optional). You can also select other MQTT protocol versions from the drop-down list. Other optional values are `3.1` and `3.1.1`.
The default value of the **MQTT Version** is `5.0` and you can configure the MQTT 5.0 specific features such as `Session Expiry Interval`, `Receive Maximum`, and `Topic Alias Maximum` (optional). You can also select other MQTT protocol versions from the drop-down list. Other optional values are `3.1` and `3.1.1`.

For detailed information on the advanced settings, see [Advanced]. <!--To do: add links later-->

Expand All @@ -79,4 +79,4 @@ The `Last-Will-QoS` and `Last-Will-Retain` fields are preset with 0 and `False`,

![mqttx-willmessage](/images/mqttx-willmessage.png)

After completing the configuration, click the `Connect` button in the upper right corner to swiftly create a connection and connect to the MQTT Broker.
After completing the configuration, click the `Connect` button in the upper right corner to swiftly create a connection and connect to the MQTT Broker.
2 changes: 1 addition & 1 deletion docs/desktop/zh/use-desktop/pub-sub.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@ Through the `payload` option in the message bar, the messages can quickly be con

![mqttx-message](/images/mqttx-message.png)

So far, the testing of an `MQTT` message is completed.
So far, the testing of an `MQTT` message is completed.

0 comments on commit 8a24b23

Please sign in to comment.