chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sysctl: replaces some slashes with dots
[elogind.git]
/
man
/
systemd.unit.xml
diff --git
a/man/systemd.unit.xml
b/man/systemd.unit.xml
index 2b59b1b841c64b3c2c5d9d870c68ef12b5ea73e8..bcd4ba8ee5605ac913c2ffb185708738c8754c74 100644
(file)
--- a/
man/systemd.unit.xml
+++ b/
man/systemd.unit.xml
@@
-70,7
+70,8
@@
<filename>...</filename>
</literallayout></para>
<filename>...</filename>
</literallayout></para>
- <para><literallayout><filename>$HOME/.config/systemd/user/*</filename>
+ <para><literallayout><filename>$XDG_CONFIG_HOME/systemd/user/*</filename>
+<filename>$HOME/.config/systemd/user/*</filename>
<filename>/etc/systemd/user/*</filename>
<filename>/run/systemd/user/*</filename>
<filename>/usr/lib/systemd/user/*</filename>
<filename>/etc/systemd/user/*</filename>
<filename>/run/systemd/user/*</filename>
<filename>/usr/lib/systemd/user/*</filename>
@@
-200,12
+201,6
@@
has the appropriate section headers before any
directive.</para>
has the appropriate section headers before any
directive.</para>
- <para>If a line starts with <option>.include</option>
- followed by a filename, the specified file will be
- parsed at this point. Make sure that the file that is
- included has the appropriate section headers before
- any directives.</para>
-
<para>Note that while systemd offers a flexible
dependency system between units it is recommended to
use this functionality only sparingly and instead rely
<para>Note that while systemd offers a flexible
dependency system between units it is recommended to
use this functionality only sparingly and instead rely
@@
-325,9
+320,13
@@
</row>
</thead>
<tbody>
</row>
</thead>
<tbody>
+ <row>
+ <entry><filename>$XDG_CONFIG_HOME/systemd/user</filename></entry>
+ <entry>User configuration (only used when $XDG_CONFIG_HOME is set)</entry>
+ </row>
<row>
<entry><filename>$HOME/.config/systemd/user</filename></entry>
<row>
<entry><filename>$HOME/.config/systemd/user</filename></entry>
- <entry>User configuration</entry>
+ <entry>User configuration
(only used when $XDG_CONFIG_HOME is not set)
</entry>
</row>
<row>
<entry><filename>/etc/systemd/user</filename></entry>
</row>
<row>
<entry><filename>/etc/systemd/user</filename></entry>
@@
-356,7
+355,7
@@
</refsect1>
<refsect1>
</refsect1>
<refsect1>
- <title>Options</title>
+ <title>
[Unit] Section
Options</title>
<para>Unit file may include a [Unit] section, which
carries generic information about the unit that is not
<para>Unit file may include a [Unit] section, which
carries generic information about the unit that is not
@@
-1173,6
+1172,11
@@
</varlistentry>
</variablelist>
</varlistentry>
</variablelist>
+ </refsect1>
+
+ <refsect1>
+ <title>[Install] Section Options</title>
+
<para>Unit file may include a [Install] section, which
carries installation information for the unit. This
section is not interpreted by
<para>Unit file may include a [Install] section, which
carries installation information for the unit. This
section is not interpreted by