From 2fa4d1bd3eae9aed5520417a977314843ce49ef9 Mon Sep 17 00:00:00 2001 From: Erik Flodin Date: Tue, 18 Mar 2025 20:47:36 +0100 Subject: [PATCH] Fix typos --- _docs/040_common_usage.md | 2 +- _docs/060_alternates.md | 2 +- _docs/070_templates.md | 2 +- _docs/110_faq.md | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/_docs/040_common_usage.md b/_docs/040_common_usage.md index 157105b..76a9540 100644 --- a/_docs/040_common_usage.md +++ b/_docs/040_common_usage.md @@ -22,7 +22,7 @@ directory often more than only dotfiles, by default yadm ignores untracked files when displaying status. `yadm push`, `yadm fetch` -: Send or retrive commits to/from your remote repository . +: Send or retrieve commits to/from your remote repository . `yadm commit --amend` : Replace the last commit with a new one. Allows you to change your commit diff --git a/_docs/060_alternates.md b/_docs/060_alternates.md index 97c1e14..e8ec916 100644 --- a/_docs/060_alternates.md +++ b/_docs/060_alternates.md @@ -96,7 +96,7 @@ If running on a Solaris server, the link will use the default version: `$HOME/path/example.txt` → `$HOME/path/example.txt##default` -If running on a Macbook, with class set to `Work`, the link will be: +If running on a MacBook, with class set to `Work`, the link will be: `$HOME/path/example.txt` → `$HOME/path/example.txt##class.Work` diff --git a/_docs/070_templates.md b/_docs/070_templates.md index 9a76258..148b5bf 100644 --- a/_docs/070_templates.md +++ b/_docs/070_templates.md @@ -102,7 +102,7 @@ blocks must start with `{% if yadm.variable == "value" %}` and end with `{% endif %}`. An alternative block can also be specified using the directive `{% else %}`. These directives must appear on lines by themselves. They may not appear on the same line. The "if" directive only supports testing a single -variable, and there is no "elif" directive as there is in Jinja. Comparisions +variable, and there is no "elif" directive as there is in Jinja. Comparisons are done case-insensitive.

If multiple classes are defined, `yadm.class=="someclass"` will be true if *any* diff --git a/_docs/110_faq.md b/_docs/110_faq.md index 1de023e..b55a71f 100644 --- a/_docs/110_faq.md +++ b/_docs/110_faq.md @@ -37,7 +37,7 @@ to configure it each time you clone the repo. ### How can I display untracked files with a `yadm status` command? By default, yadm is configured to ignore untracked files when displaying a -status. You can use the `-u` paramter on the status command to alter how +status. You can use the `-u` parameter on the status command to alter how untracked files are treated. `-unormal` will show untracked files and directories. @@ -171,7 +171,7 @@ when displaying a status. This does not prevent you from adding untracked files. However, if you would like to prevent some files from being added accidentally, you can configure them to be ignored. -If you add a `.gitignore` file to your `$HOME` directory (or subdirectories) you +If you add a `.gitignore` file to your `$HOME` directory (or sub-directories) you can have those patterns ignored by yadm. This works exactly like it does for Git. Be sure to add these `.gitignore` files to your repo, so they can be synced along with your other configurations.