From b735309e783627a6d530bae15efc69d90f00f57b Mon Sep 17 00:00:00 2001
From: David Enyeart <enyeart@us.ibm.com>
Date: Thu, 9 Sep 2021 15:39:26 -0400
Subject: [PATCH] Updates in main for v2.3.3

Update docs and scripts in main branch for v2.3.3 release.

Signed-off-by: David Enyeart <enyeart@us.ibm.com>
---
 docs/source/install.md   | 4 ++--
 docs/source/whatsnew.rst | 2 ++
 scripts/bootstrap.sh     | 8 ++++----
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/docs/source/install.md b/docs/source/install.md
index c5c42a7ee24..326fc1e1f07 100644
--- a/docs/source/install.md
+++ b/docs/source/install.md
@@ -46,11 +46,11 @@ To view the help and available commands for the download script, please use the
 curl -sSL https://bit.ly/2ysbOFE | bash -s -- -h
 ```
 
-To download a specific release, pass a version identifier for Fabric and Fabric CA Docker images. The command below demonstrates how to download the latest production releases - `Fabric v2.3.2` and `Fabric CA v1.5.0` 
+To download a specific release, pass a version identifier for Fabric and Fabric CA Docker images. The command below demonstrates how to download the latest production releases - `Fabric v2.3.3` and `Fabric CA v1.5.2` 
 
 ```shell
 curl -sSL https://bit.ly/2ysbOFE | bash -s -- <fabric_version> <fabric-ca_version>
-curl -sSL https://bit.ly/2ysbOFE | bash -s -- 2.3.2 1.5.0
+curl -sSL https://bit.ly/2ysbOFE | bash -s -- 2.3.3 1.5.2
 ```
 
 ## Notes
diff --git a/docs/source/whatsnew.rst b/docs/source/whatsnew.rst
index 63e71584f3c..b27854de220 100644
--- a/docs/source/whatsnew.rst
+++ b/docs/source/whatsnew.rst
@@ -274,9 +274,11 @@ announced in each of the v2.x releases.
 * `Fabric v2.2.1 release notes <https://github.com/hyperledger/fabric/releases/tag/v2.2.1>`_.
 * `Fabric v2.2.2 release notes <https://github.com/hyperledger/fabric/releases/tag/v2.2.2>`_.
 * `Fabric v2.2.3 release notes <https://github.com/hyperledger/fabric/releases/tag/v2.2.3>`_.
+* `Fabric v2.2.4 release notes <https://github.com/hyperledger/fabric/releases/tag/v2.2.4>`_.
 * `Fabric v2.3.0 release notes <https://github.com/hyperledger/fabric/releases/tag/v2.3.0>`_.
 * `Fabric v2.3.1 release notes <https://github.com/hyperledger/fabric/releases/tag/v2.3.1>`_.
 * `Fabric v2.3.2 release notes <https://github.com/hyperledger/fabric/releases/tag/v2.3.2>`_.
+* `Fabric v2.3.3 release notes <https://github.com/hyperledger/fabric/releases/tag/v2.3.3>`_.
 
 .. Licensed under Creative Commons Attribution 4.0 International License
    https://creativecommons.org/licenses/by/4.0/
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index a532c8948dd..0867663c989 100755
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@@ -6,9 +6,9 @@
 #
 
 # if version not passed in, default to latest released version
-VERSION=2.3.2
+VERSION=2.3.3
 # if ca version not passed in, default to latest released version
-CA_VERSION=1.5.1
+CA_VERSION=1.5.2
 ARCH=$(echo "$(uname -s|tr '[:upper:]' '[:lower:]'|sed 's/mingw64_nt.*/windows/')-$(uname -m | sed 's/x86_64/amd64/g')")
 MARCH=$(uname -m)
 
@@ -21,8 +21,8 @@ printHelp() {
     echo "-s : bypass fabric-samples repo clone"
     echo "-b : bypass download of platform-specific binaries"
     echo
-    echo "e.g. bootstrap.sh 2.3.2 1.5.1 -s"
-    echo "will download docker images and binaries for Fabric v2.3.2 and Fabric CA v1.5.1"
+    echo "e.g. bootstrap.sh 2.3.3 1.5.2 -s"
+    echo "will download docker images and binaries for Fabric v2.3.3 and Fabric CA v1.5.2"
 }
 
 # dockerPull() pulls docker images from fabric and chaincode repositories