Merge branch 'master' into feature/multi-wallet-page

_compress_images_cache.yml

@@ -33,6 +33,7 @@ assets/images/contribute/contribute.jpg: contribute.jpg
 assets/images/contribute/[email protected]: [email protected]
 assets/images/contribute/design-guide.png: design-guide.png
 assets/images/contribute/designathon.png: designathon.png
+assets/images/contribute/foundation.png: foundation.png
 assets/images/contribute/hello-bitcoin.png: hello-bitcoin.png
 assets/images/contribute/joinmarket.png: joinmarket.png
 assets/images/contribute/saving-satoshi.png: saving-satoshi.png
@@ -337,11 +338,6 @@ assets/images/guide/daily-spending-wallet/backup-and-recovery/backup-recovery-im
 assets/images/guide/daily-spending-wallet/backup-and-recovery/[email protected]: [email protected]
 assets/images/guide/daily-spending-wallet/backup-and-recovery/copy-recovery-phrase.png: copy-recovery-phrase.png
 assets/images/guide/daily-spending-wallet/backup-and-recovery/[email protected]: [email protected]
-assets/images/guide/daily-spending-wallet/backup-and-recovery/manual-backup/backing-up-a-wallet-manual-mobile.png: backing-up-a-wallet-manual-mobile.png
-assets/images/guide/daily-spending-wallet/backup-and-recovery/manual-backup/[email protected]: [email protected]
-assets/images/guide/daily-spending-wallet/backup-and-recovery/manual-backup/backing-up-a-wallet-manual-preview.png: backing-up-a-wallet-manual-preview.png
-assets/images/guide/daily-spending-wallet/backup-and-recovery/manual-backup/backing-up-a-wallet-manual.png: backing-up-a-wallet-manual.png
-assets/images/guide/daily-spending-wallet/backup-and-recovery/manual-backup/[email protected]: [email protected]
 assets/images/guide/daily-spending-wallet/backup-and-recovery/manual-backup/confirm-recovery-phrase-columns.png: confirm-recovery-phrase-columns.png
 assets/images/guide/daily-spending-wallet/backup-and-recovery/manual-backup/[email protected]: [email protected]
 assets/images/guide/daily-spending-wallet/backup-and-recovery/manual-backup/confirm-recovery-phrase-entry.png: confirm-recovery-phrase-entry.png
@@ -368,12 +364,15 @@ assets/images/guide/daily-spending-wallet/backup-and-recovery/manual-backup/manu
 assets/images/guide/daily-spending-wallet/backup-and-recovery/manual-backup/manual-backup-complete-full.png: manual-backup-complete-full.png
 assets/images/guide/daily-spending-wallet/backup-and-recovery/manual-backup/manual-backup-complete.png: manual-backup-complete.png
 assets/images/guide/daily-spending-wallet/backup-and-recovery/manual-backup/[email protected]: [email protected]
+assets/images/guide/daily-spending-wallet/backup-and-recovery/manual-backup/manual-backup-mobile.jpg: manual-backup-mobile.jpg
+assets/images/guide/daily-spending-wallet/backup-and-recovery/manual-backup/[email protected]: [email protected]
 assets/images/guide/daily-spending-wallet/backup-and-recovery/manual-backup/manual-backup-next-steps-full.png: manual-backup-next-steps-full.png
 assets/images/guide/daily-spending-wallet/backup-and-recovery/manual-backup/manual-backup-next-steps.png: manual-backup-next-steps.png
 assets/images/guide/daily-spending-wallet/backup-and-recovery/manual-backup/[email protected]: [email protected]
 assets/images/guide/daily-spending-wallet/backup-and-recovery/manual-backup/manual-backup-notes-full.png: manual-backup-notes-full.png
 assets/images/guide/daily-spending-wallet/backup-and-recovery/manual-backup/manual-backup-notes.png: manual-backup-notes.png
 assets/images/guide/daily-spending-wallet/backup-and-recovery/manual-backup/[email protected]: [email protected]
+assets/images/guide/daily-spending-wallet/backup-and-recovery/manual-backup/manual-backup-preview.jpg: manual-backup-preview.jpg
 assets/images/guide/daily-spending-wallet/backup-and-recovery/manual-backup/manual-backup-print-detail-full.png: manual-backup-print-detail-full.png
 assets/images/guide/daily-spending-wallet/backup-and-recovery/manual-backup/manual-backup-print-detail.png: manual-backup-print-detail.png
 assets/images/guide/daily-spending-wallet/backup-and-recovery/manual-backup/[email protected]: [email protected]
@@ -401,6 +400,8 @@ assets/images/guide/daily-spending-wallet/backup-and-recovery/manual-backup/manu
 assets/images/guide/daily-spending-wallet/backup-and-recovery/manual-backup/manual-backup-validation-start-full.png: manual-backup-validation-start-full.png
 assets/images/guide/daily-spending-wallet/backup-and-recovery/manual-backup/manual-backup-validation-start.png: manual-backup-validation-start.png
 assets/images/guide/daily-spending-wallet/backup-and-recovery/manual-backup/[email protected]: [email protected]
+assets/images/guide/daily-spending-wallet/backup-and-recovery/manual-backup/manual-backup.jpg: manual-backup.jpg
+assets/images/guide/daily-spending-wallet/backup-and-recovery/manual-backup/[email protected]: [email protected]
 assets/images/guide/daily-spending-wallet/backup-and-recovery/recovery/import-options.png: import-options.png
 assets/images/guide/daily-spending-wallet/backup-and-recovery/recovery/[email protected]: [email protected]
 assets/images/guide/daily-spending-wallet/backup-and-recovery/recovery/recovery-header-mobile.png: recovery-header-mobile.png
