summaryrefslogtreecommitdiffstats
path: root/docs/guide
diff options
context:
space:
mode:
authorYogeshwar Srikrishnan <yoga80@yahoo.com>2011-05-23 10:09:08 -0500
committerYogeshwar Srikrishnan <yoga80@yahoo.com>2011-05-23 10:09:08 -0500
commit7a6378d4e52e016324e41cfca40b61832bbe7c27 (patch)
treedf14865f9018a794393f0c686c5b1b9573a9d5f0 /docs/guide
parent9a14d18416db3aafeacb787468b1f60af082a4dd (diff)
downloadkeystone-7a6378d4e52e016324e41cfca40b61832bbe7c27.tar.gz
keystone-7a6378d4e52e016324e41cfca40b61832bbe7c27.tar.xz
keystone-7a6378d4e52e016324e41cfca40b61832bbe7c27.zip
Changes to support roles and baseurls on wadl.
Diffstat (limited to 'docs/guide')
-rw-r--r--docs/guide/src/docbkx/identitydevguide.xml4
-rw-r--r--docs/guide/src/docbkx/samples/roleRefs.json12
-rw-r--r--docs/guide/src/docbkx/xsd/api.xsd2
3 files changed, 10 insertions, 8 deletions
diff --git a/docs/guide/src/docbkx/identitydevguide.xml b/docs/guide/src/docbkx/identitydevguide.xml
index 5ea766ab..4418ce42 100644
--- a/docs/guide/src/docbkx/identitydevguide.xml
+++ b/docs/guide/src/docbkx/identitydevguide.xml
@@ -1404,14 +1404,14 @@ Host: identity.api.openstack.org/v1.1/
<title>Add Role Request: XML</title>
<?dbfo keep-together="always"?>
<programlisting language="xml">
-<xi:include href="samples/role.xml" parse="text"/>
+<xi:include href="samples/roleRef.xml" parse="text"/>
</programlisting>
</example>
<example>
<title>Add Role Request: JSON</title>
<?dbfo keep-together="always"?>
<programlisting language="javascript">
-<xi:include href="samples/role.json" parse="text"/>
+<xi:include href="samples/roleRef.json" parse="text"/>
</programlisting>
</example>
</section>
diff --git a/docs/guide/src/docbkx/samples/roleRefs.json b/docs/guide/src/docbkx/samples/roleRefs.json
index a4300231..d815a19a 100644
--- a/docs/guide/src/docbkx/samples/roleRefs.json
+++ b/docs/guide/src/docbkx/samples/roleRefs.json
@@ -1,14 +1,14 @@
{
"roleRefs" : [
{
- "id" : 1,
- "href" : "https://.openstack.org/identity/v1.1/roles/admin",
- "tenantId" : "one"
+ "id" : 1,
+ "href" : "https://.openstack.org/identity/v1.1/roles/admin",
+ "tenantId" : "one"
},
{
- "id" : 2,
- "href" : "https://.openstack.org/identity/v1.1/roles/test",
- "tenantId" : "two"
+ "id" : 2,
+ "href" : "https://.openstack.org/identity/v1.1/roles/test",
+ "tenantId" : "two"
},
]
}
diff --git a/docs/guide/src/docbkx/xsd/api.xsd b/docs/guide/src/docbkx/xsd/api.xsd
index d4603c2e..a23abd99 100644
--- a/docs/guide/src/docbkx/xsd/api.xsd
+++ b/docs/guide/src/docbkx/xsd/api.xsd
@@ -11,4 +11,6 @@
<include schemaLocation="token.xsd"/>
<include schemaLocation="tenant.xsd"/>
<include schemaLocation="fault.xsd"/>
+ <include schemaLocation="baseURLs.xsd"/>
+ <include schemaLocation="roles.xsd"/>
</schema>