summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2007-10-09 14:23:28 +0100
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2007-10-09 14:23:28 +0100
commit1a5ef4003d07aab548e59621b1497b37ec84e59f (patch)
tree2d7d3f729c9b9b55a0c1d08deb3e621da42cc502
parentfafd784424efc065d8e5f891a09319557c106559 (diff)
Improve description of allowed variant signatures (#10185)
Patch based on one from Kristoffer Lundén, amended as per Havoc's comment.
-rw-r--r--ChangeLog7
-rw-r--r--doc/dbus-specification.xml2
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index f1078fa9..4dd59e96 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,11 @@
2007-10-09 Simon McVittie <simon.mcvittie@collabora.co.uk>
* doc/dbus-specification.xml: Specifically forbid empty structs (#7969)
- * doc/dbus-specification.xml: Patch from Kristoffer Lundén to clarify
- description of DBUS_COOKIE_SHA1 (#10184) [OK for MIT/X11 licensing]
+ * doc/dbus-specification.xml: Patches from Kristoffer Lundén to clarify
+ description of DBUS_COOKIE_SHA1 (#10184) and allowable contents of a
+ variant (#10185, amended as per Havoc's comments)
+
+ [All of the above are OK for MIT/X11 licensing]
2007-09-20 Ryan Lortie <desrt@desrt.ca>
diff --git a/doc/dbus-specification.xml b/doc/dbus-specification.xml
index 125f892b..932ba0a3 100644
--- a/doc/dbus-specification.xml
+++ b/doc/dbus-specification.xml
@@ -566,7 +566,7 @@
given in the signature.
Unlike a message signature, the variant signature
can contain only a single complete type.
- So "i" is OK, "ii" is not.
+ So "i", "ai" or "(ii)" is OK, but "ii" is not.
</entry>
<entry>
1 (alignment of the signature)