Streamline counter, wCCD and voting smart contract tutorials

source/mainnet/net/guides/tokens.rst

@@ -39,7 +39,7 @@ You can add, inspect, and send tokens in the |bw| and |mw-gen2|.
 
         Once the tokens are added you can see them on the relevant tab.
 
-        An easy way to see how this works is to use the `wCCD example dApp hosted by Concordium <https://wccd.testnet.concordium.com/>`_. Connect it to your |bw| and convert some CCD to wrapped CCD. When you do this, you get the a smart contract index. You can then use this smart contract index to search for tokens on the contract and add them to your |bw|.
+        An easy way to see how this works is to use the `wCCD example dApp hosted by Concordium <https://wccd.testnet.concordium.com/>`_. Connect it to your |bw| and convert some CCD to wrapped CCD. When you do this, you get a smart contract index. You can then use this smart contract index to search for tokens on the contract and add them to your |bw|.
 
     .. dropdown:: Inspect tokens
 
@@ -108,7 +108,7 @@ You can add, inspect, and send tokens in the |bw| and |mw-gen2|.
 
         Once the tokens are added you can see them on the relevant tab.
 
-        An easy way to see how this works is to use the `wCCD example dApp hosted by Concordium <https://wccd.testnet.concordium.com/>`_. Connect it to your |mw-gen2| and convert some CCD to wrapped CCD. When you do this, you get the a smart contract index. You can then use this smart contract index to search for tokens on the contract and add them to your |mw-gen2|.
+        An easy way to see how this works is to use the `wCCD example dApp hosted by Concordium <https://wccd.testnet.concordium.com/>`_. Connect it to your |mw-gen2| and convert some CCD to wrapped CCD. When you do this, you get a smart contract index. You can then use this smart contract index to search for tokens on the contract and add them to your |mw-gen2|.
 
     .. dropdown:: Inspect tokens
 

source/mainnet/net/installation/verification-instructions.rst

@@ -49,6 +49,9 @@ Linux
 
 .. include:: client-verification-instructions/client-linux.rst
 
+Cargo Concordium
+================
+
 .. _verification-cargo-linux:
 
 Linux

source/mainnet/smart-contracts-v0/tutorials/piggy-bank/testing.rst

@@ -83,7 +83,6 @@ Preparation
 Before you start, make sure to have the necessary tooling to build Rust
 contracts.
 The guide :ref:`setup-tools` shows you how to do this.
-Also, make sure to have a text editor setup to write Rust.
 
 Additionally, to run the tests you need to:
 

source/mainnet/smart-contracts-v0/tutorials/piggy-bank/writing.rst

@@ -48,7 +48,6 @@ Preparation
 Before you start, make sure to have the necessary tooling to build Rust
 contracts.
 The guide :ref:`setup-tools` shows you how to do this.
-Also, make sure to have a text editor for writing Rust.
 
 You also need to set up a new smart contract project.
 Follow the guide :ref:`setup-contract` and return to this point afterwards.

source/mainnet/smart-contracts/guides/setup-contract.rst

@@ -11,13 +11,9 @@ The *from a template* option is available for ``cargo-concordium`` version 2.2.0
 smart contract templates. Choose the template that best fits your project scope.
 The *from scratch* option guides you through the process when you want to start a new project without any boilerplate code.
 
-.. note::
-
-   Concordium recommends that newcomers choose the *from a template* option.
-
 .. tabs::
 
-   .. tab:: From a template
+   .. tab:: From a template (recommended)
 
       Concordium maintains several smart contract
       `templates <https://github.com/Concordium/concordium-rust-smart-contracts/tree/main/templates>`_ (currently a ``default`` template and a ``cis2-nft`` template).

source/mainnet/smart-contracts/tutorials/piggy-bank/deploying.rst

@@ -12,12 +12,6 @@ So far you have written and tested a piggy bank smart contract in the Rust_ prog
 
 This part focuses on how you can deploy your developed piggy bank smart contract to the Concordium testnet and interact with it.
 
-.. warning::
-
-   The reader is assumed to have basic knowledge of what a blockchain and smart
-   contract is, and some experience with Rust_.
-
-
 Preparation
 ===========
 

source/mainnet/smart-contracts/tutorials/piggy-bank/index.rst

@@ -32,7 +32,8 @@ Finally, the :ref:`fourth part<piggy-bank-frontend>` explains how to set up a we
 .. warning::
 
    The reader is assumed to have basic knowledge of what a blockchain and smart
-   contracts are, and to have some experience with Rust_.
+   contracts are, and to have some experience with Rust_. Consider reading the
+   simpler :ref:`Counter smart contract tutorial <counter-sc>` first.
 
 Before starting the tutorial, make sure that you have all of the necessary tools installed and running as described in :ref:`Setup the development environment<setup-env>`.
 

