From f2c90e5601e6e9068f9ff7779b68b5acdb01dc68 Mon Sep 17 00:00:00 2001 From: stuebinm Date: Sat, 24 Sep 2022 17:46:48 +0200 Subject: [PATCH] websites: remove mentions of gitlab.infra4future.de (one remains for now, will do that later once anyone from students for future says what to do in that case) --- websites/hacc.earth/index.html | 6 +++--- websites/hacc.earth/index_de.html | 3 +-- websites/infra4future.de/nutzungsbedingungen.md | 2 +- websites/muc.hacc.earth/index.html | 17 +++++++---------- 4 files changed, 12 insertions(+), 16 deletions(-) diff --git a/websites/hacc.earth/index.html b/websites/hacc.earth/index.html index 01ee6dc..8abfd94 100644 --- a/websites/hacc.earth/index.html +++ b/websites/hacc.earth/index.html @@ -349,7 +349,7 @@
  • Regular meetings of the hacc e.V., usually every 1st and 3rd Wednesday 7:30 p.m. at muCCC. At the moment we meet online on mumble.hacc.space.
  • Meetings of Klimanotstandbündnis in Siegen. See hacc group page.
  • - Propose changes to the hacc e.V. infrastructure. You can open an issue on our meta discussion repository or (if you are familiar with Nix) open a merge request on the nixfiles which control a growing part of our infrastructure. Or just ask us via one of hacc e.V. channels above. + Propose changes to the hacc e.V. infrastructure. You can open an issue or open a merge request on the nixfiles which control a growing part of our infrastructure. Or just ask us via one of hacc e.V. channels above.
  • Add you or your project to the hacc directory @@ -438,7 +438,7 @@ Unfortunately conflicts led to a split between the local chapter Munich and CHT

    About this page

    The hacc e.V. runs this page (hacc.earth) but not necessarily the linked projects. You can find more about our activities and involvements on our own page.
    -Also the source of the page can be found here. As with the hacc e.V. infrastructure in general you are invited to make change requests or just contact us to ask for changes. +Also the source of the page can be found here. As with the hacc e.V. infrastructure in general you are invited to make change requests or just contact us to ask for changes.

    The hacc logo was designed by Creatives for Future. @@ -451,7 +451,7 @@ The hacc logo was designed by Creatives

    - Source of hacc.earth • + Source of hacc.earth • Contact • Imprint
    diff --git a/websites/hacc.earth/index_de.html b/websites/hacc.earth/index_de.html index dc55ada..0f9b8d9 100644 --- a/websites/hacc.earth/index_de.html +++ b/websites/hacc.earth/index_de.html @@ -317,8 +317,7 @@
  • Regelmäßige Treffen von hacc in München, normalerweise jeden ersten und dritten Mittwoch im Monat um 19:00 Uhr beim muCCC. Im Moment treffen wir uns Online auf mumble.hacc.space.
  • Regelmäßige Treffen des Klimanotstandbündnis in Siegen. Jeden zweiten Sonntag, siehe hacc-Seite.
  • - Wenn du Vorschläge für Änderungen an unserer Infrastruktur hast, leg bitte einen Issue in unserem Meta-Diskussions-Repo an, - oder (falls du Nix kennst) erstelle einen Merge Request auf die nixfiles, über die wir einen (größer werdenden) Teil unserer Server verwalten. + Wenn du Vorschläge für Änderungen an unserer Infrastruktur hast, leg bitte einen Issue oder erstelle einen Merge Request auf die nixfiles, über die wir einen (größer werdenden) Teil unserer Server verwalten.
    • diff --git a/websites/infra4future.de/nutzungsbedingungen.md b/websites/infra4future.de/nutzungsbedingungen.md index ac1d214..cf0934f 100644 --- a/websites/infra4future.de/nutzungsbedingungen.md +++ b/websites/infra4future.de/nutzungsbedingungen.md @@ -16,7 +16,7 @@ title: Infra4future 1. Geltungsbereich der Nutzungsbedingungen - (1) Diese Nutzungsbedingungen gelten für das Online-Angebot Infra4future, das im Internet unter cloud.infra4future.de, talk.infra4future.de, mattermost.infra4future.de, auth.infra4future.de, social.infra4future.de, gitlab.infra4future.de, survey.infra4future.de, live.infra4future.de, 4future.dev und discuss.infra4future.de abrufbar ist. Hierbei handelt es sich um eine Plattform, auf der Nutzer Profile anlegen können. + (1) Diese Nutzungsbedingungen gelten für das Online-Angebot Infra4future, das im Internet unter cloud.infra4future.de, talk.infra4future.de, mattermost.infra4future.de, login.infra4future.de, git.infra4future.de, 4future.dev und discuss.infra4future.de abrufbar ist. Hierbei handelt es sich um eine Plattform, auf der Nutzer Profile anlegen können. (2) Sie können die derzeit gültigen Nutzungsbedingungen unter infra4future.de/nutzungsbedingungen.html abrufen und ausdrucken. diff --git a/websites/muc.hacc.earth/index.html b/websites/muc.hacc.earth/index.html index e386de9..a9aa0ba 100644 --- a/websites/muc.hacc.earth/index.html +++ b/websites/muc.hacc.earth/index.html @@ -300,14 +300,11 @@ Of course we also did and do support multiple events and groups in Munich and Ge
    • Regular meetings of the hacc e.V., usually every 1st and 3rd Wednesday 7:30 p.m. at muCCC. At the moment we meet online on mumble.hacc.space.
    • Regular matinanence of the hacc e.V. infrastrucutre, usually the Wednesday after the regular meeting sometime in the evening. Normally coordinated on mumble.hacc.space.
      • -
    • Help us running the hacc e.V. infrastructure like infra4future.de. You can open an issue on our meta discussion repository or (if you are familiar with Nix) open a merge request on the nixfiles which control a growing part of our infrastructure. Or just ask us via one of hacc e.V. channels above. +
    • Help us running the hacc e.V. infrastructure like infra4future.de. You can open an issue or create a merge request on the nixfiles which control a growing part of our infrastructure. Or just ask us via one of hacc e.V. channels above.
    • Interested in streaming and recording? Get in contact with hacc-voc
      • -
    • - The hacc blog can always use input. It's based on zola. The source of our blog is here. -
    • Use the wiki and add your project!
      • @@ -403,11 +400,11 @@ registered at the local court Munich VR 208921
    • raphael or rw
    • zauberberg
    • moira
      • -
    • -
  • Satzung (statutes)
    • -
  • Mitgliedsantrag (membership application)
    • -
  • Vereinfachter Spendennachweis (simplified proof of donation)
    • +
  • Satzung (statutes)
    • +
  • Mitgliedsantrag (membership application)
    • +
  • Vereinfachter Spendennachweis (simplified proof of donation)

    • @@ -430,7 +427,7 @@ Germany

    About this page

    -The source of the page can be found here. As with the hacc e.V. infrastructure in general you are invited to make change requests or just contact us to ask for changes. +The source of the page can be found here. As with the hacc e.V. infrastructure in general you are invited to make change requests or just contact us to ask for changes.

    The hacc logo was designed by Creatives for Future. @@ -443,7 +440,7 @@ The hacc logo was designed by Creatives