From b4a598af2a4b6e6b817b167ba769793733bb7c4e Mon Sep 17 00:00:00 2001 From: Oliver Sprinzl Date: Thu, 29 Apr 2021 22:39:28 +0200 Subject: [PATCH] Fixed a few typos. --- content/de/Kontakt.md | 2 +- content/de/Treffen.md | 2 +- content/en/Imprint.md | 10 +++++----- content/en/LUGFrankfurt.md | 22 +++++++++++----------- content/en/Meetup.md | 6 +++--- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/content/de/Kontakt.md b/content/de/Kontakt.md index 68670d1..52e7d14 100644 --- a/content/de/Kontakt.md +++ b/content/de/Kontakt.md @@ -5,4 +5,4 @@ draft: false --- Am besten über unsere [Mailingliste](/de/Mailingliste) bzw. wir sind auch in Freenode (alternativ als Server einfach `irc.freenode.org` angeben) vertreten. Channel: #lug-ffm -Oder einfach Mal bei unseren [Treffen](/de/Treffen) vorbei kommen. +Oder einfach Mal bei unseren [Treffen](/de/Treffen) vorbeikommen. diff --git a/content/de/Treffen.md b/content/de/Treffen.md index 3cd307f..769b3f7 100644 --- a/content/de/Treffen.md +++ b/content/de/Treffen.md @@ -67,4 +67,4 @@ Die Vorträge finden in "**Nichtraucherräumen**" statt. Raucher müssen den Rau ### Im Saalbau Gallus -Das Treffen findet im Seminarraum 4 statt. Die Vorträge beginnen in der Regel gegen 19 Uhr. Es kann jegliche Form von Hardware mitgebracht werden. Ist der Vortrag beendet, kann in Clubatmosphäre diskutiert bzw. sich um die mitgebrachte Hardware gekümmert werden. Üblicherweise begeben wir uns im Anschluss noch in eine der Gaststätten in der Nähe zum Weiterdiskutieren; ~~derzeit "Zum Hufnagel", Hufnagelstraße 12a, 60326 Frankfurt a.M.~~ Das ehemalige "Zum Hufnagel" ist nun ein Chinesisches Restaurant und heisst nun "Asian Flavors". +Das Treffen findet im Seminarraum 4 statt. Die Vorträge beginnen in der Regel gegen 19 Uhr. Es kann jegliche Form von Hardware mitgebracht werden. Ist der Vortrag beendet, kann in Clubatmosphäre diskutiert bzw. sich um die mitgebrachte Hardware gekümmert werden. Üblicherweise begeben wir uns im Anschluss noch in eine der Gaststätten in der Nähe zum Weiterdiskutieren; ~~derzeit "Zum Hufnagel", Hufnagelstraße 12a, 60326 Frankfurt a.M.~~ Das ehemalige "Zum Hufnagel" ist nun ein Chinesisches Restaurant und heisst nun "Asian Flavors". Müssen wir mal austesten ... diff --git a/content/en/Imprint.md b/content/en/Imprint.md index 4e4ab51..789259c 100644 --- a/content/en/Imprint.md +++ b/content/en/Imprint.md @@ -21,7 +21,7 @@ Dr. Christoph Zimmermann E-Mail: info AT lugfrankfurt PUNKT de -If you have any problems, contact our web hoster [here](http://www.jekkt.com/impressum.php) +If you have any problems, contact our web hoster [here](http://www.jekkt.com/impressum.php). ----- @@ -29,7 +29,7 @@ If you have any problems, contact our web hoster [here](http://www.jekkt.com/imp ### Provision of our statutory and business services -We process the data of our members, supporters, prospects, customers or other persons in accordance with Art. 6 para. 1 lit. b. DSGVO, if we offer them contractual services or in the context of an existing business relationship, e.g. members, or are themselves recipients of benefits and benefits. Incidentally, we process the data of affected persons in accordance with. Art. 6 para. 1 lit. f. DSGVO based on our legitimate interests, e.g. when it comes to administrative tasks or public relations. +We process the data of our members, supporters, prospects, customers or other persons in accordance with Art. 6 para. 1 lit. b. GDPR, if we offer them contractual services or in the context of an existing business relationship, e.g. members, or are themselves recipients of benefits and benefits. Incidentally, we process the data of affected persons in accordance with. Art. 6 para. 1 lit. f. GDPR based on our legitimate interests, e.g. when it comes to administrative tasks or public relations. The data processed, the nature, scope and purpose and necessity of their processing are determined by the underlying contractual relationship. This includes in principle inventory and master data of the persons (e.g., name, address, etc.) as well as the contact data (e.g., e-mail address, telephone, etc.). @@ -39,12 +39,12 @@ We delete data that is no longer required to serve our statutory and business pu The hosting services we use are designed to provide the following services: infrastructure and platform services, computing capacity, storage and database services, e-mailing, security and technical maintenance services we use to operate this online service. -Here we, or our hosting provider, process inventory data, contact data, content data, contract data, usage data, meta and communication data of customers, interested parties and visitors to this online offer on the basis of our legitimate interests in an efficient and secure provision of this online offer acc. Art. 6 para. 1 lit. f DSGVO i.V.m. Art. 28 DSGVO (conclusion of contract processing contract). +Here we, or our hosting provider, process inventory data, contact data, content data, contract data, usage data, meta and communication data of customers, interested parties and visitors to this online offer on the basis of our legitimate interests in an efficient and secure provision of this online offer acc. Art. 6 para. 1 lit. f GDPR i.V.m. Art. 28 GDPR (conclusion of contract processing contract). ### Registration -Users can create a user account. As part of the registration, the required mandatory information is communicated to the users and based on Art. 6 para. 1 lit. b DSGVO processed for purposes of providing the user account. The processed data include in particular the login information (name, password and an e-mail address). The data entered during registration will be used for the purpose of using the user account and its purpose. +Users can create a user account. As part of the registration, the required mandatory information is communicated to the users and based on Art. 6 para. 1 lit. b GDPR processed for purposes of providing the user account. The processed data include in particular the login information (name, password and an e-mail address). The data entered during registration will be used for the purpose of using the user account and its purpose. Users may have access to information relevant to their user account, e.g. technical changes, be informed by e-mail. If users have terminated their user account, their data will be deleted with respect to the user account, subject to a statutory retention requirement. It is the responsibility of the users to secure their data upon termination before the end of the contract. We are entitled to irretrievably delete all user data stored during the term of the contract. -As part of the use of our registration and registration functions as well as the use of the user account, the IP address and the time of the respective user action will be saved. The storage is based on our legitimate interests, as well as the user's protection against misuse and other unauthorized use. A transfer of these data to third parties does not take place, unless it is necessary for the prosecution of our claims or there is a legal obligation in accordance with. Art. 6 para. 1 lit. c DSGVO. +As part of the use of our registration and registration functions as well as the use of the user account, the IP address and the time of the respective user action will be saved. The storage is based on our legitimate interests, as well as the user's protection against misuse and other unauthorized use. A transfer of these data to third parties does not take place, unless it is necessary for the prosecution of our claims or there is a legal obligation in accordance with. Art. 6 para. 1 lit. c GDPR. diff --git a/content/en/LUGFrankfurt.md b/content/en/LUGFrankfurt.md index 362c44d..276d616 100644 --- a/content/en/LUGFrankfurt.md +++ b/content/en/LUGFrankfurt.md @@ -11,11 +11,11 @@ draft: false :warning: Due to the current situation with regard to the administrative directions regarding the constraints of social interaction unfortunately we are forced to move to virtual meetings instead of physical interaction (talks and Stammtisch) until further notice. As usual, details are posted on our mailing list. -Once the situation has changed, we will publish update in this location. +Once the situation has changed, we will publish a update on this location. ----- -## The next meeting is on Monday, 05/10/2021 at 7 pm. +## The next meeting will be on Monday, 05/10/2021 at 7 pm. Please note: As talk Tuesdays may be subject to change on short notice, please check the talks page for any last-minute changes. (Regular meetings on Mondays take place at the Sandelmühle, talk Tuesdays at Saalbau Gallus. Modifications are announced here.) @@ -23,7 +23,7 @@ Please note: As talk Tuesdays may be subject to change on short notice, please c Our group was formed in 1998. The hard core consists of approximately 15 users who are from the Rhine Main area. The number of users on our mailing list is by far bigger though. Similar to other Linux User Groups (LUGs) the focus of our activities is on the free and open source Linux operating system. The LUG Frankfurt does not stop here though but regards itself as a local special interest group for topics around Free and Open Source Software (FOSS) in general. -Members are recruited from all walks of life, ranging from pforessional Linux system administrators and developers to long-standing enthusiasts to absolute beginners. We do not focus on a partiular distribution but welcome them all (an overview of distributions can be found on our distribution list). Although we are a registered association, membership is not mandatory but optional when you want participate in our activities. We focus on the sharing of knowledge and experience and not strict rules; other Unix-like operating systems and MacOS users are more than welcome. +Members are recruited from all walks of life, ranging from professional Linux system administrators and developers to long-standing enthusiasts to absolute beginners. We do not focus on a partiular distribution but welcome them all (an overview of distributions can be found on our [distribution list](/de/Distriliste)). Although we are a registered association, membership is not mandatory but optional when you want participate in our activities. We focus on the sharing of knowledge and experience and not strict rules; other Unix-like operating systems and MacOS users are more than welcome. ## Meetups @@ -31,7 +31,7 @@ We regularly meet twice a month. Every second Monday we host a [regulars' table](/en/Meetup) (we are a German community after all :-) ). We meet at around 7 pm at the [Sandelmühle](http://www.sandelmuehle.de/restaurant/restaurant-frankfurt/), An der Sandelmühle 35, 60439 Frankfurt. You are more than welcome to bring your laptop; power and Wifi are provided by the location. We aim to help with all Linux issues. -Every fourth Tuesday we meet at room # 4 at the [Saalbau Gallus](https://www.saalbau.com/raumangebot/detail/?SAALBAU-Gallus&objekt=52) Frankenallee 111, 60326 Frankfurt, for the [monthly talk](/de/Vortraege). These talks also start around 7 pm. After the talk we normally gather in a nearby restaurant called Hufnagel (Hufnagelstraße 12a, 60326 Frankfurt a.M.). These talks are normally in German but most of the time we do have English speaking members around for a chat. +Every fourth Tuesday we meet at room # 4 at the [Saalbau Gallus](https://www.saalbau.com/raumangebot/detail/?SAALBAU-Gallus&objekt=52) Frankenallee 111, 60326 Frankfurt, for the [monthly talk](/de/Vortraege). These talks also start around 7 pm. After the talk we normally gather in a nearby restaurant called ~~Hufnagel (Hufnagelstraße 12a, 60326 Frankfurt a.M.)~~ (needs to be checked). These talks are normally in German but most of the time we do have English speaking members around for a chat. ## Mailing list @@ -41,9 +41,9 @@ Between events we communicate via our [mailing list](/de/Mailingliste), which is The focus of the Tuesday meetups is a presentation on a FOSS topic. These talks are open to all interested parties who would like to give a presentation on a Linux / FOSS subject. Suggestions for topics can be found here. These talks normally start around 7 pm. -The schedule of these talks can be found here. +The schedule of these talks can be found [here](/de/Vortraege). -The Linux Presentation Day +## The Linux Presentation Day ![LPD](/LPD.png) @@ -53,7 +53,7 @@ The Linux Presentation Day is an event where primarily German-speaking LUGs pres The MausTürÖffnerTag is an opportunity to look behind doors of administrations, companies and associations which are normally closed to the public. In addition, it is an ideal opportunity to introduct children at school age to Linux and FOSS in general. -The slides of the first LPD in Frankfurt and the corresponding live recording can be found here. +The slides of the first LPD in Frankfurt and the corresponding live recording can be found [here](/de/LPD). ----- @@ -61,7 +61,7 @@ The slides of the first LPD in Frankfurt and the corresponding live recording ca ### Provision of our statutory and business services -We process the data of our members, supporters, prospects, customers or other persons in accordance with Art. 6 para. 1 lit. b. DSGVO, if we offer them contractual services or in the context of an existing business relationship, e.g. members, or are themselves recipients of benefits and benefits. Incidentally, we process the data of affected persons in accordance with. Art. 6 para. 1 lit. f. DSGVO based on our legitimate interests, e.g. when it comes to administrative tasks or public relations. +We process the data of our members, supporters, prospects, customers or other persons in accordance with Art. 6 para. 1 lit. b. GDPR, if we offer them contractual services or in the context of an existing business relationship, e.g. members, or are themselves recipients of benefits and benefits. Incidentally, we process the data of affected persons in accordance with. Art. 6 para. 1 lit. f. GDPR based on our legitimate interests, e.g. when it comes to administrative tasks or public relations. The data processed, the nature, scope and purpose and necessity of their processing are determined by the underlying contractual relationship. This includes in principle inventory and master data of the persons (e.g., name, address, etc.) as well as the contact data (e.g., e-mail address, telephone, etc.). @@ -71,12 +71,12 @@ We delete data that is no longer required to serve our statutory and business pu The hosting services we use are designed to provide the following services: infrastructure and platform services, computing capacity, storage and database services, e-mailing, security and technical maintenance services we use to operate this online service. -Here we, or our hosting provider, process inventory data, contact data, content data, contract data, usage data, meta and communication data of customers, interested parties and visitors to this online offer on the basis of our legitimate interests in an efficient and secure provision of this online offer acc. Art. 6 para. 1 lit. f DSGVO i.V.m. Art. 28 DSGVO (conclusion of contract processing contract). +Here we, or our hosting provider, process inventory data, contact data, content data, contract data, usage data, meta and communication data of customers, interested parties and visitors to this online offer on the basis of our legitimate interests in an efficient and secure provision of this online offer acc. Art. 6 para. 1 lit. f GDPR i.V.m. Art. 28 GDPR (conclusion of contract processing contract). ### Registration -Users can create a user account. As part of the registration, the required mandatory information is communicated to the users and based on Art. 6 para. 1 lit. b DSGVO processed for purposes of providing the user account. The processed data include in particular the login information (name, password and an e-mail address). The data entered during registration will be used for the purpose of using the user account and its purpose. +Users can create a user account. As part of the registration, the required mandatory information is communicated to the users and based on Art. 6 para. 1 lit. b GDPR processed for purposes of providing the user account. The processed data include in particular the login information (name, password and an e-mail address). The data entered during registration will be used for the purpose of using the user account and its purpose. Users may have access to information relevant to their user account, e.g. technical changes, be informed by e-mail. If users have terminated their user account, their data will be deleted with respect to the user account, subject to a statutory retention requirement. It is the responsibility of the users to secure their data upon termination before the end of the contract. We are entitled to irretrievably delete all user data stored during the term of the contract. -As part of the use of our registration and registration functions as well as the use of the user account, the IP address and the time of the respective user action will be saved. The storage is based on our legitimate interests, as well as the user's protection against misuse and other unauthorized use. A transfer of these data to third parties does not take place, unless it is necessary for the prosecution of our claims or there is a legal obligation in accordance with. Art. 6 para. 1 lit. c DSGVO. +As part of the use of our registration and registration functions as well as the use of the user account, the IP address and the time of the respective user action will be saved. The storage is based on our legitimate interests, as well as the user's protection against misuse and other unauthorized use. A transfer of these data to third parties does not take place, unless it is necessary for the prosecution of our claims or there is a legal obligation in accordance with. Art. 6 para. 1 lit. c GDPR. diff --git a/content/en/Meetup.md b/content/en/Meetup.md index d195c78..7415190 100644 --- a/content/en/Meetup.md +++ b/content/en/Meetup.md @@ -21,7 +21,7 @@ Every fourth Tuesday we meet in room # 4 at [Saalbau Gallus](https://www.saalbau An der Sandelmühle 35 60439 Frankfurt -Telefon: 0 69 / 57 57 42 +Telefon: 069 / 57 57 42 [Homepage](http://www.sandelmuehle.de/restaurant/restaurant-frankfurt/) [Menu](http://www.sandelmuehle.de/restaurant/speisenkarte/) @@ -41,7 +41,7 @@ From the city: Tube # U2, stop: Heddernheim -Exit the station near the river, staying on the left-hand side under the bridge facing backwards / towards the city (sounds more complicated than it actually is). Take a left and follow the road named "An der Sandelmühle" for about 150 meters; the car park of the restaurant is on your righthand side. +Exit the station near the river Nidda, staying on the left-hand side under the bridge facing backwards / towards the city (sounds more complicated than it actually is). Take a left and follow the road named "An der Sandelmühle" for about 150 meters; the car park of the restaurant is on your righthand side. ----- @@ -69,4 +69,4 @@ As it's custom these days in Germany, all our meetups take place in non-smoking ### Saalbau Gallus / monthly talks -The meetup takes place in room #4. The talks start around 7 pm; please to be on time so that other people can enjoy the presentation without interruptions from people arriving late. After the talk we normally gather in a small restaurant nearby: ~~"Zum Hufnagel", Hufnagelstraße 12a, 60326 Frankfurt a.M.~~ The restaurant "Zum Hufnagel" is now a Asian restaurant called "Asian Flavors". +The meetup takes place in room #4. The talks start around 7 pm; please to be on time so that other people can enjoy the presentation without interruptions from people arriving late. After the talk we normally gather in a small restaurant nearby: ~~"Zum Hufnagel", Hufnagelstraße 12a, 60326 Frankfurt a.M.~~ The restaurant "Zum Hufnagel" is now a Asian restaurant called "Asian Flavors". We have to check it out ...