From 391223fbdd9f536f02bfe637c7ba7bd0928fa305 Mon Sep 17 00:00:00 2001 From: Nic Volanschi Date: Thu, 10 Feb 2022 14:43:47 +0100 Subject: [PATCH 1/6] doc: explain kibibytes --- docs/012/plugins.rst | 2 +- docs/alpha/plugins.rst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/012/plugins.rst b/docs/012/plugins.rst index df09bb005b02..9f98e55fac78 100644 --- a/docs/012/plugins.rst +++ b/docs/012/plugins.rst @@ -182,7 +182,7 @@ The default value of the parameter ``N`` is chosen such that a node will always manager operations to allow the next baker to produce a filled block (if there are enough operations in the network). Its value is currently fixed to 5000. Indeed, the total size occupied by manager operations in a -block is currently bounded by 512 KibiBytes, and ``unset deposits limit`` seems +block is currently bounded by 512 `KiB `_, and ``unset deposits limit`` seems to be the smallest manager operation, with 126 Bytes, so there are at most 512 * 1024 / 126 = 4161 manager operations per block. diff --git a/docs/alpha/plugins.rst b/docs/alpha/plugins.rst index 6d74ff133b1e..701e09debd8d 100644 --- a/docs/alpha/plugins.rst +++ b/docs/alpha/plugins.rst @@ -183,7 +183,7 @@ The default value of the parameter ``N`` is chosen such that a node will always manager operations to allow the next baker to produce a filled block (if there are enough operations in the network). Its value is currently fixed to 5000. Indeed, the total size occupied by manager operations in a -block is currently bounded by 512 KibiBytes, and ``unset deposits limit`` seems +block is currently bounded by 512 `KiB `_, and ``unset deposits limit`` seems to be the smallest manager operation, with 126 Bytes, so there are at most 512 * 1024 / 126 = 4161 manager operations per block. -- GitLab From 8c542664061983eac7658c97224ea670fa7a5115 Mon Sep 17 00:00:00 2001 From: Nic Volanschi Date: Thu, 10 Feb 2022 21:55:01 +0100 Subject: [PATCH 2/6] doc: advise to finally revert the yes-node patch (#2400) --- docs/developer/proposal_testing.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/developer/proposal_testing.rst b/docs/developer/proposal_testing.rst index b05aa68831c7..d034444a4656 100644 --- a/docs/developer/proposal_testing.rst +++ b/docs/developer/proposal_testing.rst @@ -348,6 +348,11 @@ we would revert it:: Reversed (or previously applied) patch detected! Assume -R? [n] n Apply anyway? [n] n +.. warning:: + After finishing your migration tests, mind reverting the yes-node patch to obtain a "normal" node; otherwise you may obtain spurious errors. + To do this, you may apply the same patch backwards using + ``patch -p1 --reverse < scripts/yes-node.patch``. + Alternatively, if you are sure that no other changes were done, you can reset the source file using ``git checkout src/lib_crypto/signature.ml``. 5. Compile the Project ~~~~~~~~~~~~~~~~~~~~~~ -- GitLab From c09360293924ce22114580e50715f0b3f53253ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Proust?= Date: Fri, 11 Feb 2022 11:26:45 +0100 Subject: [PATCH 3/6] Manifest: fix small issues in the doc --- manifest/manifest.mli | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest/manifest.mli b/manifest/manifest.mli index 0281be43e166..bf87dffef1e4 100644 --- a/manifest/manifest.mli +++ b/manifest/manifest.mli @@ -124,7 +124,7 @@ module Dune : sig - [alias_deps] is a list of target aliases to build before this rule. They are added to the [deps] stanza in [alias] stanzas - (resulting in [(deps (alias ...) ...)]. + (resulting in [(deps (alias ...) ...)]). - [deps_dune] can be used to specify the arguments of the [deps] stanza directly as an s-expression instead. @@ -614,7 +614,7 @@ val public_exe : ?internal_name:string -> string maker public names. If not given, the list of internal names is derived from the list of names as for [public_lib]. - @raise [Invalid_arg] if the list of names is empty or if the length of + @raise Invalid_arg if the list of names is empty or if the length of [internal_names] differs from the length of the list of public names. *) val public_exes : ?internal_names:string list -> string list maker @@ -710,7 +710,7 @@ val external_lib : [node_wrapper_flags]: flags to add to the [node_wrapper] executable command in [runtest_js] aliases. Only used for test and executable test targets. - @raise [Invalid_arg] if [main_lib] was not built with [external_lib]. *) + @raise Invalid_arg if [main_lib] was not built with [external_lib]. *) val external_sublib : ?main_module:string -> ?js_compatible:bool -> -- GitLab From 6e047f9a9c96a2c58dc96d2281ab1e45f653e615 Mon Sep 17 00:00:00 2001 From: Nic Volanschi Date: Mon, 21 Feb 2022 10:37:23 +0100 Subject: [PATCH 4/6] doc: typo fix by @metanivek --- docs/developer/contributing.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/developer/contributing.rst b/docs/developer/contributing.rst index a2ed4843e30f..f8e5123db418 100644 --- a/docs/developer/contributing.rst +++ b/docs/developer/contributing.rst @@ -414,7 +414,7 @@ To find reviewers, either: - Look at authors of the code you are modifying using `git blame `_. - Ask help to the :ref:`merge coordinator `, either - by asking him/here on Slack or mentioning them in a comment (see next paragraph). + by asking him/her on Slack or mentioning them in a comment (see next paragraph). Depending on your `GitLab role `_ you may or may not be able to use the *Reviewers* field for specifying -- GitLab From 146f69ff87553af5b5d5e14bccd6d00a64c035cf Mon Sep 17 00:00:00 2001 From: Nic Volanschi Date: Thu, 24 Feb 2022 09:19:01 +0100 Subject: [PATCH 5/6] doc: fix link to merge team members --- docs/developer/merge_team.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/developer/merge_team.rst b/docs/developer/merge_team.rst index 790e04d7acbb..b4d0f556ef3a 100644 --- a/docs/developer/merge_team.rst +++ b/docs/developer/merge_team.rst @@ -2,7 +2,7 @@ Octez Merge Team ================ The Octez merge team is a `group of developers -`_ +`_ from different teams of the Tezos ecosystem. They are automatically selected as approvers when you create a merge -- GitLab From 0c59925ff8376527b0015d265d29a17cf7b70e6b Mon Sep 17 00:00:00 2001 From: Nic Volanschi Date: Thu, 24 Feb 2022 18:07:51 +0100 Subject: [PATCH 6/6] doc: explicit instructions for zcash params --- docs/introduction/howtoget.rst | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/introduction/howtoget.rst b/docs/introduction/howtoget.rst index bf1948370230..d985325bf4b1 100644 --- a/docs/introduction/howtoget.rst +++ b/docs/introduction/howtoget.rst @@ -422,7 +422,9 @@ another location (such as ``/usr/local/bin``), the Tezos binaries may prompt you to install the Zcash parameter files. The easiest way is to download and run this script:: - https://raw.githubusercontent.com/zcash/zcash/master/zcutil/fetch-params.sh + wget https://raw.githubusercontent.com/zcash/zcash/master/zcutil/fetch-params.sh + chmod +x fetch-params.sh + ./fetch-params.sh The node will try to find Zcash parameters in the following directories, in this order: -- GitLab