Action change to Term of Use and Privacy Policy

We have added the new Terms of Use and Privacy Policy to the website and
in-line with the existing policies we state we will give 30 days notice of
change.

Note: These changes will switch to the new policies and should not be
merged until the 6th May 2021.

Signed-off-by: Martyn Welch <martyn.welch@collabora.com>

config.toml

@@ -47,8 +47,8 @@ languageCode = "en-us"
     name = "Privacy Policy"
     weight = 3
   [[menu.footer]]
-    url = "policies/general_disclaimer/"
-    name = "Disclaimer"
+    url = "policies/terms_of_use/"
+    name = "Terms of Use"
     weight = 4
   [[menu.footer]]
     url = "policies/code_of_conduct/"

content/_index.md

@@ -22,13 +22,6 @@ aliases = [
 ]
 +++
 
-{{% notice info %}}
-The Apertis privacy policy and terms and conditions are changing on the
-**6 May 2021**. Please see the
-[Apertis Privacy Policy & Terms of Use Update page]({{< ref "conditions_change.md" >}})
-for more information.
-{{% /notice %}}
-
 Apertis is a versatile
 [open source infrastructure]({{< ref "platform-guide.md" >}}) tailored to the
 automotive needs and fit for a wide variety of electronic devices.  Security

content/guides/development_process.md

@@ -27,7 +27,7 @@ detailed below.
 
 {{% notice note %}}
 By creating an account you signify that you accept the Apertis
-[Privacy Policy]({{< ref "new_privacy_policy" >}}) and
+[Privacy Policy]({{< ref "privacy_policy" >}}) and
 [Terms of Use]({{% ref "terms_of_use.md" %}})
 {{% /notice %}}
 

content/policies/conditions_change.md

