diff options
| author | Josh Triplett <josh@freedesktop.org> | 2006-06-15 03:03:13 -0700 |
|---|---|---|
| committer | Josh Triplett <josh@freedesktop.org> | 2006-06-15 03:03:13 -0700 |
| commit | ab4393d3a63dde6fca2a167f7d6aaf64972b02f0 (patch) | |
| tree | bde139edf214f1f03b380612defd066cf4369353 /doc/xml-xcb.txt | |
| parent | 4f1ff61d7906b3a27bb261564cf681a97154df18 (diff) | |
Remove arbitrary division between xcb_types and xproto by merging
xcb_types.xml into xproto.xml.
Diffstat (limited to 'doc/xml-xcb.txt')
| -rw-r--r-- | doc/xml-xcb.txt | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/doc/xml-xcb.txt b/doc/xml-xcb.txt index b88d182..f428493 100644 --- a/doc/xml-xcb.txt +++ b/doc/xml-xcb.txt @@ -86,8 +86,8 @@ Top-Level Elements The import element allows the protocol description to reference types declared in another extension. The content is be the basename of the extension XML file, which is also the header attribute of the extension's - root node. Note that types from xcb_types and xproto are automatically - available, without explicitly importing them. + root node. Note that types from xproto are automatically available, without + explicitly importing them. <struct name="identifier">structure contents</struct> @@ -197,14 +197,14 @@ Structure Contents ------------------ Note: "type" attributes below refer to types defined by previous elements, -either in the current extension, xproto, xcb_types, or one of the imported -extensions. The type name must refer to only one possible type; if more than -one type matches, an error occurs. To avoid this, the type may be explicitly -prefixed with a namespace, which should be the value of the header attribute -on the protocol description containing the desired type. The namespace and -type are separated by a single colon. For example, to refer to the PIXMAP -type defined in glx rather than the one defined in xcb_types, use -type="glx:PIXMAP" rather than type="PIXMAP". +either in the current extension, xproto, or one of the imported extensions. +The type name must refer to only one possible type; if more than one type +matches, an error occurs. To avoid this, the type may be explicitly prefixed +with a namespace, which should be the value of the header attribute on the +protocol description containing the desired type. The namespace and type are +separated by a single colon. For example, to refer to the PIXMAP type defined +in glx rather than the one defined in xproto, use type="glx:PIXMAP" rather +than type="PIXMAP". <pad bytes="integer" /> |