Skip to content

Commit 708d1a5

Browse files
committed
Editorial updates
1 parent 5132ea6 commit 708d1a5

File tree

11 files changed

+112
-91
lines changed

11 files changed

+112
-91
lines changed

en_US/deploy/cluster/introduction.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Besides working with a single EMQX node, EMQX natively supports a distributed cl
44

55
::: tip Note
66

7-
Clustering is available during the trial period, but once the trial period ends, you will need to purchase a Commercial license to continue using it. Without a valid Commercial license, the clustering feature will be disabled after the trial period expires.
7+
Clustering is available during the trial period, but once the trial period ends, you will need to purchase a Commercial License to continue using it. Without a valid Commercial License, the clustering feature will be disabled after the trial period expires.
88

99
:::
1010

en_US/deploy/install-enterprise.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,23 @@ Use the official Docker image to install and run EMQX Enterprise and use Docker
1515

1616
**[Install on Debian](./install-debian.md)**
1717

18-
Install the EMQX on the Debian system with deb and tar.gz.
18+
Install the EMQX Enterprise on the Debian system with deb and tar.gz.
1919

2020
**[Install on Ubuntu](./install-ubuntu.md)**
2121

22-
Install the EMQX on the Ubuntu system with deb and tar.gz.
22+
Install the EMQX Enterprise on the Ubuntu system with deb and tar.gz.
2323

2424
**[Install on CentOS/RHEL](./install-rhel.md)**
2525

26-
Install the EMQX on CentOS/RHEL system with rpm and tar.gz.
26+
Install the EMQX Enterprise on CentOS/RHEL system with rpm and tar.gz.
2727

2828
**[Install on macOS](./install-macOS.md)**
2929

30-
Install the EMQX on macOS with a zip package.
30+
Install the EMQX Enterprise on macOS with a zip package.
3131