-+++
-date = "2021-04-05"
-weight = 100
-
-title = "Apertis Privacy Policy & Terms of Use Update"
-+++
-
-The Apertis project is opening up!
-
-We are planning to open registration on the Apertis
-[GitLab Repository](https://gitlab.apertis.org), as part of this we need to
-update our [privacy policy]({{< ref "privacy_policy.md" >}}) and other
-conditions.
-
-As a result of these changes, and inline with our policies regarding changes to
-the privacy policy, we are highlighting the following changes to the privacy
-policy that we intend to implement on **6 May 2021**.
-
-## Highlevel Changes:
-
-- We will be replacing the [privacy policy]({{< ref "privacy_policy.md" >}})
-  with a [new privacy policy]({{< ref "new_privacy_policy.md" >}}).
-- We will be adding a new set of [Terms of Use]({{< ref "terms_of_use.md" >}})
-  that will replace the current
-  [general disclaimer]({{< ref "general_disclaimer.md" >}}) and
-  [copyrights]({{< ref "copyrights.md" >}}).
-
-## Privacy Policy
-
-The existing [privacy policy]({{< ref "privacy_policy.md" >}}) was written
-when Apertis provided a Mediawiki based website. This was removed some time
-ago and whilst small changes were made to make it more relevant to the
-Apertis services provided today, it does not meet our requirements,
-specifically around topics like GDPR compliance. As a result, the document is
-being replaced with the
-[new privacy policy]({{< ref "new_privacy_policy.md" >}}).
-
-## Terms of use
-
-The current website contains a
-[general disclaimer]({{< ref "general_disclaimer.md" >}})  and a
-[copyright]({{< ref "copyrights.md" >}}) document. These cover some of the
-topics that typically get included in Terms of Use, however the Apertis project
-currently does not have a set of Terms of Use that are suitable to cover our
-planned opening of registration for GitLab and also suitable for the current
-services provided by Apertis. To remedy this, the above two documents will be
-removed and replaced by a single set of
-[Terms of Use]({{< ref "terms_of_use.md" >}}) to cover all Apertis services.
-

content/policies/contributions.md

@@ -462,7 +462,7 @@ Accounts on the Apertis GitLab instance can are available via
 
 {{% notice note %}}
 By creating an account you signify that you accept the Apertis
-[Privacy Policy]({{< ref "new_privacy_policy" >}}) and
+[Privacy Policy]({{< ref "privacy_policy" >}}) and
 [Terms of Use]({{% ref "terms_of_use.md" %}})
 {{% /notice %}}
 

content/policies/general_disclaimer.md

-+++
-date = "2015-11-02"
-weight = 100
-
-title = "General disclaimer"
-
-aliases = [
-    "/old-wiki/Apertis:General_disclaimer"
-]
-+++
-
-The Apertis website has recently transitioned from a wiki (an online
-open-content collaborative resource) to a statically generated site. A lot of
-the content provided by this site was generated whilst it was a wiki, this
-means:
-
-## No formal peer review
-
-Our active community of editors used tools such as the `Recentchanges` and
-`Newpages` feeds to monitor new and changing content. However, Apertis is not
-uniformly peer reviewed; while readers may correct errors or engage in casual
-peer review, they have no legal duty to do so and thus all information read
-here is without any implied warranty of fitness for any purpose or use
-whatsoever. Even articles that have been vetted by informal peer review
-processes may later have been edited inappropriately.
-
-**None of the contributors, sponsors, administrators or anyone else
-connected with Apertis in any way whatsoever can be responsible for the
-appearance of any inaccurate or libelous information or for your use of
-the information contained in or linked from these web pages.**
-
-## No contract; limited license
-
-Please make sure that you understand that the information provided here
-is being provided freely, and that no kind of agreement or contract is
-created between you and the owners or users of this site, the owners of
-the servers upon which it is housed, the individual Apetis contributors,
-any project administrators, sysops or anyone else who is in *any way
-connected* with this project or partner projects subject to your claims
-against them directly. You are being granted a limited license to copy
-anything from this site; it does not create or imply any contractual or
-extracontractual liability on the part of Apertis or any of its agents,
-members, organizers or other users.
-
-There is **no agreement or understanding between you and Apertis**
-regarding your use or modification of this information beyond the
-[Creative Commons Attribution-Sharealike 3.0 Unported
-License](https://creativecommons.org/licenses/by-sa/3.0/) (CC-BY-SA);
-neither is anyone at Apertis responsible should someone change, edit,
-modify or remove any information that you may post on any Apertis
-websites.
-
-## Trademarks
-
-Any of the trademarks, service marks, collective marks, design rights or
-similar rights that are mentioned, used or cited in the articles of the
-Apertis wiki are the property of their respective owners. Their use here
-does not imply that you may use them for any purpose other than for the
-same or a similar informational use as contemplated by the original
-authors of these Apertis articles under the CC-BY-SA licensing scheme.
-Unless otherwise stated Apertis and Apertis sites are neither endorsed
-by nor affiliated with any of the holders of any such rights and as such
-Apertis cannot grant any rights to use any otherwise protected
-materials. Your use of any such or similar incorporeal property is at
-your own risk.
-
-## Credits
-
-*The first version of this page was based on
-<https://en.wikipedia.org/wiki/Wikipedia:General_disclaimer>*

content/policies/new_privacy_policy.md

-+++
-date = "2015-11-05"
-lastmod= "2021-04-05"
-weight = 100
-toc = true
-
-title = "Privacy Policy"
-
-aliases = [
-    "/old-wiki/Apertis:Privacy_policy"
-]
-+++
-
-{{% notice info %}}
-This page contains the new Privacy Policy that will become effective as of
-**6 May 2021**. Please see the
-[Apertis Privacy Policy & Terms of Use Update page]({{< ref "conditions_change.md" >}})
-for more information.
-{{% /notice %}}
-
-# Who are we?
-
-"apertis.org" is managed and maintained by Collabora Limited. We are an IT
-global consultancy company, specialized in open source software.
-
-Our main office is in The Platinum Building, St John's Innovation Park,
-Cambridge, United Kingdom. Our registered company number is 05513718 and our
-ICO registration number is ZA229843.
-
-If you have any queries in connection with how we use your data, you can
-contact us by emailing [data@collabora.com](mailto:data@collabora.com) or
-phoning one of our offices. You can also contact our EU Representative, Olivier
-Potin, at [olivier.potin@collabora.com](mailto:olivier.potin@collabora.com).
-
-# What data do we collect about you?
-
-1. We collect and process the following data when you sign up to GitLab, in
-order to create your basic profile with GitLab, and provide the core
-functionality of our GitLab platform to you:
-
-   - Username
-   - First Name
-   - Last Name
-   - Email Address
-   - Date you joined
-   - Commit history on the platform
-   - Commit history from other other projects
-
-   We handle this data (which we refer to from now on as your **Core Account
-Data**) to perform the contract in place between us. Your Core Account Data is
-critical to us being able to manage the history of, and develop our open source
-software.
-
-   If you update your Core Account Data with us, we do not apply those changes
-retrospectively (meaning commits you make to Gitlab under an old email address
-will remain posted under that email address).
-
-   You are free to delete your GitLab account at any time, but please keep in
-mind that the right to erasure does not apply to your Core Account Data. This
-means that your history on our platform (such as your history of working on the
-GitLab software) will remain publically visible even after you delete your
-account.
-
-2. You can choose to enhance your GitLab profile and experience by:
-
-   - Following others on GitLab, and engaging with others who follow you
-   - Adding detail to your profile such as your job title, where you work, and
-     an avatar
-
-   We handle this data (which we refer to from now on as your **Additional
-Account Data**) because of our legitimate interest to build a community of
-developers who work on our platform. If you choose to delete your GitLab
-account, which you can do at any time, we will also erase your Additional
-Account Data.
-
-3. When you contribute to the GitLab project, in addition to your Core Account
-Data and any Additional Account Data you choose to provide, we collect and
-process the following data created by you, which we refer to from now on as
-your Account Activity Data:
-
-   - Issues with the software
-   - Merge requests
-   - Notes
-   - Abuse reports
-   - Award emojis
-
-   We handle this data about you under our legitimate interests to ensure the
-service we provide to you is as expected, and that we are able to take steps to
-solve any issues/ fix any bugs you highlight to us and respond to any of your
-queries.
-
-# What happens when I delete my account?
-
-When you delete your user account:
-
-- We delete your Additional Account Data.
-- Your Core Account Data is not deleted, which means any commits made by a
-  deleted user will still display your username at the time the commit was
-  made.
-
-- Your Account Activity Data is unlinked from your username, and moved to a
-  system-wide user called “Ghost User”, which acts as a container for deleted
-  records. We do this because we want to respect our users’ privacy and ensure
-  the development history of our software remains intact.
-
-# Where is your data stored?
-
-Our servers are located in the UK.
-
-# Transfer of data to third parties:
-
-No data is transferred to 3rd parties for further processing, and we do not use
-any non-essential cookies on GitLab. We use the following, essential cookies:
-
-| Cookie Name | Retention Period | Description |
-| ----------- | ---------------- | ----------- |
-| \_gitlab\_session | End of session | Tracking the user session to provide core functionality such as logging in |
-| experimentation\_subject\_id | 20 years | Utilised to perform A/B testing by the gitlab developers on the gitlab.com instance (it is not used on the Apertis instance). |
-
-Under no circumstances, does Collabora sell customer data of any kind.
-
-Please keep in mind that information you actively contribute to our GitLab
-project, including personal data, is publicly visible and can be found by
-search engines. It is also possible that a third party could decide to create a
-fork (a spin off project) that involves copying our GitLab, along with its
-development history and publically available data, and creating their own
-version of our software. With this in mind, please do not contribute any
-information that you are uncomfortable making permanently public, such as
-information revealing your real name or location in your contributions.
-
-# Retention Period:
-
-We will only retain your personal information for as long as we need it unless
-we are required to keep it for longer to comply with our legal, accounting or
-regulatory requirements. We will usually delete your personal data when you
-delete your account as described above, or 6 years after the GitLab project
-shuts down. Any data we have on any backup systems will usually be deleted
-within 6 months.
-
-In some circumstances we may carefully anonymise your personal data so that it
-can no longer be associated with you, and we may use this anonymised
-information indefinitely without notifying you. We use this anonymised
-information to analyse our programmes and support other similar programmes
-around the world.
-
-# Your Rights
-
-You have various other rights under applicable data protection laws, including
-the right to:
-
-- **access** your personal data (also known as a “subject access request”);
-- **correct** incomplete or inaccurate data we hold about you;
-- ask us to **erase** the personal data we hold about you;
-- ask us to **restrict** our handling of your personal data;
-- ask us to **transfer** your personal data to a third party; 
-- **object** to how we are using your personal data; and
-- **withdraw your consent** to us handling your personal data.
-
-You also have the right to lodge a complaint with your relevant supervisory
-authority, you can find which one applies to youi
-[here](https://ec.europa.eu/justice/article-29/structure/data-protection-authorities/index_en.htm).
-
-To exercise any of the above rights, please contact us using
-[data@collabora.com](mailto:data@collabora.com). Please keep in mind that
-privacy law is often complicated, and these rights will not be available to you
-all of the time. And in order to process your request, we may need to verify
-your identity for your security.  In such cases, we may need you to respond
-with proof of your identity.
-
-This privacy policy was last updated on 23 March 2021.

content/policies/terms_of_use.md

@@ -13,13 +13,6 @@ aliases = [
 ]
 +++
 
-{{% notice info %}}
-This page contains the new Terms of Use that will become effective as of
-**6 May 2021**. Please see the
-[Apertis Privacy Policy & Terms of Use Update page]({{< ref "conditions_change.md" >}})
-for more information.
-{{% /notice %}}
-
 **PLEASE READ THESE TERMS AND CONDITIONS CAREFULLY BEFORE USING THIS SITE**
 
 # WHAT'S IN THESE TERMS?
@@ -48,7 +41,7 @@ reference.
 These terms of use refer to the following additional terms, which also apply to
 your use of our site:
 
-- Our [Privacy Policy]({{% ref "new_privacy_policy.md" %}}), which also sets
+- Our [Privacy Policy]({{% ref "privacy_policy.md" %}}), which also sets
   out information about the cookies on our site.
 
 # WE MAY MAKE CHANGES TO THESE TERMS
@@ -244,7 +237,7 @@ us at [contact@apertis.org](mailto:contact@apertis.org).
 # HOW WE MAY USE YOUR PERSONAL INFORMATION
 
 We will only use your personal information as set out in our
-[Privacy Policy]({{% ref "new_privacy_policy.md" %}}).
+[Privacy Policy]({{% ref "privacy_policy.md" %}}).
 
 # UPLOADING CONTENT TO OUR SITE