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

Projects
None yet
7 participants
@jnewbery
Copy link
Member

commented Nov 21, 2018

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

@sipa
Copy link
Member

left a comment

ACK

doc/descriptors.md Outdated
- 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)).

This comment has been minimized.

Copy link
@sipa

sipa Nov 22, 2018

Member

tb1 even

This comment has been minimized.

Copy link
@jnewbery

jnewbery Nov 22, 2018

Author Member

Fixed. Thanks!

@fanquake fanquake added the Docs label Nov 22, 2018

@meshcollider

This comment has been minimized.

Copy link
Member

commented Nov 22, 2018

ACK 068dd53

@jnewbery jnewbery force-pushed the jnewbery:descriptors_doc_update branch to 8284756 Nov 22, 2018

@meshcollider

This comment has been minimized.

Copy link
Member

commented Nov 22, 2018

reACK 8284756

Only change was tb -> tb1

@promag

This comment has been minimized.

Copy link
Member

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

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

laanwj added a commit that referenced this pull request Nov 23, 2018

Merge #14778: A few minor formatting fixes and clarifications to desc…
…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 jnewbery:descriptors_doc_update branch Nov 23, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.