Merge branch 'master' into fix/block_proposal_token_renaming

concepts/block-production/stacking.md

@@ -40,7 +40,7 @@ Stacking functionality is implemented as a smart contract, using Clarity. Read m
 
 ### Locking and Unlocking STX
 
-One important thing to keep in mind is that when we speak of STX tokens being "locked", no transfer of STX tokens is occuring. Locking STX tokens is non-custodial, and STX tokens remain in your wallet. When you initiate a stacking transaction (described below) those tokens are locked and unsependable at the protocol level, but they do not leave the stacker's wallet.
+One important thing to keep in mind is that when we speak of STX tokens being "locked", no transfer of STX tokens is occuring. Locking STX tokens is non-custodial, and STX tokens remain in your wallet. When you initiate a stacking transaction (described below) those tokens are locked and unspendable at the protocol level, but they do not leave the stacker's wallet.
 
 At the end of the lock period, they will be automatically unlocked (spendable at the protocol level) but this occurs implicitly, there is no direct transaction that unlocks them.
 

concepts/network-fundamentals/accounts.md

@@ -4,7 +4,7 @@
 
 Stacks uses an accounts-based model, more similar to Ethereum, rather than a [UTXO](https://learnmeabitcoin.com/technical/transaction/utxo/) model like Bitcoin. In a UTXO model, the network operates as a ledger, with each UTXO being analagous to a cash bill.
 
-With an accounts, model, each account is associated with a balance and that balance can be added to or subtracted from.
+With an accounts-based model, each account is associated with a balance and that balance can be added to or subtracted from.
 
 Stacks accounts are entities that own assets, like Stacks (STX) tokens. An account has an address, private key, nonce, and one or more asset balances.
 
@@ -96,4 +96,3 @@ const stacksAddress = getAddressFromPrivateKey(
 ```
 
 Finally, you can generate new account using a Stacks-enabled wallet like [Leather](https://leather.io/), [Xverse](https://www.xverse.app/), or [Asigna](https://asigna.io/).
-

reference/sample-configuration-files.md

@@ -28,6 +28,7 @@ The signer configuration file is a TOML file that contains the configuration opt
 | db\_path              | ✓        | Path to the signer's database file or :memory: for an in-memory database. |
 | metrics\_endpoint     |           | IP:PORT for Prometheus metrics collection. |
 | event\_timeout\_ms    |           | Time to wait (in milliseconds) for a response from the stacker-db instance. |
+| block\_proposal\_timeout\_ms    |           | Time to wait (in milliseconds) for a block response from miners. |
 | dkg\_public\_timeout\_ms |        | Timeout in (milliseconds) to gather DkgPublicShares messages. |
 | dkg\_private\_timeout\_ms |       | Timeout in (milliseconds) to gather DkgPrivateShares messages. |
 | dkg\_end\_timeout\_ms |           | Timeout in (milliseconds) to gather DkgEnd messages. |