[daemon-fix] fixed getting uid and pid when transport is not kdbus

[platform/upstream/dbus.git] / doc / introspect.dtd

diff --git a/doc/introspect.dtd b/doc/introspect.dtd
index fd6aa47..ba263d3 100644 (file)
--- a/doc/introspect.dtd
+++ b/doc/introspect.dtd
@@ -1,18 +1,21 @@
-<!-- DTD for D-BUS Introspection data -->
-<!-- (C) 2005-02-02 David A. Wheeler; released under the D-BUS licenses,
+<!-- 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 -->
+<!-- see D-Bus specification for documentation -->
 
-<!ELEMENT node (interface*,node*)>
-<!ATTLIST node name CDATA #REQUIRED>
+<!ELEMENT node (node|interface)*>
+<!ATTLIST node name CDATA #IMPLIED>
 
-<!ELEMENT interface (annotation*,method*,signal*,property*)>
+<!ELEMENT interface (method|signal|property|annotation)*>
 <!ATTLIST interface name CDATA #REQUIRED>
 
-<!ELEMENT method (annotation*,arg*)>
+<!ELEMENT method (arg|annotation)*>
 <!ATTLIST method name CDATA #REQUIRED>
 
+<!ELEMENT signal (arg|annotation)*>
+<!ATTLIST signal name CDATA #REQUIRED>
+
 <!ELEMENT arg EMPTY>
 <!ATTLIST arg name CDATA #IMPLIED>
 <!ATTLIST arg type CDATA #REQUIRED>
@@ -21,12 +24,10 @@
      The DTD format can't express that subtlety. -->
 <!ATTLIST arg direction (in|out) "in">
 
-<!ELEMENT signal (arg,annotation)>
-<!ATTLIST signal name CDATA #REQUIRED>
-
-<!ELEMENT property (annotation)>  <!-- AKA "attribute" -->
+<!-- AKA "attribute" -->
+<!ELEMENT property (annotation)*>
 <!ATTLIST property name CDATA #REQUIRED>
-<!ATTLIST property type CDATA #REQUIRED>
+<!ATTLIST property type CDATA #REQUIRED> 
 <!ATTLIST property access (read|write|readwrite) #REQUIRED>
 
 <!ELEMENT annotation EMPTY>  <!-- Generic metadata -->