diff --git a/.typos.toml b/.typos.toml index 7000141e4..eda09a5c3 100644 --- a/.typos.toml +++ b/.typos.toml @@ -1,4 +1,12 @@ +[files] +extend-exclude = [ + "vendored_parsers/", "sample_files/", + "homepage/home_static/", "homepage/home_img", + "difft.1", +] + [default.extend-words] ba = "ba" edn = "edn" mak = "mak" +ND = "ND" diff --git a/CHANGELOG.md b/CHANGELOG.md index b2e18508b..c1e330b37 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -106,7 +106,7 @@ Fixed crash on some textual files where a single change contained more than Added support for device tree and F#. -Difftastic now uses tree-sitter comment highlighing as a hint that +Difftastic now uses tree-sitter comment highlighting as a hint that nodes should be treated as atoms. This ensures comments are treated more consistently across languages. This fixes cases in Elm where comment differences were ignored, and may improve other languages too. @@ -1429,11 +1429,11 @@ Fixed a parsing performance regression introduced in 0.13. ### Diffing Text diffing now has a standalone implementation rather than reusing -structural diff logic. This is signficantly faster and highlighted +structural diff logic. This is significantly faster and highlighted better. Improved performance when diffing two identical files. This is common -when diffing directorires. +when diffing directories. ### Display diff --git a/manual/src/language_detection.md b/manual/src/language_detection.md index 1f69cbf3f..96772f699 100644 --- a/manual/src/language_detection.md +++ b/manual/src/language_detection.md @@ -24,7 +24,7 @@ You can override language detection for specific file globs using the $ difft --override=GLOB:NAME FIRST-FILE SECOND-FILE # For example, treating .h files as C rather than C++: -$ difft --override=*.h:c sample_files/preprocesor_1.h sample_files/preprocesor_2.h +$ difft --override=*.h:c sample_files/preprocessor_1.h sample_files/preprocessor_2.h ``` See `difft --help` for more examples of `--override` usage. diff --git a/sample_files/preprocesor_1.h b/sample_files/preprocessor_1.h similarity index 100% rename from sample_files/preprocesor_1.h rename to sample_files/preprocessor_1.h diff --git a/sample_files/preprocesor_2.h b/sample_files/preprocessor_2.h similarity index 100% rename from sample_files/preprocesor_2.h rename to sample_files/preprocessor_2.h diff --git a/translation/zh-CN/manual-zh-CN/src/installation.md b/translation/zh-CN/manual-zh-CN/src/installation.md index a07273feb..22dfea281 100644 --- a/translation/zh-CN/manual-zh-CN/src/installation.md +++ b/translation/zh-CN/manual-zh-CN/src/installation.md @@ -2,7 +2,7 @@ ## 从二进制安装 -Difftastic 将预先编译好的二进制文件 [提供到 GitHub realeases](https://github.com/Wilfred/difftastic/releases) 。[更新日志](https://github.com/Wilfred/difftastic/blob/master/CHANGELOG.md) 描述了每个发行版的变更。 +Difftastic 将预先编译好的二进制文件 [提供到 GitHub releases](https://github.com/Wilfred/difftastic/releases) 。[更新日志](https://github.com/Wilfred/difftastic/blob/master/CHANGELOG.md) 描述了每个发行版的变更。 在以下平台上也可以使用软件包。 diff --git a/translation/zh-CN/manual-zh-CN/src/usage.md b/translation/zh-CN/manual-zh-CN/src/usage.md index 0eeb08e2b..068e17f31 100644 --- a/translation/zh-CN/manual-zh-CN/src/usage.md +++ b/translation/zh-CN/manual-zh-CN/src/usage.md @@ -54,7 +54,7 @@ Difftastic 根据文件的扩展名、文件名和第一行的内容猜测文件 ```bash $ difft --override=GLOB:NAME FIRST-FILE SECOND-FILE -$ difft --override=*.h:c sample_files/preprocesor_1.h sample_files/preprocesor_2.h +$ difft --override=*.h:c sample_files/preprocessor_1.h sample_files/preprocessor_2.h ``` ## 选项