From 6df37bdf802657c1c0183711204d229b629d1144 Mon Sep 17 00:00:00 2001 From: William Banfield Date: Wed, 30 Mar 2022 18:00:08 -0400 Subject: [PATCH] language fixes --- UPGRADING.md | 11 +++++++---- docs/nodes/configuration.md | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/UPGRADING.md b/UPGRADING.md index be83fb193..6ae381b7b 100644 --- a/UPGRADING.md +++ b/UPGRADING.md @@ -78,7 +78,9 @@ configured. These parameters, `timeout-propose`, `timeout-propose-delta`, `timeout-precommit-delta`, `timeout-commit`, and `skip-timeout-commit`, were previously configured in `config.toml`. These timing parameters have moved and are no longer configured in the `config.toml` file. These parameters have been -migrated into the `ConsensusParameters`. +migrated into the `ConsensusParameters`. Nodes with these parameters set in the +local configuration file will see a warning logged on startup indicating that +these parameters are no longer used. These parameters have also been pared-down. There are no longer separate parameters for both the `prevote` and `precommit` phases of Tendermint. The @@ -101,9 +103,10 @@ Note, however, that these overrides will be removed in Tendermint v0.37. See [configuration](https://github.com/tendermint/tendermint/blob/wb/issue-8182/docs/nodes/configuration.md) for more information about these overrides. -For more discussion of this, see [ADR 074](https://tinyurl.com/adr074), which lays out -the reasoning for the changes as well as [RFC 009](https://tinyurl.com/rfc009) -for a discussion of the complexities of upgrading consensus parameters. +For more discussion of this, see [ADR 074](https://tinyurl.com/adr074), which +lays out the reasoning for the changes as well as [RFC +009](https://tinyurl.com/rfc009) for a discussion of the complexities of +upgrading consensus parameters. ## v0.35 diff --git a/docs/nodes/configuration.md b/docs/nodes/configuration.md index 828595f5f..a55bfb63a 100644 --- a/docs/nodes/configuration.md +++ b/docs/nodes/configuration.md @@ -613,6 +613,6 @@ removed in Tendermint v0.37. receiving +2/3 precommits before beginning the next height. - `unsafe-bypass-commit-timeout-override`: Configures if the consensus engine will wait for the full commit timeout before proceeding to the next height. If - this field is set to true, the conesnsus engine will proceed to the next + this field is set to true, the consensus engine will proceed to the next height as soon as the node has gathered votes from all of the validators on the network.