Improve description of allowed variant signatures (#10185)

Patch based on one from Kristoffer Lundén, amended as per Havoc's comment.

diff --git a/ChangeLog b/ChangeLog
index f1078fa90d08bbe80c3b574f6ab655c6ea8c187e..4dd59e96f45c49afaf445337dffc7dc139424b24 100644 (file)
--- 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 125f892bc60d4443dbeca6363629feaf6956442d..932ba0a3576ef66ae2695e1886132cd34379f1c1 100644 (file)
--- 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)