diff options
| author | merge-script <fanquake@gmail.com> | 2024-11-12 09:48:13 +0000 |
|---|---|---|
| committer | merge-script <fanquake@gmail.com> | 2024-11-12 09:48:13 +0000 |
| commit | 3fb6229dcfd462f74a3948bba4d35d5597e29a36 (patch) | |
| tree | 26a61b27ef6f0d6df15ffa69458bbb497bded344 /src/script | |
| parent | 8d340be92470f3fd37f2ef4e709d1040bb2a84cf (diff) | |
| parent | 726cbee9553b25bedfef70cfd5be9f1eeec8a30d (diff) | |
Merge bitcoin/bitcoin#31271: doc: correct typos
726cbee9553b25bedfef70cfd5be9f1eeec8a30d doc: correct typos (fanquake)
9fdfb73ca84300b9516d10fb652c559a2e6b3b3f doc: fix typos (Afanti)
Pull request description:
Includes #31253.
Includes https://github.com/bitcoin/bitcoin/pull/31239#pullrequestreview-2425008603.
Fixes remaining lint output.
ACKs for top commit:
l0rinc:
ACK 726cbee9553b25bedfef70cfd5be9f1eeec8a30d
rkrux:
crACK 726cbee9553b25bedfef70cfd5be9f1eeec8a30d
tdb3:
ACK 726cbee9553b25bedfef70cfd5be9f1eeec8a30d
Tree-SHA512: 51978343f11fb5f0c6b824d92dbfc9999952373a9f790ab79ef8750f920f1c020c092ca874c9e39f478d12d85cdadcfd8c63dda0cbb02745bc55fda28d371e4c
Diffstat (limited to 'src/script')
| -rw-r--r-- | src/script/miniscript.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/script/miniscript.h b/src/script/miniscript.h index 1ab9fdbbca..e739d8031f 100644 --- a/src/script/miniscript.h +++ b/src/script/miniscript.h @@ -65,7 +65,7 @@ namespace miniscript { * - Is always "OP_SWAP [B]" or "OP_TOALTSTACK [B] OP_FROMALTSTACK". * - For example sc:pk_k(key) = OP_SWAP <key> OP_CHECKSIG * - * There a type properties that help reasoning about correctness: + * There are type properties that help reasoning about correctness: * - "z" Zero-arg: * - Is known to always consume exactly 0 stack elements. * - For example after(n) = <n> OP_CHECKLOCKTIMEVERIFY @@ -88,7 +88,7 @@ namespace miniscript { * - "e" Expression: * - This implies property 'd', but the dissatisfaction is nonmalleable. * - This generally requires 'e' for all subexpressions which are invoked for that - * dissatifsaction, and property 'f' for the unexecuted subexpressions in that case. + * dissatisfaction, and property 'f' for the unexecuted subexpressions in that case. * - Conflicts with type 'V'. * - "f" Forced: * - Dissatisfactions (if any) for this expression always involve at least one signature. |