source/mainnet/smart-contracts/tutorials/piggy-bank/testing.rst

@@ -95,18 +95,11 @@ This part will focus on how you can write integration-tests for your piggy bank
 contract using the |concordium-smart-contract-testing|_ library.
 The library simulates part of a blockchain *locally* to allow you to create one or more contracts and interact with them in the tests.
 
-.. warning::
-
-   The reader is assumed to have basic knowledge of what a blockchain and smart
-   contract is, and some experience with Rust_.
-
-
 Preparation
 ===========
 
 Before you start, make sure to have the necessary tooling to build Rust
 contracts. The guide :ref:`setup-env` shows you how to do this.
-Also, make sure to have a text editor setup to write Rust.
 
 Since you are going to extend the smart contract code written in the :ref:`previous
 part<piggy-bank-writing>`, either follow the previous part or copy the complete

source/mainnet/smart-contracts/tutorials/piggy-bank/writing.rst

@@ -31,34 +31,22 @@ This is the first :ref:`part of a tutorial<piggy-bank>` on smart contract
 development. In this part you will focus on how to write a smart contract in the
 Rust_ programming language using the |concordium-std| library.
 
-.. warning::
-
-   The reader is assumed to have basic knowledge of what a blockchain and smart
-   contract is, and some experience with Rust_.
-
-
 Preparation
 ===========
 
-Before you start, make sure to have the necessary tooling to build Rust
-contracts. The guide :ref:`setup-env` shows you how to do this.
-Also, make sure to have a text editor for writing Rust.
-
-You also need to set up a new smart contract project.
-Follow the guide :ref:`setup-contract` and return to this point afterwards.
-
-You are now ready to write a smart contract for the Concordium blockchain!
+Set up a new smart contract project by following the guide :ref:`setup-contract` and return to this point afterwards.
 
 Bring in the standard library
 =============================
 
 The source code of your smart contract is going to be in the ``src`` directory,
-which already contains the file ``lib.rs``, assuming you follow the above guide
+which already contains a ``lib.rs`` file, assuming you follow the above guide
 to set up your project.
-Open ``src/lib.rs`` in your editor and you'll see some code for :ref:`writing tests<piggy-bank-testing>`,
+
+The smart contract template also includes some example tests under the ``tests`` directory,
 which you can delete for now. You will come back to tests later in this tutorial.
 
-First, bring everything from the |concordium-std|_ library into scope
+In ``lib.rs``, start by bringing everything from the |concordium-std|_ library into scope
 by adding the line:
 
 .. code-block:: rust

source/mainnet/smart-contracts/tutorials/voting/index.rst

@@ -8,7 +8,7 @@ The Voting dApp
 ===============
 
 In this tutorial, you are going to get familiar with the deployed voting dApp on testnet. The voting dApp example is intended to show how you can use Concordium to conduct an election using the |bw| to enable users to cast their vote in your election.
-You are going to write a basic web front-end example that can read from and write to the deployed smart contract on testnet.
+You are going to write a basic web frontend example that can read from and write to the deployed smart contract on testnet.
 
 If you want to try this example before starting the tutorial:
 
@@ -22,15 +22,16 @@ If you want to try this example before starting the tutorial:
 
 #. Click **Vote now**. You can vote and send the link to any other voters. When you click **Cast vote** you must click **Sign & submit** in the |bw|.
 
-#. Click **Results** to see the election results.
+#. Click **Results** to see the election results. Note that your vote may not appear instantaneously after voting, as the vote transaction waits for confirmation. Give it a few seconds and the vote should appear.
 
 In the :ref:`first part<voting-sc>`, you will learn about the voting smart contract.
 
-In the :ref:`second part<voting-frontend>`, you will download the |bw| and set up a basic web front-end locally.
+In the :ref:`second part<voting-frontend>`, you will download the |bw| and set up a basic web frontend locally.
 
 .. warning::
 
-   This tutorial assumes the reader has basic knowledge of what a blockchain and a smart contract is, and some experience with Rust_ and web front-end development.
+   This tutorial assumes the reader has basic knowledge of what a blockchain and a smart contract is, and some experience with Rust_ and web frontend development.
+   Consider reading the simpler :ref:`Counter smart contract tutorial <counter-sc>` first.
 
 To start the tutorial click :ref:`here<voting-sc>`.
 
@@ -39,4 +40,4 @@ To start the tutorial click :ref:`here<voting-sc>`.
    :maxdepth: 1
 
    Writing a voting smart contract <./voting-sc>
-   Setting up the front-end <./voting-dapp>
+   Setting up the frontend <./voting-dapp>