diff options
Diffstat (limited to 'doc/introspect.dtd')
| -rw-r--r-- | doc/introspect.dtd | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/doc/introspect.dtd b/doc/introspect.dtd index fd6aa472..15d913af 100644 --- a/doc/introspect.dtd +++ b/doc/introspect.dtd @@ -4,15 +4,18 @@ <!-- 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 --> |