diff --git a/_docs/060_alternates.md b/_docs/060_alternates.md index 09c6aa6..1c91e0c 100644 --- a/_docs/060_alternates.md +++ b/_docs/060_alternates.md @@ -30,11 +30,15 @@ be omitted. Most attributes can be abbreviated as a single letter. | `template`, `t` | Valid when the value matches a supported template processor. See the [Templates](/docs/templates) section for more details.| | `user`, `u` | Valid if the value matches the current user. Current user is calculated by running id ‑u ‑n. | | `distro`, `d` | Valid if the value matches the distro. Distro is calculated by running lsb_release ‑si. | -| `os`, `o` | Valid if the value matches the OS. OS is calculated by running uname ‑s. | +| `os`, `o` | Valid if the value matches the OS. OS is calculated by running uname ‑s. * | | `class`, `c` | Valid if the value matches the local.class configuration. Class must be manually set using yadm config local.class <class>. | |`hostname`, `h`|Valid if the value matches the short hostname. Hostname is calculated by running `hostname`, and trimming off any domain.| |`default`|Valid when no other alternate is valid.| +* +The OS for "Windows Subsystem for Linux" is reported as "WSL", even though uname identifies as "Linux". + + You may use any number of conditions, in any order. An alternate will only be used if _ALL_ conditions are valid. For all files managed by yadm's repository or listed in `$HOME/.config/yadm/encrypt`, if they match this naming convention, diff --git a/_docs/070_templates.md b/_docs/070_templates.md index 655bc4b..7c13eb4 100644 --- a/_docs/070_templates.md +++ b/_docs/070_templates.md @@ -43,10 +43,14 @@ When template processors run, they will be provided the following set of data. | `yadm.class` | `YADM_CLASS` | Locally defined yadm class | yadm config local.class | | `yadm.distro` | `YADM_DISTRO` | Distribution | lsb_release ‑si | | `yadm.hostname` | `YADM_HOSTNAME` | Hostname | `hostname` (without domain) | -| `yadm.os` | `YADM_OS` | Operating system | uname ‑s | +| `yadm.os` | `YADM_OS` | Operating system | uname ‑s * | | `yadm.user` | `YADM_USER` | Current user | id ‑u ‑n | | `yadm.source` | `YADM_SOURCE` | Template filename | (fully qualified path) | +* +The OS for "Windows Subsystem for Linux" is reported as "WSL", even though uname identifies as "Linux". + + ## Supported template processors default