From fde8cb2c61c5404a083367b5fbbed2d5b2483f1f Mon Sep 17 00:00:00 2001
From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Thu, 14 Feb 2013 13:39:15 +0000
Subject: [PATCH 1/2] Remove doclifter "signature" from Docbook man pages'
 source

This no longer serves any purpose, and might mislead contributors
into thinking that this XML is not the source for the man pages.
(The man(7)-formatted man pages used to be the canonical source for
the XML, but now it's the other way round.)

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=59805
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
---
 doc/dbus-cleanup-sockets.1.xml.in |    1 -
 doc/dbus-daemon.1.xml.in          |    3 +--
 doc/dbus-launch.1.xml.in          |    1 -
 doc/dbus-monitor.1.xml.in         |    1 -
 doc/dbus-send.1.xml.in            |    1 -
 doc/dbus-uuidgen.1.xml.in         |    1 -
 6 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/doc/dbus-cleanup-sockets.1.xml.in b/doc/dbus-cleanup-sockets.1.xml.in
index 9a9ae7e..5657496 100644
--- a/doc/dbus-cleanup-sockets.1.xml.in
+++ b/doc/dbus-cleanup-sockets.1.xml.in
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
                    "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
-<!-- lifted from troff+man by doclifter -->
 <refentry id='dbuscleanupsockets1'>
 
 <!--  dbus&bsol;-cleanup&bsol;-sockets manual page.
diff --git a/doc/dbus-daemon.1.xml.in b/doc/dbus-daemon.1.xml.in
index 8380f21..8bb8348 100644
--- a/doc/dbus-daemon.1.xml.in
+++ b/doc/dbus-daemon.1.xml.in
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
                    "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
-<!-- lifted from troff+man by doclifter -->
-<refentry id='dbusdaemon1in'>
+<refentry id='dbusdaemon1'>
 
 <!--  dbus&bsol;-daemon manual page.
  Copyright (C) 2003,2008 Red Hat, Inc. -->
diff --git a/doc/dbus-launch.1.xml.in b/doc/dbus-launch.1.xml.in
index c6ae0f1..b9f0767 100644
--- a/doc/dbus-launch.1.xml.in
+++ b/doc/dbus-launch.1.xml.in
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
                    "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
-<!-- lifted from troff+man by doclifter -->
 <refentry id='dbuslaunch1'>
 
 <!--  dbus&bsol;-launch manual page.
diff --git a/doc/dbus-monitor.1.xml.in b/doc/dbus-monitor.1.xml.in
index 1c58259..79586af 100644
--- a/doc/dbus-monitor.1.xml.in
+++ b/doc/dbus-monitor.1.xml.in
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
                    "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
-<!-- lifted from troff+man by doclifter -->
 <refentry id='dbusmonitor1'>
 
 <!--  dbus&bsol;-monitor manual page.
diff --git a/doc/dbus-send.1.xml.in b/doc/dbus-send.1.xml.in
index b63d09c..af4f158 100644
--- a/doc/dbus-send.1.xml.in
+++ b/doc/dbus-send.1.xml.in
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
                    "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
-<!-- lifted from troff+man by doclifter -->
 <refentry id='dbussend1'>
 
 <!--  dbus&bsol;-send manual page.
diff --git a/doc/dbus-uuidgen.1.xml.in b/doc/dbus-uuidgen.1.xml.in
index 7693c24..88e33ad 100644
--- a/doc/dbus-uuidgen.1.xml.in
+++ b/doc/dbus-uuidgen.1.xml.in
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
                    "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
-<!-- lifted from troff+man by doclifter -->
 <refentry id='dbusuuidgen1'>
 
 <!--  dbus&bsol;-uuidgen manual page.
-- 
1.7.10.4