summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--deployment/http/web/index.html7
-rw-r--r--docs/cmd_help.rst4
-rw-r--r--docs/user_guide.rst9
3 files changed, 6 insertions, 14 deletions
diff --git a/deployment/http/web/index.html b/deployment/http/web/index.html
index ecf1d27b..3897eb92 100644
--- a/deployment/http/web/index.html
+++ b/deployment/http/web/index.html
@@ -4,6 +4,7 @@
function redirectToConsole(){
window.location.href="http://"+ window.location.hostname + ":9090";
}
+
</script>
<h1 id="open-command-line-interface-platform-oclip">Open Command-line interface Platform (OCLIP)</h1>
<p>Provides unified commands to operate any cloud enabled software products from Linux/Web console.</p>
@@ -57,10 +58,4 @@ function redirectToConsole(){
</h2>
<p style="color:blue">Click <a onclick="redirectToConsole();">here</a></p>
-<<<<<<< 476f5637ae4e816f7abf3536c5eeb156e0af6bed
-<h2><a id="Download_42"></a>To download</h2>
-<p style="color:red">Please download ONAP CLI <a href="./open-cli.zip">here</a></p>
-
-=======
->>>>>>> Normalize all env with OPEN_CLI
</body></html>
diff --git a/docs/cmd_help.rst b/docs/cmd_help.rst
index e8e4fcad..6d2cbe27 100644
--- a/docs/cmd_help.rst
+++ b/docs/cmd_help.rst
@@ -9,6 +9,7 @@
.. _cli_cmd_help:
+<<<<<<< 74528bd0c35056e2e10d0aa29aac387cb6d6b05d
onap-1.1
==========================
@@ -8640,3 +8641,6 @@ Results::
Error::
On error, it prints <HTTP STATUS CODE>::<ERROR CODE>::<ERROR MESSAGE>
+=======
+TBD
+>>>>>>> Pls verify the usage
diff --git a/docs/user_guide.rst b/docs/user_guide.rst
index b82dd16b..cb1d71e7 100644
--- a/docs/user_guide.rst
+++ b/docs/user_guide.rst
@@ -12,7 +12,7 @@ CLI user guide
Provides unified commands to operate ONAP from Linux console.
Configure the following environment variables, before using it:
-1. **OPEN_HOST_URL** - Onap Micro service bus(MSB) URL or a service URL
+1. **OPEN_CLI_HOST_URL** - Onap Micro service bus(MSB) URL or a service URL
2. **OPEN_CLI_USERNAME** - Onap user name
3. **OPEN_CLI_PASSWORD** - Onap user password
@@ -53,15 +53,8 @@ Help
Debug Mode
----------
To run in debug mode, set following environment variables:
-<<<<<<< 08468db7c00dd0594d6846c4c761f0582be9fc06
-
-1. ONAP_CLI_DEBUG - By default its false, otherwise Set to true
-
-2. ONAP_CLI_DEBUG_PORT - By default it is 5005, otherwise set to new TCP port number
-=======
1. OPEN_CLI_DEBUG - By default its false, otherwise Set to true
2. OPEN_CLI_DEBUG_PORT - By default it is 5005, otherwise set to new TCP port number
->>>>>>> Migrate docs to use OPEN_ instead of ONAP_
More details
-------------