Skip to content

WiP starting point for a glossary #31

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

Merged
merged 67 commits into from
Dec 23, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
67 commits
Select commit Hold shift + click to select a range
c1f950b
WiP starting point for a glossary
GBKS Oct 1, 2020
ef0051a
Update content-guidelines.md
ImTiaan Oct 20, 2020
8cf2e6e
Update glossary.md
ImTiaan Oct 20, 2020
127ad29
Update glossary.md
ImTiaan Oct 20, 2020
a5cc631
Reordered alphabetically
GBKS Oct 21, 2020
bbd3d53
Merge branch 'feature/glossary' into feature/glossary
GBKS Oct 21, 2020
29b1fe0
Merge pull request #41 from ImTiaan/feature/glossary
GBKS Oct 21, 2020
a8650ff
Merge branch 'master' into feature/glossary
GBKS Oct 21, 2020
490d5e3
Update glossary, mainly around wallets
danielnordh Nov 17, 2020
6278256
Merge branch 'master' into feature/glossary
GBKS Dec 7, 2020
65de34d
Some added definitions
GBKS Dec 7, 2020
328514f
Added images for CoinJoin, Coin control, and wallet types
GBKS Dec 8, 2020
487c014
Wallet graphic update
GBKS Dec 9, 2020
3d3f76d
Merge branch 'master' into feature/glossary
GBKS Dec 9, 2020
24384e1
Add private/public key info
danielnordh Dec 14, 2020
7a113d4
Merge branch 'master' into feature/glossary
GBKS Dec 14, 2020
5f3f2f2
Updates to address formats
danielnordh Dec 14, 2020
53575df
Merge branch 'feature/glossary' of https://github.com/BitcoinDesign/G…
danielnordh Dec 14, 2020
763da52
Fix typo and move paragraph.
danielnordh Dec 14, 2020
f14c7eb
Address tweaks
danielnordh Dec 14, 2020
163a3c2
Minor tweaks
danielnordh Dec 14, 2020
24618f5
Write all BIPs the same way
danielnordh Dec 14, 2020
3993bd2
Tweaks to xpubs and key
danielnordh Dec 14, 2020
377542b
Tweaks to various empty or rough terms.
danielnordh Dec 14, 2020
948cb86
Further term updates
danielnordh Dec 14, 2020
268e8fd
Transaction ToDo
danielnordh Dec 14, 2020
066c765
Fix heading code for PSBT
danielnordh Dec 14, 2020
24cda11
Tweaks to wallets
danielnordh Dec 14, 2020
a6c018e
Add BIP84, fix errors
danielnordh Dec 14, 2020
57ce77c
Fix link
danielnordh Dec 14, 2020
48aaee0
Add link to CoinJoin info
danielnordh Dec 14, 2020
7e74781
Typo
danielnordh Dec 14, 2020
4a9cc71
Minor tweak to fix link rendering
GBKS Dec 14, 2020
b90200b
Merge branch 'master' into feature/glossary
GBKS Dec 15, 2020
605394a
Move change address to address section
danielnordh Dec 16, 2020
c3af454
Simplify legacy address
danielnordh Dec 16, 2020
8e0a559
Simplify script addresses
danielnordh Dec 16, 2020
dccc305
Simplify SegWit address
danielnordh Dec 16, 2020
8597bba
Merge branch 'master' into feature/glossary
GBKS Dec 16, 2020
00394d2
Merge branch 'feature/glossary' of https://github.com/BitcoinDesign/G…
GBKS Dec 16, 2020
8bc2859
Minor URL fixes
GBKS Dec 16, 2020
759ca19
Minor link fixes
GBKS Dec 16, 2020
20bd7d9
Markdown rendering fix
GBKS Dec 16, 2020
7239244
Actual line break
danielnordh Dec 16, 2020
15a5d2a
Update guide/glossary.md
danielnordh Dec 16, 2020
42977e2
Update guide/glossary.md
danielnordh Dec 16, 2020
51eeb6e
Update guide/glossary.md
danielnordh Dec 16, 2020
a680814
Update guide/glossary.md
danielnordh Dec 16, 2020
10bab6d
Change all product to application
danielnordh Dec 16, 2020
1663bdc
Update guide/glossary.md
danielnordh Dec 16, 2020
e11f72b
Segwit addresses
danielnordh Dec 16, 2020
34907aa
Merge branch 'feature/glossary' of https://github.com/BitcoinDesign/G…
danielnordh Dec 16, 2020
3ee3857
Update guide/glossary.md
danielnordh Dec 16, 2020
b9ad8e6
Update guide/glossary.md
danielnordh Dec 16, 2020
12bd761
Typos
danielnordh Dec 16, 2020
dfc071a
Update guide/glossary.md
danielnordh Dec 16, 2020
ab12b26
Update guide/glossary.md
danielnordh Dec 16, 2020
87359ad
Update guide/glossary.md
danielnordh Dec 16, 2020
ab07cd9
Coincontrol, readability
danielnordh Dec 16, 2020
9369e8e
Added links to hardware and software overview pages
GBKS Dec 17, 2020
94ee31b
Update guide/glossary.md
danielnordh Dec 17, 2020
4d384e2
Move to correct alphabetical location
danielnordh Dec 17, 2020
dc1c8cc
Add Derivation path
danielnordh Dec 17, 2020
473fe83
Derivation path tweaks / layout
danielnordh Dec 17, 2020
41ad5d4
Consistent use of SegWit
danielnordh Dec 17, 2020
5d22793
Format, typo
danielnordh Dec 17, 2020
4973f04
Update guide/glossary.md
danielnordh Dec 17, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added assets/images/guide/glossary/coin-selection.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/guide/glossary/coinjoin.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/guide/glossary/coinjoin@2x.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/guide/glossary/descriptors.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/guide/glossary/descriptors@2x.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/guide/glossary/wallet.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/guide/glossary/wallet@2x.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
334 changes: 334 additions & 0 deletions guide/glossary.md

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions guide/resources/content-guidelines.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ layout: guide
title: Content guidelines
nav_order: 10
parent: Resources
permalink: /guide/resources/content-guidelines
permalink: /guide/resources/content-guidelines/
---

# Content guidelines
Expand Down Expand Up @@ -51,4 +51,3 @@ The guide is a work in progress and needs to evolve to stay relevant. What we wr
It's a good idea to ask for directions by seeking feedback early. This may stop you from wandering too far in the wrong direction. There is a whole community around you that's ready to jump in and help.



2 changes: 1 addition & 1 deletion guide/resources/formatting.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ layout: guide
title: Formatting
nav_order: 11
parent: Resources
permalink: /guide/resources/formatting
permalink: /guide/resources/formatting/
---

# Formatting
Expand Down