1
0
mirror of https://github.com/bitcoinbook/bitcoinbook synced 2024-11-17 05:29:14 +00:00
Commit Graph

82 Commits

Author SHA1 Message Date
David A. Harding
2f0d7d8c3a Revert CC-BY-SA material added since the second edition
The commit ab5ae32bae is the last commit
for the second edition, so all changes since then are dropped except for
several commits for the third edition authored by Andreas Antonopoulos.

No attempt is made to remove CC-BY-SA or other licensed content present
in the already-published first or second editions.

This revert may itself be reverted for versions of the book published
under CC-BY-SA.
2023-02-01 06:31:10 -10:00
Andreas M. Antonopoulos
a3229bbbc0 bitcoin/Bitcoin capitalization changed everywhere 2021-10-25 23:51:17 +02:00
MG-ng
6614ae4e8b
Added the a in "is a class"
I think there should be "[…] is a class […]" instead of "[…] is class […]". 
But I'm not a native english speaker, so please review it.
2021-06-01 23:59:40 +02:00
rating89us
66dac9bf4b
glossary: fix bitcoin capitalization 2021-03-28 21:26:23 +02:00
Will Binns
ea20a9a312
Merge branch 'develop' into patch-64 2021-03-08 13:39:03 +01:00
rating89us
666b304900
ch10: add candidate block; edit stale block 2021-03-06 22:02:14 +01:00
rating89us
c1e03f85ed glossary: block reward, coinbase reward, mining reward 2021-03-06 21:42:46 +01:00
Will Binns
917336035b
Merge pull request #783 from rating89us/patch-23
glossary: fixing multisig explanation
2021-02-20 21:43:33 +00:00
Will Binns
0857cbf8e3
Merge pull request #751 from rating89us/patch-10
glossary: BIP32 -> BIP-32
2021-02-20 18:42:42 +00:00
Will Binns
c3bb593e0c
Merge pull request #754 from rating89us/patch-14
glossary: start a new sentence in"P2SH address"
2021-02-20 18:39:12 +00:00
rating89us
5f08cfb234 glossary: fixing multisig explanation 2021-02-20 16:00:56 +01:00
rating89us
4971598b5a
glossary: add passphrase entry 2021-02-08 01:47:23 +01:00
rating89us
39d0111fe2
glossary: start a new sentence in"P2SH address" 2021-01-22 14:19:29 +01:00
rating89us
d06e7c54bf
glossary: BIP32 -> BIP-32 2021-01-21 09:21:47 +01:00
Nicholas Chen
cfc18ec4b3
Update block reward due to halving.
No anger 12.5, but 6.25 are now rewarded.
2020-07-06 14:04:45 -04:00
Will Binns
694254ffc0
Drop references to Colored Coins
Context: https://github.com/bitcoinbook/bitcoinbook/issues/575

Closes #575
2020-05-04 17:26:26 -06:00
Will Binns
a67dcbf92c
glossary: Wording changes to SegWit and SPV entries 2020-05-01 13:12:40 -06:00
Will Binns
fe02c41f64
glossary: Drop vendor specific reference 2020-05-01 13:04:51 -06:00
Will Binns
a2124d2520
glossary: Drop text change 2020-05-01 13:03:08 -06:00
blip151
d85220a503
Update glossary.asciidoc 2019-11-06 17:59:07 +10:00
blip151
2db7fcfac7
Update glossary.asciidoc
This change reflects the current status of Segregated Witness and adjusts the tenses used to reflect current realities.
2019-11-06 17:18:19 +10:00
blip151
535e002897
Update glossary.asciidoc
Many people have heard that the Timechain is immutable. As a newbie, I was a little confused (ot unusual) until I did some web searches and found examples of "off Blockchain transactions." I'm not associated with Opendimes in any way other than as a customer.
2019-11-06 17:04:55 +10:00
blip151
14a5f17f8d
Update glossary.asciidoc
This is an update that reflects the current status of the Lightning Project.
2019-11-06 16:27:06 +10:00
blip151
a6863b0068
Update glossary.asciidoc
It's not an exact comparison because you could have many email addresses and a single bitcoin amount could be sent to many more than one of your bitcoin addresses. From a reader's viewpoint, I feel that the new text makes the flow of the sentence clearer without getting pedantic.
2019-11-06 16:18:44 +10:00
Will Binns
165e2fa2c2
Merge pull request #526 from trulex/patch-1
"program language" -> "programming language"
2019-05-08 13:24:58 +00:00
kristen@oreilly.com
9cd4be7e55 Edited glossary.asciidoc with Atlas code editor 2018-03-14 10:25:34 -07:00
Darko Janković
1377879f3c
"program language" -> "programming language" 2018-03-13 20:48:36 +01:00
Andreas M. Antonopoulos
751fc89bca remove second definition of SPV, fix grammer #494 2018-03-03 14:45:30 -06:00
Andreas M. Antonopoulos
6fdd7e6eb6 add hyphen to double-spending 2018-03-03 14:23:54 -06:00
Reuben Thomas
4e65d83bf5 Fix issue #454: change adverbial “just like” → “just as” 2018-02-04 20:42:08 +00:00
Andreas M. Antonopoulos
9f7a0a8cd6 Merge branch 'master' into develop
Editorial changes from ORM
2018-01-12 10:07:39 -06:00
MarcoFalke
929fe5c08e fixups 2017-10-13 14:09:21 +02:00
Will Binns
f5bc68d5f2
glossary: Fix grammar 2017-08-24 09:31:21 -06:00
nadams
83b4019332 Edited glossary.asciidoc with Atlas code editor 2017-07-18 08:10:57 -07:00
nadams
cf31467b37 Edited glossary.asciidoc with Atlas code editor 2017-07-18 08:10:05 -07:00
nadams
f8f1752502 Edited glossary.asciidoc with Atlas code editor 2017-07-18 08:06:50 -07:00
nadams
9153252294 Edited glossary.asciidoc with Atlas code editor 2017-07-18 08:01:41 -07:00
nadams
0d05a62166 Edited glossary.asciidoc with Atlas code editor 2017-07-18 07:59:54 -07:00
nadams
911603236d Edited glossary.asciidoc with Atlas code editor 2017-07-18 07:56:54 -07:00
nadams
b93dc9ee15 Edited glossary.asciidoc with Atlas code editor 2017-07-18 07:55:59 -07:00
nadams
a57fe98845 Edited glossary.asciidoc with Atlas code editor 2017-07-18 07:54:59 -07:00
nadams
b205bd059f Edited glossary.asciidoc with Atlas code editor 2017-07-18 07:53:26 -07:00
nadams
fe24245124 Edited glossary.asciidoc with Atlas code editor 2017-07-18 07:52:54 -07:00
nadams
dadce9d67e Edited glossary.asciidoc with Atlas code editor 2017-07-18 07:19:58 -07:00
nadams
200b179da9 Edited glossary.asciidoc with Atlas code editor 2017-07-18 07:17:42 -07:00
nadams
fb974b7390 Edited glossary.asciidoc with Atlas code editor 2017-07-18 07:17:24 -07:00
nadams
76603bd3bb Edited glossary.asciidoc with Atlas code editor 2017-07-18 07:16:57 -07:00
nadams
a6dd4a7e98 Edited glossary.asciidoc with Atlas code editor 2017-07-18 07:16:16 -07:00
nadams
cfd62b520c Edited glossary.asciidoc with Atlas code editor 2017-07-18 07:13:40 -07:00
nadams
f37e3604fd Edited glossary.asciidoc with Atlas code editor 2017-07-18 07:10:32 -07:00