Commit graph

1582 commits

Author SHA1 Message Date
Jeremy Kauffman
dc8f138c45 Merge pull request #182 from lbryio/bug-fix-1
fix channel name, add additional info
2017-07-14 14:33:49 -04:00
Thomas Zarebczan
0d3a63591b add help@lbry.io info 2017-07-14 14:32:51 -04:00
Thomas Zarebczan
10e87b3a9b fix channel name, add additional info
Changed #bugs to #help
Re-wording
Add lbry-app repo link
2017-07-14 14:08:50 -04:00
Jeremy Kauffman
058d302c4d Merge pull request #140 from tzarebczan/master
Two FAQ entries: lbrynet..log and clean install
2017-07-14 11:25:37 -04:00
reillysmith
717d817a6a link add 2017-07-13 12:15:51 -07:00
reillysmith
cad419a37a Update 120-slav.md 2017-07-13 12:12:07 -07:00
reillysmith
c1df14d927 link test 2017-07-13 12:09:43 -07:00
Jeremy Kauffman
c88b345387 Merge pull request #145 from SimonKev/patch-4
Update mining-credits.md
2017-07-13 15:03:30 -04:00
Jeremy Kauffman
5bcf6bf24b Merge pull request #164 from SimonKev/patch-25
Update 66-brookes-eggleston-character-design-forge.md
2017-07-13 15:02:35 -04:00
Jeremy Kauffman
112b4300af Merge pull request #146 from SimonKev/patch-5
Update how-to-run-lbry-with-lbrycrdd.md
2017-07-13 15:02:11 -04:00
Jeremy Kauffman
ccb5583134 Merge pull request #147 from SimonKev/patch-6
Update regtest-setup-guide.md
2017-07-13 15:01:51 -04:00
Jeremy Kauffman
c3a8d72311 Merge pull request #157 from SimonKev/patch-16
Update 88-cryptoverse.md
2017-07-13 14:56:14 -04:00
Jeremy Kauffman
52a79254c4 Merge pull request #143 from SimonKev/patch-2
Update what.php
2017-07-13 14:55:49 -04:00
Jeremy Kauffman
7f42548afb Merge branch 'master' into patch-2 2017-07-13 14:55:42 -04:00
Jeremy Kauffman
7e42097d26 restore missing word 2017-07-13 14:55:05 -04:00
Jeremy Kauffman
4c5fb71aa2 Merge pull request #171 from SimonKev/patch-33
Update 38-information-gatekeepers-make-our-culture-sick.md
2017-07-13 14:53:22 -04:00
Jeremy Kauffman
f4f7be337f Merge pull request #142 from SimonKev/patch-1
Update stephan-kinsella.md
2017-07-13 14:52:40 -04:00
Jeremy Kauffman
607a5800aa Merge pull request #178 from SimonKev/patch-40
Update 18-its-time-to-liberate-anne-franks-diary.md
2017-07-13 14:52:03 -04:00
reillysmith
1da9b382c9 13 july 2017 content blog 2017-07-13 11:49:27 -07:00
Alex Grintsvayg
9570287d45 mismerge 2017-07-13 14:49:00 -04:00
Alex Grintsvayg
dc5067d9f1 Merge branch 'simonkev'
* simonkev:
  lots of spelling/grammar/typo fixes from @SimonKev
