From d447fcf96fc8985f7e9f0b621d686cff8d889411 Mon Sep 17 00:00:00 2001 From: Nic Volanschi Date: Mon, 27 Mar 2023 09:22:08 +0200 Subject: [PATCH 1/6] doc: allow link redirect on reddit channel --- docs/conf.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/conf.py b/docs/conf.py index 92aa6fbfdc4d..be89a4c9bb1b 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -231,6 +231,10 @@ linkcheck_allowed_redirects = dict( r'https://github\.com/serokell/tezos-packaging/releases/latest', r'https://github\.com/serokell/tezos-packaging/releases/tag/.*', ), + ( + r'https://www.reddit.com/r/tezos/', + r'https://www.reddit.com/r/tezos/[?]rdt=[0-9]+', + ), # 2. permanent redidections, maybe fix one day (r'https://bitheap\.org/cram/', r'https://github\.com/aiiie/cram'), ] -- GitLab From fa33dc751da97a917c82e156bf76e89a7c46f3f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Corentin=20M=C3=A9hat?= Date: Mon, 27 Mar 2023 18:47:22 +0000 Subject: [PATCH 2/6] adding protocols KLMN * past: kathmandu * active: Lima * future : Mumbai, Nairobi --- docs/protocols/naming.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/protocols/naming.rst b/docs/protocols/naming.rst index 6b872db06802..c7d8e4eae882 100644 --- a/docs/protocols/naming.rst +++ b/docs/protocols/naming.rst @@ -37,6 +37,10 @@ sequence: * 011 Hangzhou * 012 Ithaca * 013 Jakarta +* 014 Kathmandu +* 015 Lima +* 016 Mumbai +* 017 Nairobi * ... Due to the evolving nature of the in-use protocols, the above absolute protocol -- GitLab From 1952d92581780ac0709242c102f999f6789e30c6 Mon Sep 17 00:00:00 2001 From: Arvid Jakobsson Date: Thu, 30 Mar 2023 13:13:17 +0200 Subject: [PATCH 3/6] docs/history_modes: replace [experimental-rolling] with [rolling] --- docs/user/history_modes.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/user/history_modes.rst b/docs/user/history_modes.rst index fd8cb35141ff..74787ed11b8d 100644 --- a/docs/user/history_modes.rst +++ b/docs/user/history_modes.rst @@ -141,14 +141,14 @@ To run a ``rolling`` node you can either use the command line arguments: .. code-block:: console - octez-node run --history-mode experimental-rolling + octez-node run --history-mode rolling or use your configuration file as described in :doc:`here `: .. code-block:: json { "shell": { - "history_mode": "experimental-rolling" + "history_mode": "rolling" }} In ``rolling`` mode, the `caboose` is the genesis at its early state, -- GitLab From efc158418e821eed0d5feecb1613a7f6f17a4d40 Mon Sep 17 00:00:00 2001 From: Arvid Jakobsson Date: Thu, 30 Mar 2023 13:27:00 +0200 Subject: [PATCH 4/6] docs/storage.rst: fix accidental single backticks --- docs/shell/storage.rst | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/shell/storage.rst b/docs/shell/storage.rst index 02de39f9d643..23c1d22225b8 100644 --- a/docs/shell/storage.rst +++ b/docs/shell/storage.rst @@ -197,12 +197,12 @@ possible values for this variable: ``v`` for ``Info`` logging and ``vv`` for ``Debug`` logging (warning: the ``Debug`` mode is very talkative). Additionally, this environment variable allows to tweak, with care, the following context parameters (using the standard -`TEZOS_CONTEXT="variable=value"` pattern, separating the items with -commas such as `TEZOS_CONTEXT="v, variable=value"`): - -- "index-log-size": number of entries stored in the Irmin's index - (default `2_500_000`) -- "auto-flush": number of tree mutations allowed before a disk flush - (default `10_000`) -- "lru-size": number of entries stored in the Irmin's LRU cache - (default `5_000`) +``TEZOS_CONTEXT="variable=value"`` pattern, separating the items with +commas such as ``TEZOS_CONTEXT="v, variable=value"``): + +- ``index-log-size``: number of entries stored in the Irmin's index + (default ``2_500_000``) +- ``auto-flush``: number of tree mutations allowed before a disk flush + (default ``10_000``) +- ``lru-size``: number of entries stored in the Irmin's LRU cache + (default ``5_000``) -- GitLab From 460dfcf4db0cb59b0bebadb13ce039f7d0f0cf9c Mon Sep 17 00:00:00 2001 From: Nic Volanschi Date: Wed, 5 Apr 2023 15:17:59 +0200 Subject: [PATCH 5/6] doc: explain what stake is used for the voting power --- docs/alpha/voting.rst | 6 +----- docs/mumbai/voting.rst | 7 +------ docs/nairobi/voting.rst | 6 +----- 3 files changed, 3 insertions(+), 16 deletions(-) diff --git a/docs/alpha/voting.rst b/docs/alpha/voting.rst index ae8f1bb07950..133f29952a79 100644 --- a/docs/alpha/voting.rst +++ b/docs/alpha/voting.rst @@ -102,11 +102,7 @@ Voting Power ------------ When supporting a proposal or casting a Yay, Nay, or Pass ballot, each delegate -has voting power equal to its *stake*. The stake is always measured in -**mutez**. - -Note that the stake of each delegate is computed at the beginning of each -period. +has a voting power equal to its *stake*. More precisely, the voting power of a delegate during a voting period is its :ref:`staking balance `, measured in *mutez*, sampled at the beginning of the period. (Note that this is opposed to validator selection for consensus, which is based on the active stake, and sampled at some stake snapshot during some previous cycle.) Super-majority and Quorum diff --git a/docs/mumbai/voting.rst b/docs/mumbai/voting.rst index 970826d5ba00..874b8f69ed44 100644 --- a/docs/mumbai/voting.rst +++ b/docs/mumbai/voting.rst @@ -102,12 +102,7 @@ Voting Power ------------ When supporting a proposal or casting a Yay, Nay, or Pass ballot, each delegate -has voting power equal to its *stake*. The stake is always measured in -**mutez**. - -Note that the stake of each delegate is computed at the beginning of each -period. - +has a voting power equal to its *stake*. More precisely, the voting power of a delegate during a voting period is its :ref:`staking balance `, measured in *mutez*, sampled at the beginning of the period. (Note that this is opposed to validator selection for consensus, which is based on the active stake, and sampled at some stake snapshot during some previous cycle.) Super-majority and Quorum ------------------------- diff --git a/docs/nairobi/voting.rst b/docs/nairobi/voting.rst index 2251552a8279..3dd7895db764 100644 --- a/docs/nairobi/voting.rst +++ b/docs/nairobi/voting.rst @@ -102,11 +102,7 @@ Voting Power ------------ When supporting a proposal or casting a Yay, Nay, or Pass ballot, each delegate -has voting power equal to its *stake*. The stake is always measured in -**mutez**. - -Note that the stake of each delegate is computed at the beginning of each -period. +has a voting power equal to its *stake*. More precisely, the voting power of a delegate during a voting period is its :ref:`staking balance `, measured in *mutez*, sampled at the beginning of the period. (Note that this is opposed to validator selection for consensus, which is based on the active stake, and sampled at some stake snapshot during some previous cycle.) Super-majority and Quorum -- GitLab From c2ab473704296cb28c85b36f85aded24ce9363c1 Mon Sep 17 00:00:00 2001 From: Nic Volanschi Date: Thu, 6 Apr 2023 09:45:44 +0200 Subject: [PATCH 6/6] doc: fix typos in glossary/voting listings --- docs/alpha/glossary.rst | 4 ++-- docs/mumbai/glossary.rst | 4 ++-- docs/nairobi/glossary.rst | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/alpha/glossary.rst b/docs/alpha/glossary.rst index 8c2519999f4e..48ee3315363f 100644 --- a/docs/alpha/glossary.rst +++ b/docs/alpha/glossary.rst @@ -237,6 +237,6 @@ _`Voting period` _`Voting listings` The list calculated at the beginning of each `voting period`_ that contains the staking balance (in number of mutez) of each delegate_ that owns more - than the `minimal stake`_ at that moment. For each delegate_, The voting listings - reflects the weight of the vote emitted by the delegate_ when amending the + than the `minimal stake`_ at that moment. For each delegate_, the voting listings + reflect the weight of the vote emitted by the delegate_ when amending the `economic protocol`_. diff --git a/docs/mumbai/glossary.rst b/docs/mumbai/glossary.rst index df12e7db7f1a..e258e1c7f81a 100644 --- a/docs/mumbai/glossary.rst +++ b/docs/mumbai/glossary.rst @@ -224,6 +224,6 @@ _`Voting period` _`Voting listings` The list calculated at the beginning of each `voting period`_ that contains the staking balance (in number of mutez) of each delegate_ that owns more - than one roll_ at that moment. For each delegate_, The voting listings - reflects the weight of the vote emitted by the delegate_ when amending the + than one roll_ at that moment. For each delegate_, the voting listings + reflect the weight of the vote emitted by the delegate_ when amending the `economic protocol`_. diff --git a/docs/nairobi/glossary.rst b/docs/nairobi/glossary.rst index 857dcf1e8c24..b8d014a341b8 100644 --- a/docs/nairobi/glossary.rst +++ b/docs/nairobi/glossary.rst @@ -237,6 +237,6 @@ _`Voting period` _`Voting listings` The list calculated at the beginning of each `voting period`_ that contains the staking balance (in number of mutez) of each delegate_ that owns more - than the `minimal stake`_ at that moment. For each delegate_, The voting listings - reflects the weight of the vote emitted by the delegate_ when amending the + than the `minimal stake`_ at that moment. For each delegate_, the voting listings + reflect the weight of the vote emitted by the delegate_ when amending the `economic protocol`_. -- GitLab