From 8e9a0ca00b7437402f80d10290c972fa1c07446a Mon Sep 17 00:00:00 2001
From: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
Date: Thu, 14 Nov 2013 08:51:42 +0200
Subject: combine choice and ui_choice properties of fields

---
 protocol.txt | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'protocol.txt')

diff --git a/protocol.txt b/protocol.txt
index 9f94c53..f0ad9cb 100644
--- a/protocol.txt
+++ b/protocol.txt
@@ -62,9 +62,8 @@ resp: JSON object, with the following attributes:
       	    - required (boolean)
 	    - default
       	    - max-length
-      	    - choices (optional array of allowed values)
-      	    - ui-choices (user-friendly choices to be shown in combo
-	      boxes)
+      	    - choices (optional array of allowed values, which are
+	      tuples of actual values and user-friendly versions)
       	    - fields (model only): array of field metadata JSON
 	      objects
       	    - members (collections and sets only): metadata for
-- 
cgit v1.2.3