Merge pull request #11301 from cdapio/CDAP-15277

CDAP-15277 Update references to cask market in docs
cdapio · May 18, 2019 · dfb8c2f · dfb8c2f
2 parents 5719aaf + 9ce63f1
commit dfb8c2f
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 31 deletions.
diff --git a/cdap-docs/_common/_source/guides.rst b/cdap-docs/_common/_source/guides.rst
@@ -112,7 +112,7 @@ Guides
 .. _integrations: integrations/index.html
 
 .. |integ-man-hub-black| replace:: `Hub:`
-.. _integ-man-hub-black: integrations/cask-market.html
+.. _integ-man-hub-black: integrations/hub.html
 
 .. |integ-man-cl-black| replace:: `Cloudera:`
 .. _integ-man-cl-black: integrations/partners/cloudera/index.html

diff --git a/cdap-docs/_common/common_conf.py b/cdap-docs/_common/common_conf.py
@@ -309,7 +309,7 @@ def get_git_build_vars():
     'GIT_HDP_VERSIONS':  'hdp-versions',
     'GIT_MAPR_VERSIONS': 'mapr-versions',
     'GIT_EMR_VERSIONS':  'emr-versions',
-    'GIT_CASK_MARKET_VERSION': 'cask-market-version',
+    'GIT_HUB_VERSION': 'hub-version',
     'GIT_PLUGINS_SPEC_VERSION': 'plugins-spec-version',
     'GIT_NODE_JS_MIN_VERSION': 'node-js-min-version',
 #     'GIT_NODE_JS_MAX_VERSION': 'node-js-max-version',

diff --git a/...-docs/integrations/source/cask-market.rst → cdap-docs/integrations/source/hub.rst b/...-docs/integrations/source/cask-market.rst → cdap-docs/integrations/source/hub.rst
@@ -4,7 +4,7 @@
 
 .. :hide-toc: true
 
-.. _cask-market:
+.. _hub:
 
 ===
 Hub
@@ -60,7 +60,7 @@ they would serve any static content. For example, an Apache web server can be pl
 top of a local directory structure that matches the expected Hub directory structure.
 
 
-.. _cask-market-api:
+.. _hub-api:
 
 Hub HTTP RESTful API
 ============================
@@ -77,14 +77,14 @@ The directory structure must be:
 
 .. parsed-literal::
 
-  <base>/|cask-market-version|/packages.json
-  <base>/|cask-market-version|/packages/<package-name>/<version>/icon.png
-  <base>/|cask-market-version|/packages/<package-name>/<version>/spec.json
-  <base>/|cask-market-version|/packages/<package-name>/<version>/spec.json.asc
-  <base>/|cask-market-version|/packages/<package-name>/<version>/<resource1>
-  <base>/|cask-market-version|/packages/<package-name>/<version>/<resource1>.asc
-  <base>/|cask-market-version|/packages/<package-name>/<version>/<resource2>
-  <base>/|cask-market-version|/packages/<package-name>/<version>/<resource2>.asc
+  <base>/|hub-version|/packages.json
+  <base>/|hub-version|/packages/<package-name>/<version>/icon.png
+  <base>/|hub-version|/packages/<package-name>/<version>/spec.json
+  <base>/|hub-version|/packages/<package-name>/<version>/spec.json.asc
+  <base>/|hub-version|/packages/<package-name>/<version>/<resource1>
+  <base>/|hub-version|/packages/<package-name>/<version>/<resource1>.asc
+  <base>/|hub-version|/packages/<package-name>/<version>/<resource2>
+  <base>/|hub-version|/packages/<package-name>/<version>/<resource2>.asc
   ...
 
 .. directory-structure-end
@@ -93,7 +93,7 @@ The directory structure must be:
 .. --------------------
 .. include:: ../../reference-manual/source/http-restful-api/base-url.txt
 
-.. _cask-market-get-catalog:
+.. _hub-get-catalog:
 
 Get Hub Catalog
 ---------------
@@ -104,7 +104,7 @@ To retrieve a list of available packages, submit an HTTP GET request:
 
 .. parsed-literal::
 
-  GET /|cask-market-version|/packages.json
+  GET /|hub-version|/packages.json
 
 .. highlight:: json-ellipsis
 
@@ -157,7 +157,7 @@ To retrieve a package specification, submit an HTTP GET request:
 
 .. parsed-literal::
 
