Consensys · alexandratran · Mar 10, 2022 · Mar 9, 2022 · Mar 9, 2022 · Mar 9, 2022
diff --git a/docs/concepts/account-management.md b/docs/concepts/account-management.md
@@ -9,5 +9,5 @@ of a public key and a private key. The public key can be shared freely, but **th
 * GoQuorum derives the account address from the public key by taking the last 20 bytes of its keccak256 hash
 * The Privacy Manager uses the public key as an identifier for the target nodes of a private transaction (that is the `privateFor` transaction field)
 
-Key management determines how [GoQuorum](../develop/manage-keys/managing-keys.md) and [Tessera]({{ extra.othersites.tessera }})
+Key management determines how [GoQuorum](../develop/manage-keys/index.md) and [Tessera]({{ extra.othersites.tessera }})
 store and use private keys.
diff --git a/docs/concepts/architecture.md b/docs/concepts/architecture.md
@@ -21,7 +21,7 @@ GoQuorum includes the following changes to geth:
 * The P2P layer is changed to only allow connections between [permissioned](permissions-overview.md) nodes.
 * The block generation logic is changed to replace the `global state root` check with a `global public state root` check.
 * The block validation logic is changed to replace the `global state root` in the block header with the `global public state root`.
-* The State Patricia trie is split into two: [a public state trie and a private state trie](privacy/privacy.md#public-and-private-state).
+* The State Patricia trie is split into two: [a public state trie and a private state trie](privacy/index.md#public-and-private-state).
 * Block validation logic is changed to handle [private transactions](privacy/private-and-public.md#private-transactions).
 * Transaction creation is changed to allow for replacing transaction data with encrypted hashes to preserve private data
   where required.

diff --git a/docs/concepts/blockchain-basics/blockchain-components.md b/docs/concepts/blockchain-basics/blockchain-components.md
@@ -4,6 +4,8 @@ description: What are the various parts of a Blockchain
 
 # Blockchain components
 
+This section introduces the components of [blockchains](index.md).
+
 ## Nodes
 
 Blockchains are decentralized, which means that they store data across a network of members who collaborate to monitor
@@ -52,7 +54,7 @@ access the network.
 
 ## Privacy
 
-In a blockchain network, [*privacy*](../privacy/privacy.md) refers to
+In a blockchain network, [*privacy*](../privacy/index.md) refers to
 the ability to keep transactions private between the involved participants.
 Often in a consortium network, some of the participants prefer to restrict how much information they share or who they
 transact with.

diff --git a/...s/blockchain-basics/what-is-blockchain.md → docs/concepts/blockchain-basics/index.md b/...s/blockchain-basics/what-is-blockchain.md → docs/concepts/blockchain-basics/index.md
@@ -2,7 +2,10 @@
 description: Blockchain Introduction
 ---
 
-# Blockchain introduction
+# Blockchain basics
+
+This section introduces the concept of a blockchain.
+Learn more about [blockchain components](blockchain-components.md).
 
 ## What is a blockchain?
 

diff --git a/docs/concepts/consensus/overview.md → docs/concepts/consensus/index.md b/docs/concepts/consensus/overview.md → docs/concepts/consensus/index.md
diff --git a/docs/concepts/privacy/privacy.md → docs/concepts/privacy/index.md b/docs/concepts/privacy/privacy.md → docs/concepts/privacy/index.md
diff --git a/docs/concepts/privacy/privacy-marker-transactions.md b/docs/concepts/privacy/privacy-marker-transactions.md
@@ -9,7 +9,7 @@ You can use privacy marker transactions (PMTs) instead of [normal private transa
 
 PMTs are public transactions.
 PMTs each have a corresponding [internal private transaction](#internal-private-transaction) stored in the
-[private transaction manager](privacy.md#private-transaction-manager) (Tessera) and only available to participants.
+[private transaction manager](index.md#private-transaction-manager) (Tessera) and only available to participants.
 
 The advantages of using a PMT over a normal private transaction are:
 

diff --git a/docs/concepts/privacy/private-and-public.md b/docs/concepts/privacy/private-and-public.md
@@ -9,7 +9,7 @@ GoQuorum achieves transaction privacy by:
 - Enabling transaction senders to create private transactions by marking who is privy to a transaction via the
   `privateFor` parameter.
 - Storing encrypted private data off-chain in a separate component called the
-  [private transaction manager](privacy.md#private-transaction-manager).
+  [private transaction manager](index.md#private-transaction-manager).
   The private transaction manager encrypts private data, distributes the encrypted data to other parties that are privy
   to the transaction, and returns the decrypted payload to those parties.
 - Replacing the payload of a private transaction with a key for the location of the encrypted payload, such that the

diff --git a/docs/concepts/security-framework.md b/docs/concepts/security-framework.md
@@ -21,7 +21,7 @@ They require governance structures that fulfill the concerns of participants equ
 
 ### Security checklist
 
-- Use a [Byzantine fault tolerant consensus protocol](consensus/overview.md) in case nodes are managed by non-trusted participants.
+- Use a [Byzantine fault tolerant consensus protocol](consensus/index.md) in case nodes are managed by non-trusted participants.
 - Ensure consortium members provide a reasonable network service-level agreement (SLA).
 - Ensure private and public payload data is stored in an appropriate geographical legislation area.
 - Document:

diff --git a/docs/configure-and-manage/configure/private-transaction-manager.md b/docs/configure-and-manage/configure/private-transaction-manager.md
@@ -1,7 +1,7 @@
 # Configure the private transaction manager
 
 You can configure a connection to the
-[private transaction manager](../../concepts/privacy/privacy.md#private-transaction-manager) and enable private
+[private transaction manager](../../concepts/privacy/index.md#private-transaction-manager) and enable private
 transactions using any of the following methods.
 
 * [Direct IPC connection configuration](#direct-ipc-connection-configuration)
@@ -172,9 +172,9 @@ HTTP using TLS requires:
 
     ```bash
     geth <other parameters> \
-         --ptm.url "https://127.0.0.1:9101" \
-         --ptm.tls.mode "strict" \
-         --ptm.tls.rootca "path/to/certfile.pem,dir/with/cert/files/" \
-         --ptm.tls.clientcert "path/to/client.cert.pem" \
-         --ptm.tls.clientkey "path/to/client.key.pem" \
+        --ptm.url "https://127.0.0.1:9101" \
+        --ptm.tls.mode "strict" \
+        --ptm.tls.rootca "path/to/certfile.pem,dir/with/cert/files/" \
+        --ptm.tls.clientcert "path/to/client.cert.pem" \
+        --ptm.tls.clientkey "path/to/client.key.pem" \
     ```
diff --git a/docs/configure-and-manage/monitor/elastic-stack.md b/docs/configure-and-manage/monitor/elastic-stack.md
@@ -5,7 +5,7 @@ description: Using Elastic Stack (ELK) with GoQuorum
 # Elastic Stack
 
 [Elastic Stack] (ELK) is an open-source log management platform that is available when using the
-[Quorum Developer Quickstart](../../tutorials/quorum-dev-quickstart/getting-started.md).
+[Quorum Developer Quickstart](../../tutorials/quorum-dev-quickstart/index.md).
 
 The [Filebeat] configuration ingests logs and the [Metricbeat] configuration collects metrics from the nodes at regular
 defined intervals and outputs them to Redis for storage.
@@ -22,9 +22,9 @@ The [pipeline configuration] defines the JSON format used for GoQuorum logs and
 To view the GoQuorum Quickstart network logs in Kibana:
 
 1. [Start the Quorum Developer Quickstart with GoQuorum](../../tutorials/quorum-dev-quickstart/using-the-quickstart.md),
-   selecting ELK monitoring.
+    selecting ELK monitoring.
 1. Open the [`Kibana logs address`](http://localhost:5601/app/kibana#/discover) listed by the sample networks `list.sh` script.
-   The logs display in Kibana.
+    The logs display in Kibana.
 
     ![Kibana](../../images/KibanaQuickstart.png)
 

diff --git a/docs/configure-and-manage/monitor/quorum-reporting.md b/docs/configure-and-manage/monitor/quorum-reporting.md
@@ -6,7 +6,7 @@ description: Using Quorum Reporting tool
 
 [Quorum Reporting](https://github.com/ConsenSys/quorum-reporting) is a tool that provides APIs for generating reports
 about contracts deployed to your GoQuorum network.
-You can access Quorum Reporting when using the [Quorum Developer Quickstart](../../tutorials/quorum-dev-quickstart/getting-started.md)
+You can access Quorum Reporting when using the [Quorum Developer Quickstart](../../tutorials/quorum-dev-quickstart/index.md)
 or by following the instructions on the repository [README](https://github.com/ConsenSys/quorum-reporting#readme).
 
 Once a contract is registered, you can use Quorum Reporting to inspect the transactions related to that contract and see
@@ -15,8 +15,8 @@ how the state of the contract has changed over time.
 To access Quorum Reporting for your GoQuorum Quickstart network:
 
 1. [Start the Quorum Developer Quickstart with GoQuorum](../../tutorials/quorum-dev-quickstart/using-the-quickstart.md),
-   selecting default monitoring.
+    selecting default monitoring.
 1. Open the Reporting UI at [`http://localhost:3000`](http://localhost:3000).
-   The RPC API runs at [`http://localhost:4000`](http://localhost:4000).
+    The RPC API runs at [`http://localhost:4000`](http://localhost:4000).
 
 ![Reporting Tool](../../images/reporting2.png)
diff --git a/docs/configure-and-manage/monitor/splunk.md b/docs/configure-and-manage/monitor/splunk.md
@@ -5,7 +5,7 @@ description: Using Splunk with GoQuorum
 # Splunk
 
 [Splunk](https://splunkbase.splunk.com/app/4866/#/details) is a third-party monitoring solution that is available when
-using the [Quorum Developer Quickstart](../../tutorials/quorum-dev-quickstart/getting-started.md).
+using the [Quorum Developer Quickstart](../../tutorials/quorum-dev-quickstart/index.md).
 
 If you add Splunk to your GoQuorum Quickstart network, all logs will be directed to the local Splunk container.
 From there, you can search through the logs, view network metrics, and create custom dashboards with the data that you're
@@ -14,7 +14,7 @@ interested in.
 To view the GoQuorum Quickstart network logs in Splunk:
 
 1. [Start the Quorum Developer Quickstart with GoQuorum](../../tutorials/quorum-dev-quickstart/using-the-quickstart.md),
-   selecting Splunk monitoring.
+    selecting Splunk monitoring.
 1. Open the Splunk UI at [`http://localhost:8000`](http://localhost:8000).
 
 ![Splunk](../../images/splunk.png)
diff --git a/docs/deploy/deployment-overview.md b/docs/deploy/deployment-overview.md
@@ -11,4 +11,4 @@ The following are examples of Quorum deployments.
 
 For more information about Quorum deployment options, [contact Quorum support](https://consensys.net/quorum/subscription/).
 
-[Get started with GoQuorum](install/getting-started-overview.md).
+[Get started with GoQuorum](install/index.md).
diff --git a/...eploy/install/getting-started-overview.md → docs/deploy/install/index.md b/...eploy/install/getting-started-overview.md → docs/deploy/install/index.md
@@ -1,8 +1,8 @@
 ---
-description: Getting started with GoQuorum overview
+description: Install GoQuorum overview
 ---
 
-# Getting started overview
+# Installation overview
 
 You can get started with GoQuorum in multiple ways.
 They range from using the quickstart to generate a local network, to creating and configuring a full network from scratch.
@@ -47,7 +47,7 @@ use a cloud service (for example Google GKE, Azure AKS, AWS EKS) or a self-hoste
 
 ## Creating a network from scratch
 
-Follow the step-by-step walk-throughs to create and configure GoQuorum networks for [IBFT](../../tutorials/private-network/create-ibft-network.md), [QBFT](../../tutorials/private-network/create-qbft-network.md), and [Raft](../../tutorials/private-network/create-a-raft-network.md) consensus.
+Follow the step-by-step walk-throughs to create and configure GoQuorum networks for [QBFT](../../tutorials/private-network/create-qbft-network.md), [IBFT](../../tutorials/private-network/create-ibft-network.md), and [Raft](../../tutorials/private-network/create-a-raft-network.md) consensus.
 It also shows how to enable privacy and add/remove nodes as required.
 
 ## Creating a network deployed in the cloud

diff --git a/docs/deploy/install/kubernetes.md b/docs/deploy/install/kubernetes.md
@@ -8,5 +8,5 @@ Use the [reference implementations](https://github.com/ConsenSys/quorum-Kubernet
 Kubernetes (K8S). The repository has full support for cloud providers like AWS, Azure, GCP, and IBM, and has production
 setups that use of identities and cloud-native secret storage services like Azure KeyVault and AWS Secrets Manager.
 
-Refer to the [tutorial](../../tutorials/kubernetes/overview.md) and familiarize yourself with the reference
+Refer to the [tutorial](../../tutorials/kubernetes/index.md) and familiarize yourself with the reference
 implementations, and customize them to your requirements.
diff --git a/docs/develop/connecting-to-a-node.md b/docs/develop/connecting-to-a-node.md
@@ -8,7 +8,7 @@ description: connecting to a node
 
 Set up a GoQuorum network using one of the following tutorials:
 
-* The [Quorum Developer Quickstart](../tutorials/quorum-dev-quickstart/getting-started.md)
+* The [Quorum Developer Quickstart](../tutorials/quorum-dev-quickstart/index.md)
 * [Create a private network](../tutorials/private-network/create-ibft-network.md)
 * [Create a privacy-enabled network](../tutorials/create-privacy-enabled-network.md)
 

diff --git a/docs/develop/manage-keys/index.md b/docs/develop/manage-keys/index.md
@@ -0,0 +1,10 @@
+# Manage keys
+
+Options for managing keys in GoQuorum include:
+
+* [`keystore` files](https://geth.ethereum.org/docs/interface/managing-your-accounts) - As with `geth`, you can store
+  keys in password-protected `keystore` files.
+* [`clef`](clef.md) - Introduced in GoQuorum v2.6.0, `clef` runs as a standalone process that increases flexibility and
+  security by handling GoQuorum's account management responsibilities.
+* [`account` plugins](account-plugins.md) - Introduced in GoQuorum v2.7.0, `account` plugins allow you to extend
+  GoQuorum or `clef` with alternative methods of managing accounts.
diff --git a/docs/develop/manage-keys/managing-keys.md b/docs/develop/manage-keys/managing-keys.md
diff --git a/docs/develop/smart-contracts-transactions.md b/docs/develop/smart-contracts-transactions.md
@@ -43,7 +43,7 @@ Dapps are built on a decentralized network (Ethereum) and interact with smart co
 They can be thought of as a GUI (front end) for a smart contract (back end), and can be written in any language (for example,
 JavaScript).
 
-If using the [Quorum Developer Quickstart](../tutorials/quorum-dev-quickstart/getting-started.md), or
+If using the [Quorum Developer Quickstart](../tutorials/quorum-dev-quickstart/index.md), or
 existing blockchain, you can use a demo dapp called [Pet Shop](https://docs.goquorum.consensys.net/en/latest/Tutorials/Quorum-Dev-Quickstart/Using-the-Quickstart/#smart-contract-and-dapp-usage),
 provided by [Truffle](https://trufflesuite.com/tutorial).
 

diff --git a/docs/index.md b/docs/index.md
@@ -10,7 +10,7 @@ hide:
   - navigation
 
 profiles:
-  - link: deploy/install/getting-started-overview/
+  - link: deploy/install/
     title: Deploy GoQuorum
     text: Install GoQuorum or upgrade from an earlier version.
       Run the Quorum Developer Quickstart to set up a local development environment.
@@ -28,12 +28,12 @@ profiles:
       applications for the GoQuorum network.
     image: assets/illustrations/undraw_web_development_0l6v.svg
 
-  - link: concepts/blockchain-basics/what-is-blockchain/
+  - link: concepts/blockchain-basics/
     title: Learn about GoQuorum
     text: Read about blockchain concepts and GoQuorum architecture and features.
     image: assets/illustrations/undraw_knowledge_g-5-gf.svg
 
-  - link: tutorials/quorum-dev-quickstart/getting-started/
+  - link: tutorials/quorum-dev-quickstart/
     title: Try the tutorials
     text: Use the Quorum Developer Quickstart, deploy and interact with smart contracts, and create private networks.
     image: assets/illustrations/undraw_setup_wizard_re_nday.svg

diff --git a/docs/reference/api-methods.md b/docs/reference/api-methods.md
@@ -2468,7 +2468,7 @@ This can only be performed for the master organization and requires the majority
 
 ## Privacy methods
 
-The following API methods provide functionality for GoQuorum [privacy](../concepts/privacy/privacy.md).
+The following API methods provide functionality for GoQuorum [privacy](../concepts/privacy/index.md).
 
 !!! note
 

diff --git a/docs/tutorials/contracts/account-funds-transfers.md b/docs/tutorials/contracts/account-funds-transfers.md
@@ -5,13 +5,13 @@ description: funds transfer transactions
 # Transfer funds between accounts
 
 This tutorial shows you how to transfer funds (ETH) between accounts in a transaction on a running network.
-Use the [Quorum Developer Quickstart](../quorum-dev-quickstart/getting-started.md) to rapidly generate a local blockchain network.
+Use the [Quorum Developer Quickstart](../quorum-dev-quickstart/index.md) to rapidly generate a local blockchain network.
 
 ## Prerequisites
 
 * A private network.
   You can use a [private network tutorial](../private-network/create-ibft-network.md) or the
-  [Quorum Developer Quickstart](../quorum-dev-quickstart/getting-started.md).
+  [Quorum Developer Quickstart](../quorum-dev-quickstart/index.md).
 
 ## Using `eth_sendSignedTransaction`
 

diff --git a/docs/tutorials/contracts/calling-contract-functions.md b/docs/tutorials/contracts/calling-contract-functions.md
@@ -5,7 +5,7 @@ description: calling smart contracts functions
 # Interact with a deployed smart contract
 
 This tutorial shows you how to interact with smart contracts that have been deployed to a network.
-Use the [Quorum Developer Quickstart](../quorum-dev-quickstart/getting-started.md) to rapidly generate a local blockchain network.
+Use the [Quorum Developer Quickstart](../quorum-dev-quickstart/index.md) to rapidly generate a local blockchain network.
 
 ## Prerequisites
 

diff --git a/docs/tutorials/contracts/deploying-contracts.md b/docs/tutorials/contracts/deploying-contracts.md
@@ -5,7 +5,7 @@ description: deploying smart contracts
 # Deploy a smart contract
 
 This tutorial shows you how to deploy smart contracts as transactions onto a running network.
-Use the [Quorum Developer Quickstart](../quorum-dev-quickstart/getting-started.md) to rapidly generate a local blockchain network.
+Use the [Quorum Developer Quickstart](../quorum-dev-quickstart/index.md) to rapidly generate a local blockchain network.
 
 ## Prerequisites
Original file line number	Diff line number	Diff line change
Expand Up		@@ -11,4 +11,4 @@ The following are examples of Quorum deployments.

		For more information about Quorum deployment options, [contact Quorum support](https://consensys.net/quorum/subscription/).

		[Get started with GoQuorum](install/getting-started-overview.md).
		[Get started with GoQuorum](install/index.md).