Merge branch 'master' into feature/sending-bitcoin-lightning-iteration

Author: GBKS

_includes/custom-head.html

@@ -5,12 +5,20 @@
   2. Customize default _includes/custom-head.html in your source directory and insert the given code snippet.
 {% endcomment %}
 
+{% if page.video %}<meta property="og:video" content="{{ page.video | absolute_url }}">{% endif %}
+{% if page.videoSecure %}<meta property="og:video:secure_url" content="{{ page.videoSecure }}">{% endif %}
+{% if page.videoType %}<meta property="og:video:type" content="{{ page.videoType }}">{% endif %}
+{% if page.videoWidth %}<meta property="og:video:width" content="{{ page.videoWidth }}">{% endif %}
+{% if page.videoHeight %}<meta property="og:video:height" content="{{ page.videoHeight }}">{% endif %}
+
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
 <link rel="apple-touch-icon" sizes="180x180" href="{{ "/assets/apple-touch-icon.png" | relative_url }}">
 <link rel="icon" type="image/png" sizes="32x32" href="{{ "/assets/favicon-32x32.png" | relative_url }}">
 <link rel="icon" type="image/png" sizes="16x16" href="{{ "/assets/favicon-16x16.png" | relative_url }}">
 <link rel="manifest" href="{{ "/site.webmanifest" | relative_url }}">
 <link rel="mask-icon" href="{{ "/assets/safari-pinned-tab.svg" | relative_url }}" color="#f2a900">
+
 <meta name="msapplication-TileColor" content="#f2a900">
-<meta name="theme-color" content="#f2a900">
+<meta name="theme-color" content="#f2a900">
+

assets/images/bitcoin-design-preview.mp4

@@ -255,9 +255,9 @@ By _wallet_, we normally mean the [_wallet application_](/guide/glossary/wallet/
 
 </div>
 
-A good starting point today is an [HD wallet](/guide/glossary/wallet/#hd-wallet) implemented according to [BIP](/guide/glossary/#bip---bitcoin-improvement-proposal)32, 39, 43, 44, 49, 84 and 380.
+A good starting point today is an [HD wallet](/guide/glossary/wallet/#hd-wallet) implemented according to [BIP](/guide/glossary/#bip---bitcoin-improvement-proposal) [32](https://github.com/bitcoin/bips/blob/master/bip-0032.mediawiki), [39](https://github.com/bitcoin/bips/blob/master/bip-0039.mediawiki), [43](https://github.com/bitcoin/bips/blob/master/bip-0043.mediawiki), [44](https://github.com/bitcoin/bips/blob/master/bip-0044.mediawiki), [49](https://github.com/bitcoin/bips/blob/master/bip-0049.mediawiki), [84](https://github.com/bitcoin/bips/blob/master/bip-0084.mediawiki) and [380](https://github.com/bitcoin/bips/blob/master/bip-0380.mediawiki).
 
-Some older software may create wallets with outdated technical formats, while others allow users to choose specific formats for their particular needs. Generally, this is difficult to understand for regular users and should either be automatically handled with good default settings, or explained in layman terms. The Wallets Recovery project provides a great overview of different implementations and how nuanced some of the differences are. 
+Some older software may create wallets with outdated technical formats, while others allow users to choose specific formats for their particular needs. Generally, this is difficult to understand for regular users and should either be automatically handled with good default settings, or explained in layman terms. [Wallets Recovery](https://walletsrecovery.org) provides a great overview of different implementations and how nuanced some of the differences are. 
 
 Most modern wallet applications should aim to support the Lightning network in addition to the base layer. While there are different options for how the applications interact with a Lightning network node, an HD wallet works fine for storing the required keys.
 

guide/designing-products/common-user-flows.md

@@ -1,6 +1,6 @@
 ---
 layout: guide
-title: Cloud backup
+title: Automatic cloud backup
 description: How to backup bitcoin wallet data via cloud storage service providers.
 grand_parent: Onboarding
 parent: Backing up a wallet
@@ -32,7 +32,7 @@ height = 600
 layout = "full-width"
 %}
 
-# Cloud backup
+# Automatic cloud backup
 
 ### How it works
 
@@ -46,7 +46,7 @@ If the user's device is lost, stolen, or broken, they can use the backup from th
 
 This method provides users with the feeling that they can rely on their cloud provider to regain access to their funds rather than putting the responsibility on themselves.
 
-Below is an example of what the user interface might look like for a cloud backup that significantly reduces friction during onboarding. An optimal phase to show this may be after the wallet has received funds for the first time, so that the user has an incentive to back up their wallet.
+Below is an example of what the user interface might look like for an automatic cloud backup that significantly reduces friction during onboarding. An optimal phase to show this may be after the wallet has received funds for the first time, so that the user has an incentive to back up their wallet.
 
 <div class="image-slide-gallery">
 
@@ -126,7 +126,7 @@ Before creating a wallet backup via cloud backup, make sure the user knows what
 
 ### Tradeoffs
 
-By not making users manually backup, you decrease the risk of self-inflicted loss of funds. Cloud backups put less pressure and responsibility on the user.
+By not making users manually backup, you decrease the risk of self-inflicted loss of funds. Automatic cloud backups put less pressure and responsibility on the user.
 
 While this is an easier way for users to set up a wallet, it brings in the potential threat of malicious third-party access. If a user's cloud account is hacked, their funds could be compromised. This can be mitigated by encrypting the wallet recovery data before sending it to the cloud provider. However, the user could still lose access to funds if they forget their cloud login information or the cloud provider blocks their access.
 

guide/onboarding/cloud-backup.md

@@ -4,6 +4,10 @@
 
 layout: home
 permalink: /
+video: /assets/images/bitcoin-design-preview.mp4
+videoType: 'video/mp4'
+videoWidth: 1600
+videoHeight: 840
 ---
 
 ## We are helping make [Bitcoin](https://bitcoin.org) more intuitive and accessible.