Auto-formatted and syntacically validated every JSON example in the doc guide

29 files changed, 508 insertions, 494 deletions

diff --git a/doc/guide/src/docbkx/samples/auth.json b/doc/guide/src/docbkx/samples/auth.json
index b5fbada2..c74dcb2b 100644
--- a/doc/guide/src/docbkx/samples/auth.json
+++ b/doc/guide/src/docbkx/samples/auth.json
@@ -1,37 +1,37 @@
 {
-    "auth" : {
-        "token" : {
-            "id" : "asdasdasd-adsasdads-asdasdasd-adsadsasd",
-            "expires" : "2010-11-01T03:32:15-05:00"
+  "auth":{
+    "token":{
+      "id":"asdasdasd-adsasdads-asdasdasd-adsadsasd",
+      "expires":"2010-11-01T03:32:15-05:00"
+    },
+    "serviceCatalog":{
+      "service1":[
+        {
+          "region":"DFW",
+          "publicURL":"https://service1-public/v1/blah-blah",
+          "internalURL":"https://service1-internal/v1/blah-blah"
         },
-        "serviceCatalog" : {
-            "service1" : [
-                {
-                    "region" : "DFW",
-                    "publicURL" : "https://service1-public/v1/blah-blah",
-                    "internalURL" : "https://service1-internal/v1/blah-blah"
-                },
-                {
-                    "region" : "ORD",
-                    "publicURL" : "https://service1-public-ord/v1/blah-blah",
-                    "internalURL" : "https://service1-internal-ord/v1/blah-blah"
-                }
-            ],
-            "service2" : [
-                {
-                    "region" : "DFW",
-                    "publicURL" : "https://service2-public-dfw/v1/blah-blah",
-                },
-                {
-                    "region" : "ORD",
-                    "publicURL" : "https://service2-public-orf/v1/blah-blah",
-                }
-            ],
-            "service3" : [
-                {
-                    "publicURL" : "https://service3-public/v1/blah-blah",
-                }
-            ]
+        {
+          "region":"ORD",
+          "publicURL":"https://service1-public-ord/v1/blah-blah",
+          "internalURL":"https://service1-internal-ord/v1/blah-blah"
         }
+      ],
+      "service2":[
+        {
+          "region":"DFW",
+          "publicURL":"https://service2-public-dfw/v1/blah-blah"
+        },
+        {
+          "region":"ORD",
+          "publicURL":"https://service2-public-orf/v1/blah-blah"
+        }
+      ],
+      "service3":[
+        {
+          "publicURL":"https://service3-public/v1/blah-blah"
+        }
+      ]
     }
+  }
 }
diff --git a/doc/guide/src/docbkx/samples/auth_credentials.json b/doc/guide/src/docbkx/samples/auth_credentials.json
index 67b06304..a886351a 100644
--- a/doc/guide/src/docbkx/samples/auth_credentials.json
+++ b/doc/guide/src/docbkx/samples/auth_credentials.json
@@ -1,7 +1,7 @@
 {
-    "passwordCredentials" : {
-        "username" : "test_user",
-        "password"     : "a86850deb2742ec3cb41518e26aa2d89",
-        "tenantId"     : "77654"
-    }
+  "passwordCredentials":{
+    "username":"test_user",
+    "password":"a86850deb2742ec3cb41518e26aa2d89",
+    "tenantId":"77654"
+  }
 }
diff --git a/doc/guide/src/docbkx/samples/baseURL.json b/doc/guide/src/docbkx/samples/baseURL.json
index 534484aa..3c15aafe 100644
--- a/doc/guide/src/docbkx/samples/baseURL.json
+++ b/doc/guide/src/docbkx/samples/baseURL.json
@@ -1,12 +1,11 @@
 {
-  "baseURL" :
-   {
-       "id" : 1,
-       "region"   : "DFW",
-       "default"  : true,
-       "serviceName" : "service1",
-       "publicURL" : "https://service-public.com/v1",
-       "internalURL" : "https://service-internal.com/v1",
-       "enabled"  : true
-   }
+  "baseURL":{
+    "id":1,
+    "region":"DFW",
+    "default":true,
+    "serviceName":"service1",
+    "publicURL":"https://service-public.com/v1",
+    "internalURL":"https://service-internal.com/v1",
+    "enabled":true
+  }
 }
diff --git a/doc/guide/src/docbkx/samples/baseURLRef.json b/doc/guide/src/docbkx/samples/baseURLRef.json
index aed01500..13e8c9dc 100644
--- a/doc/guide/src/docbkx/samples/baseURLRef.json
+++ b/doc/guide/src/docbkx/samples/baseURLRef.json
@@ -1,5 +1,5 @@
 {
-    "baseURLRef" : {
-        "id" : 3
-    }
+  "baseURLRef":{
+    "id":3
+  }
 }
diff --git a/doc/guide/src/docbkx/samples/baseURLRefs.json b/doc/guide/src/docbkx/samples/baseURLRefs.json
index a815f2b9..6f0fd41e 100644
--- a/doc/guide/src/docbkx/samples/baseURLRefs.json
+++ b/doc/guide/src/docbkx/samples/baseURLRefs.json
@@ -1,24 +1,24 @@
 {
- "baseURLRefs" : [
-  {
-  "id" : 1,
-  "href" : "https://auth.keystone.com/v2.0/baseURLs/1"
-  },
-  {
-  "id" : 2
-  "href" : "https://auth.keystone.com/v2.0/baseURLs/2"
-  },
-  {
-  "id" : 3,
-  "href" : "https://auth.keystone.com/v2.0/baseURLs/3"
-  },
-  {
-  "id" : 4,
-  "href" : "https://auth.keystone.com/v2.0/baseURLs/4"
-  },
-  {
-  "id" : 5,
-  "href" : "https://auth.keystone.com/v2.0/baseURLs/5"
-  }
- ]
+  "baseURLRefs":[
+    {
+      "id":1,
+      "href":"https://auth.keystone.com/v2.0/baseURLs/1"
+    },
+    {
+      "id":2,
+      "href":"https://auth.keystone.com/v2.0/baseURLs/2"
+    },
+    {
+      "id":3,
+      "href":"https://auth.keystone.com/v2.0/baseURLs/3"
+    },
+    {
+      "id":4,
+      "href":"https://auth.keystone.com/v2.0/baseURLs/4"
+    },
+    {
+      "id":5,
+      "href":"https://auth.keystone.com/v2.0/baseURLs/5"
+    }
+  ]
 }
diff --git a/doc/guide/src/docbkx/samples/baseURLs.json b/doc/guide/src/docbkx/samples/baseURLs.json
index 36ec4f6e..0c3a9938 100644
--- a/doc/guide/src/docbkx/samples/baseURLs.json
+++ b/doc/guide/src/docbkx/samples/baseURLs.json
@@ -1,43 +1,43 @@
 {
- "baseURLs" : [
-     {
-     "id" : 1,
-     "region"   : "DFW",
-     "default"  : true,
-     "serviceName" : "service1",
-     "publicURL" : "https://service1.public.com/v1",
-     "internalURL" : "https://service1.internal.com/v1",
-     "enabled"  : true
-     },
-     {
-     "id" : 2,
-     "region"   : "ORD",
-     "serviceName" : "service2",
-     "publicURL" : "https://service2.public.com/v1",
-     "internalURL" : "https://service2.internal.com/v1",
-     "enabled"  : false
-     },
-     {
-     "id" : 3,
-     "region"   : "DFW",
-     "default"  : true,
-     "serviceName" : "service1",
-     "publicURL" : "https://service.public.com/v1.0",
-     "enabled"  : true
-     },
-     {
-     "id" : 4,
-     "region"   : "ORD",
-     "serviceName" : "service2",
-     "publicURL" : "https://service2.public.com/v2",
-     "enabled"  : true
-     },
-     {
-     "id" : 5,
-     "default"  : true,
-     "serviceName" : "service3",
-     "publicURL" : "https://service3.public.com/v3.2",
-     "enabled"  : true
-     }
- ]
+  "baseURLs":[
+    {
+      "id":1,
+      "region":"DFW",
+      "default":true,
+      "serviceName":"service1",
+      "publicURL":"https://service1.public.com/v1",
+      "internalURL":"https://service1.internal.com/v1",
+      "enabled":true
+    },
+    {
+      "id":2,
+      "region":"ORD",
+      "serviceName":"service2",
+      "publicURL":"https://service2.public.com/v1",
+      "internalURL":"https://service2.internal.com/v1",
+      "enabled":false
+    },
+    {
+      "id":3,
+      "region":"DFW",
+      "default":true,
+      "serviceName":"service1",
+      "publicURL":"https://service.public.com/v1.0",
+      "enabled":true
+    },
+    {
+      "id":4,
+      "region":"ORD",
+      "serviceName":"service2",
+      "publicURL":"https://service2.public.com/v2",
+      "enabled":true
+    },
+    {
+      "id":5,
+      "default":true,
+      "serviceName":"service3",
+      "publicURL":"https://service3.public.com/v3.2",
+      "enabled":true
+    }
+  ]
 }
diff --git a/doc/guide/src/docbkx/samples/choices.json b/doc/guide/src/docbkx/samples/choices.json
index 16ec35f0..9beecef0 100644
--- a/doc/guide/src/docbkx/samples/choices.json
+++ b/doc/guide/src/docbkx/samples/choices.json
@@ -1,72 +1,72 @@
 {
-    "choices" : {
-        "values" : [
+  "choices":{
+    "values":[
+      {
+        "id":"v1.0",
+        "status":"DEPRECATED",
+        "links":[
+          {
+            "rel":"self",
+            "href":"http://identity.api.openstack.org/v2.0"
+          }
+        ],
+        "media-types":{
+          "values":[
             {
-                "id" : "v1.0",
-                "status" : "DEPRECATED",
-                "links": [
-                    {
-                        "rel" : "self",
-                        "href" : "http://identity.api.openstack.org/v2.0"
-                    }
-                ],
-                "media-types": {
-                    "values" : [
-                        {
-                            "base" : "application/xml",
-                            "type" : "application/vnd.openstack.identity-v1.0+xml"
-                        },
-                        {
-                            "base" : "application/json",
-                            "type" : "application/vnd.openstack.identity-v1.0+json"
-                        }
-                    ]
-                }
+              "base":"application/xml",
+              "type":"application/vnd.openstack.identity-v1.0+xml"
             },
             {
-                "id" : "v1.1",
-                "status" : "CURRENT",
-                "links": [
-                    {
-                        "rel" : "self",
-                        "href" : "http://identity.api.openstack.org/v1.1"
-                    }
-                ],
-                "media-types": {
-                    "values" : [
-                        {
-                            "base" : "application/xml",
-                            "type" : "application/vnd.openstack.identity-v1.1+xml"
-                        },
-                        {
-                            "base" : "application/json",
-                            "type" : "application/vnd.openstack.identity-v1.1+json"
-                        }
-                    ]
-                }
+              "base":"application/json",
+              "type":"application/vnd.openstack.identity-v1.0+json"
+            }
+          ]
+        }
+      },
+      {
+        "id":"v1.1",
+        "status":"CURRENT",
+        "links":[
+          {
+            "rel":"self",
+            "href":"http://identity.api.openstack.org/v1.1"
+          }
+        ],
+        "media-types":{
+          "values":[
+            {
+              "base":"application/xml",
+              "type":"application/vnd.openstack.identity-v1.1+xml"
+            },
+            {
+              "base":"application/json",
+              "type":"application/vnd.openstack.identity-v1.1+json"
+            }
+          ]
+        }
+      },
+      {
+        "id":"v2.0",
+        "status":"BETA",
+        "links":[
+          {
+            "rel":"self",
+            "href":"http://identity.api.openstack.org/v2.0"
+          }
+        ],
+        "media-types":{
+          "values":[
+            {
+              "base":"application/xml",
+              "type":"application/vnd.openstack.identity-v2.0+xml"
             },
             {
-                "id" : "v2.0",
-                "status" : "BETA",
-                "links": [
-                    {
-                        "rel" : "self",
-                        "href" : "http://identity.api.openstack.org/v2.0"
-                    }
-                ],
-                "media-types": {
-                    "values" : [
-                        {
-                            "base" : "application/xml",
-                            "type" : "application/vnd.openstack.identity-v2.0+xml"
-                        },
-                        {
-                            "base" : "application/json",
-                            "type" : "application/vnd.openstack.identity-v2.0+json"
-                        }
-                    ]
-                }
+              "base":"application/json",
+              "type":"application/vnd.openstack.identity-v2.0+json"
             }
-        ]
-    }
+          ]
+        }
+      }
+    ]
+  }
 }
diff --git a/doc/guide/src/docbkx/samples/ext-getuser.json b/doc/guide/src/docbkx/samples/ext-getuser.json
index 03f74dda..34068f54 100644
--- a/doc/guide/src/docbkx/samples/ext-getuser.json
+++ b/doc/guide/src/docbkx/samples/ext-getuser.json
@@ -1,21 +1,22 @@
-{"user":
-    {
-      "groups": {
-        "values": [
-          {
-            "tenantId" : "1234",
-            "id": "Admin"
-          }
-        ]},
-        "id": "jqsmith",
-        "tenantId": "1234",
-        "email": "john.smith@example.org",
-        "enabled": true,
-        "RS-META:metadata" : {
-            "values" : {
-                "MetaKey1" : "MetaValue1",
-                "MetaKey2" : "MetaValue2"
-            }
-        },
+{
+  "user":{
+    "groups":{
+      "values":[
+        {
+          "tenantId":"1234",
+          "id":"Admin"
+        }
+      ]
+    },
+    "id":"jqsmith",
+    "tenantId":"1234",
+    "email":"john.smith@example.org",
+    "enabled":true,
+    "RS-META:metadata":{
+      "values":{
+        "MetaKey1":"MetaValue1",
+        "MetaKey2":"MetaValue2"
+      }
     }
+  }
 }
diff --git a/doc/guide/src/docbkx/samples/extension.json b/doc/guide/src/docbkx/samples/extension.json
index 9efaa422..74773915 100644
--- a/doc/guide/src/docbkx/samples/extension.json
+++ b/doc/guide/src/docbkx/samples/extension.json
@@ -1,21 +1,21 @@
 {
-  "extension" : {
-      "name" : "User Metadata Extension",
-      "namespace" : "http://docs.rackspacecloud.com/identity/api/ext/meta/v2.0",
-      "alias" : "RS-META",
-      "updated" : "2011-01-12T11:22:33-06:00",
-      "description" : "Allows associating arbritrary metadata with a user.",
-      "links" : [
-          {
-              "rel" : "describedby",
-              "type" : "application/pdf",
-              "href" : "http://docs.rackspacecloud.com/identity/api/ext/identity-meta-20111201.pdf"
-          },
-          {
-              "rel" : "describedby",
-              "type" : "application/vnd.sun.wadl+xml",
-              "href" : "http://docs.rackspacecloud.com/identity/api/ext/identity-cbs.wadl"
-          }
-      ] 
+  "extension":{
+    "name":"User Metadata Extension",
+    "namespace":"http://docs.rackspacecloud.com/identity/api/ext/meta/v2.0",
+    "alias":"RS-META",
+    "updated":"2011-01-12T11:22:33-06:00",
+    "description":"Allows associating arbritrary metadata with a user.",
+    "links":[
+      {
+        "rel":"describedby",
+        "type":"application/pdf",
+        "href":"http://docs.rackspacecloud.com/identity/api/ext/identity-meta-20111201.pdf"
+      },
+      {
+        "rel":"describedby",
+        "type":"application/vnd.sun.wadl+xml",
+        "href":"http://docs.rackspacecloud.com/identity/api/ext/identity-cbs.wadl"
+      }
+    ]
   }
 }
diff --git a/doc/guide/src/docbkx/samples/extensions.json b/doc/guide/src/docbkx/samples/extensions.json
index da3cbc50..53d8d508 100644
--- a/doc/guide/src/docbkx/samples/extensions.json
+++ b/doc/guide/src/docbkx/samples/extensions.json
@@ -1,44 +1,44 @@
 {
-    "extensions" : {
-        "values" : [
-            {
-                "name" : "Reset Password Extension",
-                "namespace" : "http://docs.rackspacecloud.com/identity/api/ext/rpe/v2.0",
-                "alias" : "RS-RPE",
-                "updated" : "2011-01-22T13:25:27-06:00",
-                "description" : "Adds the capability to reset a user's password. The user is emailed when the password has been reset.",
-                "links" : [
-                    {
-                        "rel" : "describedby",
-                        "type" : "application/pdf",
-                        "href" : "http://docs.rackspacecloud.com/identity/api/ext/identity-rpe-20111111.pdf"
-                    },
-                    {
-                        "rel" : "describedby",
-                        "type" : "application/vnd.sun.wadl+xml",
-                        "href" : "http://docs.rackspacecloud.com/identity/api/ext/identity-rpe.wadl"
-                    }
-                ]
-            },
-            {
-                "name" : "User Metadata Extension",
-                "namespace" : "http://docs.rackspacecloud.com/identity/api/ext/meta/v2.0",
-                "alias" : "RS-META",
-                "updated" : "2011-01-12T11:22:33-06:00",
-                "description" : "Allows associating arbritrary metadata with a user.",
-                "links" : [
-                    {
-                        "rel" : "describedby",
-                        "type" : "application/pdf",
-                        "href" : "http://docs.rackspacecloud.com/identity/api/ext/identity-meta-20111201.pdf"
-                    },
-                    {
-                        "rel" : "describedby",
-                        "type" : "application/vnd.sun.wadl+xml",
-                        "href" : "http://docs.rackspacecloud.com/identity/api/ext/identity-meta.wadl"
-                    }
-                ]
-            }
+  "extensions":{
+    "values":[
+      {
+        "name":"Reset Password Extension",
+        "namespace":"http://docs.rackspacecloud.com/identity/api/ext/rpe/v2.0",
+        "alias":"RS-RPE",
+        "updated":"2011-01-22T13:25:27-06:00",
+        "description":"Adds the capability to reset a user's password. The user is emailed when the password has been reset.",
+        "links":[
+          {
+            "rel":"describedby",
+            "type":"application/pdf",
+            "href":"http://docs.rackspacecloud.com/identity/api/ext/identity-rpe-20111111.pdf"
+          },
+          {
+            "rel":"describedby",
+            "type":"application/vnd.sun.wadl+xml",
+            "href":"http://docs.rackspacecloud.com/identity/api/ext/identity-rpe.wadl"
+          }
         ]
-    }
+      },
+      {
+        "name":"User Metadata Extension",
+        "namespace":"http://docs.rackspacecloud.com/identity/api/ext/meta/v2.0",
+        "alias":"RS-META",
+        "updated":"2011-01-12T11:22:33-06:00",
+        "description":"Allows associating arbritrary metadata with a user.",
+        "links":[
+          {
+            "rel":"describedby",
+            "type":"application/pdf",
+            "href":"http://docs.rackspacecloud.com/identity/api/ext/identity-meta-20111201.pdf"
+          },
+          {
+            "rel":"describedby",
+            "type":"application/vnd.sun.wadl+xml",
+            "href":"http://docs.rackspacecloud.com/identity/api/ext/identity-meta.wadl"
+          }
+        ]
+      }
+    ]
+  }
 }
diff --git a/doc/guide/src/docbkx/samples/getuser-1.json b/doc/guide/src/docbkx/samples/getuser-1.json
index bef6c9a7..b0f6dc95 100644
--- a/doc/guide/src/docbkx/samples/getuser-1.json
+++ b/doc/guide/src/docbkx/samples/getuser-1.json
@@ -1,29 +1,29 @@
-{"user":
-    {
-      "groups": {
-          "values": [
-              {
-                  "tenantId" : "1234",
-                  "id": "Admin"
-              },
-              {
-                  "tenantId" : "1234",
-                  "id" : "DBUser"
-              },
-              {
-                  "id" : "Super"
-            }
-          ],
-          "links" : [
-              {
-                  "rel"  : "next",
-                  "href" : "http://identity.api.openstack.org/v2.0/tenants/1234/users/jqsmith/groups?marker=Super"
-              }
-          ]
-      },
-      "id": "jqsmith",
-      "tenantId": "1234",
-      "email": "john.smith@example.org",
-      "enabled": true
-    }
+{
+  "user":{
+    "groups":{
+      "values":[
+        {
+          "tenantId":"1234",
+          "id":"Admin"
+        },
+        {
+          "tenantId":"1234",
+          "id":"DBUser"
+        },
+        {
+          "id":"Super"
+        }
+      ],
+      "links":[
+        {
+          "rel":"next",
+          "href":"http://identity.api.openstack.org/v2.0/tenants/1234/users/jqsmith/groups?marker=Super"
+        }
+      ]
+    },
+    "id":"jqsmith",
+    "tenantId":"1234",
+    "email":"john.smith@example.org",
+    "enabled":true
+  }
 }
diff --git a/doc/guide/src/docbkx/samples/group.json b/doc/guide/src/docbkx/samples/group.json
index 07dc0a10..4e4fdc5e 100644
--- a/doc/guide/src/docbkx/samples/group.json
+++ b/doc/guide/src/docbkx/samples/group.json
@@ -1 +1,6 @@
-{"group": {"id": "test_global_group", "description": "A description ..."}}
\ No newline at end of file
+{
+  "group":{
+    "id":"test_global_group",
+    "description":"A description ..."
+  }
+}
diff --git a/doc/guide/src/docbkx/samples/groups.json b/doc/guide/src/docbkx/samples/groups.json
index 06dd58a0..6d565eb6 100644
--- a/doc/guide/src/docbkx/samples/groups.json
+++ b/doc/guide/src/docbkx/samples/groups.json
@@ -1 +1,13 @@
-{"groups": {"values": [{"id": "test_global_group_add", "description": "A description ..."}], "links": []}}
\ No newline at end of file
+{
+  "groups":{
+    "values":[
+      {
+        "id":"test_global_group_add",
+        "description":"A description ..."
+      }
+    ],
+    "links":[
+
+    ]
+  }
+}
diff --git a/doc/guide/src/docbkx/samples/identity_fault.json b/doc/guide/src/docbkx/samples/identity_fault.json
index d61feff4..1aab06dc 100644
--- a/doc/guide/src/docbkx/samples/identity_fault.json
+++ b/doc/guide/src/docbkx/samples/identity_fault.json
@@ -1,7 +1,7 @@
-{"identityFault":
-    {
-      "message": "Fault",
-      "details": "Error Details...",
-      "code": 500
-    }
-}
\ No newline at end of file
+{
+  "identityFault":{
+    "message":"Fault",
+    "details":"Error Details...",
+    "code":500
+  }
+}
diff --git a/doc/guide/src/docbkx/samples/item_not_found.json b/doc/guide/src/docbkx/samples/item_not_found.json
index dda88a59..248ed146 100644
--- a/doc/guide/src/docbkx/samples/item_not_found.json
+++ b/doc/guide/src/docbkx/samples/item_not_found.json
@@ -1,7 +1,7 @@
-{"itemNotFound":
-    {
-      "message": "Item not found.",
-      "details": "Error Details...",
-      "code": 404
-    }
-}
\ No newline at end of file
+{
+  "itemNotFound":{
+    "message":"Item not found.",
+    "details":"Error Details...",
+    "code":404
+  }
+}
diff --git a/doc/guide/src/docbkx/samples/role.json b/doc/guide/src/docbkx/samples/role.json
index 904801ee..248ed146 100644
--- a/doc/guide/src/docbkx/samples/role.json
+++ b/doc/guide/src/docbkx/samples/role.json
@@ -1,7 +1,7 @@
 {
-  "role" :
-   {
-       "id" : "Admin",
-       "description" : "All access"
-   }
-}
\ No newline at end of file
+  "itemNotFound":{
+    "message":"Item not found.",
+    "details":"Error Details...",
+    "code":404
+  }
+}
diff --git a/doc/guide/src/docbkx/samples/roleRef.json b/doc/guide/src/docbkx/samples/roleRef.json
index 83f4ae4b..faa74283 100644
--- a/doc/guide/src/docbkx/samples/roleRef.json
+++ b/doc/guide/src/docbkx/samples/roleRef.json
@@ -1,7 +1,7 @@
 {
-   "roleRef" : {
-  		"id" : 1,
-  		"roleId" : "admin",
-  		"tenantId" : "one"
+  "roleRef":{
+    "id":1,
+    "roleId":"admin",
+    "tenantId":"one"
   }
-}
\ No newline at end of file
+}
diff --git a/doc/guide/src/docbkx/samples/roleRefs.json b/doc/guide/src/docbkx/samples/roleRefs.json
index 51573f74..34e391f5 100644
--- a/doc/guide/src/docbkx/samples/roleRefs.json
+++ b/doc/guide/src/docbkx/samples/roleRefs.json
@@ -1,14 +1,14 @@
 {
- "roleRefs" : [
-  {
-  	"id" : 1,
-  	"roleId" : "admin",
-  	"tenantId" : "one"
-  },
-  {
-  	"id" : 2,
-  	"roleId" : "test",
-  	"tenantId" : "two"
-  }
- ]
+  "roleRefs":[
+    {
+      "id":1,
+      "roleId":"admin",
+      "tenantId":"one"
+    },
+    {
+      "id":2,
+      "roleId":"test",
+      "tenantId":"two"
+    }
+  ]
 }
diff --git a/doc/guide/src/docbkx/samples/roles.json b/doc/guide/src/docbkx/samples/roles.json
index 4f431806..4f1428e4 100644
--- a/doc/guide/src/docbkx/samples/roles.json
+++ b/doc/guide/src/docbkx/samples/roles.json
@@ -1,12 +1,12 @@
 {
- "roles" : [
-     {
-     "id" : "Admin",
-     "description" : "All access"
-     },
-     {
-     "id" : "Guest",
-     "description" : "Guest Access"
-     },
- ]
+  "roles":[
+    {
+      "id":"Admin",
+      "description":"All access"
+    },
+    {
+      "id":"Guest",
+      "description":"Guest Access"
+    }
+  ]
 }
diff --git a/doc/guide/src/docbkx/samples/tenant.json b/doc/guide/src/docbkx/samples/tenant.json
index 7ff7ce32..cf6ca370 100644
--- a/doc/guide/src/docbkx/samples/tenant.json
+++ b/doc/guide/src/docbkx/samples/tenant.json
@@ -1,7 +1,7 @@
-{"tenant":
-    {
-      "id": "1234",
-      "description": "A description ...",
-      "enabled": true
-    }
+{
+  "tenant":{
+    "id":"1234",
+    "description":"A description ...",
+    "enabled":true
+  }
 }
diff --git a/doc/guide/src/docbkx/samples/tenantlock.json b/doc/guide/src/docbkx/samples/tenantlock.json
index 584c21a4..a0f5b138 100644
--- a/doc/guide/src/docbkx/samples/tenantlock.json
+++ b/doc/guide/src/docbkx/samples/tenantlock.json
@@ -1,5 +1,5 @@
-{"tenant":
-    {
-      "description": "A NEW description..."
-    }
-}
\ No newline at end of file
+{
+  "tenant":{
+    "description":"A NEW description..."
+  }
+}
diff --git a/doc/guide/src/docbkx/samples/tenants-1.json b/doc/guide/src/docbkx/samples/tenants-1.json
index c80050a4..67f16deb 100644
--- a/doc/guide/src/docbkx/samples/tenants-1.json
+++ b/doc/guide/src/docbkx/samples/tenants-1.json
@@ -1,16 +1,17 @@
 {
-"tenants": {
-    "values" : [
-        {
-            "id": "1234",
-            "description": "A description ...",
-            "enabled": true
-        }
+  "tenants":{
+    "values":[
+      {
+        "id":"1234",
+        "description":"A description ...",
+        "enabled":true
+      }
     ],
-    "links" : [
-        {
-            "rel" : "next",
-            "href" : "http://identity.api.openstack.org/v2.0/tenants?limit=1&marker=1234"
-        }
+    "links":[
+      {
+        "rel":"next",
+        "href":"http://identity.api.openstack.org/v2.0/tenants?limit=1&marker=1234"
+      }
     ]
+  }
 }
diff --git a/doc/guide/src/docbkx/samples/tenants-2.json b/doc/guide/src/docbkx/samples/tenants-2.json
index d1fcae35..cc0e9f03 100644
--- a/doc/guide/src/docbkx/samples/tenants-2.json
+++ b/doc/guide/src/docbkx/samples/tenants-2.json
@@ -1,20 +1,21 @@
 {
-"tenants": {
-    "values" : [
-        {
-            "id": "3645",
-            "description": "A description ...",
-            "enabled": true
-        }
+  "tenants":{
+    "values":[
+      {
+        "id":"3645",
+        "description":"A description ...",
+        "enabled":true
+      }
     ],
-    "links" : [
-        {
-            "rel" : "next",
-            "href" : "http://identity.api.openstack.org/v2.0/tenants?limit=1&marker=3645"
-        },
-        {
-            "rel" : "previous",
-            "href" : "http://identity.api.openstack.org/v2.0/tenants?limit=1"
-        }
+    "links":[
+      {
+        "rel":"next",
+        "href":"http://identity.api.openstack.org/v2.0/tenants?limit=1&marker=3645"
+      },
+      {
+        "rel":"previous",
+        "href":"http://identity.api.openstack.org/v2.0/tenants?limit=1"
+      }
     ]
+  }
 }
diff --git a/doc/guide/src/docbkx/samples/tenants-3.json b/doc/guide/src/docbkx/samples/tenants-3.json
index 72948804..eb0ed803 100644
--- a/doc/guide/src/docbkx/samples/tenants-3.json
+++ b/doc/guide/src/docbkx/samples/tenants-3.json
@@ -1,16 +1,17 @@
 {
-"tenants": {
-    "values" : [
-        {
-            "id": "9999",
-            "description": "A description ...",
-            "enabled": true
-        }
+  "tenants":{
+    "values":[
+      {
+        "id":"9999",
+        "description":"A description ...",
+        "enabled":true
+      }
     ],
-    "links" : [
-        {
-            "rel" : "previous",
-            "href" : "http://identity.api.openstack.org/v2.0/tenants?limit=1&marker=1234"
-        }
+    "links":[
+      {
+        "rel":"previous",
+        "href":"http://identity.api.openstack.org/v2.0/tenants?limit=1&marker=1234"
+      }
     ]
+  }
 }
diff --git a/doc/guide/src/docbkx/samples/tenants.json b/doc/guide/src/docbkx/samples/tenants.json
index a2fa2608..7077a2da 100644
--- a/doc/guide/src/docbkx/samples/tenants.json
+++ b/doc/guide/src/docbkx/samples/tenants.json
@@ -3,18 +3,19 @@ Content-Type: application/json; charset=UTF-8
 Content-Length: 100
 Date: Sun, 1 Jan 2011 9:00:00 GMT
 
-{"tenants": {
-    "values" : [
-        {
-            "id": "1234",
-            "description": "A description ...",
-            "enabled": true
-        },
-        {
-            "id": "3456",
-            "description": "A description ...",
-            "enabled": true
-        }
+{
+  "tenants":{
+    "values":[
+      {
+        "id":"1234",
+        "description":"A description ...",
+        "enabled":true
+      },
+      {
+        "id":"3456",
+        "description":"A description ...",
+        "enabled":true
+      }
     ]
-}
-}
+  }
+}
\ No newline at end of file
diff --git a/doc/guide/src/docbkx/samples/updatedtenant.json b/doc/guide/src/docbkx/samples/updatedtenant.json
index 05df6a3a..9349c90f 100644
--- a/doc/guide/src/docbkx/samples/updatedtenant.json
+++ b/doc/guide/src/docbkx/samples/updatedtenant.json
@@ -1,7 +1,7 @@
-{"tenant":
-    {
-      "id": "1234",
-      "description": "A NEW description...",
-      "enabled": true
-    }
+{
+  "tenant":{
+    "id":"1234",
+    "description":"A NEW description...",
+    "enabled":true
+  }
 }
diff --git a/doc/guide/src/docbkx/samples/validatetoken.json b/doc/guide/src/docbkx/samples/validatetoken.json
index 6906991a..989d28ff 100644
--- a/doc/guide/src/docbkx/samples/validatetoken.json
+++ b/doc/guide/src/docbkx/samples/validatetoken.json
@@ -1,27 +1,20 @@
 {
-  "auth" :  {
-      "token": {
-          "id": "ab48a9efdfedb23ty3494",
-          "expires": "2010-11-01T03:32:15-05:00"
-      },
-      "user" : {
-          "groups": {
-              "group": [
-                  {
-                      "tenantId" : "1234",
-                      "name": "Admin"
-                  }
-              ]},
-           "roleRefs": {   
-	           "roleRef" : [
-                  {
-                      "id" : 1,
-                      "href" : "https://.openstack.org/identity/v2.0/roles/admin",
-                      "tenantId" : "one"
-                  }
-              ]},   
-          "username": "jqsmith",
-          "tenantId": "1234"
-      }
+  "auth":{
+    "token":{
+      "expires":"2010-11-01T03:32:15-05:00",
+      "id":"ab48a9efdfedb23ty3494",
+      "tenantId":"1234"
+    },
+    "user":{
+      "username":"jqsmith",
+      "roleRefs":[
+        {
+          "roleId":"Admin",
+          "id":1,
+          "tenantId":"one"
+        }
+      ],
+      "tenantId":"1234"
+    }
   }
 }
diff --git a/doc/guide/src/docbkx/samples/version.json b/doc/guide/src/docbkx/samples/version.json
index fce09386..d204cabb 100644
--- a/doc/guide/src/docbkx/samples/version.json
+++ b/doc/guide/src/docbkx/samples/version.json
@@ -1,33 +1,33 @@
 {
-    "version" : {
-        "id" : "v2.0",
-        "status" : "CURRENT",
-        "updated" : "2011-01-21T11:33:21-06:00",
-        "links": [
-            {
-                "rel" : "self",
-                "href" : "http://identity.api.openstack.org/v2.0/"
-            },
-            {
-                "rel" : "describedby",
-                "type" : "application/pdf",
-                "href" : "http://docs.rackspacecloud.com/identity/api/v2.0/identity-devguide-20110125.pdf"
-            },
-            {
-                "rel" : "describedby",
-                "type" : "application/vnd.sun.wadl+xml",
-                "href" : "http://docs.rackspacecloud.com/identity/api/v2.0/application.wadl"
-            }
-        ],
-        "media-types": [
-            {
-                "base" : "application/xml",
-                "type" : "application/vnd.openstack.identity-v2.0+xml"
-            },
-            {
-                "base" : "application/json",
-                "type" : "application/vnd.openstack.identity-v2.0+json"
-            }
-        ]
-    }
+  "version":{
+    "id":"v2.0",
+    "status":"CURRENT",
+    "updated":"2011-01-21T11:33:21-06:00",
+    "links":[
+      {
+        "rel":"self",
+        "href":"http://identity.api.openstack.org/v2.0/"
+      },
+      {
+        "rel":"describedby",
+        "type":"application/pdf",
+        "href":"http://docs.rackspacecloud.com/identity/api/v2.0/identity-devguide-20110125.pdf"
+      },
+      {
+        "rel":"describedby",
+        "type":"application/vnd.sun.wadl+xml",
+        "href":"http://docs.rackspacecloud.com/identity/api/v2.0/application.wadl"
+      }
+    ],
+    "media-types":[
+      {
+        "base":"application/xml",
+        "type":"application/vnd.openstack.identity-v2.0+xml"
+      },
+      {
+        "base":"application/json",
+        "type":"application/vnd.openstack.identity-v2.0+json"
+      }
+    ]
+  }
 }
diff --git a/doc/guide/src/docbkx/samples/versions.json b/doc/guide/src/docbkx/samples/versions.json
index ec3a8498..b7ac02dd 100644
--- a/doc/guide/src/docbkx/samples/versions.json
+++ b/doc/guide/src/docbkx/samples/versions.json
@@ -1,39 +1,39 @@
 {
-    "versions" : {
-        "values" : [
-            {
-                "id" : "v1.0",
-                "status" : "DEPRECATED",
-                "updated" : "2009-10-09T11:30:00Z",
-                "links": [
-                    {
-                        "rel" : "self",
-                        "href" : "http://identity.api.openstack.org/v1.0/"
-                    }
-                ]
-            },
-            {
-                "id" : "v1.1",
-                "status" : "CURRENT",
-                "updated" : "2010-12-12T18:30:02.25Z",
-                "links": [
-                    {
-                        "rel" : "self",
-                        "href" : "http://identity.api.openstack.org/v1.1/"
-                    }
-                ]
-            },
-            {
-                "id" : "v2.0",
-                "status" : "BETA",
-                "updated" : "2011-05-27T20:22:02.25Z",
-                "links": [
-                    {
-                        "rel" : "self",
-                        "href" : "http://identity.api.openstack.org/v2.0/"
-                    }
-                ]
-            }
+  "versions":{
+    "values":[
+      {
+        "id":"v1.0",
+        "status":"DEPRECATED",
+        "updated":"2009-10-09T11:30:00Z",
+        "links":[
+          {
+            "rel":"self",
+            "href":"http://identity.api.openstack.org/v1.0/"
+          }
         ]
-    }
+      },
+      {
+        "id":"v1.1",
+        "status":"CURRENT",
+        "updated":"2010-12-12T18:30:02.25Z",
+        "links":[
+          {
+            "rel":"self",
+            "href":"http://identity.api.openstack.org/v1.1/"
+          }
+        ]
+      },
+      {
+        "id":"v2.0",
+        "status":"BETA",
+        "updated":"2011-05-27T20:22:02.25Z",
+        "links":[
+          {
+            "rel":"self",
+            "href":"http://identity.api.openstack.org/v2.0/"
+          }
+        ]
+      }
+    ]
+  }
 }