From 3727831709f2dc2872c69e92b0733634903f4893 Mon Sep 17 00:00:00 2001 From: kristof de spiegeleer Date: Fri, 21 Jun 2024 06:53:21 +0300 Subject: [PATCH 1/2] s --- src/pages/farming.astro | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pages/farming.astro b/src/pages/farming.astro index a20fadb..4cacc94 100644 --- a/src/pages/farming.astro +++ b/src/pages/farming.astro @@ -43,13 +43,13 @@ const metadata = { period: 'per node', items: [ { - description: '32 GB of Memory', + description: '16 GB of Memory', }, { - description: '2,000 GB of SSD', + description: '1,000 GB of SSD', }, { - description: '8 Logical CPU Cores', + description: '4 Logical CPU Cores', }, { description: 'Up to 1,500 INCA/month for utilization.', -- 2.40.1 From dd49d98cd3588049db82e377aa221a25c8350900 Mon Sep 17 00:00:00 2001 From: Mik-TF Date: Tue, 25 Jun 2024 14:28:41 -0400 Subject: [PATCH 2/2] updated legal --- src/pages/privacy.md | 16 ++++++++++++++-- src/pages/terms.md | 12 ++++++------ 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/src/pages/privacy.md b/src/pages/privacy.md index 0592bc4..4df125a 100644 --- a/src/pages/privacy.md +++ b/src/pages/privacy.md @@ -3,7 +3,15 @@ title: 'Privacy Policy' layout: '~/layouts/MarkdownLayout.astro' --- -*This privacy policy will explain how ThreeFold Movement ("companies", "we", or "us") uses the personal data we collect from you when you use our websites, including the Project INCA website.* +This privacy policy will explain how INCA, doing business as INCA or, as the case may be “ThreeFold” or ThreeFold DMCC (“INCA“, “we”, “us”, or “our”), concerning your access to and use of any of the following INCA related websites: The project INCA website or ThreeFold websites/wikis/forums, including without limitation any sites such as https://internetcapacity.org, https://threefold.io, https://threefold.me, https://grid.tf, https://threefold.tech, https://freeflownation.org, https://3bot.org, https://incubaid.com or https://consciousinternet.org or any other website as used/promoted by the ThreeFold Foundation or any other site as originating from our open-source git repositories on https://github.com/threefoldfoundation, https://github.com/threefoldtech and https://git.ourworld.tf/tfgrid, as well as any other media form, media channel, forum, mobile website or mobile application related, linked, or otherwise connected thereto (collectively, the “Site”). + +We use the personal data we collect from you when you use our websites, including the Project INCA website. + +

ThreeFold DMCC
+Unit No: BA1120 DMCC Business Centre, Level No 1,
+Jewellery & Gemplex 3,
+Dubai,
+United Arab Emirates

### What data do we collect? @@ -112,4 +120,8 @@ We keep our privacy policy under regular review and places any updates on this w If you have any questions about our privacy policy, the data we hold on you, or you would like to exercise one of your data protection rights, please do not hesitate to contact us. -Email us at: dataprivacy@threefold.io \ No newline at end of file +

ThreeFold DMCC
+Unit No: BA1120 DMCC Business Centre, Level No 1,
+Jewellery & Gemplex 3,
+Dubai,
+United Arab Emirates
dataprivacy@threefold.io

diff --git a/src/pages/terms.md b/src/pages/terms.md index e2d5c9d..b0975a3 100644 --- a/src/pages/terms.md +++ b/src/pages/terms.md @@ -3,9 +3,7 @@ title: 'Terms and Conditions' layout: '~/layouts/MarkdownLayout.astro' --- -These Terms of Use constitute a legally binding agreement made between you, whether personally or on behalf of an entity (“you”) and ThreeFold, doing business as ThreeFold (“ThreeFold“, “we”, “us”, or “our”), concerning your access to and use of the threefold related websites: - -The project INCA website, websites/wikis/forums ending with threefold.io, threefold.me, grid.tf, threefold.tech, TFT.com, freeflownation.org, 3bot.org, incubaid.com or consciousinternet.org or any other website as used/promoted by the ThreeFold Foundation or any other site as originating from our open-source git repository on https://github.com/threefoldfoundation, as well as any other media form, media channel, forum, mobile website or mobile application related, linked, or otherwise connected thereto (collectively, the “Site”). +These Terms of Use constitute a legally binding agreement made between you, whether personally or on behalf of an entity (“you”) and INCA, doing business as INCA or, as the case may be “ThreeFold” or ThreeFold DMCC (“INCA“, “we”, “us”, or “our”), concerning your access to and use of any of the following INCA related websites: The project INCA website or ThreeFold websites/wikis/forums, including without limitation any sites such as www.https://internetcapacity.org, https://threefold.io, https://threefold.me, https://grid.tf, https://threefold.tech, https://freeflownation.org, https://3bot.org, https://incubaid.com or https://consciousinternet.org or any other website as used/promoted by the ThreeFold Foundation or any other site as originating from our open-source git repositories on https://github.com/threefoldfoundation, https://github.com/threefoldtech and https://git.ourworld.tf/tfgrid, as well as any other media form, media channel, forum, mobile website or mobile application related, linked, or otherwise connected thereto (collectively, the “Site”). You agree that by accessing the Site, you have read, understood, and agreed to be bound by all of these Terms of Use. @@ -149,6 +147,8 @@ These Terms of Use and any policies or operating rules posted by us on the Site In order to resolve a complaint regarding the Site or to receive further information regarding use of the Site, please contact us at: -- ThreeFold FCZ -- BA1120 DMCC BUSINESS CENTRE, LEVEL NO 1, JEWELLERY & GEMPLEX 3, DUBAI, UNITED EMIRATES ARAB -- info@threefold.io \ No newline at end of file +

ThreeFold DMCC
+Unit No: BA1120 DMCC Business Centre, Level No 1,
+Jewellery & Gemplex 3,
+Dubai,
+United Arab Emirates
info@threefold.io

\ No newline at end of file -- 2.40.1