-  GET /|cask-market-version|/packages/<package-name>/<version>/spec.json
+  GET /|hub-version|/packages/<package-name>/<version>/spec.json
 
 .. highlight:: json-ellipsis
 
@@ -836,7 +836,7 @@ To retrieve the signature for a package specification, submit an HTTP GET reques
 
 .. parsed-literal::
 
-  GET /|cask-market-version|/packages/<package-name>/<version>/spec.json.asc
+  GET /|hub-version|/packages/<package-name>/<version>/spec.json.asc
 
 The signature is a PGP signature that can be used to validate a package resource. The
 package publisher signs the package specification with their private key. The signature can
@@ -852,7 +852,7 @@ To retrieve a package resource, submit an HTTP GET request:
 
 .. parsed-literal::
 
-  GET /|cask-market-version|/packages/<package-name>/<version>/<resource-name>
+  GET /|hub-version|/packages/<package-name>/<version>/<resource-name>
 
 The resource can contain arbitrary data. They can be artifact JARs, configuration files,
 sample data, or anything else that a package action may require.
@@ -866,7 +866,7 @@ To retrieve the signature for a package resource, submit an HTTP GET request:
 
 .. parsed-literal::
 
-  GET /|cask-market-version|/packages/<package-name>/<version>/<resource-name>.asc
+  GET /|hub-version|/packages/<package-name>/<version>/<resource-name>.asc
 
 The signature is a PGP signature that can be used to validate a package resource. The
 package publisher signs the package resource with their private key. The signature can
@@ -882,7 +882,7 @@ To retrieve the icon for a package, submit an HTTP GET request:
 
 .. parsed-literal::
 
-  GET /|cask-market-version|/packages/<package-name>/<version>/icon.png
+  GET /|hub-version|/packages/<package-name>/<version>/icon.png
 
 
 Hosting a Custom Hub
@@ -894,7 +894,7 @@ The Hub APIs are simply a contract about the directory structure of the Hub.
 
 .. Directory structure
 .. --------------------
-.. include:: cask-market.rst
+.. include:: hub.rst
     :start-after: .. directory-structure-start
     :end-before: .. directory-structure-end
 

diff --git a/cdap-docs/integrations/source/index.rst b/cdap-docs/integrations/source/index.rst
@@ -11,21 +11,21 @@ Integrations
 
 .. rubric:: Hub
 
-.. |cask-market-overview| replace:: **Overview:**
-.. _cask-market-overview: cask-market.html#overview
+.. |hub-overview| replace:: **Overview:**
+.. _hub-overview: hub.html#overview
 
-- |cask-market-overview|_ Summary of the **Hub,** a source for re-usable
+- |hub-overview|_ Summary of the **Hub,** a source for re-usable
   applications, data, and code for CDAP users
 
-.. |cask-market-api| replace:: **API:**
-.. _cask-market-api: cask-market.html#api
+.. |hub-api| replace:: **API:**
+.. _hub-api: hub.html#api
 
-- |cask-market-api|_ Hub APIs used to create entities in a Hub
+- |hub-api|_ Hub APIs used to create entities in a Hub
 
-.. |cask-market-custom| replace:: **Custom Hosting:**
-.. _cask-market-custom: cask-market.html#custom
+.. |hub-custom| replace:: **Custom Hosting:**
+.. _hub-custom: hub.html#custom
 
-- |cask-market-custom|_ Hosting your own custom Hub
+- |hub-custom|_ Hosting your own custom Hub
 
 
 .. rubric:: Cloudera

diff --git a/cdap-docs/integrations/source/table-of-contents.rst b/cdap-docs/integrations/source/table-of-contents.rst
@@ -10,7 +10,7 @@ CDAP Integrations Table of Contents
    :titlesonly:
 
     Introduction <index>
-    Hub <cask-market>
+    Hub <hub>
     Cloudera <partners/cloudera/index>
     Apache Sentry <apache-sentry>
     Apache Ranger <apache-ranger>

diff --git a/cdap-docs/vars b/cdap-docs/vars
@@ -68,7 +68,7 @@ GIT_BRANCH_CDAP_GUIDES="develop"
 # Used by integrations-manual
 GIT_BRANCH_CDAP_PACKS="develop"
 
-GIT_CASK_MARKET_VERSION="v2"
+GIT_HUB_VERSION="v2"
 
 # Google Analytics Code
 GOOGLE_TAG_MANAGER_CODE="GTM-KWLFGH"