Merge pull request #17 from sonatagreen/master

FAQ improvements

posts/faq/api-help.md

@@ -12,7 +12,7 @@ USER and PASSWORD can be found in your lbrycrd.conf file, COMMAND can be any of
 
 See Also: [important directories](https://lbry.io/faq/lbry-directories).
 
-Note: the lbry api can only be used while either the app or lbrynet-daemon command line are running
+Note: the LBRY API can only be used while either the app or lbrynet-daemon is running.
 
     import sys
     from jsonrpc.proxy import JSONRPCProxy

posts/faq/block-rewards.md

@@ -29,4 +29,4 @@ Eventually 1,000,000,000 LBRY credits will exist. They are awarded on the follow
   3. The final stage is the "normal" mining stage. From block 55001 onward, the block reward decreases logarithmically over the course of 20
      years.
 
-* Block rewards ramp up slowly because we want to ensure that users are given some time to get LBRY up and running, and to avoid unfairly benefit the earliest users.
+* Block rewards ramp up slowly because we want to ensure that users are given some time to get LBRY up and running, and to avoid unfairly benefitting the earliest users.

posts/faq/blockchain-explorer.md

@@ -2,4 +2,4 @@
 title: Do you have a blockchain explorer?
 ---
 
-Yep. You can see it at [https://explorer.lbry.io](https://explorer.lbry.io);
+Yep. You can see it at [https://explorer.lbry.io](https://explorer.lbry.io).

posts/faq/custom-ui.md

@@ -2,12 +2,12 @@
 title: How do I specify a web-UI to use?
 ---
 
-If the files for the UI you'd like to use are stored locally on your computer, start lbry with the `--ui` flag:
+If the files for the UI you'd like to use are stored locally on your computer, start LBRY with the `--ui` flag:
 
     lbrynet-daemon --ui=/full/path/to/ui/files/root/folder
 
-Once set with the UI flag, the given UI will be cached by lbry and used as the default going forward. Also, it will only successfully load a UI if it contains a conforming requirements.txt file to specify required lbrynet and lbryum versions. [Here](https://github.com/lbryio/lbry-web-ui/blob/master/dist/requirements.txt) is an example requirements.txt file.
+Once set with the UI flag, the given UI will be cached by LBRY and used as the default going forward. Also, LBRY will only successfully load a UI if the UI contains a conforming requirements.txt file to specify the required versions of lbrynet and lbryum. [Here](https://github.com/lbryio/lbry-web-ui/blob/master/dist/requirements.txt) is an example requirements.txt file.
 
-To reset your ui to pull from lbryio, or to try a UI still in development, run lbry with the `--branch` flag:
+To reset your UI to pull from lbryio, or to try a UI still in development, run LBRY with the `--branch` flag:
 
     lbrynet-daemon --branch=master

posts/faq/earn-credits.md

@@ -6,7 +6,7 @@ Currently, there are four ways to obtain LBRY Credits, or LBC for short.
 
 1. Beta testers get an LBC gift. Talk to us on [Slack](https://slack.lbry.io/) if
    you're interested.
-1. Mine them: see [Mining](https://lbry.io/faq/mining-credits)
+1. Mine them: see [Mining](https://lbry.io/faq/mining-credits).
 1. Host content: see [Hosting](https://lbry.io/faq/host-content) for details. Note that
    hosting requires the LBRY app, which is currently open to beta testers only.
 1. Publish content: when you publish your own content to the LBRY network, you can sell it for LBC at the price of your choice. Note: publishing tools are forthcoming.

posts/faq/host-content.md

@@ -1,10 +1,10 @@
 ---
-title: How does content hosting work
+title: How does content hosting work?
 ---
 
-Right now, its simple: you host what you download.
+Right now, it's simple: you host what you download.
 
-While the LBRY app is running it communicates with the network what
+While the LBRY app is running, it communicates to the network what
 content you're making available. If somebody downloads content from
 you, you will recieve LBRY credits (LBC) for that. The prices are
 currently set by the app and can't be changed.

posts/faq/how-do-i-check-my-lbc-address

@@ -1,9 +0,0 @@
----
-title: How do I check my LBC address?
----
-
-In order to check your LBC address you must first find out the name of the account you are interested in.
-`lbrycrd-cli listaccounts`
-
-Now you just have to check that account address
-`lbrycrd-cli getaccountaddress ""`

posts/faq/how-do-i-check-my-lbc-address.md

@@ -0,0 +1,11 @@
+---
+title: How do I check my LBC address?
+---
+
+In order to check your LBC address, you must first find out the name of the account you are interested in:
+
+    lbrycrd-cli listaccounts
+
+Now you just have to check that account address:
+
+    lbrycrd-cli getaccountaddress ""

posts/faq/how-to-backup-wallet.md

@@ -1,7 +1,7 @@
 ---
-title: How do I backup my wallet?
+title: How do I back up my wallet?
 ---
 
 You can use `lbrycrd-cli backupwallet <pathtobackup>` to back up your wallet, or alternatively you can copy the wallet.dat file manually to anywhere you choose.
 
-See Also: [important directories](https://lbry.io/faq/lbry-directories)
+See also: [important directories](https://lbry.io/faq/lbry-directories).

posts/faq/how-to-check-hashrate.md

@@ -2,4 +2,4 @@
 title: How do I check my hashrate?
 ---
 
-You cannot at the present time, but that feature is coming soon (gethashespersec is not implemented for lbrycrd yet).
+You cannot at the present time (gethashespersec is not yet implemented for lbrycrd), but this feature is coming soon.

posts/faq/how-to-check-mining-balance.md

@@ -2,4 +2,4 @@
 title: How do I check my mining balance?
 ---
 
-You can use `lbrycrd-cli getbalance`, `lbrycrd-cli getinfo`, or `lbrycrd-cli getwalletinfo` for more detailed information. It takes 100 confirmed blocks (roughly a bit over 4 hours) for mined LBC to show up in your confirmed balance, but you can see these credits in your immature balance in getwalletinfo.
+You can use `lbrycrd-cli getbalance`, or `lbrycrd-cli getwalletinfo` for more detailed information. It takes 100 confirmed blocks (roughly a bit over 4 hours) for mined LBC to show up in your confirmed balance, but you can see these credits in your immature balance in getwalletinfo.

posts/faq/how-to-encrypt-wallet.md

@@ -2,4 +2,10 @@
 title: How do I encrypt my wallet?
 ---
 
-You can use `lbrycrd-cli encryptwallet <passphrase>` to encrypt your wallet. You can use `lbrycrd-cli walletpassphrase <passphrase> <timeout>` to temporarily unlock the wallet (don't set timeout seconds too low or high).
+You can use `lbrycrd-cli encryptwallet <passphrase>` to encrypt your wallet.
+
+You can use `lbrycrd-cli walletpassphrase <passphrase> <timeout>` to temporarily unlock the wallet. The <timeout> parameter is in seconds.
+
+For example, `lbrycrd-cli walletpassphrase 'open sesame 321' 300` would unlock your wallet for five minutes, assuming your passphrase was `open sesame 321`. (In reality you should choose a harder-to-guess passphrase than that.)
+
+If you set <timeout> too low, it might expire before you get done using your wallet. If you set it too high, you might forget that you left your wallet unlocked.

posts/faq/how-to-generate-receiving-address.md

@@ -1,5 +1,5 @@
 ---
-title: How do I a generate receiving address?
+title: How do I generate a receiving address?
 ---
 
 You can generate a new receiving address by using `lbrycrd-cli getnewaddress`. Sending and receiving functionality will eventually be coming to the LBRY UI.

posts/faq/how-to-get-lbry-command-line.md

@@ -1,20 +1,7 @@
 ---
-title: How do I get LBRY for development
+title: How do I get LBRY for development?
 ---
 
-#### On Linux
+The LBRY project sources are hosted on [Github](https://github.com/lbryio).
 
-LBRY is installed into `/usr/share/python/lbrynet`. The executables are in
+To install LBRY from source, you'll need the [lbry](https://github.com/lbryio/lbry) repository, as well as either [lbrycred](https://github.com/lbryio/lbrycrd) or [lbryum](https://github.com/lbryio/lbryum). Further documentation is available in the respective repositories' READMEs and similar files.
-`/usr/share/python/lbrynet/bin`. For example, to run lbrynet-daemon, type:
-
-    /usr/share/python/lbrynet/bin/lbry
-
-
-
-#### On OS X
-
-On OS X, you need more than the packaged app. You can install LBRY command line by running this in a terminal:
-
-    curl -sL https://raw.githubusercontent.com/lbryio/lbry-setup/master/lbry_setup_osx.sh | sudo bash
-
-This script will install lbrynet and its dependancies, as well as the app.

posts/faq/how-to-report-bugs.md

@@ -2,4 +2,4 @@
 title: How do I report bugs?
 ---
 
-Have a technical problem? If you're having an issue with install of the UI/miner, or something involving an invite code, please join the slack at https://lbry.slack.com and in channel #bugs post a SINGLE detailed note with what exactly is going on. If you need an invite to the LBRY slack, you can get one at https://slack.lbry.io. If you can get to the LBRY UI after installing, but can't watch a video or have another problem, please click the three horizontal lines in the top right hand corner of the LBRY UI, click Help, then click the Send Us a Bug Report link.
+Have a technical problem? If you're having an issue with install of the UI/miner, or something involving an invite code, please join the slack at https://lbry.slack.com and in channel #bugs post a **single** detailed note with what exactly is going on. If you need an invite to the LBRY slack, you can get one at https://slack.lbry.io. If you can get to the LBRY UI after installing, but can't watch a video or have another problem, please click the three horizontal lines in the top right hand corner of the LBRY UI, click Help, then click the Send Us a Bug Report link.

posts/faq/how-to-run-lbry-with-lbrycrdd.md

@@ -2,7 +2,7 @@
 title:  How do I run LBRY with lbrycrdd?
 ---
 
-Start lbry with the `--wallet flag` set:
+Start LBRY with the `--wallet` flag set:
 
     lbrynet-daemon --wallet=lbrycrd
 

posts/faq/how-to-run-lbry.md

@@ -1,5 +1,28 @@
 ---
-title: How do I run LBRY from command line?
+title: How do I run LBRY from the command line?
 ---
 
-In a terminal window, run `lbrynet-daemon`.
+#### If you [installed from source](how-to-get-lbry-command-line.md)
+
+If using lbryum, run `lbrynet-daemon`.
+
+If using [lbrycrdd](how-to-run-lbry-with-lbrycrdd.md), run `lbrynet-daemon --wallet=lbrycrd`.
+
+
+
+#### On Linux
+
+LBRY is installed into `/usr/share/python/lbrynet`. The executables are in
+`/usr/share/python/lbrynet/bin`. For example, to run lbrynet-daemon, type:
+
+    /usr/share/python/lbrynet/bin/lbry
+
+
+
+#### On OS X
+
+On OS X, you need more than the packaged app. You can install LBRY command line by running this in a terminal:
+
+    curl -sL https://raw.githubusercontent.com/lbryio/lbry-setup/master/lbry_setup_osx.sh | sudo bash
+
+This script will install lbrynet and its dependencies, as well as the app.

posts/faq/lbry-directories.md

@@ -2,4 +2,4 @@
 title: Where are all the behind the scenes files?
 ---
 
-On linux, the relevant directories are `~/.lbrynet`, `~/.lbrycrd`, and `~/.lbryum`, depending on which wallets you've used. On OS X, the folders of interest are `~/Library/Application Support/LBRY`, `~/Library/Application Support/lbrycrd`, `~/.lbrycrd` and `~/.lbryum`, also depending on which wallets you've used.
+On Linux, the relevant directories are `~/.lbrynet`, `~/.lbrycrd`, and `~/.lbryum`, depending on which wallets you've used. On OS X, the folders of interest are `~/Library/Application Support/LBRY`, `~/Library/Application Support/lbrycrd`, `~/.lbrycrd`, and `~/.lbryum`, again depending on which wallets you've used.

posts/faq/to-log-to-console.md

@@ -2,6 +2,6 @@
 title: How can I see the log in the terminal?
 ---
 
-Run lbry with the `--log-to-console` flag set:
+Run LBRY with the `--log-to-console` flag set:
 
     lbrynet-daemon --log-to-console

view/template/content/faq.php

@@ -8,6 +8,6 @@
         <a href="<?php echo $post->getRelativeUrl() ?>" class="link-primary"><?php echo $post->getTitle() ?></a>
       </div>
     <?php endforeach ?>
-  </section>>
+  </section>
 </main>
 <?php echo View::render('nav/footer') ?>

view/template/content/news.php

@@ -19,6 +19,6 @@
         </div>
       </div>
     <?php endforeach ?>
-  </section>>
+  </section>
 </main>
 <?php echo View::render('nav/footer') ?>