Architecture_and_Design/en-US

[Jeroen van Meeuwen]

 Architecture_and_Design/en-US/Administration_Panel.xml |   18 ++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

New commits:
commit e5290e835712a6b2ee431790710803e598ccaf73
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Wed Feb 22 13:53:05 2012 +0000

    Use JSON terminology

diff --git a/Architecture_and_Design/en-US/Administration_Panel.xml b/Architecture_and_Design/en-US/Administration_Panel.xml
index d7d26ed..9c413df 100644
--- a/Architecture_and_Design/en-US/Administration_Panel.xml
+++ b/Architecture_and_Design/en-US/Administration_Panel.xml
@@ -232,7 +232,7 @@
                 The standard response layout offers a location for the request status, an error code and the corresponding message, or a result.
             </para>
             <para>
-                The status is the first item in the JSON dictionary. It has two possible values: <literal>OK</literal> or <literal>ERROR</literal>. Depending on the status of the request, the rest of the JSON output contains a result (OK) or the error details (ERROR).
+                The status is the first item in the JSON object. It has two possible values: <literal>OK</literal> or <literal>ERROR</literal>. Depending on the status of the request, the rest of the JSON output contains a result (OK) or the error details (ERROR).
             </para>
             <para>
                 The response to a successful request looks as follows:
@@ -697,7 +697,7 @@ domain_dn="dc=${domain_dn}"
                 <formalpara id="form-Architecture_and_Design-domains.list_Method-Response">
                     <title>Response</title>
                     <para>
-                        The response consists of the following two toplevel keys, contained within a JSON dictionary:
+                        The response consists of the following two toplevel keys, contained within a JSON object:
                     </para>
 
                 </formalpara>
@@ -720,7 +720,7 @@ domain_dn="dc=${domain_dn}"
 
                 </para>
                 <para>
-                    The <literal>result</literal> JSON dictionary contains the following two primary keys:
+                    The <literal>result</literal> JSON object contains the following two primary keys:
                 </para>
                 <para>
                     <orderedlist>
@@ -868,7 +868,7 @@ domain_dn="dc=${domain_dn}"
                 <formalpara id="form-Architecture_and_Design-group.members_list_Method-Response">
                     <title>Response</title>
                     <para>
-                        The response consists of the following two toplevel keys, contained within a JSON dictionary:
+                        The response consists of the following two toplevel keys, contained within a JSON object:
                     </para>
 
                 </formalpara>
@@ -891,7 +891,7 @@ domain_dn="dc=${domain_dn}"
 
                 </para>
                 <para>
-                    The <literal>result</literal> JSON dictionary contains the following two primary keys:
+                    The <literal>result</literal> JSON object contains the following two primary keys:
                 </para>
                 <para>
                     <orderedlist>
@@ -1668,7 +1668,7 @@ if response_data.has_key('result'):
                 <formalpara id="form-Architecture_and_Design-user_types.list_Method-Response">
                     <title>Response</title>
                     <para>
-                        The response consists of the following two toplevel keys, contained within a JSON dictionary:
+                        The response consists of the following two toplevel keys, contained within a JSON object:
                     </para>
 
                 </formalpara>
@@ -1691,7 +1691,7 @@ if response_data.has_key('result'):
 
                 </para>
                 <para>
-                    The <literal>result</literal> JSON dictionary contains the following two primary keys:
+                    The <literal>result</literal> JSON object contains the following two primary keys:
                 </para>
                 <para>
                     <orderedlist>
@@ -1757,7 +1757,7 @@ if response_data.has_key('result'):
                 <formalpara id="form-Architecture_and_Design-users.list_Method-Response">
                     <title>Response</title>
                     <para>
-                        The response consists of the following two toplevel keys, contained within a JSON dictionary:
+                        The response consists of the following two toplevel keys, contained within a JSON object:
                     </para>
 
                 </formalpara>
@@ -1780,7 +1780,7 @@ if response_data.has_key('result'):
 
                 </para>
                 <para>
-                    The <literal>result</literal> JSON dictionary contains the following two primary keys:
+                    The <literal>result</literal> JSON object contains the following two primary keys:
                 </para>
                 <para>
                     <orderedlist>