diff options
author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2008-09-09 14:55:19 +0100 |
---|---|---|
committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2008-09-09 14:55:19 +0100 |
commit | 9f83605638e5dbb6114535db5556f431f0384331 (patch) | |
tree | 6a105948ddfdaefe9e15d2365d67c228cfb1faf5 /spec/Channel.xml | |
parent | 42c4cdbcf473cdd47d5dddb64f3d5ed25f34247b (diff) | |
parent | ffd155e9a729b194f045d73d0d5a2a82a0028c73 (diff) |
Merge branch 'release' into codegen-annotations
Conflicts:
spec/Connection.xml
Diffstat (limited to 'spec/Channel.xml')
-rw-r--r-- | spec/Channel.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/Channel.xml b/spec/Channel.xml index 253c446f..c91cd4e7 100644 --- a/spec/Channel.xml +++ b/spec/Channel.xml @@ -292,7 +292,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ guaranteed-unique via their link to the well-known bus name.</p> <p>If all connection managers in use are known to comply with at least - spec version 0.17.UNRELEASED, then the Connection's object path can + spec version 0.17.10, then the Connection's object path can even be determined from the Channel's without any additional information, by taking the first 7 components.</p> </tp:rationale> @@ -334,7 +334,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ threads. </tp:changed> - <tp:changed version="0.17.UNRELEASED">Previously we did not explicitly + <tp:changed version="0.17.10">Previously we did not explicitly guarantee that Channels' object paths had the Connection's object path as a prefix. </tp:changed> |