Merge pull request #18827 from keszybz/a-bunch-of-man-page-updates

author Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>

Mon, 1 Mar 2021 14:14:40 +0000 (15:14 +0100)

committer GitHub <noreply@github.com>

Mon, 1 Mar 2021 14:14:40 +0000 (15:14 +0100)
author Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Mon, 1 Mar 2021 14:14:40 +0000 (15:14 +0100)
committer GitHub <noreply@github.com>
Mon, 1 Mar 2021 14:14:40 +0000 (15:14 +0100)
diff --cc TODO
Simple merge
diff --cc man/systemd.unit.xml
Simple merge
author	Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
	Mon, 1 Mar 2021 14:14:40 +0000 (15:14 +0100)
committer	GitHub <noreply@github.com>
	Mon, 1 Mar 2021 14:14:40 +0000 (15:14 +0100)
		1	2
TODO	patch \|	diff1 \|	diff2 \|	blob \| history
man/systemd.unit.xml	patch \|	diff1 \|	diff2 \|	blob \| history