merge upstream

_pages/equipment.md

@@ -37,8 +37,10 @@ You do not need to use a laptop, any desktop computer can work. We find laptops
 ## Bitcoin Core Node
 For regular users, we recommend using
 [RaspiBlitz](https://shop.fulmo.org/raspiblitz/),
-[MyNode](https://mynodebtc.com/), or
-[Nodl](https://www.nodl.it/)
+[MyNode](https://mynodebtc.com/), 
+[Nodl](https://www.nodl.it/), or
+[Umbrel](https://www.umbrel.io/)
+
 (more [here](/setup-computer/)).
 
 For advanced users, you can [run your own Bitcoin Core node](setup-computer/bitcoin-node) for more details.

_pages/send-bitcoin/advanced.md

@@ -13,12 +13,12 @@ Fortunately, your wallet software will abstract this away for you.
 SD Card is a better airgap, and preferable over signing through USB.
 
 1. On the previous page, at Step 9, choose "Sign with SD Card file" instead of choosing "Sign with USB"
-2. Click Save transaction, and save to your SD card
-3. Eject the SD card from computer, and load into Coldcard
-4. Click "Ready to sign" on Coldcard and confirm transaction details
-5. Coldcard will save the signed transaction back to the SD card, but with the `-part` suffix at the end of the filename
-6. Back in Specter, click "Load transaction from file", and choose the file on the SD card with the `part` suffix
-7. Broadcast 
+1. Click Save transaction, and save to your SD card
+1. Eject the SD card from computer, and load into Coldcard
+1. Click "Ready to sign" on Coldcard and confirm transaction details
+1. Coldcard will save the signed transaction back to the SD card, but with the `-part` suffix at the end of the filename
+1. Back in Specter, click "Load transaction from file", and choose the file on the SD card with the `part` suffix
+1. Broadcast 
 
 
 #### Inspect Signed Transactions Before Broadcasting

_pages/setup-wallets/index.md

@@ -9,8 +9,8 @@ We're going to configure a `2-of-3` multisignature scheme, meaning you will have
 The three wallets / keys will be:
 
 1. A "paper wallet" key intended only for backup/recovery purposes - To simplify setup (and reduce upfront costs associated with hardware purchases), this key will be generated on your computer. By design this key is only for backup/recovery, and therefore will hopefully never be needed.
-2. A key generated by your Cobo Vault hardware wallet
-3. A key generated by your Coldcard hardware wallet
+1. A key generated by your Cobo Vault hardware wallet
+1. A key generated by your Coldcard hardware wallet
 
 While there are a lot of steps here, you only ever need to do them once.
 After setup is complete, you will be able to generate (nearly) infinite addresses and sign (nearly) infinite transactions.

_pages/verify-receive-address/advanced.md

@@ -38,11 +38,33 @@ We can improve this by using an offline/dedicated machine, where we install only
 While this will help protect you against malware on your computer, you are still at risk from an [Evil maid attack](https://en.wikipedia.org/wiki/Evil_maid_attack) with physical access to your computer (or paper printout).
 Such an "evil maid" could tamper with this software/printout to instead show bitcoin addresses that they control, and trick you into receiving a deposit on their address.
 
-#### Option A: Dedicated Machine
-TODO: add instructions for inputting extended public keys & paths (no private keys/seeds) running Electrum, Sparrow, Caravan, or some CLI script.
+#### Option A: Offline/Dedicated Machine
+You will set up the multisig in the software wallet of your choice  by importing the extended public keys for all N seeds from your quorum.
 
-It is recommended to use an eternally quarantined machine, meaning that it is never again connected to the internet and not used for any other purpose.
-That way, the attack surface is reduced and you are not at risk of malware on an ongoing basis.
+It is recommended to use an eternally quarantined machine, meaning that it is never again connected to the internet and not used for any other purpose. That way, the attack surface is reduced and you are not at risk of malware on an ongoing basis. 
+
+Alternatively, you can use Tails, which you might already have used when [setting up your Paper Wallet](https://btcguide.github.io/setup-wallets/paper-advanced).
+
+1. [Verify](https://btcguide.github.io/setup-wallets/coordinate-multisig-advanced) that all the Zpub/xpub keys match on both the Cobo and the Coldcard
+
+##### Electrum
+
+1. In Specter, click on your `Wallet Name -> Settings -> Export -> Export to Wallet software -> Download Electrum (watch-only) File`
+1. Save this file to USB stick or SD card. Something that you can access from Tails.
+1. Reboot and run Tails
+1. Open Electrum, on the first window, click "Choose" and find the wallet file that you exported above in step 2
+1. The wallet should open. Go to the Addresses tab to verify the addresses match the addresses shown on the hardware wallets. If you cannot see the Addresses tab, use the menu item for View -> Show Addresses
+
+
+##### Caravan
+
+1. Reboot and run Tails
+1. Turn on WiFi inside Tails, and visit:  <https://unchained-capital.github.io/caravan/>
+1. Turn off WiFi
+1. Click "WALLET"
+1. On the right side of the page, set 2 of 3 quorum, and set P2WSH address type
+1. On the left side of the page, select the dropdown to "Enter as text", and type in all 3 of your Zpub keys [shown](https://btcguide.github.io/setup-wallets/coordinate-multisig-advanced) on either your Cobo or Coldcard
+1. Allow Caravan some time to generate the wallet, and then use the Addresses tab to verify the addresses match the addresses shown on the hardware wallets
 
 #### Option B: Print the Addresses to Paper
 One benefit of this is that you could get by without a dedicated machine, and the other is that paper is easier for most people to secure vs a computer.

_pages/verify-receive-address/cobo.md

@@ -8,5 +8,7 @@ The large screen and true airgap improve both security and useability.
 On Cobo Vault, click `Multisig Wallet` > `Receiving` tab (default selected) and click on the address:  
 ![](/assets/img/verify-receive-address-cobo.jpeg){:width="35%" class="border_image"} 
 
+To see more addresses, return to the `Receiving` tab, and press the big `+` button to add more addresses
+
 
 {% include next_steps.md next_url="coldcard" next_name="Verify Receive Address on Coldcard" %}