summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2013-02-11 14:42:24 -0500
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2013-02-13 09:48:32 -0500
commit5f9cfd4c3877fdc68618faf9ae5efb5948e002b6 (patch)
tree5decc6b7384623f968214e6f12df9f5817cc974b /man
parenta7f5bb1eafadbb08c8528baae588bbe773a37e79 (diff)
man: rename systemd.conf to systemd-system.conf
Alias as systemd-user.conf is also provided. This should help users running systemd in session mode. https://bugzilla.redhat.com/show_bug.cgi?id=690868
Diffstat (limited to 'man')
-rw-r--r--man/journald.conf.xml2
-rw-r--r--man/logind.conf.xml2
-rw-r--r--man/systemd-cgtop.xml2
-rw-r--r--man/systemd-system.conf.xml (renamed from man/systemd.conf.xml)11
-rw-r--r--man/systemd.exec.xml6
-rw-r--r--man/systemd.xml4
6 files changed, 14 insertions, 13 deletions
diff --git a/man/journald.conf.xml b/man/journald.conf.xml
index 30523c5370..6ba583b31d 100644
--- a/man/journald.conf.xml
+++ b/man/journald.conf.xml
@@ -404,7 +404,7 @@
<citerefentry><refentrytitle>systemd-journald.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
<citerefentry><refentrytitle>journalctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry><refentrytitle>systemd.journal-fields</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
- <citerefentry><refentrytitle>systemd.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+ <citerefentry><refentrytitle>systemd-system.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
</para>
</refsect1>
diff --git a/man/logind.conf.xml b/man/logind.conf.xml
index d223514e0e..96e5936e5e 100644
--- a/man/logind.conf.xml
+++ b/man/logind.conf.xml
@@ -329,7 +329,7 @@
<citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry><refentrytitle>systemd-logind.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
<citerefentry><refentrytitle>loginctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
- <citerefentry><refentrytitle>systemd.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+ <citerefentry><refentrytitle>systemd-system.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
</para>
</refsect1>
diff --git a/man/systemd-cgtop.xml b/man/systemd-cgtop.xml
index 7a34512b21..ad1f0f8c4d 100644
--- a/man/systemd-cgtop.xml
+++ b/man/systemd-cgtop.xml
@@ -78,7 +78,7 @@
<literal>blkio</literal> and <literal>memory</literal>
to the <varname>DefaultControllers=</varname> setting
in <filename>/etc/systemd/system.conf</filename> (see
- <citerefentry><refentrytitle>systemd.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+ <citerefentry><refentrytitle>systemd-system.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
for details). Alternatively, it is possible to enable
resource accounting individually for services, by
making use of the <varname>ControlGroup=</varname>
diff --git a/man/systemd.conf.xml b/man/systemd-system.conf.xml
index 8c8fb7d7c0..12979d81b6 100644
--- a/man/systemd.conf.xml
+++ b/man/systemd-system.conf.xml
@@ -22,9 +22,9 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
-->
-<refentry id="systemd.conf">
+<refentry id="systemd-system.conf">
<refentryinfo>
- <title>systemd.conf</title>
+ <title>systemd-system.conf</title>
<productname>systemd</productname>
<authorgroup>
@@ -38,13 +38,14 @@
</refentryinfo>
<refmeta>
- <refentrytitle>systemd.conf</refentrytitle>
+ <refentrytitle>systemd-system.conf</refentrytitle>
<manvolnum>5</manvolnum>
</refmeta>
<refnamediv>
- <refname>systemd.conf</refname>
- <refpurpose>System and service manager configuration file</refpurpose>
+ <refname>systemd-system.conf</refname>
+ <refname>systemd-user.conf</refname>
+ <refpurpose>System and session service manager configuration file</refpurpose>
</refnamediv>
<refsynopsisdiv>
diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
index 53094e587d..952bb9595e 100644
--- a/man/systemd.exec.xml
+++ b/man/systemd.exec.xml
@@ -462,7 +462,7 @@
with
<option>DefaultStandardOutput=</option>
in
- <citerefentry><refentrytitle>systemd.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+ <citerefentry><refentrytitle>systemd-system.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
which defaults to
<option>journal</option>.</para></listitem>
</varlistentry>
@@ -481,7 +481,7 @@
setting defaults to the value set with
<option>DefaultStandardError=</option>
in
- <citerefentry><refentrytitle>systemd.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+ <citerefentry><refentrytitle>systemd-system.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
which defaults to
<option>inherit</option>.</para></listitem>
</varlistentry>
@@ -839,7 +839,7 @@
settings of
<varname>DefaultControllers=</varname>
of
- <citerefentry><refentrytitle>systemd.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+ <citerefentry><refentrytitle>systemd-system.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
but a unit's
<varname>ControlGroup=</varname>
setting for a specific controller
diff --git a/man/systemd.xml b/man/systemd.xml
index 5380ae8b67..cd38c16375 100644
--- a/man/systemd.xml
+++ b/man/systemd.xml
@@ -78,7 +78,7 @@
the configuration file
<filename>system.conf</filename>, otherwise
<filename>user.conf</filename>. See
- <citerefentry><refentrytitle>systemd.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+ <citerefentry><refentrytitle>systemd-system.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
for more information.</para>
</refsect1>
@@ -1258,7 +1258,7 @@
<refsect1>
<title>See Also</title>
<para>
- <citerefentry><refentrytitle>systemd.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+ <citerefentry><refentrytitle>systemd-system.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
<citerefentry><refentrytitle>locale.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
<citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry><refentrytitle>journalctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,