rename /etc/systemd/systemd-{login,journal}d.conf to {login,journal}d.conf

6 files changed, 14 insertions, 17 deletions

diff --git a/man/journalctl.xml b/man/journalctl.xml
index efceefa43f..f6e46cfbc7 100644
--- a/man/journalctl.xml
+++ b/man/journalctl.xml
@@ -44,7 +44,6 @@
 
         <refnamediv>
                 <refname>journalctl</refname>
-                <refname>systemd-journalctl</refname>
                 <refpurpose>Query the systemd journal</refpurpose>
         </refnamediv>
 
@@ -254,7 +253,7 @@
                 <para>
                         <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
                         <citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-                        <citerefentry><refentrytitle>systemd-journald.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+                        <citerefentry><refentrytitle>journald.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
                 </para>
         </refsect1>
 
diff --git a/man/systemd-journald.conf.xml b/man/journald.conf.xml
index 37dae68b36..a9b0f66de9 100644
--- a/man/systemd-journald.conf.xml
+++ b/man/journald.conf.xml
@@ -22,9 +22,9 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<refentry id="systemd-journald.conf">
+<refentry id="journald.conf">
         <refentryinfo>
-                <title>systemd-journald.conf</title>
+                <title>journald.conf</title>
                 <productname>systemd</productname>
 
                 <authorgroup>
@@ -38,17 +38,17 @@
         </refentryinfo>
 
         <refmeta>
-                <refentrytitle>systemd-journald.conf</refentrytitle>
+                <refentrytitle>journald.conf</refentrytitle>
                 <manvolnum>5</manvolnum>
         </refmeta>
 
         <refnamediv>
-                <refname>systemd-journald.conf</refname>
+                <refname>journald.conf</refname>
                 <refpurpose>Journal service configuration file</refpurpose>
         </refnamediv>
 
         <refsynopsisdiv>
-                <para><filename>systemd-journald.conf</filename></para>
+                <para><filename>journald.conf</filename></para>
         </refsynopsisdiv>
 
         <refsect1>
diff --git a/man/loginctl.xml b/man/loginctl.xml
index be72cc331a..af1d631cf4 100644
--- a/man/loginctl.xml
+++ b/man/loginctl.xml
@@ -44,7 +44,6 @@
 
         <refnamediv>
                 <refname>loginctl</refname>
-                <refname>systemd-loginctl</refname>
                 <refpurpose>Control the systemd login manager</refpurpose>
         </refnamediv>
 
@@ -451,7 +450,7 @@
                 <para>
                         <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
                         <citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-                        <citerefentry><refentrytitle>systemd-logind.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+                        <citerefentry><refentrytitle>logind.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
                 </para>
         </refsect1>
 
diff --git a/man/systemd-logind.conf.xml b/man/logind.conf.xml
index 27c11c2904..950f81fa93 100644
--- a/man/systemd-logind.conf.xml
+++ b/man/logind.conf.xml
@@ -22,9 +22,9 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<refentry id="systemd-logind.conf">
+<refentry id="logind.conf">
         <refentryinfo>
-                <title>systemd-logind.conf</title>
+                <title>logind.conf</title>
                 <productname>systemd</productname>
 
                 <authorgroup>
@@ -38,17 +38,17 @@
         </refentryinfo>
 
         <refmeta>
-                <refentrytitle>systemd-logind.conf</refentrytitle>
+                <refentrytitle>logind.conf</refentrytitle>
                 <manvolnum>5</manvolnum>
         </refmeta>
 
         <refnamediv>
-                <refname>systemd-logind.conf</refname>
+                <refname>logind.conf</refname>
                 <refpurpose>Login manager configuration file</refpurpose>
         </refnamediv>
 
         <refsynopsisdiv>
-                <para><filename>systemd-logind.conf</filename></para>
+                <para><filename>logind.conf</filename></para>
         </refsynopsisdiv>
 
         <refsect1>
diff --git a/man/pam_systemd.xml b/man/pam_systemd.xml
index 883b50b640..c07b46bab2 100644
--- a/man/pam_systemd.xml
+++ b/man/pam_systemd.xml
@@ -212,7 +212,7 @@
                 stricter version of
                 <varname>KillUserProcesses=1</varname> which may be
                 configured system-wide in
-                <citerefentry><refentrytitle>systemd-logind.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>. The
+                <citerefentry><refentrytitle>logind.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>. The
                 former kills processes of a session as soon as it
                 ends, the latter kills processes as soon as the last
                 session of the user ends.</para>
@@ -308,7 +308,7 @@ session    required     pam_systemd.so kill-session-processes=1</programlisting>
                         <citerefentry><refentrytitle>pam.d</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
                         <citerefentry><refentrytitle>pam</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
                         <citerefentry><refentrytitle>pam_loginuid</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
-                        <citerefentry><refentrytitle>systemd-logind.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+                        <citerefentry><refentrytitle>logind.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
                         <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>
                 </para>
         </refsect1>
diff --git a/man/systemctl.xml b/man/systemctl.xml
index 25b9266d49..968da84e36 100644
--- a/man/systemctl.xml
+++ b/man/systemctl.xml
@@ -44,7 +44,6 @@
 
         <refnamediv>
                 <refname>systemctl</refname>
-                <refname>systemd-systemctl</refname>
                 <refpurpose>Control the systemd system and service manager</refpurpose>
         </refnamediv>