Diff between 7bf32b8d10795bb1135dca74eebdac0be3c4842d and 8a10ddc5488040af60f244a3a783636e3fbcc6d8

Changed Files

File Additions Deletions Status
.gitignore +0 -8 modified
configure.ac +1 -1 modified
doc/bluez-docs.xml +0 -97 deleted
doc/version.xml.in +0 -1 deleted

Full Patch

diff --git a/.gitignore b/.gitignore
index 7be0fce..2398ed7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -70,14 +70,6 @@ emulator/btvirt
 emulator/b1ee
 client/bluetoothctl
 
-doc/*.bak
-doc/*.stamp
-doc/bluez.*
-doc/bluez-*.txt
-doc/*.sgml
-doc/version.xml
-doc/xml
-doc/html
 src/bluetoothd.8
 src/bluetooth.service
 
diff --git a/configure.ac b/configure.ac
index f22f06a..47a2a29 100644
--- a/configure.ac
+++ b/configure.ac
@@ -254,4 +254,4 @@ fi
 AC_DEFINE_UNQUOTED(CONFIGDIR, "${configdir}",
 			[Directory for the configuration files])
 
-AC_OUTPUT(Makefile doc/version.xml src/bluetoothd.8 bluez.pc)
+AC_OUTPUT(Makefile src/bluetoothd.8 bluez.pc)
diff --git a/doc/bluez-docs.xml b/doc/bluez-docs.xml
deleted file mode 100644
index 814ce00..0000000
--- a/doc/bluez-docs.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
-               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-<!ENTITY version SYSTEM "version.xml">
-]>
-<book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
-  <bookinfo>
-    <title>BlueZ Reference Manual</title>
-    <releaseinfo>Version &version;</releaseinfo>
-    <authorgroup>
-      <author>
-	<firstname>Marcel</firstname>
-	<surname>Holtmann</surname>
-	<affiliation>
-	  <address>
-	    <email>marcel@holtmann.org</email>
-	  </address>
-	</affiliation>
-      </author>
-    </authorgroup>
-
-    <copyright>
-      <year>2002-2008</year>
-      <holder>Marcel Holtmann</holder>
-    </copyright>
-
-    <legalnotice>
-      <para>
-	Permission is granted to copy, distribute and/or modify this
-	document under the terms of the <citetitle>GNU Free
-	Documentation License</citetitle>, Version 1.1 or any later
-	version published by the Free Software Foundation with no
-	Invariant Sections, no Front-Cover Texts, and no Back-Cover
-	Texts. You may obtain a copy of the <citetitle>GNU Free
-	Documentation License</citetitle> from the Free Software
-	Foundation by visiting <ulink type="http"
-	url="http://www.fsf.org">their Web site</ulink> or by writing
-	to:
-
-	<address>
-	  The Free Software Foundation, Inc.,
-	  <street>59 Temple Place</street> - Suite 330,
-	  <city>Boston</city>, <state>MA</state> <postcode>02111-1307</postcode>,
-	  <country>USA</country>
-	</address>
-      </para>
-    </legalnotice>
-  </bookinfo>
-
-  <reference id="adapter">
-    <title>Adapter interface</title>
-    <para>
-<programlisting><xi:include href="adapter-api.txt" parse="text" /></programlisting>
-    </para>
-  </reference>
-
-  <reference id="device">
-    <title>Device interface</title>
-    <para>
-<programlisting><xi:include href="device-api.txt" parse="text" /></programlisting>
-    </para>
-  </reference>
-
-  <reference id="profile">
-    <title>Profile interface</title>
-    <para>
-<programlisting><xi:include href="profile-api.txt" parse="text" /></programlisting>
-    </para>
-  </reference>
-
-  <reference id="agent">
-    <title>Agent interface</title>
-    <para>
-<programlisting><xi:include href="agent-api.txt" parse="text" /></programlisting>
-    </para>
-  </reference>
-
-  <reference id="reference">
-    <title>API Reference</title>
-    <partintro>
-      <para>
-	This part presents the function reference for BlueZ.
-      </para>
-    </partintro>
-  </reference>
-
-  <appendix id="license">
-    <title>License</title>
-    <para>
-<programlisting><xi:include href="../COPYING" parse="text" /></programlisting>
-    </para>
-  </appendix>
-
-  <index>
-    <title>Index</title>
-  </index>
-</book>
diff --git a/doc/version.xml.in b/doc/version.xml.in
deleted file mode 100644
index d78bda9..0000000
--- a/doc/version.xml.in
+++ /dev/null
@@ -1 +0,0 @@
-@VERSION@