3232
**[Deploy on Kubernets](https://docs.emqx.com/en/emqx-operator/latest/getting-started/getting-started.html)**
3333

34-
Use the EMQX Operator to deploy the EMQX.
34+
Use the EMQX Operator to deploy the EMQX Enterprise.
3535

3636
**[Work with License](./license.md)**
3737

en_US/deploy/license.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ You can update your license file and configure the settings for the license conn
5252

5353
<img src="./assets/license.png" alt="license" style="zoom: 50%;" />
5454

55-
#### Reset License in the Dashboard
55+
#### Reset License on Dashboard
5656

5757
In addition to updating the license, the EMQX Dashboard also provides a **Reset License** button. This feature allows users to reset the system to the default single-node community license.
5858

en_US/faq/concept.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
EMQX has [two main product lines](https://www.emqx.com/en/products/emqx). Different products support different numbers of connections, features, services, etc.
66

7-
- EMQX Enterprise: EMQX Enterprise is the commercial self-hosted edition of an MQTT messaging platform. It supports data persistence (supports Redis, MySQL, MongoDB or PostgreSQL), data integration to Kafka, LoRaWAN support, EMQX monitoring, Kubernetes deployment, etc. It supports 1 million concurrent MQTT connections.
8-
- EMQX Cloud: [EMQX Cloud](https://www.emqx.com/cloud) is our fully managed MQTT cloud service where EMQ handles all aspects of infrastructure deployment, maintenance, scaling, and upgrades. As the world's first fully managed MQTT 5.0 public cloud service, EMQX Cloud provides a one-stop O&M colocation and a unique isolated environment for MQTT services. In the era of Internet of Everything, EMQX Cloud can help you quickly build industry applications and easily realize the collection, transmission, computation and persistence of IoT data.
7+
- **EMQX Enterprise**: EMQX Enterprise is the commercial self-hosted edition of an MQTT messaging platform. It supports data persistence (supports Redis, MySQL, MongoDB or PostgreSQL), data integration to Kafka, LoRaWAN support, EMQX monitoring, Kubernetes deployment, etc. It supports 1 million concurrent MQTT connections.
8+
- **EMQX Cloud**: [EMQX Cloud](https://www.emqx.com/cloud) is our fully managed MQTT cloud service where EMQ handles all aspects of infrastructure deployment, maintenance, scaling, and upgrades. As the world's first fully managed MQTT 5.0 public cloud service, EMQX Cloud provides a one-stop O&M colocation and a unique isolated environment for MQTT services. In the era of Internet of Everything, EMQX Cloud can help you quickly build industry applications and easily realize the collection, transmission, computation and persistence of IoT data.
99

1010
## What's a WebSocket? When to use a Websocket to connect to EMQX?
1111

en_US/getting-started/feature-comparison.md

+44-30
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ This page lists features supported across different deployment types in detail.
1515
</tr>
1616
<tr>
1717
<td>EMQX Enterprise</td>
18-
<td>EMQX Cloud Serverless</td>
19-
<td>EMQX Dedicated Cloud</td>
18+
<td>EMQX Serverless</td>
19+
<td>EMQX Dedicated</td>
2020
</tr>
2121
</thead>
2222
<tbody>
@@ -172,6 +172,7 @@ This page lists features supported across different deployment types in detail.
172172
</div>
173173

174174

175+
175176
## Scalability and Performance
176177

177178
<div style="text-align: center;">
@@ -185,8 +186,8 @@ This page lists features supported across different deployment types in detail.
185186
</tr>
186187
<tr>
187188
<td>EMQX Enterprise</td>
188-
<td>EMQX Cloud Serverless</td>
189-
<td>EMQX Dedicated Cloud</td>
189+
<td>EMQX Serverless</td>
190+
<td>EMQX Dedicated</td>
190191
</tr>
191192
</thead>
192193
<tbody>
@@ -238,6 +239,7 @@ This page lists features supported across different deployment types in detail.
238239

239240

240241

242+
241243
## Clustering Architecture
242244

243245
<div style="text-align: center;">
@@ -251,8 +253,8 @@ This page lists features supported across different deployment types in detail.
251253
</tr>
252254
<tr>
253255
<td>EMQX Enterprise</td>
254-
<td>EMQX Cloud Serverless</td>
255-
<td>EMQX Dedicated Cloud</td>
256+
<td>EMQX Serverless</td>
257+
<td>EMQX Dedicated</td>
256258
</tr>
257259
</thead>
258260
<tbody>
@@ -394,6 +396,7 @@ This page lists features supported across different deployment types in detail.
394396
</div>
395397

396398

399+
397400
## MQTT and Connectivity
398401

399402
<div style="text-align: center;">
@@ -407,8 +410,8 @@ This page lists features supported across different deployment types in detail.
407410
</tr>
408411
<tr>
409412
<td>EMQX Enterprise</td>
410-
<td>EMQX Cloud Serverless</td>
411-
<td>EMQX Dedicated Cloud</td>
413+
<td>EMQX Serverless</td>
414+
<td>EMQX Dedicated</td>
412415
</tr>
413416
</thead>
414417
<tbody>
@@ -550,6 +553,7 @@ This page lists features supported across different deployment types in detail.
550553
</div>
551554

552555

556+
553557
## Security
554558

555559
<div style="text-align: center;">
@@ -563,8 +567,8 @@ This page lists features supported across different deployment types in detail.
563567
</tr>
564568
<tr>
565569
<td>EMQX Enterprise</td>
566-
<td>EMQX Cloud Serverless</td>
567-
<td>EMQX Dedicated Cloud</td>
570+
<td>EMQX Serverless</td>
571+
<td>EMQX Dedicated</td>
568572
</tr>
569573
</thead>
570574
<tbody>
@@ -629,6 +633,7 @@ This page lists features supported across different deployment types in detail.
629633
</div>
630634

631635

636+
632637
## Authentication and Authorization
633638

634639
<div style="text-align: center;">
@@ -642,8 +647,8 @@ This page lists features supported across different deployment types in detail.
642647
</tr>
643648
<tr>
644649
<td>EMQX Enterprise</td>
645-
<td>EMQX Cloud Serverless</td>
646-
<td>EMQX Dedicated Cloud</td>
650+
<td>EMQX Serverless</td>
651+
<td>EMQX Dedicated</td>
647652
</tr>
648653
</thead>
649654
<tbody>
@@ -715,6 +720,7 @@ This page lists features supported across different deployment types in detail.
715720
</div>
716721

717722

723+
718724
## Data Integration
719725

720726
<div style="text-align: center;">
@@ -727,8 +733,8 @@ This page lists features supported across different deployment types in detail.
727733
</tr>
728734
<tr>
729735
<td>EMQX Enterprise</td>
730-
<td>EMQX Cloud Serverless</td>
731-
<td>EMQX Dedicated Cloud</td>
736+
<td>EMQX Serverless</td>
737+
<td>EMQX Dedicated</td>
732738
</tr>
733739
</thead>
734740
<tbody>
@@ -905,6 +911,7 @@ This page lists features supported across different deployment types in detail.
905911
</div>
906912

907913

914+
908915
## Rule Engine
909916

910917
<div style="text-align: center;">
@@ -918,8 +925,8 @@ This page lists features supported across different deployment types in detail.
918925
</tr>
919926
<tr>
920927
<td>EMQX Enterprise</td>
921-
<td>EMQX Cloud Serverless</td>
922-
<td>EMQX Dedicated Cloud</td>
928+
<td>EMQX Serverless</td>
929+
<td>EMQX Dedicated</td>
923930
</tr>
924931
</thead>
925932
<tbody>
@@ -1005,6 +1012,7 @@ This page lists features supported across different deployment types in detail.
10051012
</div>
10061013

10071014

1015+
10081016
## Extensibility
10091017

10101018
<div style="text-align: center;">
@@ -1018,8 +1026,8 @@ This page lists features supported across different deployment types in detail.
10181026
</tr>
10191027
<tr>
10201028
<td>EMQX Enterprise</td>
1021-
<td>EMQX Cloud Serverless</td>
1022-
<td>EMQX Dedicated Cloud</td>
1029+
<td>EMQX Serverless</td>
1030+
<td>EMQX Dedicated</td>
10231031
</tr>
10241032
</thead>
10251033
<tbody>
@@ -1070,6 +1078,7 @@ This page lists features supported across different deployment types in detail.
10701078
</div>
10711079

10721080

1081+
10731082
## Operability
10741083

10751084
<div style="text-align: center;">
@@ -1083,8 +1092,8 @@ This page lists features supported across different deployment types in detail.
10831092
</tr>
10841093
<tr>
10851094
<td>EMQX Enterprise</td>
1086-
<td>EMQX Cloud Serverless</td>
1087-
<td>EMQX Dedicated Cloud</td>
1095+
<td>EMQX Serverless</td>
1096+
<td>EMQX Dedicated</td>
10881097
</tr>
10891098
</thead>
10901099
<tbody>
@@ -1135,6 +1144,7 @@ This page lists features supported across different deployment types in detail.
11351144
</div>
11361145

11371146

1147+
11381148
## Observability
11391149

11401150
<div style="text-align: center;">
@@ -1148,8 +1158,8 @@ This page lists features supported across different deployment types in detail.
11481158
</tr>
11491159
<tr>
11501160
<td>EMQX Enterprise</td>
1151-
<td>EMQX Cloud Serverless</td>
1152-
<td>EMQX Dedicated Cloud</td>
1161+
<td>EMQX Serverless</td>
1162+
<td>EMQX Dedicated</td>
11531163
</tr>
11541164
</thead>
11551165
<tbody>
@@ -1242,6 +1252,7 @@ This page lists features supported across different deployment types in detail.
12421252
</div>
12431253

12441254

1255+
12451256
## Cloud Native and K8S
12461257

12471258
<div style="text-align: center;">
@@ -1255,8 +1266,8 @@ This page lists features supported across different deployment types in detail.
12551266
</tr>
12561267
<tr>
12571268
<td>EMQX Enterprise</td>
1258-
<td>EMQX Cloud Serverless</td>
1259-
<td>EMQX Dedicated Cloud</td>
1269+
<td>EMQX Serverless</td>
1270+
<td>EMQX Dedicated</td>
12601271
</tr>
12611272
</thead>
12621273
<tbody>
@@ -1286,6 +1297,7 @@ This page lists features supported across different deployment types in detail.
12861297
</div>
12871298

12881299

1300+
12891301
## Cloud Platform Availability
12901302

12911303
<div style="text-align: center;">
@@ -1299,8 +1311,8 @@ This page lists features supported across different deployment types in detail.
12991311
</tr>
13001312
<tr>
13011313
<td>EMQX Enterprise</td>
1302-
<td>EMQX Cloud Serverless</td>
1303-
<td>EMQX Dedicated Cloud</td>
1314+
<td>EMQX Serverless</td>
1315+
<td>EMQX Dedicated</td>
13041316
</tr>
13051317
</thead>
13061318
<tbody>
@@ -1350,6 +1362,7 @@ This page lists features supported across different deployment types in detail.
13501362
</div>
13511363

13521364

1365+
13531366
## MQTT Tools and SDKs
13541367

13551368
<div style="text-align: center;">
@@ -1363,8 +1376,8 @@ This page lists features supported across different deployment types in detail.
13631376
</tr>
13641377
<tr>
13651378
<td>EMQX Enterprise</td>
1366-
<td>EMQX Cloud Serverless</td>
1367-
<td>EMQX Dedicated Cloud</td>
1379+
<td>EMQX Serverless</td>
1380+
<td>EMQX Dedicated</td>
13681381
</tr>
13691382
</thead>
13701383
<tbody>
@@ -1443,6 +1456,7 @@ This page lists features supported across different deployment types in detail.
14431456
</div>
14441457

14451458

1459+
14461460
## Support Services
14471461

14481462
<div style="text-align: center;">
@@ -1456,8 +1470,8 @@ This page lists features supported across different deployment types in detail.
14561470
</tr>
14571471
<tr>
14581472
<td>EMQX Enterprise</td>
1459-
<td>EMQX Cloud Serverless</td>
1460-
<td>EMQX Dedicated Cloud</td>
1473+
<td>EMQX Serverless</td>
1474+
<td>EMQX Dedicated</td>
14611475
</tr>
14621476
</thead>
14631477
<tbody>

en_US/index.md

+6-4
Original file line numberDiff line numberDiff line change
@@ -67,20 +67,20 @@ EMQX Enterprise provides a graphical management system called the [Dashboard](./
6767

6868
## Deployment Modes and Edition Comparison
6969

70-
EMQ provides three deployment options for EMQX: two managed services (EMQX Cloud Serverless and EMQX Dedicated Cloud) and one self-hosted option (EMQX Enterprise). To help you choose the best deployment option for your requirements, the following table lists a comparison of feature support across different deployment types. For a comparison of supported features in detail, refer to [Feature Comparison](./getting-started/feature-comparison.md).
70+
EMQ provides three deployment options for EMQX: two managed services (EMQX Serverless and EMQX Dedicated) and one self-hosted option (EMQX Enterprise). To help you choose the best deployment option for your requirements, the following table lists a comparison of feature support across different deployment types. For a comparison of supported features in detail, refer to [Feature Comparison](./getting-started/feature-comparison.md).
7171

7272
<table>
7373
<thead>
7474
<tr>
75-
<th colspan="2">Self Hosted</th>
75+
<th colspan="1">Self-Hosted</th>
7676
<th colspan="2">MQTT as a Service</th>
7777
</tr>
7878
</thead>
7979
<tbody>
8080
<tr>
8181
<td>EMQX Enterprise</td>
82-
<td>EMQX Cloud Serverless</td>
83-
<td>EMQX Dedicated Cloud</td>
82+
<td>EMQX Serverless</td>
83+
<td>EMQX Dedicated</td>
8484
</tr>
8585
<tr>
8686
<td><a href="https://www.emqx.com/en/apply-licenses/emqx">Get a Free Trial License</a></td>
@@ -97,6 +97,8 @@ EMQ provides three deployment options for EMQX: two managed services (EMQX Cloud
9797

9898

9999

100+
101+
100102
## Use Cases
101103

102104
EMQX Enterprise is a comprehensive IoT messaging platform that plays a crucial role in different stages of IoT device connectivity and data transmission, providing powerful functionality and flexibility for various business needs.

0 commit comments

Comments
 (0)