From faebe5a933f571ad907e198832e8e10795b3dcb8 Mon Sep 17 00:00:00 2001
From: Daniel Mack <daniel@zonque.org>
Date: Sat, 20 Jun 2015 14:25:27 +0200
Subject: man: rename systemd-bus-proxyd@.service.xml →
 systemd-bus-proxyd.service.xml
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The bus proxy is multi-threaded now. Reflect that in the man pages.
---
 Makefile-man.am                     |  8 ++--
 man/systemd-bus-proxyd.service.xml  | 81 +++++++++++++++++++++++++++++++++++++
 man/systemd-bus-proxyd@.service.xml | 81 -------------------------------------
 3 files changed, 85 insertions(+), 85 deletions(-)
 create mode 100644 man/systemd-bus-proxyd.service.xml
 delete mode 100644 man/systemd-bus-proxyd@.service.xml

diff --git a/Makefile-man.am b/Makefile-man.am
index 76c9389835..734a923799 100644
--- a/Makefile-man.am
+++ b/Makefile-man.am
@@ -83,7 +83,7 @@ MANPAGES += \
 	man/systemd-ask-password-console.service.8 \
 	man/systemd-ask-password.1 \
 	man/systemd-bus-proxyd.8 \
-	man/systemd-bus-proxyd@.service.8 \
+	man/systemd-bus-proxyd.service.8 \
 	man/systemd-cat.1 \
 	man/systemd-cgls.1 \
 	man/systemd-cgtop.1 \
@@ -572,7 +572,7 @@ man/system.conf.d.5: man/systemd-system.conf.5
 man/systemd-ask-password-console.path.8: man/systemd-ask-password-console.service.8
 man/systemd-ask-password-wall.path.8: man/systemd-ask-password-console.service.8
 man/systemd-ask-password-wall.service.8: man/systemd-ask-password-console.service.8
-man/systemd-bus-proxyd.socket.8: man/systemd-bus-proxyd@.service.8
+man/systemd-bus-proxyd.socket.8: man/systemd-bus-proxyd.service.8
 man/systemd-fsck-root.service.8: man/systemd-fsck@.service.8
 man/systemd-fsck.8: man/systemd-fsck@.service.8
 man/systemd-hibernate-resume.8: man/systemd-hibernate-resume@.service.8
@@ -1145,7 +1145,7 @@ man/systemd-ask-password-wall.path.html: man/systemd-ask-password-console.servic
 man/systemd-ask-password-wall.service.html: man/systemd-ask-password-console.service.html
 	$(html-alias)
 
-man/systemd-bus-proxyd.socket.html: man/systemd-bus-proxyd@.service.html
+man/systemd-bus-proxyd.socket.html: man/systemd-bus-proxyd.service.html
 	$(html-alias)
 
 man/systemd-fsck-root.service.html: man/systemd-fsck@.service.html
@@ -2076,8 +2076,8 @@ EXTRA_DIST += \
 	man/systemd-backlight@.service.xml \
 	man/systemd-binfmt.service.xml \
 	man/systemd-bootchart.xml \
+	man/systemd-bus-proxyd.service.xml \
 	man/systemd-bus-proxyd.xml \
-	man/systemd-bus-proxyd@.service.xml \
 	man/systemd-cat.xml \
 	man/systemd-cgls.xml \
 	man/systemd-cgtop.xml \
