summaryrefslogtreecommitdiff
path: root/man/standard-conf.xml
Commit message (Collapse)AuthorAgeFilesLines
* man: rework section about configuration file precedenceZbigniew Jędrzejewski-Szmek2020-01-161-41/+37
| | | | | | | | | | | | | This section is loaded in a bunch of places, so this affects many man pages. 1. point the reader to the synopsis section, which has the exact paths that are used to load files. 2. put the "reference" part first, and recommendations later, in separate paragraphs. 3. describe how individual settings and whole files are replaces. Closes #12791.
* man: document paths under /usr/local in standard-conf.xmlZbigniew Jędrzejewski-Szmek2019-02-181-12/+11
| | | | | | | | | | | | | | | | | | | | standard-conf.xml is currently included by: man/binfmt.d.xml man/environment.d.xml man/modules-load.d.xml man/sysctl.d.xml man/coredump.conf.xml man/journal-remote.conf.xml man/journal-upload.conf.xml man/journald.conf.xml man/logind.conf.xml man/networkd.conf.xml man/resolved.conf.xml man/systemd-sleep.conf.xml man/systemd-system.conf.xml All those programs actually use CONF_PATHS_NULSTR or CONF_PATHS_STRV, so this changes the documentation to match code.
* man: drop mode line in file headersZbigniew Jędrzejewski-Szmek2018-07-031-1/+1
| | | | | This is already included in .dir-locals, so we don't need it in the files themselves.
* Drop my copyright headersZbigniew Jędrzejewski-Szmek2018-06-141-2/+0
| | | | | | | perl -i -0pe 's/\s*Copyright © .... Zbigniew Jędrzejewski.*?\n/\n/gms' man/*xml git grep -e 'Copyright.*Jędrzejewski' -l | xargs perl -i -0pe 's/(#\n)?# +Copyright © [0-9, -]+ Zbigniew Jędrzejewski.*?\n//gms' git grep -e 'Copyright.*Jędrzejewski' -l | xargs perl -i -0pe 's/\s*\/\*\*\*\s+Copyright © [0-9, -]+ Zbigniew Jędrzejewski[^\n]*?\s*\*\*\*\/\s*/\n\n/gms' git grep -e 'Copyright.*Jędrzejewski' -l | xargs perl -i -0pe 's/\s+Copyright © [0-9, -]+ Zbigniew Jędrzejewski[^\n]*//gms'
* tree-wide: beautify remaining copyright statementsLennart Poettering2018-06-141-2/+2
| | | | | | Let's unify an beautify our remaining copyright statements, with a unicode ©. This means our copyright statements are now always formatted the same way. Yay.
* tree-wide: drop 'This file is part of systemd' blurbLennart Poettering2018-06-141-2/+0
| | | | | | | | | | | | | | | | This part of the copyright blurb stems from the GPL use recommendations: https://www.gnu.org/licenses/gpl-howto.en.html The concept appears to originate in times where version control was per file, instead of per tree, and was a way to glue the files together. Ultimately, we nowadays don't live in that world anymore, and this information is entirely useless anyway, as people are very welcome to copy these files into any projects they like, and they shouldn't have to change bits that are part of our copyright header for that. hence, let's just get rid of this old cruft, and shorten our codebase a bit.
* tree-wide: drop license boilerplateZbigniew Jędrzejewski-Szmek2018-04-061-13/+0
| | | | | | | | | | Files which are installed as-is (any .service and other unit files, .conf files, .policy files, etc), are left as is. My assumption is that SPDX identifiers are not yet that well known, so it's better to retain the extended header to avoid any doubt. I also kept any copyright lines. We can probably remove them, but it'd nice to obtain explicit acks from all involved authors before doing that.
* Add missing headers and SPDX identifiers to man pagesZbigniew Jędrzejewski-Szmek2017-11-191-0/+22
|
* man: explain precedence for options which take a list (#7010)Zbigniew Jędrzejewski-Szmek2017-10-061-8/+9
| | | Hopefully finally fixes #6639.
* man: unify titling, fix description of precedence in sysusers.d(5)Zbigniew Jędrzejewski-Szmek2017-09-141-1/+0
| | | | | | | | | Fixes #6639. (This behaviour of systemd-sysusers is long established, so it's better to adjust the documentation rather than change the code. If there are any situations out there where it matters, users must have adjusted to the current behaviour.)
* doc: correct orthography, word forms and missing/extraneous wordsJan Engelhardt2015-11-061-1/+1
|
* doc: correct punctuation and improve typography in documentationJan Engelhardt2015-11-061-1/+1
|
* man: *.d conf directories: add note about initrd regenerationJan Synacek2015-09-021-1/+3
|
* man: revert dynamic paths for split-usr setupsTom Gundersen2015-06-181-6/+3
| | | | | | | | | | | | | | | | | | | | | | | This did not really work out as we had hoped. Trying to do this upstream introduced several problems that probably makes it better suited as a downstream patch after all. At any rate, it is not releaseable in the current state, so we at least need to revert this before the release. * by adjusting the path to binaries, but not do the same thing to the search path we end up with inconsistent man-pages. Adjusting the search path too would be quite messy, and it is not at all obvious that this is worth the effort, but at any rate it would have to be done before we could ship this. * this means that distributed man-pages does not make sense as they depend on config options, and for better or worse we are still distributing man pages, so that is something that definitely needs sorting out before we could ship with this patch. * we have long held that split-usr is only minimally supported in order to boot, and something we hope will eventually go away. So before we start adding even more magic/effort in order to make this work nicely, we should probably question if it makes sense at all.
* man: generate configured paths in manpagesFilipe Brandenburger2015-05-281-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In particular, use /lib/systemd instead of /usr/lib/systemd in distributions like Debian which still have not adopted a /usr merge setup. Use XML entities from man/custom-entities.ent to replace configured paths while doing XSLT processing of the original XML files. There was precedent of some files (such as systemd.generator.xml) which were already using this approach. This addresses most of the (manual) fixes from this patch: http://anonscm.debian.org/cgit/pkg-systemd/systemd.git/tree/debian/patches/Fix-paths-in-man-pages.patch?h=experimental-220 The idea of using generic XML entities was presented here: http://lists.freedesktop.org/archives/systemd-devel/2015-May/032240.html This patch solves almost all the issues, with the exception of: - Path to /bin/mount and /bin/umount. - Generic statements about preference of /lib over /etc. These will be handled separately by follow up patches. Tested: - With default configure settings, ran "make install" to two separate directories and compared the output to confirm they matched exactly. - Used a set of configure flags including $CONFFLAGS from Debian: http://anonscm.debian.org/cgit/pkg-systemd/systemd.git/tree/debian/rules Installed the tree and confirmed the paths use /lib/systemd instead of /usr/lib/systemd and that no other unexpected differences exist. - Confirmed that `make distcheck` still passes.
* man: standard-conf: change directory reference to wildcardAlison Chaiken2015-03-151-1/+1
|
* Do not advertise .d snippets over main config fileZbigniew Jędrzejewski-Szmek2015-03-031-8/+34
| | | | | | | | | | For daemons which have a main configuration file, there's little reason for the administrator to use configuration snippets. They are useful for packagers which need to override settings, but we shouldn't advertise that as the main way of configuring those services. https://bugs.freedesktop.org/show_bug.cgi?id=89397
* man: Factor out a common snippet for .d directories and precedenceJosh Triplett2014-11-291-0/+45
Several manpages contain duplicate text describing a standard set of .d configuration directories, with the usual sorting, precedence, overrides, and so on. Factor this common text out using XInclude before proliferating it even further.