Merge branch 'revision_2' into 'master'

Revision 2

See merge request !7

content/legal/imprint.md

@@ -10,6 +10,8 @@ _paq.push(['forgetConsentGiven']);
 
 # Responsible for the content
 
+With *content* the domain solidbase.info with the subdomains app.solidbase.info and learn.solidbase.info are named here. Responsible for content of subdomains of ld.solidbase.info is the respective user.
+
 Solidarische Landwirtschaft e.V.  
 Vorstand: Mathias von Mirbach, Dorfstr. 1a, 24568 Kattendorf  
 Steuernummer: 162 142 09938  
@@ -20,13 +22,78 @@ Gemeinnütziger Verein; Registergericht Kassel: VR 4941
 
 # Privacy Policy
 
-## Purpose of the processing
+## Solid
+
+The [SolidBase App](https://app.solidbase.info) uses [Solid](https://solid.mit.edu) to store user data. Therefore the responsibility for the data is with the [Solid server providers](https://solid.inrupt.com/get-a-solid-pod).  
+
+### inrupt.net
+
+[Inrupt](https://inrupt.com) runs a *productive* instance of the solid server prototype on https://inrupt.net. They have well elaborated [Terms of Service](https://inrupt.com/terms-of-service).
+
+### ld.solidbase.info
+
+For development and experimental use purposes we have setup a [node-solid-server](https://github.com/solid/node-solid-server) instance on https://ld.solidbase.info. It is run by [ecobytes](https://ecobytes.net) without any guarantees for long term support, in particular but  among other things  not for data stability, integrity or general persistence.
+
+Ecobytes, as in the role of service provider, can not overtake any responsibility for any user uploaded or generated content on ld.solidbase.info.
+
+#### What & why
+
+When you create a Solid Pod, Ecobytes stores the following information about you in order to provide the Service:
+
+- Your email
+- Your name
+- Data stored on your POD
+
+This information will only be used to reset your password upon your request, or to contact you in case of crucial service announcements. Your email address needs to be working to be able to reset your password.
+
+Your password is saved in hashed form. The hashed password is saved so that your identity can be verified when logging in to your Solid Pod.
+
+Your information will not be shared outside of Ecobytes and legally contracted Ecobytes service providers.
+
+Ecobytes does not use your information for providing targeted advertising.
+
+Ecobytes will not provide access to your data for any purpose other than providing it to those who have been given read access to it by the Solid Pod owner(s).
+
+#### Where
+
+The instance runs from source in a LXD container in a [hetzner datacenter](https://www.hetzner.com/), somewhere in Bavaria.
+
+#### Acceptable Use Policy
+
+By using our Services you agree not to misuse the Services or assist or enable anyone else to do so. For example, you must not try to do any of the following in connection with the Services:
+
+
+- breach or otherwise circumvent any security or authentication measures;
+- interfere with or disrupt any user, host, or network, for example by sending a virus, overloading, flooding, spamming, or mail-bombing any part of the Services;
+- access, search, or create accounts for the Services by any means other than our publicly supported interfaces (for example, "scraping" or creating accounts in bulk);
+- send unsolicited communications, promotions or advertisements, or spam;
+- send altered, deceptive or false source-identifying information, including "spoofing" or "phishing";
+- promote or advertise products or services other than your own without appropriate authorization;
+- abuse referrals or promotions to get more storage space than deserved;
+- circumvent storage space limits;
+- sell the Services unless specifically authorized to do so;
+- harass or abuse ecobytes personnel or representatives or agents performing Services on behalf of ecobytes;
+- violate the law in any way, including storing, publishing or sharing material that's fraudulent, defamatory, or misleading;
+- violate the privacy or infringe the rights of others;
+- use the Services to violate any law or regulation.
+
+In the event that any user is monopolising an unfair proportion of available system or network resources, we reserve the right to limit that user’s activity.
+
+At our sole discretion, ecobytes reserves the right to delete and close accounts that do not adhere to the solidbase.info Terms of Service, Privacy Policy, or Acceptable Use Policy.
+
+Ecobytes welcomes your comments regarding the Terms of Service, Acceptable Use Policy, and Privacy Policy. If you have questions or concerns about the Services, you can contact us at [support[ädd]ecobytes.net](mailto://support[ädd]ecobytes.net).
+
+Websites under the solidbase.info domain may contain links to websites that are  owned, operated or controlled by other stakeholder, and, therefore, Netzwerk Solidarische Landwirtschaft e.V. nor ecobytes e.V. are not responsible for the content or your use of such websites. Please read the Terms of Service of any other website that you access from the solidbase.info websites, as they may be different from the solidbase.info Terms of Service.
+
+## Matomo
+
+### Purpose of the processing
 
 This website is using [Matomo](https://matomo.org/), an Open Source, self-hosted software for collecting anonymous usage statistics for this website.
 
 The data is used to analyse the behaviour of the website visitors to identify potential pitfalls like not found pages, search engine indexing issues and to find out which contents are the most appreciated. Once the data (number of visitors reaching a not found pages, viewing only one page…) is processed, Matomo is generating reports for website owners to take action, for example changing the layout of the pages, publishing some fresh content… etc.
 
-### Matomo
+### Which data is processed?
 
 Matomo is processing the following data:
 
@@ -47,7 +114,7 @@ Matomo is processing the following data:
 - User Agent of the browser
 
 
-### Webfonts
+## Webfonts
 
 This website is using Fonts from [Google Fonts](https://fonts.google.com/) which get fetched from Google Servers when loading this website. You can find more information about the privacy implications [in the FAQs](https://developers.google.com/fonts/faq?hl=en#what_does_using_the_google_fonts_api_mean_for_the_privacy_of_my_users).
 

content/recommendations.md

@@ -70,7 +70,7 @@ For organic farmers a tool from the US emerged that seems to fullfill the needs
 
 Two offline MS-Windows based tools for the management of the first wave of box delivery services starting in the 1980's are still of notability: The [PC Gärtner](https://www.pcgaertner.de) is a all in one solution from crop planning to door delivery Box schemes. The [AboBote](http://www.abobote.de) only has delivery planning functionality but in a well elaborated fashion.
 
-Only one (which is good, as concentration could be put onto it) **FLOSS tool** seems to be active in the field of farm management: [Farm OS]( https://farmos.org). In the originating country US, FLOSS usage in agriculture is going fast through networking: [OpenTEAM - Open Technology Ecosystem for Agricultural Management](https://openteam.community/).
+Only one (which is good, as concentration could be put onto it) **FLOSS tool** seems to be active in the field of farm management: [Farm OS]( https://farmos.org). It is a web-based application for farm management, planning, and record keeping. It is being developed with the aim of providing a standard platform for agricultural data collection and management. In the originating country US, FLOSS usage in agriculture is going fast through networking: [OpenTEAM - Open Technology Ecosystem for Agricultural Management](https://openteam.community/).
 
 ## Members administration
 In the association management category there had been no report about any FLOSS web tool that is used in production. Altgough [Galette](http://galette.eu/) has good prospects to become a membership administrative tool of global applicability. Another similar development could be of interest for French SFS: [Garradin](https://garradin.eu/).

detox @ cc0315ba

-Subproject commit c8968da3f98be9ab22b9a4b63e792d9466189189
+Subproject commit cc0315ba59212d4a38e1368aab2eaa691c3915dd