From b243d4302882f77064ab418f131245bcf7c7f05c Mon Sep 17 00:00:00 2001 From: Andrew Godwin Date: Sat, 17 Dec 2022 15:26:36 -0700 Subject: [PATCH] Expand more on flagship info --- .../privacy.md => privacy/index.md} | 14 +++++---- content/takahesocial/index.md | 29 ++++++++++++++++++- .../{takahesocial/terms.md => terms/index.md} | 15 ++++++---- 3 files changed, 47 insertions(+), 11 deletions(-) rename content/{takahesocial/privacy.md => privacy/index.md} (98%) rename content/{takahesocial/terms.md => terms/index.md} (96%) diff --git a/content/takahesocial/privacy.md b/content/privacy/index.md similarity index 98% rename from content/takahesocial/privacy.md rename to content/privacy/index.md index a4b096e..0a9f8ac 100644 --- a/content/takahesocial/privacy.md +++ b/content/privacy/index.md @@ -1,8 +1,12 @@ +--- +title: Privacy Policy +--- + *Last updated December 16, 2022* This privacy notice for Scaled Industries, Ltd. ("Company," "we," "us," or "our"), describes how and why we might collect, store, use, and/or share ("process") your information when you use our services ("Services"), such as when you: -* Visit our website at https://takahe.social, or any website of ours that links to this privacy notice +* Visit our websites at https://takahe.social, https://jointakahe.org, or any website of ours that links to this privacy notice * Engage with us in other related ways, including any sales, marketing, or events Questions or concerns? Reading this privacy notice will help you understand your privacy rights and choices. If you do not agree with our policies and practices, please do not use our Services. If you still have any questions or concerns, please contact us at legal@scaledindustries.com. @@ -163,10 +167,10 @@ We may update this privacy notice from time to time. The updated version will be If you have questions or comments about this notice, you may email us at legal@scaledindustries.com or by post to: -Scaled Industries, Ltd. -4890 Ironton St Unit 6D -Denver, CO 80239 -United States + Scaled Industries, Ltd. + 4890 Ironton St Unit 6D + Denver, CO 80239 + United States # 14. HOW CAN YOU REVIEW, UPDATE, OR DELETE THE DATA WE COLLECT FROM YOU? diff --git a/content/takahesocial/index.md b/content/takahesocial/index.md index 9d82d79..418fdda 100644 --- a/content/takahesocial/index.md +++ b/content/takahesocial/index.md @@ -34,7 +34,34 @@ All users of takahe.social must abide by the project's [Code of Conduct](/conduct/). Please use the "report" feature to send any posts that do not agree with the Code of Conduct into the moderation queue. -The server also has additional [Terms of Service](https://takahe.social/pages/terms/) +The server also has additional [Terms of Service](/terms/) that you must agree to to create and continue using an account. Among other things, copyrighted content not covered under Fair Use and illegal content is strictly forbidden. + + +## What Doesn't Work Yet + +The current features are not yet implemented: + +* Uploading video or animated GIFs +* Manual follower approval rather than automatic +* Seeing, creating, and responding to polls +* Moving accounts to/from other servers +* Account deletion (we will honour GDPR/etc. requests via manual deletion) +* Filters +* Image focal point selection + + +## Custom Domains + +While custom domains are a feature of Takahē, we will be limiting +them, at least initially, on takahe.social. If you'd like to set up a custom +domain, please email contact@jointakahe.org. + + +## Client Apps + +While Takahē now has initial support for client applications that support the +Mastodon API, we don't have the ability to test on every application and so +we particularly value feedback about what apps work and which ones do not. diff --git a/content/takahesocial/terms.md b/content/terms/index.md similarity index 96% rename from content/takahesocial/terms.md rename to content/terms/index.md index 4e8d170..4cac0ff 100644 --- a/content/takahesocial/terms.md +++ b/content/terms/index.md @@ -1,3 +1,6 @@ +--- +title: Terms of Service +--- *Last updated December 16, 2022* TABLE OF CONTENTS @@ -32,7 +35,7 @@ TABLE OF CONTENTS ## 1. AGREEMENT TO TERMS -These Terms of Use constitute a legally binding agreement made between you, whether personally or on behalf of an entity (“you”) and Scaled Industries, Ltd. ("Company," “we," “us," or “our”), concerning your access to and use of the takahe.social website as well as any other media form, media channel, mobile website or mobile application related, linked, or otherwise connected thereto (collectively, the “Site”). We are registered in Colorado, United States and have our registered office at 4890 Ironton St Unit 6D, Denver, CO 80239. You agree that by accessing the Site, you have read, understood, and agreed to be bound by all of these Terms of Use. IF YOU DO NOT AGREE WITH ALL OF THESE TERMS OF USE, THEN YOU ARE EXPRESSLY PROHIBITED FROM USING THE SITE AND YOU MUST DISCONTINUE USE IMMEDIATELY. +These Terms of Use constitute a legally binding agreement made between you, whether personally or on behalf of an entity (“you”) and Scaled Industries, Ltd. ("Company," “we," “us," or “our”), concerning your access to and use of the takahe.social and jointakahe.org websites as well as any other media form, media channel, mobile website or mobile application related, linked, or otherwise connected thereto (collectively, the “Site”). We are registered in Colorado, United States and have our registered office at 4890 Ironton St Unit 6D, Denver, CO 80239. You agree that by accessing the Site, you have read, understood, and agreed to be bound by all of these Terms of Use. IF YOU DO NOT AGREE WITH ALL OF THESE TERMS OF USE, THEN YOU ARE EXPRESSLY PROHIBITED FROM USING THE SITE AND YOU MUST DISCONTINUE USE IMMEDIATELY. Supplemental terms and conditions or documents that may be posted on the Site from time to time are hereby expressly incorporated herein by reference. We reserve the right, in our sole discretion, to make changes or modifications to these Terms of Use from time to time. We will alert you about any changes by updating the “Last updated” date of these Terms of Use, and you waive any right to receive specific notice of each such change. Please ensure that you check the applicable Terms every time you use our Site so that you understand which Terms apply. You will be subject to, and will be deemed to have been made aware of and to have accepted, the changes in any revised Terms of Use by your continued use of the Site after the date such revised Terms of Use are posted. @@ -144,7 +147,7 @@ We reserve the right, but not the obligation, to: (1) monitor the Site for viola ## 12. PRIVACY POLICY -We care about data privacy and security. Please review our Privacy Policy: https://takahe.social/pages/privacy/. By using the Site, you agree to be bound by our Privacy Policy, which is incorporated into these Terms of Use. Please be advised the Site is hosted in the United States. If you access the Site from any other region of the world with laws or other requirements governing personal data collection, use, or disclosure that differ from applicable laws in the United States, then through your continued use of the Site, you are transferring your data to the United States, and you agree to have your data transferred to and processed in the United States. +We care about data privacy and security. Please review our Privacy Policy: https://jointakahe.org/privacy/. By using the Site, you agree to be bound by our Privacy Policy, which is incorporated into these Terms of Use. Please be advised the Site is hosted in the United States. If you access the Site from any other region of the world with laws or other requirements governing personal data collection, use, or disclosure that differ from applicable laws in the United States, then through your continued use of the Site, you are transferring your data to the United States, and you agree to have your data transferred to and processed in the United States. ## 13. DIGITAL MILLENNIUM COPYRIGHT ACT (DMCA) NOTICE AND POLICY @@ -254,11 +257,13 @@ These Terms of Use and any policies or operating rules posted by us on the Site ## 26. CONTACT US -In order to resolve a complaint regarding the Site or to receive further information regarding use of the Site, please contact us at: +In order to resolve a complaint regarding the Site or to receive further information regarding use of the Site, please email us at: + + legal@scaledindustries.com + +Or by mail at: Scaled Industries, Ltd. 4890 Ironton St Unit 6D Denver, CO 80239 United States - Phone: 7207402803 - legal@scaledindustries.com