Merge branch 'develop' of github.com:watson-developer-cloud/python-sdk into develop

Author: germanattanasio

README.md

@@ -37,24 +37,24 @@ The [examples][examples] folder has basic and advanced examples.
 
 Service credentials are required to access the APIs.
 
-If you run your app in Bluemix, you don't need to specify the username and password. In that case, the SDK uses the `VCAP_SERVICES` environment variable to load the credentials.
+If you run your app in IBM Cloud, you don't need to specify the username and password. In that case, the SDK uses the `VCAP_SERVICES` environment variable to load the credentials.
 
-To run locally or outside of Bluemix you need the `username` and `password` credentials for each service. (Service credentials are different from your Bluemix account email and password.)
+To run locally or outside of IBM Cloud you need the `username` and `password` credentials for each service. (Service credentials are different from your IBM Cloud account email and password.)
 
 To create an instance of the service:
 
-1. Log in to [Bluemix][bluemix].
+1. Log in to [IBM Cloud][ibm_cloud].
 1. Create an instance of the service:
-   1. In the Bluemix **Catalog**, select the Watson service you want to use. For example, select the Conversation service.
+   1. In the IBM Cloud **Catalog**, select the Watson service you want to use. For example, select the Conversation service.
    1. Type a unique name for the service instance in the **Service name** field. For example, type `my-service-name`. Leave the default values for the other options.
    1. Click **Create**.
 
 To get your service credentials:
 
-Copy your credentials from the **Service details** page. To find the the Service details page for an existing service, navigate to your Bluemix dashboard and click the service name.
+Copy your credentials from the **Service details** page. To find the the Service details page for an existing service, navigate to your IBM Cloud dashboard and click the service name.
 
 1. On the **Service Details** page, click **Service Credentials**, and then **View credentials**.
-1. Copy `username` and `password`.
+1. Copy `username`, `password`, and `url`.
 
 ## Python Version
 
@@ -82,9 +82,6 @@ response = conversation.message(workspace_id=workspace_id, input={
     'text': 'What\'s the weather like?'})
 print(json.dumps(response, indent=2))
 ```
-## Known Issues
-
-See [issues](https://github.com/watson-developer-cloud/python-sdk/issues).
 
 ## Dependencies
 
@@ -104,7 +101,7 @@ See [CONTRIBUTING.md][CONTRIBUTING].
 This library is licensed under the [Apache 2.0 license][license].
 
 [wdc]: http://www.ibm.com/watson/developercloud/
-[bluemix]: https://console.bluemix.net
+[ibm_cloud]: https://console.bluemix.net
 [responses]: https://github.com/getsentry/responses
 [requests]: http://docs.python-requests.org/en/latest/
 [examples]: https://github.com/watson-developer-cloud/python-sdk/tree/master/examples

examples/README.md

@@ -1,12 +1,11 @@
 ## Examples
-To run the examples, you will need the `username` and `password` credentials. To get your service credentials, follow these steps:
- 1. Log in to Bluemix at https://bluemix.net.
+To run the examples, you will need a `username`, `password`, and `url`. To get your service credentials, follow these steps:
+ 1. Log in to IBM Cloud at https://console.bluemix.net.
 
  1. Create an instance of the service:
-     1. In the Bluemix **Catalog**, select the Natural Language Classifier service.
-     1. Under **Add Service**, type a unique name for the service instance in the Service name field. For example, type `my-service-name`. Leave the default values for the other options.
-     1. Click **Use**.
+     1. In the IBM Cloud **Catalog**, select the Natural Language Classifier service.
+     1. Click **Create**.
 
  1. Copy your credentials:
      1. On the left side of the page, click **Service Credentials** to view your service credentials.
-     1. Copy `username` and `password` from these service credentials.
+     1. Copy `username`, `password`, and `url` from these service credentials.

examples/conversation_tone_analyzer_integration/README.md

@@ -9,8 +9,8 @@ This example provides sample code for integrating [Tone Analyzer][tone_analyzer]
 
 Requirements to run the sample code
 
-  * [Tone Analyzer Service credentials][bluemix_tone_analyzer_service]
-  * [Conversation Service credentials][bluemix_conversation_service]
+  * [Tone Analyzer Service credentials][ibm_cloud_tone_analyzer_service]
+  * [Conversation Service credentials][ibm_cloud_conversation_service]
   * [Conversation Workspace ID][conversation_simple_workspace]
 
 Credentials & the Workspace ID can be set in environment properties, a .env file, or directly in the code.
@@ -24,8 +24,8 @@ Command to run the sample code
 
 [conversation]: https://www.ibm.com/watson/developercloud/conversation.html
 [tone_analyzer]: http://www.ibm.com/watson/developercloud/tone-analyzer.html
-[bluemix_conversation_service]: https://console.ng.bluemix.net/catalog/services/conversation/
-[bluemix_tone_analyzer_service]: https://console.ng.bluemix.net/catalog/services/tone-analyzer/
+[ibm_cloud_conversation_service]: https://console.ng.bluemix.net/catalog/services/conversation/
+[ibm_cloud_tone_analyzer_service]: https://console.ng.bluemix.net/catalog/services/tone-analyzer/
 [conversation_simple_workspace]: https://github.com/watson-developer-cloud/conversation-simple#workspace
 [tone_conversation_integration_example]: https://github.com/watson-developer-cloud/python-sdk/tree/master/examples/tone_conversation_integration.v1.py
 [tone_conversation_integration_example_tone_detection]: https://github.com/watson-developer-cloud/python-sdk/tree/master/examples/conversation_addons/tone_detection.py