2017-07-13 14:43:33 -04:00
Alex Grintsvayg
bd20c151e7 lots of spelling/grammar/typo fixes from @SimonKev 2017-07-13 14:43:19 -04:00
reillysmith
e1078caff7 13 july 2017 banner 2017-07-13 11:37:34 -07:00
reillysmith
ecfe3b5a0e 13 july 2017 inline 2017-07-13 11:35:38 -07:00
SimonKev
46ea3f62c8 Update 18-its-time-to-liberate-anne-franks-diary.md
coauthorship -> co-authorship
oldmedia -> old media
2017-07-13 20:04:38 +03:00
SimonKev
4ef0e6f1d9 Update 38-information-gatekeepers-make-our-culture-sick.md
"They kept telling me" insteand of "The kept telling me"
"first hand" is your favorite hand, while "firsthand" is the first thing you encouner/learn in this context.
2017-07-13 19:35:04 +03:00
Josh Finer
4a03bda557 Merge pull request #153 from SimonKev/patch-12
Update 100-20000-illegal-college-lectures-rescued.md
2017-07-13 12:33:00 -04:00
Josh Finer
8decb2fe90 Merge pull request #161 from SimonKev/patch-21
Update 79-singletree.md
2017-07-13 12:32:32 -04:00
Josh Finer
e728305898 Merge pull request #169 from SimonKev/patch-31
Update 41-apple-lost-my-music.md
2017-07-13 12:32:12 -04:00
Josh Finer
bee77eea18 Merge pull request #168 from SimonKev/patch-30
Update 43-ultimate-wizard-meet-alex-grin.md
2017-07-13 12:32:00 -04:00
Josh Finer
f387731439 Merge pull request #167 from SimonKev/patch-28
Update 52-day-in-shoes-venezuelan.md
2017-07-13 12:31:27 -04:00
Josh Finer
4f7516f094 Merge pull request #166 from SimonKev/patch-27
Update 60-heckbender-charney-on-lbry.md
2017-07-13 12:31:09 -04:00
SimonKev
ff90408b9d Update 41-apple-lost-my-music.md
"enough enough" - one is sufficient
2017-07-13 19:30:51 +03:00
Josh Finer
18a7aa7905 Merge pull request #159 from SimonKev/patch-18
Update 81-acryptypical.md
2017-07-13 12:30:41 -04:00
SimonKev
04747f5aee Update 43-ultimate-wizard-meet-alex-grin.md
"the the" - one "the" is enough
2017-07-13 19:28:59 +03:00
SimonKev
9b30144cf1 Update 52-day-in-shoes-venezuelan.md
a smartphone instead of "an smart phone"
2017-07-13 19:21:39 +03:00
SimonKev
38a9b491c7 Update 60-heckbender-charney-on-lbry.md
Reservoir Dogs instead of "Resevoir"
2017-07-13 19:14:15 +03:00
SimonKev
492f86c768 Update 66-brookes-eggleston-character-design-forge.md
just deleted an unnecesary comma
2017-07-13 19:06:33 +03:00
Jeremy Kauffman
40abe93172 clarify numbers 2017-07-13 11:31:51 -04:00
SimonKev
79926e1f89 Update 79-singletree.md
Chiseled with only 1 "L" and separated the *lawnmowing* babes into "lawn-mowing".
2017-07-13 17:59:21 +03:00
SimonKev
2687b61ab6 Update 81-acryptypical.md
its (theirs) not the shortened "it is"
2017-07-13 17:53:57 +03:00
SimonKev
1cb804e848 Update 88-cryptoverse.md
the the :) just one is enough
2017-07-13 17:45:36 +03:00
SimonKev
f5195180ff Update 100-20000-illegal-college-lectures-rescued.md
Worldclass is a famous gym I used to train at. World-class is something that in an earth-enveloping class.
2017-07-13 17:33:16 +03:00
SimonKev
afbd105121 Update regtest-setup-guide.md 2017-07-13 16:49:25 +03:00
SimonKev
7567e69ba4 Update how-to-run-lbry-with-lbrycrdd.md 2017-07-13 16:45:32 +03:00
SimonKev
aff5ab24c5 Update mining-credits.md
econonmically -> economically
2017-07-13 16:44:21 +03:00
SimonKev
1734f022b2 Update what.php
"5. Collect no rent.. Whatever" (2 repeated dots instead of one)
"3. Prove decentralization... no way for rightsholders" -> "rights holders" / "right holders" (with singular right)
Not sure about this one, but "public ledger of ... content publishings"? Is that even a word? I would rather formulate it as "public ledger of published content/content publishers/publishers of content"

"LBRY Credits... The total *break down* " - in this context it should be "breakdown" (without a space)
www.merriam-webster.com/dictionary/breakdown
e :  division into categories a statistical breakdown of data :  classification; also :  an account analyzed into categories

"Content Distribution... LBRY’s infringement *disincentivizeing* properties" ->  disincentivizing (without the "e")
http://en.wiktionary.org/wiki/disincentivizing#English

"Content Discovery... LBRY needs *it’s* own" -> "its own"
http://dictionary.cambridge.org/grammar/british-grammar/it-s-or-its
2017-07-13 16:33:36 +03:00
SimonKev
b34e53eabb Update stephan-kinsella.md
Stephan Kinsella "Lousiana State University" -> "Louisiana S.U."
2017-07-13 16:24:16 +03:00
Jeremy Kauffman
3feb7f34d2 revised lbrynet.log help file 2017-07-12 19:29:38 -04:00
Jeremy Kauffman
ccbf743479 light clean up on re-install steps 2017-07-12 19:24:17 -04:00