diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 162aa4347c9..3b354760a0a 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -19,7 +19,7 @@ repos:
       - id: remove-tabs
         types: [text]
   - repo: https://github.com/PFCCLab/typos-pre-commit-mirror.git
-    rev: v1.39.2
+    rev: v1.40.0
     hooks:
       - id: typos
         args: [--force-exclude]
diff --git a/_typos.toml b/_typos.toml
index 07f2d250b8a..671a9efbb78 100644
--- a/_typos.toml
+++ b/_typos.toml
@@ -12,9 +12,11 @@ extend-ignore-words-re = ["^[a-zA-Z]{1,3}$"]
 # refer to https://github.com/crate-ci/typos/blob/master/docs/reference.md#example-configurations
 extend-ignore-re = [
     # Ignore lines by `# typos: disable-line`
-    "(?Rm)^.*(#|//)\\s*typos:\\s*disable-line$",
+    "(?Rm)^.*(#|//|<!--)\\s*typos:\\s*disable-line\\s*(?:-->)?$",
     # Ignore block by `# typos: off` and `# typos: on`
-    "(?s)(#|//)\\s*typos:\\s*off.*?\\n\\s*(#|//)\\s*typos:\\s*on"
+    "(?s)(#|//)\\s*typos:\\s*off.*?\\n\\s*(#|//)\\s*typos:\\s*on",
+    # Next-line ignore # typos:ignore-next-line
+    "(#|//|<!--)\\s*typos:ignore-next-line\\s*(?:-->)?\\n.*"
 ]
 
 [default.extend-words]
@@ -23,10 +25,6 @@ CANN = "CANN"
 Clas = "Clas"
 arange = "arange"
 unsupport = "unsupport"
-Nervana = "Nervana"
 datas = "datas"
 feeded = "feeded"
-
-# These words need to be fixed
-softwares = "softwares"
 splitted = "splitted"
diff --git a/docs/design/motivation/fluid.md b/docs/design/motivation/fluid.md
index e9ab8b1ef4e..b4b0c1f3612 100644
--- a/docs/design/motivation/fluid.md
+++ b/docs/design/motivation/fluid.md
@@ -135,6 +135,6 @@ Fluid is moving towards the direction of a compiler, which is explain in [fluid_
 
 ## Backward Compatibility of Fluid
 
-Given all the advantages from the removal of the concept of a *model*, hardware manufacturers might still prefer the existence of the concept of a model, so it would be easier for them to support multiple frameworks all at once and could run a trained model during inference.  For example, Nervana, a startup company acquired by Intel, has been working on an XPU that reads the models in the format known as [n-graph](https://github.com/NervanaSystems/ngraph).  Similarly, [Movidius](https://www.movidius.com/) is producing a mobile deep learning chip that reads and runs graphs of operators.  The well-known [ONNX](https://github.com/onnx/onnx) is also a file format of graphs of operators.
+Given all the advantages from the removal of the concept of a *model*, hardware manufacturers might still prefer the existence of the concept of a model, so it would be easier for them to support multiple frameworks all at once and could run a trained model during inference.  For example, Nervana, a startup company acquired by Intel, has been working on an XPU that reads the models in the format known as [n-graph](https://github.com/NervanaSystems/ngraph).  Similarly, [Movidius](https://www.movidius.com/) is producing a mobile deep learning chip that reads and runs graphs of operators.  The well-known [ONNX](https://github.com/onnx/onnx) is also a file format of graphs of operators. <!-- typos: disable-line -->
 
 For Fluid, we can write a converter that extracts the parts in the `ProgramDesc` protobuf message, converts them into a graph of operators, and exports the graph into the ONNX or n-graph format.
diff --git a/docs/install/pip/windows-pip.md b/docs/install/pip/windows-pip.md
index 157830d4feb..4200ab12b44 100644
--- a/docs/install/pip/windows-pip.md
+++ b/docs/install/pip/windows-pip.md
@@ -85,7 +85,7 @@
 
 * 请确认需要安装 PaddlePaddle 的 Python 是您预期的位置，因为您计算机可能有多个 Python。根据您的环境您可能需要将说明中所有命令行中的 python 替换为具体的 Python 路径。
 
-* 上述命令默认安装`avx`、`mkl`的包。判断你的机器是否支持`avx`，可以安装[CPU-Z](https://www.cpuid.com/softwares/cpu-z.html)工具查看“处理器-指令集”。飞桨不再支持`noavx`指令集的安装包。
+* 上述命令默认安装`avx`、`mkl`的包。判断你的机器是否支持`avx`，可以安装 [CPU-Z](https://www.cpuid.com/softwares/cpu-z.html) 工具查看“处理器-指令集”。飞桨不再支持`noavx`指令集的安装包。
 
 
 ## **三、验证安装**