replace all bluemix text with ibm cloud

README.md

@@ -70,7 +70,7 @@ Follow these environment setup [instructions](./docs/env_setup.md) to install **
 ### 1. Download Marbles
 We need to download marbles to your local system.
 Let’s do this with Git by cloning this repository.
-You will need to do this step even if you plan on hosting marbles in Bluemix.
+You will need to do this step even if you plan on hosting marbles in IBM Cloud.
 
 - Open a command prompt/terminal and browse to your desired working directory
 - Run the following command:
@@ -90,7 +90,7 @@ Hello again. Now we need a blockchain network.
 
 **Choose 1 option below:**
 
-- **Option 1:** Create a network with the Bluemix IBM Blockchain Service - [instructions](./docs/use_bluemix_hyperledger.md)
+- **Option 1:** Create a network with the IBM Cloud IBM Blockchain Service - [instructions](./docs/use_bluemix_hyperledger.md)
 - **Option 2:** :lollipop: Use a locally hosted Hyperledger Fabric Network - [instructions](./docs/use_local_hyperledger.md)
 
 <a name="installchaincode"></a>
@@ -117,7 +117,7 @@ Last but not least we need marbles running somewhere.
 
 **Choose 1 option below:**
 
-- **Option 1:** Host marbles on Bluemix - [instructions](./docs/host_marbles_bluemix.md)
+- **Option 1:** Host marbles on IBM Cloud - [instructions](./docs/host_marbles_bluemix.md)
 - **Option 2:** :lollipop: Host marbles locally - [instructions](./docs/host_marbles_locally.md)
 
 ***
@@ -127,7 +127,7 @@ Last but not least we need marbles running somewhere.
 # Use Marbles
 
 1. If you are at this step, you should have your environment setup, blockchain network created, marbles app and chaincode running. Right? If not look up for help (up the page, not literally upwards).
