Merge 0.10->trunk

[prosody.git] / doc / roster_format.txt

diff --git a/doc/roster_format.txt b/doc/roster_format.txt
index 9094b5a16527594ff7925b0eac503ac32e3c5aa5..132dbf4ebf3379b2879ed07ecdbc715d439f5d72 100644 (file)
--- a/doc/roster_format.txt
+++ b/doc/roster_format.txt
@@ -9,6 +9,7 @@ table roster_item {
   string subscription = "none" | "to" | "from" | "both"\r
   string name = Opaque string set by client. (optional)\r
   set groups = a set of opaque strings set by the client\r
+  boolean ask = nil | "subscribe" - a value of true indicates subscription is pending\r
 }\r
 \r
 The roster is available as\r