diff options
| author | Ray Strode <rstrode@redhat.com> | 2016-07-29 13:52:55 -0400 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-02-20 18:49:14 -0500 |
| commit | 79d615d56c186475089bc617f6d6850d89687e38 (patch) | |
| tree | a264e6ed494bf3b48e8a38aad0c53d61907fbe77 /Makefile-man.am | |
| parent | f63c4aabb2f127ce4acdaec59e3f00e3579f8a75 (diff) | |
build-sys,man: load /etc/environment and describe the new environment.d syntax
Add support for /etc/environment and document the changes to the user manager
to automatically import environment *.conf files from:
~/.config/environment.d/
/etc/environment.d/
/run/environment.d/
/usr/local/lib/environment.d/
/usr/lib/environment.d/
/etc/environment
Diffstat (limited to 'Makefile-man.am')
| -rw-r--r-- | Makefile-man.am | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile-man.am b/Makefile-man.am index 2413d5b6c8..4249e13ec3 100644 --- a/Makefile-man.am +++ b/Makefile-man.am @@ -11,6 +11,7 @@ MANPAGES += \ man/bootup.7 \ man/busctl.1 \ man/daemon.7 \ + man/environment.d.5 \ man/file-hierarchy.7 \ man/halt.8 \ man/hostname.5 \ @@ -2642,6 +2643,7 @@ EXTRA_DIST += \ man/crypttab.xml \ man/daemon.xml \ man/dnssec-trust-anchors.d.xml \ + man/environment.d.xml \ man/file-hierarchy.xml \ man/halt.xml \ man/hostname.xml \ |