-1. Open up your favorite browser and browse to [http://localhost:3001](http://localhost:3001) or your Bluemix www route.
+1. Open up your favorite browser and browse to [http://localhost:3001](http://localhost:3001) or your IBM Cloud www route.
     - If the site does not load, check your node console logs for the hostname/ip and port marbles is using.
 
 1. Finally we can test the application. Click the "+" icon on one of your users in the "United Marbles" section

app.js

@@ -49,7 +49,7 @@ var ws_server = require('./utils/websocket_server_side.js')(cp, fcw, logger);
 // setup/startup logic
 var startup_lib = require('./utils/startup_lib.js')(logger, cp, fcw, marbles_lib, ws_server);
 
-// ------------- Bluemix Host Detection ------------- //
+// ------------- IBM Cloud Host Detection ------------- //
 if (process.env.VCAP_APPLICATION) {
 	host = '0.0.0.0';												//overwrite defaults
 	port = process.env.PORT;

docs/config_file.md

@@ -58,7 +58,7 @@ There is already an example file in the config folder you can use.
 	- `> export CONNECTION_PROFILE="{JSON GOES IN HERE}"`
 - Tip: Use separate files for separate blockchain networks.
 
-**If you are using the Bluemix Blockchain Service you will not need to manually edit these files**.
+**If you are using the IBM Cloud Blockchain Service you will not need to manually edit these files**.
 You should have already downloaded this file from the service during the [install chaincode tutorial](./install_chaincode.md).
 
 **Example JSON**

docs/env_setup.md

@@ -85,7 +85,7 @@ If you don't do this step you run the risk of being unable to build your chainco
 
 - **Option 3:** Choose this option if you want to modify chaincode and use the Blockchain Service for my network
 	- Get the commit hash from your network or use the hash `ae4e37d`.
-		- If you have a network on the Bluemix service, then the exact Fabric version can be found in the "Support" tab under the "Release Notes" section of your network's dashboard.
+		- If you have a network on the IBM Cloud service, then the exact Fabric version can be found in the "Support" tab under the "Release Notes" section of your network's dashboard.
 	 - Go to the `Continue the Fabric Install Instructions` section below. You will enter the hash there.
 
 

docs/host_marbles_bluemix.md

@@ -1,9 +1,9 @@
-# Run Marbles on Bluemix
+# Run Marbles on IBM Cloud
 
-### Run Marbles on Bluemix (command line)
+### Run Marbles on IBM Cloud (command line)
 
 1. Well to do this correctly you first need to [run marbles locally](./host_marbles_locally.md).
-1. Seriously make sure marbles on your local machine starts up and you have traded a marble successfully before you continue. You do not want to troubleshoot config settings with the Bluemix flow. It will take forever and you may lose your mind. 
+1. Seriously make sure marbles on your local machine starts up and you have traded a marble successfully before you continue. You do not want to troubleshoot config settings with the IBM Cloud flow. It will take forever and you may lose your mind.
 1. Edit `manifest.yml`.  This file is in the root of your marbles directory.
 	- We need to change the application **name** in this file since "marbles" is taken. Try to pick a unique name (or else the next steps will fail, and you will have to try again).
 
@@ -22,26 +22,26 @@
 	- [Download](https://github.com/cloudfoundry/cli/releases) an installer for your OS
 	- Run the installer
 	- Lets test it by opening a command prompt or terminal window and typing
-		
+
 			> cf
-	
+
 	- You should see a bunch of text.
 	- If you get something like command not found, then your installation was either not successful or CF is not added to your system path.
 			Windows/Linux/Mac have different ways to edit the PATH therefore look up instructions for your OS.
-	
+
 1. Login to CF
 	- Open a command prompt or terminal window
 	- Type:
-		
-			> cf api https://api.ng.bluemix.net 
+
+			> cf api https://api.ng.bluemix.net
 			> cf login
-			(follow the prompts to enter your Bluemix ID and password)
+			(follow the prompts to enter your IBM ID and password)
 
 1. Push the application by opening a command prompt and browsing to your marbles directory
-
-		> cf push YOUR_APP_NAME_HERE 
 
-1. This can take some time to complete (1-3 minutes). You will see logs from Bluemix, but they will stop once the app launches. 
+		> cf push YOUR_APP_NAME_HERE
+
+1. This can take some time to complete (1-3 minutes). You will see logs from IBM Cloud, but they will stop once the app launches.
 	- To see logs from marbles during and after its start up open a second terminal/command prompt and type:
 
 		> cf logs YOUR_APP_NAME_HERE
@@ -51,11 +51,11 @@
 		> cf logs YOUR_APP_NAME_HERE --recent
 
 1. If all goes well you should see this message in the console:
-	
+
 		--------------------------------- Server Up - 0.0.0.0:xxxx ------------------------------------
-		
-1. Once you see the message below you are good to go: 
-		
+
+1. Once you see the message below you are good to go:
+
 		---------------------------------------- Websocket Up ------------------------------------------
 
 1. Marbles is running! Now [continue the tutorial](../README.md#use).

docs/host_marbles_locally.md

@@ -14,7 +14,7 @@
 - **Option 1:** :lollipop: If you are using a local network use this command:
 	> gulp marbles_local
 
-- **Option 2:** If you are using a bluemix network, use this command:
+- **Option 2:** If you are using a IBM Cloud Blockchain network, use this command:
 	> gulp marbles_tls
 
 1. If all goes well you should see this message in the console:

docs/install_chaincode.md

@@ -1,7 +1,7 @@
-# Install and Instantiate Chaincode w/Bluemix
+# Install and Instantiate Chaincode w/IBM Cloud
 
 1. If you are not currently on the Blockchain "Resources" page... then get there via:
-    1. Login to [Bluemix](https://console.ng.bluemix.net)
+    1. Login to [IBM Cloud](https://console.ng.bluemix.net)
     1. Get to your dashboard by clicking the "Menu" icon on the top left and then clicking the "Dashboard" link
     1. Under "All Services" locate your the Blockchain row and click it
     1. Enter your IBM Blockchain Service's dashboard by clicking the "Enter" button

docs/use_bluemix_hyperledger.md

@@ -1,14 +1,14 @@
-# Use Bluemix IBM Blockchain Service:
+# Use IBM Cloud Blockchain Service:
 
-### Creating a Blockchain Network in IBM Bluemix
+### Creating a Blockchain Network in IBM Cloud
 1. Don't fret, this is as simple as clicking on a particular button and filling out a text input field or two, or three.
   Meh it’s about a dozen.
   But that’s not too bad.
-  The Bluemix service will run our peers and orderer, thus forming our blockchain network.
+  The IBM Cloud service will run our peers and orderer, thus forming our blockchain network.
   We also have the ability to join other networks, but let’s focus on creating our own.
 
 1. First [create an IBM ID](https://console.ng.bluemix.net/registration/) if you do not already have one.
-1. Then login to [Bluemix](https://console.ng.bluemix.net)
+1. Then login to [IBM Cloud](https://console.ng.bluemix.net)
 1. Click the "Catalog" link on the top navigation bar
 
 ![](/doc_images/bluemix_ibc1.png)
@@ -23,7 +23,7 @@
 ![](/doc_images/bluemix_ibc3.png)
 
 1. The service will be created in the currently selected space. This is found on the top toolbar near your email address. Click the space if you want to create the Blockchain service in a different space. This will bring up multiple options for Region/Org/Space.
-    - All of this is a Bluemix concept for organizing services/apps. If these terms confuse you then leave the values alone.
+    - All of this is a IBM Cloud concept for organizing services/apps. If these terms confuse you then leave the values alone.
 
 ![](/doc_images/bluemix_ibc4.png)
 

docs/use_local_hyperledger.md

@@ -152,7 +152,7 @@ sudo docker logs -f orderer0
 Nice work! The network is all setup. Right? I guess we will find out together.
 If you followed the instructions then your orderer will be batching new blocks every 10 seconds.
 This is a litttttle long for our application.
-If you use the Bluemix service, the batch time is only 1 second and this is the delay the app has been optimized for.
+If you use the IBM Cloud Blockchain service, the batch time is only 1 second and this is the delay the app has been optimized for.
 The application will continue to work with a 10 sec batch time, but you will have excess idle time to contemplate your life choices.
 
 Next up we need to **pass network info (such as IP addresses)** to our marbles application.

gulpfile.js

@@ -39,14 +39,14 @@ gulp.task('watch-server', function () {
 
 // ---------------- Runnable Gulp Tasks ---------------- //
 gulp.task('default', ['watch-sass', 'watch-server', 'server']);
-gulp.task('marbles_tls', ['env_tls', 'watch-sass', 'watch-server', 'server']);		//run with command `gulp marbles_tls` for bluemix blockchain service
+gulp.task('marbles_tls', ['env_tls', 'watch-sass', 'watch-server', 'server']);		//run with command `gulp marbles_tls` for IBM Cloud blockchain service
 gulp.task('marbles_local', ['env_local', 'watch-sass', 'watch-server', 'server']);	//run with command `gulp marbles_local` for a local network
-gulp.task('marbles_cs', ['env_cs', 'watch-sass', 'watch-server', 'server']);		//run with command `gulp marbles_cs` for bluemix container service
+gulp.task('marbles_cs', ['env_cs', 'watch-sass', 'watch-server', 'server']);		//run with command `gulp marbles_cs` for IBM Cloud container service
 gulp.task('marbles_dev', ['env_dev', 'watch-sass', 'watch-server', 'server']);		//run with command `gulp marbles_dev` if you are me
 gulp.task('marbles_dev2', ['env_dev2', 'watch-sass', 'watch-server', 'server']);	//run with command `gulp marbles_dev` if you are me
 gulp.task('build', ['watch-sass']);
 
-// Bluemix IBM Blockchain Service
+// IBM Cloud Blockchain Service
 gulp.task('env_tls', function () {
 	env['creds_filename'] = 'marbles_tls.json';
 });
@@ -56,7 +56,7 @@ gulp.task('env_local', function () {
 	env['creds_filename'] = 'marbles_local.json';
 });
 
-// Bluemix Container Service
+// IBM Cloud Container Service
 gulp.task('env_cs', function () {
 	env['creds_filename'] = 'marbles_cs.json';
 });

utils/connection_profile_lib/parts/detect_env.js

@@ -8,7 +8,7 @@ module.exports = function (logger) {
 	detect_env.getConnectionProfileFromEnv = function () {
 
 		// --- Get Service Credentials  --- //
-		if (process.env.VCAP_SERVICES) {												// if we are in bluemix this will be set
+		if (process.env.VCAP_SERVICES) {												// if we are in IBM Cloud this will be set
 			logger.info('Detected that we are in IBM Cloud');
 			let VCAP = null;
 			try {

utils/connection_profile_lib/parts/verification.js

@@ -167,7 +167,7 @@ module.exports = function (cp, logger) {
 			logger.warn('----------------------------------------------------------------------');
 			logger.error('Fix this file: ./config/' + cp.getNetworkCredFileName());
 			logger.warn('It must have credentials/hostnames/ports/channels/etc for YOUR network');
-			logger.warn('How/where would I get that info? Are you using the Bluemix service? Then look at these instructions(near the end): ');
+			logger.warn('How/where would I get that info? Are you using the IBM Cloud Blockchain service? Then look at these instructions(near the end): ');
 			logger.warn('https://github.com/IBM-Blockchain/marbles/blob/v4.0/docs/install_chaincode.md');
 			logger.warn('----------------------------------------------------------------------');
 			console.log('\n\n');

utils/fc_wrangler/parts/enrollment.js

@@ -116,7 +116,7 @@ module.exports = function (logger) {
 					trustedRoots: [options.ca_tls_opts.pem],								//pem cert required
 					verify: false
 				};
-				var ca_client = new CaService(options.ca_url, tlsOptions, options.ca_name);	//ca_name is important for the bluemix service
+				var ca_client = new CaService(options.ca_url, tlsOptions, options.ca_name);	//ca_name is important for the IBM Cloud service
 				member = new User(options.enroll_id);
 
 				logger.debug('enroll id: "' + options.enroll_id + '", secret: "' + options.enroll_secret + '"');