From c7a7f78bb03d12ff0b1201739c712062ef437ea8 Mon Sep 17 00:00:00 2001 From: Lucas Werkmeister Date: Sun, 30 Oct 2016 02:42:22 +0200 Subject: man: improve systemd-escape --path description The option does more than the documentation gave it credit for. --- man/systemd-escape.xml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/man/systemd-escape.xml b/man/systemd-escape.xml index dbb3869a24..acf8e0a02e 100644 --- a/man/systemd-escape.xml +++ b/man/systemd-escape.xml @@ -108,9 +108,10 @@ When escaping or unescaping a string, assume - it refers to a file system path. This enables special - processing of the initial / of the - path. + it refers to a file system path. This eliminates leading, + trailing or duplicate / characters + and rejects . and .. + path components. -- cgit v1.2.3-54-g00ecf From 918737f36524eee99588e46b9092c4a8f4242338 Mon Sep 17 00:00:00 2001 From: Lucas Werkmeister Date: Sun, 30 Oct 2016 02:43:17 +0200 Subject: man: add missing period --- man/systemd-escape.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/man/systemd-escape.xml b/man/systemd-escape.xml index acf8e0a02e..7afac42613 100644 --- a/man/systemd-escape.xml +++ b/man/systemd-escape.xml @@ -97,7 +97,7 @@ Inserts the escaped strings in a unit name template. Takes a unit name template such as - foobar@.service May not be used in + foobar@.service. May not be used in conjunction with , or . -- cgit v1.2.3-54-g00ecf From 8bb36a1122b9e45a794188c10ca68e6dc33a271c Mon Sep 17 00:00:00 2001 From: Lucas Werkmeister Date: Sun, 30 Oct 2016 02:44:07 +0200 Subject: man: make systemd-escape examples more consistent The first example wasn't phrased with "To ..." as the other three are, and the last example was lacking the colon. --- man/systemd-escape.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/man/systemd-escape.xml b/man/systemd-escape.xml index 7afac42613..5e95e22536 100644 --- a/man/systemd-escape.xml +++ b/man/systemd-escape.xml @@ -144,7 +144,7 @@ Examples - Escape a single string: + To escape a single string: $ systemd-escape 'Hallöchen, Meister' Hall\xc3\xb6chen\x2c\x20Meister @@ -156,7 +156,7 @@ Hallöchen, Meister $ systemd-escape -p --suffix=mount "/tmp//waldi/foobar/" tmp-waldi-foobar.mount - To generate instance names of three strings + To generate instance names of three strings: $ systemd-escape --template=systemd-nspawn@.service 'My Container 1' 'containerb' 'container/III' systemd-nspawn@My\x20Container\x201.service systemd-nspawn@containerb.service systemd-nspawn@container-III.service -- cgit v1.2.3-54-g00ecf