projects
/
platform
/
upstream
/
dbus.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'doc-search-paths-35306'
[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-B
US
Introspection data -->
-<!-- (C) 2005-02-02 David A. Wheeler; released under the D-B
US
licenses,
+<!-- DTD for D-B
us
Introspection data -->
+<!-- (C) 2005-02-02 David A. Wheeler; released under the D-B
us
licenses,
GNU GPL version 2 (or greater) and AFL 1.1 (or greater) -->
GNU GPL version 2 (or greater) and AFL 1.1 (or greater) -->
-<!-- see D-B
US
specification for documentation -->
+<!-- see D-B
us
specification for documentation -->
-<!ELEMENT node (
interface*,node*)
>
-<!ATTLIST node name CDATA #
REQUIR
ED>
+<!ELEMENT node (
node|interface)*
>
+<!ATTLIST node name CDATA #
IMPLI
ED>
-<!ELEMENT interface (
annotation*,method*,signal*,property*)
>
+<!ELEMENT interface (
method|signal|property|annotation)*
>
<!ATTLIST interface name CDATA #REQUIRED>
<!ATTLIST interface name CDATA #REQUIRED>
-<!ELEMENT method (a
nnotation*,arg*)
>
+<!ELEMENT method (a
rg|annotation)*
>
<!ATTLIST method name CDATA #REQUIRED>
<!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>
<!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">
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 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 -->
<!ATTLIST property access (read|write|readwrite) #REQUIRED>
<!ELEMENT annotation EMPTY> <!-- Generic metadata -->