master merge

FAQ.md

@@ -68,7 +68,7 @@ If you run a version earlier then 0.98 you basically need to setup a new RaspiBl
 
 1. Close all open lightning channels you have (`lncli closeallchannels --force`) or use the menu option 'CLOSE ALL' if available. Wait until all closing transactions are done.
 
-2. Move all on-chain funds to a wallet outside raspiblitz (`lncli --conf_target 3 sendcoins [ADDRESS]`) or use the menu option 'CHASH OUT' if available
+2. Move all on-chain funds to a wallet outside raspiblitz (`lncli sendcoins --conf_target 3 <ADDRESS> <AMT>`) or use the menu option 'CASHOUT' if available
 
 3. Prepare the HDD for the new setup by running the script `/home/admin/XXcleanHDD.sh` (Blockchain will stay on HDD)
 
@@ -228,9 +228,9 @@ Then give LND some time to rescan the blockchain. In the end you will have resto
 
 ## What is this mnemonic seed word list?
 
-With the 24 word list given you by LND on wallet creation you can recover your private key (BIP 39). You should write it down and store it at a save place. 
+With the 24 word list given you by LND on wallet creation you can recover your private key. You should write it down and store it at a save place. Bear in mind that *this 24 word mnemonic seed is not based on the BIP 39* and therefore cannot be recovered using a Bitcoin wallet.
 
-For more background on mnemonic seeds see this video: https://www.youtube.com/watch?v=wWCIQFNf_8g
+For more background on the LND mnemonic seed [read this article](https://github.com/lightningnetwork/lnd/blob/master/docs/recovery.md#recovering-funds-from-lnd-funds-are-safu).
 
 ## How does PASSWORD D effects the word seed?
 

shoppinglist_au.md

@@ -1,4 +1,3 @@
-
 ## Shopping List: Amazon Australia
 
 * RaspBerry Pi 3: https://www.amazon.com.au/dp/B07BFR7PBS

shoppinglist_de.md

@@ -1,8 +1,8 @@
-## Shopping List: Amazon Germany
+## Shopping List: Amazon Spain
 
-* RaspBerry Pi 3: https://www.amazon.de/dp/B07BDR5PDW
+* RaspBerry Pi 3: https://www.amazon.es/gp/product/B07BDR5PDW
-* Micro SD-Card 32GB: https://www.amazon.de/dp/B07CY3QSST
+* Micro SD-Card 32GB: https://www.amazon.es/dp/B07CY3QSST
-* Power >=3A: https://www.amazon.de/gp/product/B01JZE38QE
+* Power >=3A: https://www.amazon.es/gp/product/B01JZE38QE
-* 1TB Hard Drive: https://www.amazon.de/dp/B07997KKSK?th=1
+* 1TB Hard Drive: https://www.amazon.es/gp/product/B07997KKSK
-* Heatsink-Case: https://www.amazon.de/gp/product/B07MXZ8JHL
+* Heatsink-Case: https://www.amazon.es/dp/B07MXZ8JHL
-* LCD-Display: https://www.amazon.de/gp/product/B06X191RX7
+* LCD-Display: https://www.amazon.es/dp/B06ZZBL1C4 or https://www.amazon.es/gp/product/B01MZZ1VY1

shoppinglist_uk.md

@@ -5,6 +5,8 @@
 * 1TB Hard Drive: https://www.amazon.co.uk/dp/B07997KKSK?th=1
 * Heatsink-Case: https://www.amazon.co.uk/dp/B07MXZ8JHL
 * LCD-Display: https://www.amazon.co.uk/dp/B01MRQTMTD or https://www.amazon.co.uk/dp/B07L42Z79L
-* Power >=3A: https://www.amazon.co.uk/dp/B07PMJ9C1W or https://www.amazon.co.uk/dp/B06Y46YRVR
+* Power >=3A: https://www.amazon.co.uk/dp/B017YW2CKM
+
+
 
 *NOTE: Please report if the power supplies above give you 'Undervoltage Reports' on the LCD.*