317 Commits

Author	SHA1	Message	Date
David A. Harding	bc703ce9ce	CH01: minor edits	2023-02-03 20:26:16 -10:00
David A. Harding	4b08bdf3d6	CH01::Bitcoin vs Bitcoin: be less prescriptive	2023-02-03 20:25:12 -10:00
David A. Harding	21550eecd4	CH01: Reflow text to make later diffs more readable	2023-02-03 20:24:50 -10:00
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	33bb090291	ch1 edits complete ... ch1 edits	2021-12-07 13:57:06 +01:00
Andreas M. Antonopoulos	a3229bbbc0	bitcoin/Bitcoin capitalization changed everywhere	2021-10-25 23:51:17 +02:00
Will Binns	a0282fe65e	Merge pull request #927 from chrisd95/patch-1 ... grammatical error	2021-05-29 22:40:41 +01:00
Will Binns	776dd89e4c	Merge branch 'develop' into bluewalletreceivescreen	2021-05-29 13:01:42 +01:00
Will Binns	37a9e205a2	Merge pull request #913 from rating89us/new-mbc_0102 ... ch01: update Bluewallet send screen	2021-05-29 12:58:46 +01:00
Will Binns	51fa953766	ch01: Drop additional sentence regarding tx fee ... Yield to this being explained more comprehensively elsewhere.	2021-05-29 13:19:09 +02:00
chrisd95	f15b34ce91	grammatical error	2021-05-03 10:19:29 -04:00
rating89us	7bdc8d385a	ch01: update bluewallet receive screen	2021-04-09 18:25:53 +02:00
rating89us	f7f1d14cc7	ch01: fix text to match new bluewallet screenshot	2021-04-09 16:03:52 +02:00
krupawan5618	d6ae9a9fde	Update ch01.asciidoc ... changed electrum wording to bluewallet	2021-04-08 06:35:18 -04:00
krupawan5618	eea63c8ad0	Merge branch 'develop' into patch-4	2021-04-08 06:29:00 -04:00
Will Binns	636606f371	Merge pull request #893 from rating89us/patch-72 ... ch01: update joe transaction image and text	2021-04-08 11:43:30 +02:00
Will Binns	19eb8ca6d6	Merge pull request #892 from rating89us/patch-71 ... ch01: add AML and KYC terms	2021-04-08 11:41:50 +02:00
rating89us	04e7f2529f	ch01: update joe's transaction image and text	2021-03-28 21:39:54 +02:00
rating89us	8a9d2500c4	ch01: explain mnemonic risks	2021-03-28 21:30:06 +02:00
rating89us	529a42a74f	ch01: add AML and KYC terms	2021-03-26 16:18:40 +01:00
krupawan5618	464708e210	Update ch01.asciidoc	2021-03-15 01:13:56 -04:00
krupawan5618	add7dcdc56	Update ch01.asciidoc	2021-03-15 00:37:39 -04:00
krupawan5618	b12dd237ee	Update ch01.asciidoc ... Changed Airbitz to Electrum	2021-03-15 00:29:46 -04:00
Will Binns	9947af8d2b	ch01: Bring in upstream changes	2021-03-11 10:20:32 +01:00
Will Binns	59bb109f48	ch01: Additional price reference tweaks	2021-03-11 10:14:01 +01:00
krupawan5618	3a6ba5ee0a	Update ch01.asciidoc	2021-03-11 04:02:28 -05:00
krupawan5618	ede3b74bbd	Merge branch 'develop' into patch-3	2021-03-11 04:01:01 -05:00
Will Binns	a9e3eb4823	Merge pull request #874 from krupawan5618/patch-5 ... Update ch01.asciidoc - paragraph flow	2021-03-11 09:57:06 +01:00
krupawan5618	1bae7c30a6	Update ch01.asciidoc ... double space removed	2021-03-11 03:56:18 -05:00
krupawan5618	a744a66168	Update ch01.asciidoc	2021-03-11 03:53:04 -05:00
Will Binns	f7dfcccd55	Merge pull request #873 from krupawan5618/patch-4 ... Ch 01: Added a Tip box regarding Satoshis	2021-03-11 09:52:21 +01:00
krupawan5618	6fd4c9212c	Update ch01.asciidoc	2021-03-11 03:47:53 -05:00
krupawan5618	fff54066f5	Update ch01.asciidoc	2021-03-11 03:45:21 -05:00
krupawan5618	aedbc2cda1	Update ch01.asciidoc	2021-03-11 03:43:35 -05:00
krupawan5618	8762686eff	Update ch01.asciidoc ... paragraph flow	2021-03-11 03:37:32 -05:00
Will Binns	2ed7fd044e	Merge branch 'develop' into patch-1	2021-03-11 09:34:44 +01:00
Will Binns	87aa533b7e	ch01: Drop additional redundant use (alluded to previously)	2021-03-11 09:05:26 +01:00
Will Binns	db29978d3e	ch01: Drop redundant use (alluded to previously)	2021-03-11 09:01:41 +01:00
Will Binns	acf4465ab6	ch01: s/clicks on/uses/	2021-03-11 08:58:41 +01:00
Will Binns	cb5668aa5d	ch01: s/mneumonic/mnemonic/	2021-03-11 08:57:15 +01:00
krupawan5618	50d63171ef	Update ch01.asciidoc ... narrowed scope of tip box to just talk about satoshis	2021-03-10 23:28:23 -05:00
krupawan5618	d47ef01efe	Update ch01.asciidoc ... Added a Tip box regarding Satoshis.	2021-03-10 23:25:51 -05:00
krupawan5618	00f99f6d6c	Update ch01.asciidoc ... sentence structure	2021-03-10 23:06:07 -05:00
krupawan5618	92a1f1807e	Update ch01.asciidoc ... sentence structure	2021-03-10 23:05:10 -05:00
krupawan5618	364c51c7df	Update ch01.asciidoc ... Refactored tip box to be placed at end of user stories as a sort of disclaimer	2021-03-10 22:59:27 -05:00
krupawan5618	ba91e65a88	Update ch01.asciidoc ... typos	2021-03-10 22:55:19 -05:00
krupawan5618	9a0b7cf467	Update ch01.asciidoc ... Added a Tip Box that explains how transactions used as examples are in the past and should be used for educational purposes.	2021-03-10 22:49:08 -05:00
krupawan5618	e09079d90e	Mnemonic phrase info for onboarding of new users ... - Ported main section from LnBook Ch 02 regarding mnemonic phrases - Ported main section from LnBook Ch 02 regarding acquiring acquiring bitcoin as it is more succinct.	2021-03-10 22:05:29 -05:00
krupawan5618	ae33c56980	Update ch01.asciidoc	2021-03-08 17:50:46 -05:00
krupawan5618	ff378189cd	Update ch01.asciidoc	2021-03-08 17:18:58 -05:00