From af2672cd7d6f090345c27a53e100d3df880fbef7 Mon Sep 17 00:00:00 2001
From: "Jorge L. Williams" <jorge.williams@rackspace.com>
Date: Thu, 14 Apr 2011 22:26:39 -0500
Subject: Remove mention of service catalog.

---
 docs/guide/src/docbkx/idmdevguide.xml   |  2 +-
 docs/guide/src/docbkx/samples/auth.json | 29 -----------------------------
 docs/guide/src/docbkx/samples/auth.xml  | 24 ------------------------
 3 files changed, 1 insertion(+), 54 deletions(-)

(limited to 'docs')

diff --git a/docs/guide/src/docbkx/idmdevguide.xml b/docs/guide/src/docbkx/idmdevguide.xml
index 1bad4a16..294439ce 100644
--- a/docs/guide/src/docbkx/idmdevguide.xml
+++ b/docs/guide/src/docbkx/idmdevguide.xml
@@ -751,7 +751,7 @@ Host: idm.api.openstack.org/v1.1/
             <tr>
               <td colspan="1"> &POST; </td>
               <td colspan="1">/token</td>
-              <td colspan="4">Authenticate to generate a token and a service catalog.</td>
+              <td colspan="4">Authenticate to generate a token.</td>
             </tr>
           </tbody>
         </informaltable>
diff --git a/docs/guide/src/docbkx/samples/auth.json b/docs/guide/src/docbkx/samples/auth.json
index fe368811..c4721873 100644
--- a/docs/guide/src/docbkx/samples/auth.json
+++ b/docs/guide/src/docbkx/samples/auth.json
@@ -15,34 +15,5 @@
           "username": "jqsmith",
           "tenantId": "1234",
       }
-      "serviceCatalog" : {
-          "cloudFiles" : [
-              {
-                  "region" : "DFW",
-                  "publicURL" : "https://storage.clouddrive.com/v1/MossoCloudFS_blah-blah",
-                  "internalURL" : "https://storage-snet.clouddrive.com/v1/MossoCloudFS_blah-blah"
-              },
-              {
-                  "region" : "ORD",
-                  "publicURL" : "https://otherstorage.clouddrive.com/v1/MossoCloudFS_blah-blah",
-                  "internalURL" : "https://otherstorage-snet.clouddrive.com/v1/MossoCloudFS_blah-blah"
-              }
-          ],
-          "cloudFilesCDN" : [
-              {
-                  "region" : "DFW",
-                  "publicURL" : "https://cdn.clouddrive.com/v1/MossoCloudFS_blah-blah"
-              },
-              {
-                  "region" : "ORD",
-                  "publicURL" : "https://othercdn.clouddrive.com/v1/MossoCloudFS_blah-blah"
-              }
-          ],
-          "cloudServers" : [
-              {
-                  "publicURL" : "https://servers.api.rackspacecloud.com/v1.0/322781"
-              }
-          ]
-      }
   }
 }
diff --git a/docs/guide/src/docbkx/samples/auth.xml b/docs/guide/src/docbkx/samples/auth.xml
index 3558798c..b091c7af 100644
--- a/docs/guide/src/docbkx/samples/auth.xml
+++ b/docs/guide/src/docbkx/samples/auth.xml
@@ -7,28 +7,4 @@
 	        <group tenantId="1245" name="Admin"/>
 	    </groups>
 	</user>
-    <serviceCatalog>
-        <service name="cloudFiles">
-            <endpoint
-                region="DFW"
-                publicURL="https://storage.clouddrive.com/v1/MossoCloudFS_blah-blah"
-                internalURL="https://storage-snet.clouddrive.com/v1/MossoCloudFS_blah-blah"/>
-            <endpoint
-                region="ORD"
-                publicURL="https://otherstorage.clouddrive.com/v1/MossoCloudFS_blah-blah"
-                internalURL="https://otherstorage-snet.clouddrive.com/v1/MossoCloudFS_blah-blah"/>
-        </service>
-        <service name="cloudFilesCDN">
-            <endpoint
-                region="DFW"
-                publicURL="https://cdn.clouddrive.com/v1/MossoCloudFS_blah-blah"/>
-            <endpoint
-                region="ORD"
-                publicURL="https://othercdn.clouddrive.com/v1/MossoCloudFS_blah-blah"/>
-        </service>
-        <service name="cloudServers">
-            <endpoint
-                publicURL="https://servers.api.rackspacecloud.com/v1.0/322781"/>
-        </service>
-    </serviceCatalog>
 </auth>
-- 
cgit