@@ -2027,6 +2028,7 @@ assets/images/guide/how-it-works/wallet-selector/wallet-selector-preview.jpg: wa
 assets/images/guide/how-it-works/wallet-selector/[email protected]: [email protected]
 assets/images/guide/how-it-works/wallet-selector/wallet-selector.jpg: wallet-selector.jpg
 assets/images/guide/how-it-works/wallet-selector/[email protected]: [email protected]
+assets/images/guide/multiple-wallets.png: multiple-wallets.png
 assets/images/guide/multiple-wallets/activity-big.png: activity-big.png
 assets/images/guide/multiple-wallets/activity-multi-select-big.png: activity-multi-select-big.png
 assets/images/guide/multiple-wallets/activity-multi-select.png: activity-multi-select.png
@@ -2114,6 +2116,7 @@ assets/images/guide/multiple-wallets/[email protected]: visual-customi
 assets/images/guide/multiple-wallets/visual-horizontal-cards-big.png: visual-horizontal-cards-big.png
 assets/images/guide/multiple-wallets/visual-horizontal-cards.png: visual-horizontal-cards.png
 assets/images/guide/multiple-wallets/[email protected]: [email protected]
+assets/images/guide/[email protected]: [email protected]
 assets/images/guide/resources/design-challenges/design-challenges-mobile.png: design-challenges-mobile.png
 assets/images/guide/resources/design-challenges/[email protected]: [email protected]
 assets/images/guide/resources/design-challenges/design-challenges-preview.jpg: design-challenges-preview.jpg
@@ -2404,5 +2407,3 @@ assets/images/social-media/social-media.jpg: social-media.jpg
 assets/images/social-media/[email protected]: [email protected]
 assets/images/submit-header-design-preview.jpg: submit-header-design-preview.jpg
 assets/mstile-150x150.png: mstile-150x150.png
-assets/images/guide/multiple-wallets.png: multiple-wallets.png
-assets/images/guide/[email protected]: [email protected]

contribute.md

@@ -58,3 +58,8 @@ Our first community project is a free, open-source repository for anyone buildin
 - Review code and content on the [Github repository](https://github.com/BitcoinDesign/Guide)
 - Read the original [project intro](https://docs.google.com/document/d/1YiYeRIybGmxmErCOI4Jc8Qajz3JGM1JYVfUtpzyCzSk/edit?usp=sharing) document
 - Watch the [How To Contribute to the Bitcoin Design Guide](https://www.youtube.com/playlist?list=PLPZzDjXV0FTZwILz4uyqiJNjUX-kHWP0k) video series
+
+## Bitcoin Design Foundation
+
+This initiative was created to ensure long-term sustainability of the efforts of the Bitcoin Design Community. The foundation engages in fundraising and accepts donations, which are then used to financially support individuals and projects for their open-source bitcoin design contributions. For more information visit the [foundation website](http://opencollective.com/bitcoin-design-foundation).
+

guide/daily-spending-wallet/backup-and-recovery/manual-backup.md

@@ -9,7 +9,7 @@ permalink: /guide/daily-spending-wallet/backup-and-recovery/manual-backup/
 redirect_from:
  - /guide/onboarding/backing-up-a-wallet/manual-backup/
 main_classes: -no-top-padding
-image: https://bitcoin.design/assets/images/guide/daily-spending-wallet/backup-and-recovery/manual-backup/backing-up-a-wallet-manual-preview.png
+image: https://bitcoin.design/assets/images/guide/daily-spending-wallet/backup-and-recovery/manual-backup/manual-backup-preview.jpg
 image_base: /assets/images/guide/daily-spending-wallet/backup-and-recovery/manual-backup/
 images_phrase:
     - file: manual-backup-choice
@@ -87,13 +87,13 @@ https://www.figma.com/file/NjtMNQiJtoVkedEHgwD0A9/BTC-DSN-Guide-Header-Images?no
 -->
 
 {% include picture.html
-   image = "/assets/images/guide/daily-spending-wallet/backup-and-recovery/manual-backup/backing-up-a-wallet-manual.png"
-   retina = "/assets/images/guide/daily-spending-wallet/backup-and-recovery/manual-backup/backing-up-a-wallet-manual@2x.png"
-   mobile = "/assets/images/guide/daily-spending-wallet/backup-and-recovery/manual-backup/backing-up-a-wallet-manual-mobile.png"
-   mobileRetina = "/assets/images/guide/daily-spending-wallet/backup-and-recovery/manual-backup/backing-up-a-wallet-manual-mobile@2x.png"
+   image = "/assets/images/guide/daily-spending-wallet/backup-and-recovery/manual-backup/manual-backup.jpg"
+   retina = "/assets/images/guide/daily-spending-wallet/backup-and-recovery/manual-backup/manual-backup@2x.jpg"
+   mobile = "/assets/images/guide/daily-spending-wallet/backup-and-recovery/manual-backup/manual-backup-mobile.jpg"
+   mobileRetina = "/assets/images/guide/daily-spending-wallet/backup-and-recovery/manual-backup/manual-backup-mobile@2x.jpg"
    alt-text = "Backing up a recovery phrase chapter header image"
    width = 1600
-   height = 600
+   height = 550
    layout = "full-width"
 %}
 

projects.md

@@ -58,6 +58,18 @@ projects:
       - name: Site
         link: https://bitcoinresearch.xyz
 
+  - name: Bitcoin Design Foundation
+    description: An initiative to make the community and its efforts sustainable.
+    image:
+      url: /assets/images/contribute/foundation.png
+      width: 75
+      height: 75
+    links:
+      - name: Website
+        link: http://opencollective.com/bitcoin-design-foundation
+      - name: Discord
+        link: https://discord.gg/V4xwxTBett
+
   - name: When Taproot
     description: Promote broader adoption of Taproot.
     image: