[FAB-15013] Update tutorials for commands

Update tutorials to reflect queryapprovalstatus and
query committed

Change-Id: I2a93ba9d8468c5ba499c19ac4c106d2b6de8781a
Signed-off-by: NIKHIL E GUPTA <negupta@us.ibm.com>
Signed-off-by: Alessandro Sorniotti <ale.linux@sopit.net>

Author: NIKHIL E GUPTA

docs/source/chaincode4ade.rst

@@ -39,7 +39,7 @@ the channel ledger.
 
 You also need to include an ``Init`` method that will serve as the initialization
 function for your chaincode. This method will be called in order to initialize
-the chaincode when it is started or upgraded. By default, this function is never 
+the chaincode when it is started or upgraded. By default, this function is never
 executed. However, you can use the chaincode definition to request that the ``Init``
 function be executed. If execution of ``Init`` is requested, fabric will ensure
 that ``Init`` is invoked before any other function and is only invoked once.
@@ -49,7 +49,7 @@ the peer CLI to approve the chaincode definition, use the ``--init-required``
 flag to request the execution of the ``Init`` function. Then call the ``Init``
 function by using the `peer chaincode invoke` command and passing the
 ``--isInit`` flag. If you are using the Fabric SDK for Node.js, visit
-[How to install and start your chaincode](https://fabric-sdk-node.github.io/master/tutorial-chaincode-lifecycle.html). For more information, see :doc:`chaincode4noah`.
+`How to install and start your chaincode <https://fabric-sdk-node.github.io/master/tutorial-chaincode-lifecycle.html>`__. For more information, see :doc:`chaincode4noah`.
 
 The other interface in the chaincode "shim" APIs is the ``ChaincodeStubInterface``:
 

docs/source/chaincode4noah.md

@@ -27,17 +27,18 @@ to agree on how a chaincode will be operated before it can be used on a channel.
 The tutorial will discuss how a chaincode operator would use the Fabric
 lifecycle perform the following tasks:
 
-- [Install and define a chaincode](#install-and-define-a-chaincode).
-- [Upgrade a chaincode](#upgrade-a-chaincode).
-- [Migrate to the new Fabric lifecycle](#migrate-to-the-new-fabric-lifecycle).
-
-_Note: The Fabric chaincode lifecycle is being introduced as an Alpha feature in
-Fabric v2.0. As a result, some Fabric features cannot be used with chainode that
-uses the new Fabric lifecycle:
-- *Service Discovery is not supported
-- *CouchDB indexes are not supported
+- [Install and define a chaincode](#install-and-define-a-chaincode)
+- [Upgrade a chaincode](#upgrade-a-chaincode)
+- [Migrate to the new Fabric lifecycle](#migrate-to-the-new-fabric-lifecycle)
+
+_Note: The new Fabric chaincode lifecycle has limitations in the v2.0.0 alpha 
+release. As a result, some Fabric features cannot be used with chainodes that
+use the new Fabric lifecycle:
+- Service Discovery is not supported
+- CouchDB indexes are not supported_
+
 *To use the old lifecycle model to install and instantiate a chaincode, visit the
-v1.4 version of the [Chaincode for Operators tutorial](https://hyperledger-fabric.readthedocs.io/en/release-1.4/chaincode4noah.html)_
+v1.4 version of the [Chaincode for Operators tutorial](https://hyperledger-fabric.readthedocs.io/en/release-1.4/chaincode4noah.html)*
 
 ## Install and define a chaincode
 
@@ -62,7 +63,7 @@ every organization on a channel needs to complete each step.
 This tutorial provides a detailed overview of the operations of the Fabric
 chaincode lifecycle rather than the specific commands. To learn more about how
 to use the Fabric lifecycle using the Peer CLI, see [Install and define a chaincode](build_network.html#install-define-chaincode)
-in the Building your First Network Tutorial or the [peer lifecycle command reference](../commands/peerlifecycle.html).
+in the Building your First Network Tutorial or the [peer lifecycle command reference](commands/peerlifecycle.html).
 To learn more about how to use the Fabric lifecycle using the Fabric SDK for
 Node.js, visit [How to install and start your chaincode](https://fabric-sdk-node.github.io/master/tutorial-chaincode-lifecycle.html).
 
@@ -161,15 +162,16 @@ chaincode for your organization once, even if you have multiple peers.
 ### Step Four: Commit the chaincode definition to the channel
 
 Once a sufficient number of channel members have approved a chaincode definition,
-one organization can commit the definition to the channel. The channel members
-need to communicate that they have approved the definition out of band. The
-commit transaction is first submitted to the peers of channel members, who query
-the chaincode definition approved for their organizations and endorse the
-definition if their organization has approved it. The transaction is then sent
-to the ordering service, which then commits the chaincode definition to the
-channel. The commit definition transaction needs to be submitted as the
-**Organization Administrator**, whose signing certificate is listed as an admin
-cert in the MSP of your organization definition.
+one organization can commit the definition to the channel. You can use the
+``queryapprovalstatus`` command to find which channel members have approved a
+definition before committing it to the channel using the peer CLI. The commit
+transaction is first submitted to the peers of channel members, who query the
+chaincode definition approved for their organizations and endorse the definition
+if their organization has approved it. The transaction is then sent to the
+ordering service, which then commits the chaincode definition to the channel.
+The commit definition transaction needs to be submitted as the **Organization**
+**Administrator**, whose signing certificate is listed as an admin cert in the
+MSP of your organization definition.
 
 The number of organizations that need to approve a definition before it can be
 successfully committed to the channel is governed by the
@@ -234,13 +236,13 @@ number by one and approve a new definition to upgrade the chaincode. The version
 parameter is used to track the chaincode binaries, and needs to be changed only
 when you upgrade the chaincode binaries.
 
-## Migrating to the new Fabric lifecycle
+## Migrate to the new Fabric lifecycle
 
-You can use the Fabric chaincode lifecycle my creating a new channel and setting
-the channel capabilities to `V2_0`. You will not be able to use the old lifecycle
-to install, instantiate, or update a chaincode on a channels with `V2_0` capabilities
-enabled. Migration from the old lifecycle to the new lifecycle is not supported
-for the Fabric v2.0 Alpha.
+You can use the Fabric chaincode lifecycle by creating a new channel and setting
+the channel capabilities to `V2_0`. You will not be able to use the previous
+lifecycle to install, instantiate, or update a chaincode on a channels with
+`V2_0` capabilities enabled. Migration from the old lifecycle to the new
+lifecycle is not supported for the Fabric v2.0 Alpha.
 
 <!--- Licensed under Creative Commons Attribution 4.0 International License
 https://creativecommons.org/licenses/by/4.0/ -->

docs/source/channel_update_tutorial.rst

@@ -627,10 +627,10 @@ chaincode package label as a description of the chaincode. Modify the command
 accordingly if the channel is running a chaincode written in Java or Node.js.
 Issue the following command to install the package on peer0 of Org3:
 
-  .. code:: bash
+.. code:: bash
 
-      # this command installs a chaincode package on your peer
-      peer lifecycle chaincode install mycc.tar.gz
+    # this command installs a chaincode package on your peer
+    peer lifecycle chaincode install mycc.tar.gz
 
 You can also modify the environment variables and reissue the command if you
 want to install the chaincode on the second peer of Org3. Note that a second
@@ -678,14 +678,30 @@ for Org3:
     # use the --init-required flag to request the ``Init`` function be invoked to initialize the chaincode
     peer lifecycle chaincode approveformyorg --channelID $CHANNEL_NAME --name mycc --version 1.0 --init-required --package-id $CC_PACKAGE_ID --sequence 1 --tls true --cafile /opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/ordererOrganizations/example.com/orderers/orderer.example.com/msp/tlscacerts/tlsca.example.com-cert.pem --waitForEvent
 
-Since the chaincode definition has already been committed to the channel, you
-are ready to use the ``mycc`` chaincode after you approve the definition.
-The chaincode definition uses the default endorsement policy, which requires a
-majority of organizations on the channel endorse a transaction. This implies
-that if an organization is added to or removed from the channel, the endorsement
-policy is updated automatically. We previously needed endorsements from Org1 and
-Org2 (2 out of 2). Now we need endorsements from two organizations out of Org1,
-Org2, and Org3 (2 out of 3).
+You can use the ``peer lifecycle chaincode querycommitted`` command to check if
+the chaincode definition you have approved has already been committed to the
+channel.
+
+.. code:: bash
+
+    # use the --name flag to select the chaincode whose definition you want to query
+    peer lifecycle chaincode querycommitted --channelID $CHANNEL_NAME --name mycc --cafile /opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/ordererOrganizations/example.com/orderers/orderer.example.com/msp/tlscacerts/tlsca.example.com-cert.pem
+
+A successful command will return information about the committed definition:
+
+.. code:: bash
+
+    Committed chaincode definition for chaincode 'mycc' on channel 'mychannel':
+    Version: 1, Sequence: 1, Endorsement Plugin: escc, Validation Plugin: vscc
+
+Since the chaincode definition has already been committed, you are ready to use
+the ``mycc`` chaincode after you approve the definition. The chaincode definition
+uses the default endorsement policy, which requires a majority of organizations
+on the channel endorse a transaction. This implies that if an organization is
+added to or removed from the channel, the endorsement policy is updated
+automatically. We previously needed endorsements from Org1 and Org2 (2 out of 2).
+Now we need endorsements from two organizations out of Org1, Org2, and Org3 (2
+out of 3).
 
 Query the chaincode to ensure that it has started. Note that you may need to
 wait for the chaincode container to start.

docs/source/couchdb_as_state_database.rst

@@ -108,10 +108,10 @@ CouchDB indexes
 .. note:: The Fabric chaincode lifecycle that is being introduced as an Alpha
           feature in Fabric v2.0 does not support using indexes with CouchDB. As
           a result, the `previous lifecycle process <https://hyperledger-fabric.readthedocs.io/en/release-1.4/chaincode4noah.html>`_  is required to
-          install and instantiate a chaincode that includes CouchDB indexes. You 
+          install and instantiate a chaincode that includes CouchDB indexes. You
           can only use CouchDB indexes with the Fabric v2.0 Alpha if the channel
           capabilities are set with V1_4 as the highest version enabled in the
-          Application Capabilities section of the `configtx.yaml file <https://github.com/hyperledger/fabric/blob/release-2.0/sampleconfig/configtx.yaml>`_. 
+          Application Capabilities section of the `configtx.yaml file <https://github.com/hyperledger/fabric/blob/master/sampleconfig/configtx.yaml>`_.
           CouchDB indexes will not work on channels with v2_0 capabilities
           enabled.
 

docs/source/pluggable_endorsement_and_validation.rst

@@ -96,7 +96,7 @@ The name of the custom plugin needs to be referenced by the chaincode definition
 to be used by the chaincode. If you are using the peer CLI to approve the
 chaincode definition, use the ``--escc`` and ``--vscc`` flag to select the name
 of the custom endorsement or validation library. If you are using the
-Fabric SDK for Node.js, visit [How to install and start your chaincode](https://fabric-sdk-node.github.io/master/tutorial-chaincode-lifecycle.html).
+Fabric SDK for Node.js, visit `How to install and start your chaincode <https://fabric-sdk-node.github.io/master/tutorial-chaincode-lifecycle.html>`__.
 For more information, see :doc:`chaincode4noah`.
 
 .. note:: Hereafter, custom endorsement or validation logic implementation is