Merge branch 'master' into woocommerce_update

Author: hpowernl

debian/changelog

@@ -1,4 +1,4 @@
-hndocsnext (20240226.125510) UNRELEASED; urgency=medium
+hndocsnext (20240607.131443) UNRELEASED; urgency=medium
 
   [ Rick van de Loo ]
   * Initial packaging
@@ -528,4 +528,99 @@ hndocsnext (20240226.125510) UNRELEASED; urgency=medium
   * docs/conf: Enable PHP inline highlighting
   * docs/static: Change pygments block prompt color
 
- -- Hypernode team <hypernode@byte.nl>  Mon, 26 Feb 2024 12:55:24 +0000
+  [ Rolf van de Bovenkamp ]
+  *  Change old nameserver from byte to Hypernode
+
+  [ Marvin Sanders ]
+  * change the comand to underscore
+
+  [ Niuta Godlewska ]
+  * remove Service Panel sections, update new SSH keys steps
+  * merge master branch
+  * mdformat
+  * remove notexisting link in other doc
+
+  [ Marvin Sanders ]
+  * added url and IP whitelist
+  * Fix the Markdown
+
+  [ Nick ]
+  * Create Hipex to Hypernode migration 2024 FAQ (Dutch)
+
+  [ Rick van de Loo ]
+  * mdformat basic auth page
+
+  [ Timon de Groot ]
+  * Fix formatting for nginx dev plan basic auth doc
+
+  [ Nick ]
+  * Update Hipex to Hypernode migration 2024 FAQ (Dutch)
+  * Update Hipex to Hypernode migration 2024 FAQ (Dutch)
+  * Update Hipex to Hypernode migration 2024 FAQ (Dutch)
+
+  [ Timon de Groot ]
+  * Fix formatting for hipex to hypernode faq
+
+  [ Burak ]
+  * Revert "DO NOT MERGE BEFORE SSH KEY RELEASE: remove Service Panel sections, update new SSH keys steps"
+  * Revert "Revert "DO NOT MERGE BEFORE SSH KEY RELEASE: remove Service Panel sections, update new SSH keys steps""
+
+  [ Niuta Godlewska ]
+  * recommit
+  * md format
+  * change relative path for images
+
+  [ Cipriano Groenendal ]
+  * Update responsible-disclosure-policy.md
+
+  [ ikidnapmyself ]
+  * delete AWS plans from brancher docs
+
+  [ Willem de Groot ]
+  * Update supported-php-versions-and-how-to-change-them-on-hypernode.md
+
+  [ Rick van de Loo ]
+  * add missing whitespace in php settings page
+
+  [ ikidnapmyself ]
+  * Akeneo 7.x docs
+  * delete 6x ref
+  * fix format
+  * revert redirect_from
+
+  [ Niuta Godlewska ]
+  * trim fix
+  * fix trim
+  * fix trim
+  * mdformat all
+  * fix trim
+  * fix hrefs in settings.md
+  * correct consecutive headers for vpn
+  * correct names, remove duplicated hypernode docker doc
+  * correct url for vpn
+  * correct redirects
+  * md format
+  * delete all api docs so we can just redirect to api.hypernode.com
+  * add redirect urls without hash
+
+  [ Niutah ]
+  * Update docs/hypernode-platform/vpn/hypernode-vpn.md
+
+  [ ikidnapmyself ]
+  * Update cron jobs in accordance with the official documentation
+
+  [ Hritik Kothari ]
+  * Update autoscaling docs
+  * Update docs/hypernode-platform/autoscaling/how-to-enable-autoscaling.md
+
+  [ Martijn ]
+  * Documentation how to use alternative PHP versions
+  * Mark codeblock as bash
+  * Remove redirect_from
+  * Renamed to alternative-php-versions
+  * Fix documents heading start
+
+  [ Timon de Groot ]
+  * Fix formatting for how-to-use-alternative-php-versions.md
+
+ -- Hypernode team <hypernode@byte.nl>  Fri, 07 Jun 2024 13:14:56 +0000

docs/about-hypernode/billing/_res/4tWafqDklisEwVNRFCA8VVvhf0zHkYMi1A.png

@@ -32,37 +32,6 @@ Our Control Panel supports two different payment methods: credit card and SEPA D
 - Select **Billing portal** from the menu.
 - Click **Billing History** to see your invoices.
 
