2005-02-04 Havoc Pennington <hp@redhat.com>

	* doc/Makefile.am (EXTRA_DIST): add DTDs to makefile

	* doc/introspect.dtd: add introspect.dtd from David A. Wheeler
	(with some minor changes)

	* doc/dbus-specification.xml: add deprecated attribute to
	introspection format

diff --git a/ChangeLog b/ChangeLog
index 01b497e..dece43e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2005-02-04  Havoc Pennington  <hp@redhat.com>
+
+       * doc/Makefile.am (EXTRA_DIST): add DTDs to makefile
+
+       * doc/introspect.dtd: add introspect.dtd from David A. Wheeler
+       (with some minor changes)
+
+       * doc/dbus-specification.xml: add deprecated attribute to
+       introspection format
+
 2005-01-31  Havoc Pennington  <hp@redhat.com>
 
        * glib/dbus-gproxy.c: rewrite how signals work again, this time I

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 11f7db9..3032c86 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,4 +1,6 @@
 EXTRA_DIST=                                    \
+       busconfig.dtd                           \
+       introspect.dtd                          \
        dbus-faq.xml                            \
        dbus-specification.xml                  \
        dbus-test-plan.xml                      \

diff --git a/doc/dbus-specification.xml b/doc/dbus-specification.xml
index 7a90e66..fdea2b4 100644 (file)
--- a/doc/dbus-specification.xml
+++ b/doc/dbus-specification.xml
@@ -2245,6 +2245,15 @@
             one <node>.
           </para>
         </listitem>
+        <listitem>
+          <para>
+            The method, interface, property, and signal elements may have 
+            an attribute deprecated="yes|no". If the attribute is not 
+            present, the default value for an interface is "no", and 
+            the default value for methods, properties, and signals is 
+            the deprecation status of the interface.
+          </para>
+        </listitem>
       </itemizedlist>
     </para>
 

diff --git a/doc/introspect.dtd b/doc/introspect.dtd
new file mode 100644 (file)
index 0000000..5e1c96d
--- /dev/null
+++ b/doc/introspect.dtd
@@ -0,0 +1,35 @@
+<!-- DTD for D-BUS Introspection data -->
+<!-- (C) 2005-02-02 David A. Wheeler; released under the D-BUS licenses,
+         GNU GPL version 2 (or greater) and AFL 1.1 (or greater) -->
+
+<!-- see D-BUS specification for documentation -->
+
+<!ELEMENT node (interface,node)>
+<!ATTLIST node name CDATA #REQUIRED>
+
+<!ELEMENT interface (method,signal,property)>
+<!ATTLIST interface name CDATA #REQUIRED>
+<!ATTLIST interface deprecated CDATA "no">
+
+<!ATTLIST method name CDATA #REQUIRED>
+<!ATTLIST method deprecated #IMPLIED>
+
+<!ELEMENT arg EMPTY>
+<!ATTLIST arg name CDATA #REQUIRED>
+<!ATTLIST arg type CDATA #REQUIRED>
+<!-- Method arguments SHOULD include "direction",
+     while signal and error arguments SHOULD not (since there's no point).
+     The DTD format can't express that subtlety. -->
+<!ATTLIST arg direction "in|out" #IMPLIED>
+
+<!ELEMENT signal (arg)>
+<!ATTLIST signal name CDATA #REQUIRED>
+<!ATTLIST signal deprecated #IMPLIED>
+
+<!ELEMENT property>  <!-- AKA "attribute" -->
+<!ATTLIST property name CDATA #REQUIRED>
+<!ATTLIST property type CDATA #REQUIRED>
+<!ATTLIST property access "read|write|readwrite" #REQUIRED>
+<!ATTLIST property deprecated #IMPLIED>
+
+