From 0ddc7ce21101645d5f4ace7549b921d612887e33 Mon Sep 17 00:00:00 2001 From: BitcoinMechanic Date: Mon, 28 Nov 2022 15:26:15 -0800 Subject: [PATCH 1/6] fix formatting, move naspi upgrade from DIY to upgrade --- site/source/diy.rst | 14 ++++++-------- site/source/user-manual/updating.rst | 7 +++++++ 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/site/source/diy.rst b/site/source/diy.rst index 794413d..5bcec0a 100644 --- a/site/source/diy.rst +++ b/site/source/diy.rst @@ -83,6 +83,11 @@ You can follow along with this `written guide +
+ Getting embassyOS ----------------- After building your device, you need a copy of embassyOS. @@ -109,11 +114,4 @@ Next, you'll need to flash embassyOS onto a microSD card. .. warning:: Be certain you have selected the correct target microSD card. Whatever target you select will be completely erased and replaced with embassyOS. #. Click "Flash!". You may be asked to (1) approve the unusually large disk target or (2) enter your password. Both are normal. -#. After the flash completes, you may remove the micro SD from the adapter, insert it into your Embassy's SD card slot, and continue to the :ref:`Initial Setup ` instructions. - -Upgrading from an External Drive Setup --------------------------------------- -If you already have an Embassy with an external drive, you can follow along from the `written guide appendix `_ and/or check out the video below: - - .. youtube:: 355BENA42s8 - :width: 100% +#. After the flash completes, you may remove the micro SD from the adapter, insert it into your Embassy's SD card slot, and continue to the :ref:`Initial Setup ` instructions. \ No newline at end of file diff --git a/site/source/user-manual/updating.rst b/site/source/user-manual/updating.rst index 10ad3b5..9d70102 100644 --- a/site/source/user-manual/updating.rst +++ b/site/source/user-manual/updating.rst @@ -96,3 +96,10 @@ Manual Update by Re-flashing .. figure:: /_static/images/setup/screen7-startfresh_complete.jpg :width: 60% :alt: Setup Complete + +Upgrading from an External Drive Setup +-------------------------------------- +If you already have an Embassy with an external drive, you can follow along from the `written guide appendix `_ and/or check out the video below: + + .. youtube:: 355BENA42s8 + :width: 100% From af4e832171c1ebbbeb39e0cee669abb73d8311d8 Mon Sep 17 00:00:00 2001 From: BitcoinMechanic Date: Mon, 28 Nov 2022 20:36:56 -0800 Subject: [PATCH 2/6] add new hardware upgrade page for NASPi upgraders --- site/source/user-manual/upgrade-02/index.rst | 11 +++++++++++ site/source/user-manual/upgrade-02/naspi-upgrade.rst | 10 ++++++++++ 2 files changed, 21 insertions(+) create mode 100644 site/source/user-manual/upgrade-02/naspi-upgrade.rst diff --git a/site/source/user-manual/upgrade-02/index.rst b/site/source/user-manual/upgrade-02/index.rst index 57f070e..b067997 100644 --- a/site/source/user-manual/upgrade-02/index.rst +++ b/site/source/user-manual/upgrade-02/index.rst @@ -28,6 +28,16 @@ Upgrading from 0.2.x This is for if you purchased your own hardware +.. topic-box:: + :title: Upgrade to all-in-one NASPi case + :link: naspi-upgrade + :icon: scylla-icon scylla-icon--resource-center + :class: large-5 + :anchor: Upgrade + + This is for you purchased an NASPi upgrade kit from us + + .. raw:: html @@ -38,3 +48,4 @@ Upgrading from 0.2.x Upgrade Kit DIY Hardware + NASPi upgrade \ No newline at end of file diff --git a/site/source/user-manual/upgrade-02/naspi-upgrade.rst b/site/source/user-manual/upgrade-02/naspi-upgrade.rst new file mode 100644 index 0000000..8c16e36 --- /dev/null +++ b/site/source/user-manual/upgrade-02/naspi-upgrade.rst @@ -0,0 +1,10 @@ +.. _naspi-upgrade: + +====================================== +Upgrading from an External Drive Setup +====================================== + +If you already have an Embassy with an external drive, you can follow along from the `written guide appendix `_ and/or check out the video below: + + .. youtube:: 355BENA42s8 + :width: 100% \ No newline at end of file From 228dfcb6fe0040704fec18756ac37b93476663b6 Mon Sep 17 00:00:00 2001 From: BitcoinMechanic Date: Mon, 28 Nov 2022 20:39:58 -0800 Subject: [PATCH 3/6] remove naspi instructions from updating.rst --- site/source/user-manual/updating.rst | 7 ------- 1 file changed, 7 deletions(-) diff --git a/site/source/user-manual/updating.rst b/site/source/user-manual/updating.rst index 9d70102..10ad3b5 100644 --- a/site/source/user-manual/updating.rst +++ b/site/source/user-manual/updating.rst @@ -96,10 +96,3 @@ Manual Update by Re-flashing .. figure:: /_static/images/setup/screen7-startfresh_complete.jpg :width: 60% :alt: Setup Complete - -Upgrading from an External Drive Setup --------------------------------------- -If you already have an Embassy with an external drive, you can follow along from the `written guide appendix `_ and/or check out the video below: - - .. youtube:: 355BENA42s8 - :width: 100% From 272db1311daaeed92eaf718ae558c64f57e1db2b Mon Sep 17 00:00:00 2001 From: BitcoinMechanic Date: Tue, 29 Nov 2022 12:02:31 -0800 Subject: [PATCH 4/6] change title to just upgrade hardware, change from substack to s9 forum, add note about pro, change icon --- site/source/user-manual/upgrade-02/index.rst | 25 +++++++++++++------ .../user-manual/upgrade-02/naspi-upgrade.rst | 2 +- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/site/source/user-manual/upgrade-02/index.rst b/site/source/user-manual/upgrade-02/index.rst index b067997..45e3ac7 100644 --- a/site/source/user-manual/upgrade-02/index.rst +++ b/site/source/user-manual/upgrade-02/index.rst @@ -1,8 +1,11 @@ .. _upgrade-02: -==================== -Upgrading from 0.2.x -==================== +================ +Upgrade Hardware +================ + +Embassy One +----------- .. raw:: html @@ -17,7 +20,7 @@ Upgrading from 0.2.x :class: large-5 :anchor: Upgrade - This is for if you purchased an upgrade kit from us + This is for if you purchased an upgrade kit from us to migrate from embassyOS v0.2.x to v0.3+ .. topic-box:: :title: Bring your own equipment @@ -26,22 +29,30 @@ Upgrading from 0.2.x :class: large-5 :anchor: Upgrade - This is for if you purchased your own hardware + This is for if you purchased your own hardware to migrate from embassyOS v0.2.x to v0.3+ .. topic-box:: :title: Upgrade to all-in-one NASPi case :link: naspi-upgrade - :icon: scylla-icon scylla-icon--resource-center + :icon: scylla-icon scylla-icon--home :class: large-5 :anchor: Upgrade - This is for you purchased an NASPi upgrade kit from us + This is for if you purchased a NASPi upgrade kit from us .. raw:: html + +Upgrade to Embassy Pro +---------------------- + +You can migrate from an Embassy One to an Embassy Pro simply by shutting down your Embassy One, removing the SSD and connecting it your new Embassy Pro! + +You can then migrate the data from your Embassy One to your Embassy Pro during :ref:`Initial setup. ` + .. toctree:: :maxdepth: 2 :hidden: diff --git a/site/source/user-manual/upgrade-02/naspi-upgrade.rst b/site/source/user-manual/upgrade-02/naspi-upgrade.rst index 8c16e36..fa136bf 100644 --- a/site/source/user-manual/upgrade-02/naspi-upgrade.rst +++ b/site/source/user-manual/upgrade-02/naspi-upgrade.rst @@ -4,7 +4,7 @@ Upgrading from an External Drive Setup ====================================== -If you already have an Embassy with an external drive, you can follow along from the `written guide appendix `_ and/or check out the video below: +If you already have an Embassy with an external drive, you can follow along from the `written guide appendix `_ and/or check out the video below: .. youtube:: 355BENA42s8 :width: 100% \ No newline at end of file From b9a2f426a4d87fe5a297382230c81e08961e00a9 Mon Sep 17 00:00:00 2001 From: BitcoinMechanic Date: Tue, 29 Nov 2022 13:16:19 -0800 Subject: [PATCH 5/6] spelling --- site/source/user-manual/upgrade-02/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/source/user-manual/upgrade-02/index.rst b/site/source/user-manual/upgrade-02/index.rst index 45e3ac7..5166ca9 100644 --- a/site/source/user-manual/upgrade-02/index.rst +++ b/site/source/user-manual/upgrade-02/index.rst @@ -49,7 +49,7 @@ Embassy One Upgrade to Embassy Pro ---------------------- -You can migrate from an Embassy One to an Embassy Pro simply by shutting down your Embassy One, removing the SSD and connecting it your new Embassy Pro! +You can migrate from an Embassy One to an Embassy Pro simply by shutting down your Embassy One, removing the SSD and connecting it to your new Embassy Pro! You can then migrate the data from your Embassy One to your Embassy Pro during :ref:`Initial setup. ` From c7fe4f655da9cdcd7e7a560c67caac1fd19418f2 Mon Sep 17 00:00:00 2001 From: BitcoinMechanic Date: Tue, 29 Nov 2022 13:17:21 -0800 Subject: [PATCH 6/6] rephrase --- site/source/user-manual/upgrade-02/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/source/user-manual/upgrade-02/index.rst b/site/source/user-manual/upgrade-02/index.rst index 5166ca9..bf7b09f 100644 --- a/site/source/user-manual/upgrade-02/index.rst +++ b/site/source/user-manual/upgrade-02/index.rst @@ -51,7 +51,7 @@ Upgrade to Embassy Pro You can migrate from an Embassy One to an Embassy Pro simply by shutting down your Embassy One, removing the SSD and connecting it to your new Embassy Pro! -You can then migrate the data from your Embassy One to your Embassy Pro during :ref:`Initial setup. ` +Your data will then migrate from your Embassy One to your Embassy Pro during :ref:`Initial setup. ` .. toctree:: :maxdepth: 2