From 4b30f08fdb1d5354747997bea1cd9558b1f4ca2e Mon Sep 17 00:00:00 2001
From: Dolph Mathews <dolph.mathews@gmail.com>
Date: Thu, 20 Oct 2011 13:22:13 -0500
Subject: Updated self-documentation to point to docs.openstack.org

Change-Id: Ib92cb08abaead1578218ff52bc86d89b30cefa76
---
 keystone/content/admin/version.json.tpl   | 13 +++++++++----
 keystone/content/admin/version.xml.tpl    | 12 ++++++++----
 keystone/content/service/version.json.tpl |  7 ++++++-
 keystone/content/service/version.xml.tpl  | 12 ++++++++----
 4 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/keystone/content/admin/version.json.tpl b/keystone/content/admin/version.json.tpl
index 2a165a84..c7ca3a42 100644
--- a/keystone/content/admin/version.json.tpl
+++ b/keystone/content/admin/version.json.tpl
@@ -6,12 +6,17 @@
         "links": [
             {
                 "rel" : "self",
-                "href" : "http://{{HOST}}:{{PORT}}/v2.0/"
+                "href" : "http://{{HOST}}:{{PORT}}/v{{API_VERSION}}/"
+            },
+            {
+                "rel" : "describedby",
+                "type" : "text/html",
+                "href" : "http://docs.openstack.org/api/openstack-identity-service/{{API_VERSION}}/content/"
             },
             {
                 "rel" : "describedby",
                 "type" : "application/pdf",
-                "href" : "http://{{HOST}}:{{PORT}}/v2.0/identityadminguide.pdf"
+                "href" : "http://docs.openstack.org/api/openstack-identity-service/{{API_VERSION}}/identity-dev-guide-{{API_VERSION}}.pdf"
             },
             {
                 "rel" : "describedby",
@@ -22,11 +27,11 @@
         "media-types": [
             {
                 "base" : "application/xml",
-                "type" : "application/vnd.openstack.identity-v2.0+xml"
+                "type" : "application/vnd.openstack.identity-v{{API_VERSION}}+xml"
             },
             {
                 "base" : "application/json",
-                "type" : "application/vnd.openstack.identity-v2.0+json"
+                "type" : "application/vnd.openstack.identity-v{{API_VERSION}}+json"
             }
         ]
     }
diff --git a/keystone/content/admin/version.xml.tpl b/keystone/content/admin/version.xml.tpl
index 9fd6189d..5074d146 100644
--- a/keystone/content/admin/version.xml.tpl
+++ b/keystone/content/admin/version.xml.tpl
@@ -5,17 +5,21 @@
 
     <media-types>
         <media-type base="application/xml"
-                    type="application/vnd.openstack.identity-v2.0+xml"/>
+                    type="application/vnd.openstack.identity-v{{API_VERSION}}+xml"/>
         <media-type base="application/json"
-                    type="application/vnd.openstack.identity-v2.0+json"/>
+                    type="application/vnd.openstack.identity-v{{API_VERSION}}+json"/>
     </media-types>
 
      <atom:link rel="self"
-                href="http://{{HOST}}:{{PORT}}/v2.0/"/>
+                href="http://{{HOST}}:{{PORT}}/v{{API_VERSION}}/"/>
+
+     <atom:link rel="describedby"
+                type="text/html"
+                href="http://docs.openstack.org/api/openstack-identity-service/{{API_VERSION}}/content/" />
 
      <atom:link rel="describedby"
                 type="application/pdf"
-                href="http://{{HOST}}:{{PORT}}/v2.0/identitydevguide.pdf" />
+                href="http://docs.openstack.org/api/openstack-identity-service/{{API_VERSION}}/identity-dev-guide-{{API_VERSION}}.pdf" />
 
      <atom:link rel="describedby"
                 type="application/vnd.sun.wadl+xml"
diff --git a/keystone/content/service/version.json.tpl b/keystone/content/service/version.json.tpl
index 0db03a5a..58d1fa4d 100644
--- a/keystone/content/service/version.json.tpl
+++ b/keystone/content/service/version.json.tpl
@@ -8,10 +8,15 @@
                 "rel" : "self",
                 "href" : "http://{{HOST}}:{{PORT}}/v2.0/"
             },
+            {
+                "rel" : "describedby",
+                "type" : "text/html",
+                "href" : "http://docs.openstack.org/api/openstack-identity-service/{{API_VERSION}}/content/"
+            },
             {
                 "rel" : "describedby",
                 "type" : "application/pdf",
-                "href" : "http://{{HOST}}:{{PORT}}/v2.0/identitydevguide.pdf"
+                "href" : "http://docs.openstack.org/api/openstack-identity-service/{{API_VERSION}}/identity-dev-guide-{{API_VERSION}}.pdf"
             },
             {
                 "rel" : "describedby",
diff --git a/keystone/content/service/version.xml.tpl b/keystone/content/service/version.xml.tpl
index e70195bd..1d0dcc19 100644
--- a/keystone/content/service/version.xml.tpl
+++ b/keystone/content/service/version.xml.tpl
@@ -5,17 +5,21 @@
 
     <media-types>
         <media-type base="application/xml"
-                    type="application/vnd.openstack.identity-v2.0+xml"/>
+                    type="application/vnd.openstack.identity-v{{API_VERSION}}+xml"/>
         <media-type base="application/json"
-                    type="application/vnd.openstack.identity-v2.0+json"/>
+                    type="application/vnd.openstack.identity-v{{API_VERSION}}+json"/>
     </media-types>
 
      <atom:link rel="self"
-                href="http://{{HOST}}:{{PORT}}/v2.0/"/>
+                href="http://{{HOST}}:{{PORT}}/v{{API_VERSION}}/"/>
+
+     <atom:link rel="describedby"
+                type="text/html"
+                href="http://docs.openstack.org/api/openstack-identity-service/{{API_VERSION}}/content/" />
 
      <atom:link rel="describedby"
                 type="application/pdf"
-                href="http://{{HOST}}:{{PORT}}/v2.0/identitydevguide.pdf" />
+                href="http://docs.openstack.org/api/openstack-identity-service/{{API_VERSION}}/identity-dev-guide-{{API_VERSION}}.pdf" />
 
      <atom:link rel="describedby"
                 type="application/vnd.sun.wadl+xml"
-- 
cgit