diff --git a/docs/source/Fabric-FAQ.rst b/docs/source/Fabric-FAQ.rst index 33f7a2c7ac9..25e2b7aa82d 100644 --- a/docs/source/Fabric-FAQ.rst +++ b/docs/source/Fabric-FAQ.rst @@ -154,7 +154,7 @@ on its chain. Differences in Most Recent Releases ----------------------------------- -Q. As part of the v1.0.0 release, what are the highlight differences between v0.6 and v1.0? +Q. Where can I find what are the highlighted differences between releases? A. The differences between any subsequent releases are provided together with the `Release Notes `__. diff --git a/docs/source/chaincode4ade.rst b/docs/source/chaincode4ade.rst index b7e02ba2e92..6d57a333ab5 100644 --- a/docs/source/chaincode4ade.rst +++ b/docs/source/chaincode4ade.rst @@ -429,14 +429,16 @@ should see something similar to following: docker images REPOSITORY TAG IMAGE ID CREATED SIZE - hyperledger/fabric-tools latest e09f38f8928d 4 hours ago 1.32 GB - hyperledger/fabric-tools x86_64-1.0.0 e09f38f8928d 4 hours ago 1.32 GB - hyperledger/fabric-orderer latest 0df93ba35a25 4 hours ago 179 MB - hyperledger/fabric-orderer x86_64-1.0.0 0df93ba35a25 4 hours ago 179 MB - hyperledger/fabric-peer latest 533aec3f5a01 4 hours ago 182 MB - hyperledger/fabric-peer x86_64-1.0.0 533aec3f5a01 4 hours ago 182 MB - hyperledger/fabric-ccenv latest 4b70698a71d3 4 hours ago 1.29 GB - hyperledger/fabric-ccenv x86_64-1.0.0 4b70698a71d3 4 hours ago 1.29 GB + hyperledger/fabric-tools latest b7bfddf508bc About an hour ago 1.46GB + hyperledger/fabric-tools x86_64-1.1.0 b7bfddf508bc About an hour ago 1.46GB + hyperledger/fabric-orderer latest ce0c810df36a About an hour ago 180MB + hyperledger/fabric-orderer x86_64-1.1.0 ce0c810df36a About an hour ago 180MB + hyperledger/fabric-peer latest b023f9be0771 About an hour ago 187MB + hyperledger/fabric-peer x86_64-1.1.0 b023f9be0771 About an hour ago 187MB + hyperledger/fabric-javaenv latest 82098abb1a17 About an hour ago 1.52GB + hyperledger/fabric-javaenv x86_64-1.1.0 82098abb1a17 About an hour ago 1.52GB + hyperledger/fabric-ccenv latest c8b4909d8d46 About an hour ago 1.39GB + hyperledger/fabric-ccenv x86_64-1.1.0 c8b4909d8d46 About an hour ago 1.39GB .. note:: If you retrieved the images through the :ref:`binaries`, then you will see additional images listed. However, we are only concerned with diff --git a/docs/source/fabric-sdks.rst b/docs/source/fabric-sdks.rst index dc9bbbf6c27..aad30b88086 100644 --- a/docs/source/fabric-sdks.rst +++ b/docs/source/fabric-sdks.rst @@ -3,7 +3,7 @@ Hyperledger Fabric SDKs Hyperledger Fabric intends to offer a number of SDKs for a wide variety of programming languages. The first two delivered are the Node.js and Java -SDKs. We hope to provide Python and Go SDKs soon after the 1.0.0 release. +SDKs. We hope to provide Python, REST and Go SDKs in a subsequent release. * `Hyperledger Fabric Node SDK documentation `__. * `Hyperledger Fabric Java SDK documentation `__. diff --git a/docs/source/getting_started.rst b/docs/source/getting_started.rst index 2e08a60e570..e55f6922808 100644 --- a/docs/source/getting_started.rst +++ b/docs/source/getting_started.rst @@ -42,7 +42,7 @@ Hyperledger Fabric SDKs Hyperledger Fabric intends to offer a number of SDKs for a wide variety of programming languages. The first two delivered SDKs are the Node.js and Java -SDKs. We hope to provide Python and Go SDKs soon after the 1.0.0 release. +SDKs. We hope to provide Python, REST and Go SDKs in a subsequent release. * `Hyperledger Fabric Node SDK documentation `__. * `Hyperledger Fabric Java SDK documentation `__. diff --git a/docs/source/samples.rst b/docs/source/samples.rst index ac9a9473e89..ab674a8fa34 100644 --- a/docs/source/samples.rst +++ b/docs/source/samples.rst @@ -30,7 +30,7 @@ execute the following commands: git checkout {TAG}　 .. note:: To ensure the samples are compatible with the version of Fabric binaries you download below, - checkout the samples ``{TAG}`` that matches your Fabric version, for example, v1.1.0-rc1. + checkout the samples ``{TAG}`` that matches your Fabric version, for example, v1.1.0. To see a list of all fabric-samples tags, use command "git tag". .. _binaries: @@ -49,7 +49,7 @@ you will extract the platform-specific binaries: .. code:: bash - curl -sSL https://goo.gl/6wtTN5 | bash -s 1.1.0-rc1 + curl -sSL https://goo.gl/6wtTN5 | bash -s 1.1.0 .. note:: If you get an error running the above curl command, you may have too old a version of curl that does not handle @@ -62,7 +62,7 @@ you will extract the platform-specific binaries: https://github.com/hyperledger/fabric/blob/master/scripts/bootstrap.sh .. note:: You can use the command above for any published version of Hyperledger - Fabric. Simply replace '1.1.0-rc1' with the version identifier + Fabric. Simply replace '1.1.0' with the version identifier of the version you wish to install. The command above downloads and executes a bash script diff --git a/docs/source/tutorials.rst b/docs/source/tutorials.rst index 7d441ba634b..f82d6999468 100644 --- a/docs/source/tutorials.rst +++ b/docs/source/tutorials.rst @@ -1,7 +1,7 @@ Tutorials ========= -We offer four initial tutorials to get you started with Hyperledger Fabric. +We offer tutorials to get you started with Hyperledger Fabric. The first is oriented to the Hyperledger Fabric **application developer**, :doc:`write_first_app`. It takes you through the process of writing your first blockchain application for Hyperledger Fabric using the Hyperledger Fabric @@ -12,6 +12,9 @@ operators, :doc:`build_network`. This one walks you through the process of establishing a blockchain network using Hyperledger Fabric and provides a basic sample application to test it out. +There are also tutorials for updating your channel, :doc:`channel_update_tutorial`, and +upgrading your network to a later version of Hyperledger Fabric, :doc:`upgrading_your_network_tutorial`. + Finally, we offer two chaincode tutorials. One oriented to developers, :doc:`chaincode4ade`, and the other oriented to operators, :doc:`chaincode4noah`. diff --git a/docs/source/upgrading_your_network_tutorial.rst b/docs/source/upgrading_your_network_tutorial.rst index 755dc191490..de4f3b8fdca 100644 --- a/docs/source/upgrading_your_network_tutorial.rst +++ b/docs/source/upgrading_your_network_tutorial.rst @@ -107,7 +107,7 @@ Get the newest samples .. note:: The instructions below pertain to whatever is the most recently published version of v1.1.x, starting with 1.1.0-rc1. Please substitute '1.1.x' with the version identifier of the published release that - you are testing. e.g. replace '1.1.x' with '1.1.0-rc1' if you are + you are testing. e.g. replace '1.1.x' with '1.1.0' if you are currently testing the first release candidate. Before completing the rest of the tutorial, it's important to get the v1.1.x @@ -130,7 +130,7 @@ To run the script, issue these commands: .. code:: bash - # Note, replace '1.1.x' with a specific version, for example '1.1.0-rc1'. + # Note, replace '1.1.x' with a specific version, for example '1.1.0'. # Don't pass the image flag '-i 1.1.x' if you prefer to default to 'latest' images. ./byfn.sh upgrade -i 1.1.x @@ -187,7 +187,7 @@ Let’s begin the upgrade process by **bringing down the orderer**: export LEDGERS_BACKUP=./ledgers-backup - # Note, replace '1.1.x' with a specific version, for example '1.1.0-rc1'. + # Note, replace '1.1.x' with a specific version, for example '1.1.0'. # Set IMAGE_TAG to 'latest' if you prefer to default to the images tagged 'latest' on your system. export IMAGE_TAG=`uname -m`-1.1.x