diff --git a/apps/emqx_conf/etc/emqx_conf.md b/apps/emqx_conf/etc/emqx_conf.md
index 901503d3e..837638d91 100644
--- a/apps/emqx_conf/etc/emqx_conf.md
+++ b/apps/emqx_conf/etc/emqx_conf.md
@@ -19,7 +19,7 @@ The `*-override.conf` files are overwritten at runtime when changes
 are made from dashboard UI, management HTTP API, or CLI.
 
 **NOTE** Config values from `*-override.conf` are **not** mapped to boot configs for
-the config feilds attributed with `mapping: path.to.boot.config.key`
+the config fields attributed with `mapping: path.to.boot.config.key`
 
 For detailed override rules, see [Config Overlay Rules](#config-overlay-rules).
 
diff --git a/apps/emqx_conf/src/emqx_conf_schema.erl b/apps/emqx_conf/src/emqx_conf_schema.erl
index a65d17b98..b9ad43cba 100644
--- a/apps/emqx_conf/src/emqx_conf_schema.erl
+++ b/apps/emqx_conf/src/emqx_conf_schema.erl
@@ -270,14 +270,14 @@ Path to the persistent data directory.
 Possible auto-created sub-directories are:
   - `mnesia/\<node_name>`: EMQX's built-in database directory.
     For example, `mnesia/emqx@127.0.0.1`.
-    There should be only one one such sub dirrectory.
+    There should be only one such sub directory.
     Meaning, in case the node is to be renamed (to e.g. `emqx@10.0.1.1`),
     the old dir should be deleted first.
   - `configs`: Generated configs at boot time, and cluster/local override configs.
   - `patches`: Hot-patch beam files are to be placed here.
   - `trace`: Trace log files.
 
-**NOTE**: One data dir can not be shared by two or more EMQX nodes.
+**NOTE**: One data dir cannot be shared by two or more EMQX nodes.
 """
            })}
     , {"config_files",