-## How to Change Your Plan
-
-If you log in via [my.hypernode.com](https://auth.hypernode.com/), please use the steps below to change your plan via the Control Panel:
-
-- Log into your Control Panel via [my.hypernode.com](http://my.hypernode.com)
-- There are two ways to go the **Change plan** page:
-  - Go to the**Change plan** page by selecting it from the sidebar on the left. Move your mouse over **Hypernodes** to make the menu appear:
-    ![](_res/YqbbPnc1vfVsic4Kn0_vQRU6kipJ9FLviw.png)
-  - Or click **Change your plan** in the Hypernode overview:
-    ![](_res/4tWafqDklisEwVNRFCA8VVvhf0zHkYMi1A.png)
-- You'll now see an overview of your current plan on the left and the new plan on the right:
-  ![](_res/tkmbOB9hsfJ0SfLR-TNCFtKqzRNgC6bvmA.png)
-- Select the desired plan and the type of environment, Development or Production.
-- Select an add-on. Read more about our two SLA levels [here](../support/emergency-support-outside-office-hours.md).
-- Agree with terms and conditions and click **Change** to change this plan. Your plan will be changed immediately.
-- Warnings, if applicable, will be shown on the left.
-
-## How to Cancel Your Plan
-
-- Log in to the [Control Panel](https://my.hypernode.com/).
-- Click on your username in the top right.
-- Select **Billing portal** from the menu.
-- In the Billing portal, select your current plan.
-- Then click on **Cancel subscription**.
-- The next screen confirms when your subscription will end. Please submit the reason of your cancellation as your feedback is valuable to us.
-- Click on **Confirm cancellation** to finalise your cancellation.
-
-### Cancellation Per End Date
-
-You can cancel your subscription at any time via your control panel. The end date of your subscription is always the first of the next month. Example: if you cancel your subscription on the 15th of June, your Hypernode will be no longer available from the 1st of July onwards.
-
 ## How to Add a Purchase Order Number
 
 You can add or update the PO Number while

docs/about-hypernode/billing/_res/J2LXr0iR8Fg8wtsuwv9-NzosfF82clh05A.png

@@ -83,4 +83,4 @@ Jazeker, het mail adres die je bij **Billing & Shipping Addresses**gebruiken wij
 
 ## Wat als ik verder nog vragen heb?
 
-Zet je vraag graag op de mail naar [billling@hypernode.com](mailto:billling@hypernode.com), je kunt ons ook telefonisch benaderen voor vraagstukken maar gezien vragen over facturatie nog best vaak wat uitzoekwerk vergt nemen we liever graag de tijd om hier goed in te duiken, en dit gaat simpelweg makkelijker via e-mail. Je kunt in meeste gevallen verwachten dat wij binnen 1 werkdag reageren.
+Zet je vraag graag op de mail naar [billing@hypernode.com](mailto:billing@hypernode.com), je kunt ons ook telefonisch benaderen voor vraagstukken maar gezien vragen over facturatie nog best vaak wat uitzoekwerk vergt nemen we liever graag de tijd om hier goed in te duiken, en dit gaat simpelweg makkelijker via e-mail. Je kunt in meeste gevallen verwachten dat wij binnen 1 werkdag reageren.

docs/about-hypernode/billing/_res/YqbbPnc1vfVsic4Kn0_vQRU6kipJ9FLviw.png

@@ -14,34 +14,38 @@ redirect_from:
 
 You can cancel your subscription at any time you want. Your cancellation will be processed automatically
 
-## How to Cancel Your Plan If You Are a Control Panel User
+## How to Cancel Your Plan
 
-- Log into your Control Panel via [my.hypernode.com](http://my.hypernode.com)
-- Hover over your name in the upper right corner and go to the Billing portal
+- Log in to the [Control Panel](https://my.hypernode.com/).
+- Go to **settings** of the Hypernode you want to cancel.
+- Scroll down to **Cancel my subscription**
+- The next screen confirms that your subscription will end. Please submit the reason of your cancellation as your feedback is valuable to us.
+- Click on **Continue to cancellation** to confirm the ending date of your subscription.
 
-![](_res/6NwyUzGXOzfpv38Tv572P38BUVR-Fk4nnQ.png)
+### Cancellation Per End Date
 
-- On the Billing portal, select your current plan.
-- Then click on Cancel subscription.
+You can cancel your subscription at any time via your Control Panel. The end date of your subscription is always the first of the next month. Example: if you cancel your subscription on the 15th of June, your Hypernode will be no longer available from the 1st of July onwards.
 
-![](_res/_m2Tv_dKF0Q884I06cNjymK0XM8wvshksw.png)
+## How to Undo Cancelling Your Plan
 
-- The next screen confirms when your subscription will end. Please submit the reason of your cancellation as your feedback is valuable to us.
-- Click on Confirm cancellation to finalise your cancellation.
+If you want to undo the cancellation you can do it till the end of the month after cancelling your plan. In order to cancel your cancellation follow the steps below.
 
-### Cancellation Per End Date
+- Log in to the [Control Panel](https://my.hypernode.com/).
+- Go to **settings** of the Hypernode you cancelled.
+- At the top of the screen press **Undo cancellation now**
+- Your subscription will be revived immediately, subscription will continue and backups won't be destroyed.
 
-You can cancel your subscription at any time via your control panel. The end date of your subscription is always the first of the next month. Example: if you cancel your subscription on the 15th of June, your Hypernode will be no longer available from the 1st of July onwards.
+![undo cancellation](_res/asdhbrthbq3rwgbqeqrq.png)
 
-## How to Cancel Your Domain If You Are a Control Panel User
+## How to Cancel Your Domain
 
 - Log into your Control Panel via [my.hypernode.com](http://my.hypernode.com/)
 - Click on **Domains** in the sidebar.
 
 ![](_res/J2LXr0iR8Fg8wtsuwv9-NzosfF82clh05A.png)
 
 - Select the domain by clicking it which you want to cancel or transfer.
-- At **Authorisation code** click on **here**.
+- At **Authorisation code** click on **cancel your domain**.
 
 ![](_res/wg0rB2wf96--Cj5X1MZ4p-CHVCwhkY3e2A.png)
 

docs/about-hypernode/billing/_res/asdhbrthbq3rwgbqeqrq.png

@@ -0,0 +1,43 @@
+---
+myst:
+  html_meta:
+    description: Answers to frequently asked questions regarding GDPR & UK regulations.
+    title: Data Protection FAQ for merchants
+redirect_from:
+  - /en/about/security/hypernode-dataprotection-faq
+---
+
+# Data Protection FAQ for merchants
+
+## Does a change in (data) storage location, outside the EU impact me and / or my clients?
+
+No, The European Union's General Data Protection Regulation (GDPR) imposes strict requirements
+on the transfer of personal data outside of the EU. Some of our products will now be provided by
+one of our UK team.blue group companies. Transferring data to the UK requires ensuring that the
+UK provides an adequate level of data protection. We ensure that our Client’s data will be
+protected in accordance with applicable laws and regulations, and that appropriate security
+measures are in place to safeguard the data.
+
+## Does a change in (data) storage location from the EU to the UK impact the way data is being handled / processed?
+
+No. From 31 December 2020, the UK ceased to be a member of the EU. There may be
+circumstances, depending on your location, where your Personal Data is transferred from the EU to
+the UK. We will ensure a similar degree of protection is afforded to your Personal Data by ensuring
+at least one of the approved safeguards are implemented and ensure that your Personal Data is
+treated securely and protected against unauthorized loss or damage.
+The team.blue group can improve coordination and resource allocation by sharing data internally.
+This allows for more efficient collaboration on products.
+
+## Should merchants change their own terms/policies on their websites because the data will be stored outside the EU?
+
+Our Clients use the services to host, transmit or process data to our hosting platform and this
+information may include personal data that allows their own customers to be identified. We refer to
+this type of data as "Client Customer Data".
+We only have a business or contractual relationship with our Clients and have no direct
+relationship with the individuals categorized as Client Customer Data.
+As a merchant, you retain responsibility for compliance with relevant data protection legislation,
+which includes setting standards and maintaining security standards/transparency to ensure the
+security of all data you upload to our platform.
+As with any changes to our Terms and Conditions, we advise you to revise your contracts and
+assess whether you remain compliant with relevant data protection legislation for your Customer
+Data.