Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

A few minor formatting fixes and clarifications to descriptors.md #14778

Merged
merged 1 commit into from Nov 23, 2018

Conversation

@jnewbery
Copy link
Member

@jnewbery jnewbery commented Nov 21, 2018

Fixes some markdown formatting issues, and also adds a few clarifications.

Copy link
Member

@sipa sipa left a comment

ACK

- Segwit addresses (bech32, of the form `bc1...`, defined in [BIP 173](https://github.com/bitcoin/bips/blob/master/bip-0173.mediawiki)).
- P2PKH addresses (base58, of the form `1...` for mainnet or `[nm]...` for testnet). Note that P2PKH addresses in descriptors cannot be used for P2PK outputs (use the `pk` function instead).
- P2SH addresses (base58, of the form `3...` for mainnet or `2...` for testnet, defined in [BIP 13](https://github.com/bitcoin/bips/blob/master/bip-0013.mediawiki)).
- Segwit addresses (bech32, of the form `bc1...` for mainnet or `tb...` for testnet, defined in [BIP 173](https://github.com/bitcoin/bips/blob/master/bip-0173.mediawiki)).
Copy link
Member

@sipa sipa Nov 22, 2018

tb1 even

Copy link
Member Author

@jnewbery jnewbery Nov 22, 2018

Fixed. Thanks!

@fanquake fanquake added the Docs label Nov 22, 2018
@meshcollider
Copy link
Member

@meshcollider meshcollider commented Nov 22, 2018

ACK 068dd53

@jnewbery jnewbery force-pushed the descriptors_doc_update branch from 068dd53 to 8284756 Nov 22, 2018
@meshcollider
Copy link
Member

@meshcollider meshcollider commented Nov 22, 2018

reACK 8284756

Only change was tb -> tb1

@promag
Copy link
Member

@promag promag commented Nov 22, 2018

ACK 8284756.

@MarcoFalke MarcoFalke added this to the 0.18.0 milestone Nov 22, 2018
@laanwj laanwj merged commit 8284756 into bitcoin:master Nov 23, 2018
2 checks passed
laanwj added a commit that referenced this issue Nov 23, 2018
…riptors.md

8284756 A few minor formatting fixes and clarifications to descriptors.md (John Newbery)

Pull request description:

  Fixes some markdown formatting issues, and also adds a few clarifications.

Tree-SHA512: b12fc94035c075a990756e22fb60b95e6c851c80c8a60fc8fc46b07c6749df4d257401889be4d930996432ac08850770077e667fe48473140f38b94c8e9eacdc
@jnewbery jnewbery deleted the descriptors_doc_update branch Nov 23, 2018
jasonbcox pushed a commit to Bitcoin-ABC/bitcoin-abc that referenced this issue Nov 10, 2020
Summary: This is a backport of Core [[bitcoin/bitcoin#14778 | PR14778]]

Test Plan: proof-reading

Reviewers: #bitcoin_abc, Fabien

Reviewed By: #bitcoin_abc, Fabien

Differential Revision: https://reviews.bitcoinabc.org/D8349
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

7 participants