Issues: 2242, 1801, 1791, 2079, also filters (#2405)

EdProsser · Simon Stone · commit 323240413bb7 · 2017-10-18T23:09:53.000+01:00
* Correct globalcert -&gt; globalCert

Signed-off-by: EdProsser &lt;edward.prosser@uk.ibm.com&gt;

* Fix for 1791, deploy should be start

Signed-off-by: EdProsser &lt;edward.prosser@uk.ibm.com&gt;

* Issue 1801 - notes on participant add

Signed-off-by: EdProsser &lt;edward.prosser@uk.ibm.com&gt;

* Issue 2079 - wallet -&gt; business networks, typos

Signed-off-by: EdProsser &lt;edward.prosser@uk.ibm.com&gt;

* Uncommenting between syntax for filters

Signed-off-by: EdProsser &lt;edward.prosser@uk.ibm.com&gt;
diff --git a/packages/composer-website/jekylldocs/business-network/query.md b/packages/composer-website/jekylldocs/business-network/query.md
@@ -88,10 +88,9 @@ Currently, only the `WHERE` LoopBack filter is supported. The supported operator
 ```
 {"where":{"or":[{"and":[{"field1":"foo"},{"field2":"bar"}]},{"field3":"foobar"}]}}
 ```
-<!--
+
 The **between** operator returns values between the given range. It accepts numbers, datetime values, and strings. If supplied with strings, the **between** operator returns results between the supplied strings alphabetically. In the example below, the filter will return all resources where the driver property is alphabetically between _a_ and _c_, inclusively.
 
 ```
 {"where":{"driver":{"between": ["a","c"]}}}
 ```
--->
diff --git a/packages/composer-website/jekylldocs/managing/participant-add.md b/packages/composer-website/jekylldocs/managing/participant-add.md
@@ -14,11 +14,11 @@ A participant can be added to a participant registry using either the API or the
 
 ## Before you start
 
-Before you follow these steps, you must have modeled a participant in a Business
-Network Definition and deployed it as a Business Network.
+Before you follow these steps, you must have modeled a participant in a Business Network Definition and deployed it as a Business Network.
 
-The procedure below shows an example using the following model of a participant
-from the Digital Property sample Business Network Definition: [digitalproperty-network](https://www.npmjs.com/package/digitalproperty-network)
+The procedure below shows an example using the following model of a participant from the Digital Property sample Business Network Definition: [digitalproperty-network](https://www.npmjs.com/package/digitalproperty-network)
+
+*Please note*: If you are adding the participant using the `composer participant add` command, ensure that the JSON representation of the participant is wrapped in single quotes.
 
 ```
 namespace net.biz.digitalPropertyNetwork
diff --git a/packages/composer-website/jekylldocs/playground/id-cards-playground.md b/packages/composer-website/jekylldocs/playground/id-cards-playground.md
@@ -4,7 +4,7 @@ title: Business Network Cards
 category: tasks
 section: playground
 sidebar: sidebars/accordion-toc0.md
-excerpt: Business Network Cards combine a connection profile, identity, and certificates to allow a connection to a business network in Hyperledger Composer Playground. Business Network Cards can be [created, exported and imported](./id-cards-playground.html) from the **My Wallet** page in Hyperledger Composer Playground.
+excerpt: Business Network Cards combine a connection profile, identity, and certificates to allow a connection to a business network in Hyperledger Composer Playground. Business Network Cards can be [created, exported and imported](./id-cards-playground.html) from the **Business Networks** page in Hyperledger Composer Playground.
 index-order: 401
 ---
 
@@ -29,12 +29,12 @@ Access to your Business Network is granted to another user through the provision
 
 There must be a Participant existing in the business network in order to bind an Identity required to create the Business Network Card.
 
-When an identity is issued within Playground, there is an option to add the Identity to your Wallet. By selecting this option a Business Network Card is created for the issued identity that is valid for the current business network. The Business Network Card will appear in your wallet once you log out of the current business network, and it is from this location where it may be exported to share with another user.
+When an identity is issued within Playground, there is an option to save the identity for use in your Business Networks page. By selecting this option a Business Network Card is created for the issued identity that is valid for the current business network. The Business Network Card will appear on your Business Networks page once you log out of the current business network, and it is from this location where it may be exported to share with another user.
 
 
-### Creating a Business Network Card 
+### Creating a Business Network Card
 
-1. From the **My Wallet** page, select an identity to use to connect to your business network. Click **Connect Now**. _Please note:_ You must use an identity that has permission to create new identities.
+1. From the **Business Networks** page, select an identity to use to connect to your business network. Click **Connect Now**. _Please note:_ You must use an identity that has permission to create new identities.
 
 2. If required, create the participant to which you intend to assign the identity:
    - Click the **Test** tab, and click **Create New Participant**.
@@ -52,19 +52,19 @@ When an identity is issued within Playground, there is an option to add the Iden
 
 6. Click **Create New**.
 
-7. Click **Add to My Wallet**. Adding the Business Network Card to your wallet allows you to use it to connect to the business network, or export it for someone else to use.
+7. Click **Add to My Wallet**. Adding the Business Network Card to your Business Networks page allows you to use it to connect to the business network, or export it for someone else to use.
 
-The **My Wallet** page should now show the new Business Network Card.
+The **Business Networks** page should now show the new Business Network Card.
 
 <video autoplay "autoplay=autoplay" style="display:block; width:100%; height:auto;" loop="loop">
 <source src="{{ site.baseurl }}/assets/img/tutorials/playground/vs_code_22.mp4" type="video/mp4" />
 </video>
 
 ### Exporting a Business Network Card
 
-Business Network Cards are exported from the **My Wallet** page in Playground, through interaction with the Business Network Card that you wish to export and is a one-step process.
+Business Network Cards are exported from the **Business Networks** page in Playground, through interaction with the Business Network Card that you wish to export and is a one-step process.
 
-- On the **My Wallet** page, click the **Export** icon on the Business Network Card you wish to export. The Business Network Card should download as a `.card` file.
+- On the **Business Networks** page, click the **Export** icon on the Business Network Card you wish to export. The Business Network Card should download as a `.card` file.
 
 _Please note_: If you export a Business Network Card that has never been used, for example to send to a new participant, it will contain the enrollment ID and enrollment secret required to obtain the certificate and private key which are then used to identify Participants. Alternatively, if you export a Business Network Card that has been used before, it will already contain the certificate and private key. For more information on Participants and Identities, please see our [main documentation](../managing/participantsandidentities.html).
 
@@ -74,7 +74,7 @@ _Please note_: If you export a Business Network Card that has never been used, f
 ### Creating Business Network Card Credentials
 
 It is possible to provide credentials to a user to enable them to create a Business Network Card and then use it to connect to the business network for which the credentials are valid.
-1. From the **My Wallet** page, select an identity to use to connect to your business network. Click **Connect Now**. _Please note:_ You must use an identity that has permission to create new identities.
+1. From the **Business Networks** page, select an identity to use to connect to your business network. Click **Connect Now**. _Please note:_ You must use an identity that has permission to create new identities.
 
 2. If required, create the participant to which you intend to assign the identity:
  - click the **Test** tab, and click **Create New Participant**.
@@ -108,43 +108,43 @@ It is possible to provide credentials to a user to enable them to create a Busin
 
 Importing a Business Network Card allows you to connect to a deployed business network.
 
-1. On the **My Wallet** page, click **Import Business Network Card** in the upper right.
+1. On the **Business Networks** page, click **Import Business Network Card** in the upper right.
 
 2. Drag and drop, or browse, to select a Business Network Card (`.card`) file to import. Click **Import**.
 
-The Business Network Card should now be visible in your wallet; you can now connect to the deployed Business Network.
+The Business Network Card should now be visible in your Business Networks page; you can now connect to the deployed Business Network.
 
 ### Connecting using Credentials
 
-There are two ways a Business Network Card can be created from the **My Wallet** page.
+There are two ways a Business Network Card can be created from the **Business Networks** page.
 
 A Business Network Card can be created using certificates, which requires the following: a _certificate_ and _private key_, provided by an admin of a business network; a _name_ for the Business Network Card; the _business network name_ for which the credentials are valid; the _Connection Profile_ details for the runtime on which the target business network is deployed.
 
-To create a Business Network Card from the **My Wallet** page using _certificates_:
+To create a Business Network Card from the **Business Networks** page using _certificates_:
 
-1. After receiving a certificate and private key, click the **Connect using credentials** button in the upper right of the **My Wallet** page.
+1. After receiving a certificate and private key, click the **Connect using credentials** button in the upper right of the **Business Networks** page.
 
 2. If you have previously connected to the deployed runtime, select it from the displayed list, click **Next** and proceed to step 4; otherwise select the radio option to connect to a new Blockchain and click **Next**.
 
 3. Specify the Connection Profile details that were provided to you and click **Save**.
 
 4. Enter the _certificate_, _private key_, an _Business Network Card name_ and _business network name_, and click **Create**.
 
-The Business Network Card should now be displayed in the **My Wallet** page.
+The Business Network Card should now be displayed in the **Business Networks** page.
 
 A Business Network Card can be created using an ID and secret, through knowledge of the following: a _Enrollment ID_ and _Enrollment Secret_, generated by an admin of a business network; the _Business network name_ for which the credentials are valid; the _Connection Profile_ details for the runtime on which the target business network is deployed.
 
-To create a Business Network Card from the **My Wallet** page using an _enrollment ID_ and _enrollment secret_:
+To create a Business Network Card from the **Business Networks** page using an _enrollment ID_ and _enrollment secret_:
 
-1. After receiving an enrollment ID and enrollment secret, click the **Connect using credentials** button in the upper right of the **My Wallet** page.
+1. After receiving an enrollment ID and enrollment secret, click the **Connect using credentials** button in the upper right of the **Business Networks** page.
 
 2. If you have previously connected to the deployed runtime, select it from the displayed list, click **Next** and proceed to step 4; otherwise select the radio option to connect to a new Blockchain and click **Next**.
 
 3. Specify the Connection Profile details that were provided to you and click **Save**.
 
 4. Enter the _enrollment ID_, _enrollment secret_ and _business network name_, and click **Create**.
 
-The Business Network Card should now be displayed in the **My Wallet** page.
+The Business Network Card should now be displayed in the **Business Networks** page.
 
 
 ### Manually Creating a Business Network Card
diff --git a/packages/composer-website/jekylldocs/playground/playground-index.md b/packages/composer-website/jekylldocs/playground/playground-index.md
@@ -19,9 +19,9 @@ If you are new to the Playground, we recommend that you follow the [Playground T
 
 # Navigating Playground
 
-## The wallet page
+## The Business Networks page
 
-The **My Wallet**  page is the default Playground landing page. Here you can see all the Business Network Cards in your Wallet. Each Business Network Card provides all of the information needed to connect to a blockchain business network. It is only possible to access a blockchain business network by using a valid Business Network Card. Once connected to a deployed Business Network, you will be taken to the **Define** page.
+The **Business Networks**  page is the default Playground landing page. Here you can see all the Business Network Cards you have available for use. Each Business Network Card provides all of the information needed to connect to a blockchain business network. It is only possible to access a blockchain business network by using a valid Business Network Card. Once connected to a deployed Business Network, you will be taken to the **Define** page.
 
 ![wallet-page](./images/wallet-page.png)
 
@@ -31,7 +31,7 @@ From this page you can:
 - Connect to a business network. If you already have a deployed business network and a Business Network Card created for it, you can click **Connect now** to connect to the business network.
 - Deploy a new business network. If this is your first time using Playground, or you wish to start a new network, deploying your own network is a great place to start. When creating a new business network, you can choose to base your business network definition on a sample network, or create your own network from scratch.
 - Interact with Business Network Cards. Business Network Cards are used to connect to business networks which already exist, and are a combination of connection profile and identity. The card provides options to delete the identity/card, export the card, and to connect to the corresponding business network.
-- Import Business Network Cards. Importing an existing `.card` file from your computer is the simplest way to add a Business Network Card to your wallet.
+- Import Business Network Cards. Importing an existing `.card` file from your computer is the simplest way to add a Business Network Card to your Business Networks page.
 - Connect using a user ID and user secret. If you have been provided with a user ID and user secret by your network administrator, click **Connect using credentials** to enter them and generate a Business Network Card.
 - Run through the Playground tutorial. If you don't know where to start, the Playground tutorial runs through creating a business network from scratch, and performing some basic operations.
 
@@ -43,7 +43,7 @@ Once connected to a business network using a Business Network Card, there are a
 
 - In the upper-left is the name of the connection profile you're using and the business network you're connected to. In the example above, the connection profile is called _Web_ and the business network name is _basic-sample-network_.
 - Links to the **Define** and **Test** tabs. In the **Define** tab, you can add, modify and delete the content of your business network, and in the **Test** tab you can create assets and participants that were defined in the **Define** tab, and test the functionality of your business network.
-- On the upper-right is a dropdown menu displaying the identity which is being used to connect to the business network. The dropdown contains a link to the **Identity Registry**, and the ability to log out of the business network, returning to the **My Wallet** screen.
+- On the upper-right is a dropdown menu displaying the identity which is being used to connect to the business network. The dropdown contains a link to the **Identity Registry**, and the ability to log out of the business network, returning to the **Business Networks** page.
 
 ## The Define tab
 
@@ -53,7 +53,7 @@ The Define tab is used to create, edit and update your business network.
 
 On the left of the **Define** tab, you can see a list of all the files in your current business network definition. To examine the contents of a file, click on it, and it will appear in the editor view. New files can be added to your business network with the **Add a file** button. Model files, script files, access control files, and query files can be added to your business network.
 
-Once you've added and modified the files for your business network definition, you can deploy the changes to your network with the **Update** button. After click **Update** you can experiment with your changes in the **Test** tab. The **Import/Replace** button allows you to import a business network, either from your own computer, or import a business network from our samples. Conversely, the **Export** button downloads your current business network as a business network archive `.bna` file.
+Once you've added and modified the files for your business network definition, you can deploy the changes to your network with the **Update** button. After clicking **Update** you can experiment with your changes in the **Test** tab. The **Import/Replace** button allows you to import a business network, either from your own computer, or import a business network from our samples. Conversely, the **Export** button downloads your current business network as a `.bna` file.
 
 **Please note**: If two or more users are using {{site.data.conrefs.composer_full}} Playground to connect to the same instance of {{site.data.conrefs.hlf_full}}, ensure that each user refreshes their browser after the business network definition is updated by another user. Refreshing the browser accepts the changes to the business network definition made by other users. If the the business network is changed without accepting the changes of other users the changes will be lost.
 
diff --git a/packages/composer-website/jekylldocs/reference/composer.network.start.md b/packages/composer-website/jekylldocs/reference/composer.network.start.md
@@ -45,11 +45,11 @@ The `--option, -o` option and the `--optionsFile, -O` option allow connection sp
 
 - Using the `-o` option, the endorsement policy can be sent as a single-line JSON string as follows:
 
-        composer network deploy -o endorsementPolicy='{"identities": [.... }'
+        composer network start -o endorsementPolicy='{"identities": [.... }'
 
 - Using the `-o` option, the endorsement policy can be sent as a file path as follows:
 
-        composer network deploy -o endorsementPolicyFile=/path/to/file/endorsementPolicy.json
+        composer network start -o endorsementPolicyFile=/path/to/file/endorsementPolicy.json
 
 	In this case, the endorsement policy file should follow this format:
 
@@ -58,7 +58,7 @@ The `--option, -o` option and the `--optionsFile, -O` option allow connection sp
 
 - Using the `-O` option, the endorsement policy can be sent as a file path as follows:
 
-        composer network deploy -O /path/to/file/options.json
+        composer network start -O /path/to/file/options.json
 
 	In this case, the options file should follow this format:
 
diff --git a/packages/composer-website/jekylldocs/reference/composer.participant.add.md b/packages/composer-website/jekylldocs/reference/composer.participant.add.md
@@ -10,9 +10,9 @@ excerpt: Hyperledger Composer Participant Add Command
 
 ---
 
-The `composer participant add` command adds a new instance of a participant to a
-participant registry. See the task [Add a Participant](../managing/participant-add.html)
-for a walkthrough of using this command or the API.
+The `composer participant add` command adds a new instance of a participant to a participant registry. See the task [Add a Participant](../managing/participant-add.html) for a walkthrough of using this command or the API.
+
+The `data` option must contain a serialized JSON representation of the participant to add, and must be wrapped in single quotes.
 
 ## Syntax
 
@@ -34,28 +34,31 @@ Options:
 `--connectionProfileName, -p`
 
 The connection profile name.  
+
 Example: `hlfv1`
 
 `--businessNetworkName, -n`
 
 The name of the deployed Business Network to connect to.  
-Example:
-`digitalproperty-network`
+
+Example: `digitalproperty-network`
 
 `--enrollId, -i`
 
 The enrollment ID of the identity that should be used to connect to the deployed
 Business Network.
+
 Example: `maeid1`
 
 `--enrollSecret, -s`
 
 The enrollment secret of the identity that should be used to connect to deployed
 Business Network.  
+
 Example: `Xurw3yU9zI0l`
 
 `--data, -d`
 
-The serialized JSON representation of the participant to add to the participant
-registry. The data must be valid according to the model of the participant.  
-Example: `{"$class":"net.biz.digitalPropertyNetwork.Person","personId":"mae@biznet.org","firstName":"Mae","lastName":"Smith"}`
+The serialized JSON representation of the participant to add to the participant registry. The data must be valid according to the model of the participant.  
+
+Example: `'{"$class":"net.biz.digitalPropertyNetwork.Person","personId":"mae@biznet.org","firstName":"Mae","lastName":"Smith"}'`
diff --git a/packages/composer-website/jekylldocs/reference/connectionprofile.md b/packages/composer-website/jekylldocs/reference/connectionprofile.md