diff --git a/man/systemd-bus-proxyd.service.xml b/man/systemd-bus-proxyd.service.xml
new file mode 100644
index 0000000000..5c0f3e1a7a
--- /dev/null
+++ b/man/systemd-bus-proxyd.service.xml
@@ -0,0 +1,81 @@
+<?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+
+<!--
+  This file is part of systemd.
+
+  Copyright 2013 Zbigniew Jędrzejewski-Szmek
+
+  systemd is free software; you can redistribute it and/or modify it
+  under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation; either version 2.1 of the License, or
+  (at your option) any later version.
+
+  systemd is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+-->
+
+<refentry id="systemd-bus-proxyd.service">
+
+  <refentryinfo>
+    <title>systemd-bus-proxyd.service</title>
+    <productname>systemd</productname>
+
+    <authorgroup>
+      <author>
+        <contrib>Developer</contrib>
+        <firstname>Lennart</firstname>
+        <surname>Poettering</surname>
+        <email>lennart@poettering.net</email>
+      </author>
+    </authorgroup>
+  </refentryinfo>
+
+  <refmeta>
+    <refentrytitle>systemd-bus-proxyd.service</refentrytitle>
+    <manvolnum>8</manvolnum>
+  </refmeta>
+
+  <refnamediv>
+    <refname>systemd-bus-proxyd.service</refname>
+    <refname>systemd-bus-proxyd.socket</refname>
+    <refpurpose>Proxy classic D-Bus clients to kdbus</refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <para><filename>systemd-bus-proxyd.service</filename></para>
+    <para><filename>systemd-bus-proxyd.socket</filename></para>
+  </refsynopsisdiv>
+
+  <refsect1>
+    <title>Description</title>
+
+    <para><filename>systemd-bus-proxyd.socket</filename> will launch
+    <filename>systemd-bus-proxyd.service</filename> for connections
+    to the classic D-Bus socket in
+    <filename>/var/run/dbus/system_bus_socket</filename>.</para>
+
+    <para><filename>systemd-bus-proxyd.service</filename> is launched
+    for an existing D-Bus connection and will use
+    <command>systemd-bus-proxyd</command> to proxy messages from this
+    connection to the system bus (either kdbus or classic D-Bus).
+    </para>
+  </refsect1>
+
+  <refsect1>
+    <title>See Also</title>
+
+    <para>
+      <citerefentry><refentrytitle>systemd-bus-proxyd</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+      <citerefentry project='dbus'><refentrytitle>dbus-daemon</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+      <ulink url="http://freedesktop.org/wiki/Software/dbus">D-Bus</ulink>,
+      <ulink url="https://code.google.com/p/d-bus/">kdbus</ulink>
+    </para>
+  </refsect1>
+</refentry>
diff --git a/man/systemd-bus-proxyd@.service.xml b/man/systemd-bus-proxyd@.service.xml
deleted file mode 100644
index e6e0a8e88d..0000000000
--- a/man/systemd-bus-proxyd@.service.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-
-<!--
-  This file is part of systemd.
-
-  Copyright 2013 Zbigniew Jędrzejewski-Szmek
-
-  systemd is free software; you can redistribute it and/or modify it
-  under the terms of the GNU Lesser General Public License as published by
-  the Free Software Foundation; either version 2.1 of the License, or
-  (at your option) any later version.
-
-  systemd is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with systemd; If not, see <http://www.gnu.org/licenses/>.
--->
-
-<refentry id="systemd-bus-proxyd@.service">
-
-  <refentryinfo>
-    <title>systemd-bus-proxyd@.service</title>
-    <productname>systemd</productname>
-
-    <authorgroup>
-      <author>
-        <contrib>Developer</contrib>
-        <firstname>Lennart</firstname>
-        <surname>Poettering</surname>
-        <email>lennart@poettering.net</email>
-      </author>
-    </authorgroup>
-  </refentryinfo>
-
-  <refmeta>
-    <refentrytitle>systemd-bus-proxyd@.service</refentrytitle>
-    <manvolnum>8</manvolnum>
-  </refmeta>
-
-  <refnamediv>
-    <refname>systemd-bus-proxyd@.service</refname>
-    <refname>systemd-bus-proxyd.socket</refname>
-    <refpurpose>Proxy classic D-Bus clients to kdbus</refpurpose>
-  </refnamediv>
-
-  <refsynopsisdiv>
-    <para><filename>systemd-bus-proxyd@.service</filename></para>
-    <para><filename>systemd-bus-proxyd.socket</filename></para>
-  </refsynopsisdiv>
-
-  <refsect1>
-    <title>Description</title>
-
-    <para><filename>systemd-bus-proxyd.socket</filename> will launch
-    <filename>systemd-bus-proxyd@.service</filename> for connections
-    to the classic D-Bus socket in
-    <filename>/var/run/dbus/system_bus_socket</filename>.</para>
-
-    <para><filename>systemd-bus-proxyd@.service</filename> is launched
-    for an existing D-Bus connection and will use
-    <command>systemd-bus-proxyd</command> to proxy messages from this
-    connection to the system bus (either kdbus or classic D-Bus).
-    </para>
-  </refsect1>
-
-  <refsect1>
-    <title>See Also</title>
-
-    <para>
-      <citerefentry><refentrytitle>systemd-bus-proxyd</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
-      <citerefentry project='dbus'><refentrytitle>dbus-daemon</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-      <ulink url="http://freedesktop.org/wiki/Software/dbus">D-Bus</ulink>,
-      <ulink url="https://code.google.com/p/d-bus/">kdbus</ulink>
-    </para>
-  </refsect1>
-</refentry>
-- 
cgit v1.2.3-54-g00ecf