Merge branch 'zcash:main' into main

book/src/concepts/arithmetization.md

@@ -19,13 +19,13 @@ A PLONKish circuit depends on a ***configuration***:
 
 * A subset of the columns that can participate in equality constraints.
 
-* A ***polynomial degree bound***.
+* A ***maximum constraint degree***.
 
 * A sequence of ***polynomial constraints***. These are multivariate polynomials over
   $\mathbb{F}$ that must evaluate to zero *for each row*. The variables in a polynomial
   constraint may refer to a cell in a given column of the current row, or a given column of
   another row relative to this one (with wrap-around, i.e. taken modulo $n$). The maximum
-  degree of each polynomial is given by the polynomial degree bound.
+  degree of each polynomial is given by the maximum constraint degree.
 
 * A sequence of ***lookup arguments*** defined over tuples of ***input expressions***
   (which are multivariate polynomials as above) and ***table columns***.

book/src/design/proving-system/circuit-commitments.md

@@ -61,7 +61,7 @@ Let $c$ be the number of columns that are enabled for equality constraints.
 
 Let $m$ be the maximum number of columns that can accommodated by a
 [column set](permutation.md#spanning-a-large-number-of-columns) without exceeding
-the PLONK configuration's polynomial degree bound.
+the PLONK configuration's maximum constraint degree.
 
 Let $u$ be the number of “usable” rows as defined in the
 [Permutation argument](permutation.md#zero-knowledge-adjustment) section.