Merge branch 'dev' into 'main'

update federation map: Leipzig, FAU, Jena See merge request matrix.tu-dresden.de/dokumentation!48

Merge branch 'dev' into 'main'
01d7bc47 · Marcel Achtert · 001c0bf6 · 64702d7c · 01d7bc47 · 01d7bc47
Commit 01d7bc47 authored 2 years ago by Marcel Achtert
--- a/content/first-steps/_index.en.md
+++ b/content/first-steps/_index.en.md
@@ -98,7 +98,7 @@ However, the federation with the Matrix servers of other scientific or civil soc

 * [Hochschule Zittau-Görlitz](https://matrix.hszg.de) incl. [Docu](https://zfe.hszg.de/das-zfe/aktuelle-entwicklungen/matrix)

-* [HMT Leipzig](https://matrix.hmt-leipzig.de)
+* [HMT Leipzig](https://chat.hmt-leipzig.de)

 * [Uni Kiel](https://riot.fs-infmath.uni-kiel.de) incl. [Docu](https://www.fs-infmath.uni-kiel.de/wiki/Technische_Dienste)

@@ -144,6 +144,10 @@ However, the federation with the Matrix servers of other scientific or civil soc

 * [Hochschule Furtwangen](https://matrix.hs-furtwangen.de/) incl. [Docu](https://howto.hs-furtwangen.de/hfu-chat/)

+* [Friedrich-Alexander-Universität Erlangen-Nürnberg](https://chat.fau.de/) incl. [Docu](https://www.rrze.fau.de/serverdienste/matrix/)
+
+* [Friedrich-Schiller-Universität Jena](https://chat.uni-jena.de/) incl. [Docu](https://wiki.uni-jena.de/display/URZ010SD/Chatten+mit+Matrix)
+

 Explicitly for students:


--- a/content/first-steps/_index.md
+++ b/content/first-steps/_index.md
@@ -97,7 +97,7 @@ Die Förderation mit den Matrix-Servern anderer wissenschaftlicher oder zivilges

 * [Hochschule Zittau-Görlitz](https://matrix.hszg.de) inkl. [Doku](https://zfe.hszg.de/das-zfe/aktuelle-entwicklungen/matrix)

-* [HMT Leipzig](https://matrix.hmt-leipzig.de)
+* [HMT Leipzig](https://chat.hmt-leipzig.de)

 * [Uni Kiel](https://riot.fs-infmath.uni-kiel.de) inkl. [Doku](https://www.fs-infmath.uni-kiel.de/wiki/Technische_Dienste)

@@ -143,6 +143,10 @@ Die Förderation mit den Matrix-Servern anderer wissenschaftlicher oder zivilges

 * [Hochschule Furtwangen](https://matrix.hs-furtwangen.de/) inkl. [Doku](https://howto.hs-furtwangen.de/hfu-chat/)

+* [Friedrich-Alexander-Universität Erlangen-Nürnberg](https://chat.fau.de/) inkl. [Doku](https://www.rrze.fau.de/serverdienste/matrix/)
+
+* [Friedrich-Schiller-Universität Jena](https://chat.uni-jena.de/) inkl. [Doku](https://wiki.uni-jena.de/display/URZ010SD/Chatten+mit+Matrix)
+

 Explizit für Studierende:


--- a/static/images/federation_map.svg
+++ b/static/images/federation_map.svg
@@ -28,9 +28,9 @@
   inkscape:window-height="946"
   id="namedview1381"
   showgrid="false"
-   inkscape:zoom="1.0887766"
-   inkscape:cx="477.14104"
-   inkscape:cy="851.87356"
+   inkscape:zoom="0.76988132"
+   inkscape:cx="706.60242"
+   inkscape:cy="646.2035"
   inkscape:window-x="0"
   inkscape:window-y="0"
   inkscape:window-maximized="1"
@@ -714,7 +714,7 @@
     id="path1385" /><path
     d="M 360.72381,381.097 V 59.711 h -23.13002 v -7.71 h 32.00002 v 336.807 h -32.00002 v -7.711 z"
     id="path1387" /></g><a
-   href="https://matrix.hmt-leipzig.de/"
+   href="https://chat.hmt-leipzig.de/"
   target="_blank"
   rel="noopener noreferrer"
   class="matrix_frame"
@@ -1049,6 +1049,39 @@
     x="6333.1274"
     y="11705.819"
     style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:213.333px;stroke-width:10">Uni Innsbruck</tspan></text><g
+   id="m_uni_fau"
+   class="matrix_icon"
+   transform="translate(5332.2827,8039.3222)"
+   style="clip-rule:evenodd;fill-rule:evenodd;image-rendering:optimizeQuality;shape-rendering:geometricPrecision;text-rendering:geometricPrecision"><path
+     d="m 60.875,59.711 v 321.386 h 23.13 v 7.711 H 52 V 52 h 32 v 7.71 z"
+     id="path1449-6" /><path
+     d="m 150,161.595 v 16.264 h 0.463 c 4.338,-6.191 9.563,-11 15.684,-14.406 6.117,-3.402 13.129,-5.11 21.027,-5.11 7.588,0 14.521,1.475 20.793,4.415 6.274,2.945 11.038,8.131 14.291,15.567 3.56,-5.265 8.4,-9.913 14.521,-13.94 6.117,-4.025 13.358,-6.042 21.724,-6.042 6.351,0 12.234,0.776 17.66,2.325 5.418,1.549 10.065,4.027 13.938,7.434 3.869,3.41 6.889,7.863 9.062,13.357 2.167,5.504 3.253,12.122 3.253,19.869 v 80.385 H 269.41 v -68.074 c 0,-4.025 -0.154,-7.82 -0.465,-11.385 -0.313,-3.56 -1.161,-6.656 -2.555,-9.293 -1.395,-2.631 -3.45,-4.724 -6.157,-6.274 -2.711,-1.543 -6.391,-2.322 -11.037,-2.322 -4.646,0 -8.403,0.896 -11.269,2.671 -2.868,1.784 -5.112,4.109 -6.737,6.971 -1.626,2.869 -2.711,6.12 -3.252,9.762 -0.545,3.638 -0.814,7.318 -0.814,11.035 v 66.91 h -33 v -67.375 c 0,-3.562 -0.081,-7.087 -0.23,-10.57 -0.158,-3.487 -0.814,-6.7 -1.978,-9.645 -1.162,-2.94 -3.1,-5.304 -5.809,-7.088 -2.711,-1.775 -6.7,-2.671 -11.965,-2.671 -1.551,0 -3.603,0.349 -6.156,1.048 -2.556,0.697 -5.036,2.016 -7.435,3.949 -2.404,1.938 -4.454,4.726 -6.158,8.363 -1.705,3.642 -2.556,8.402 -2.556,14.287 v 69.701 H 118.856 V 161.595 Z"
+     id="path1451-7" /><path
+     d="M 360.72381,381.097 V 59.711 h -23.13002 v -7.71 h 32.00002 v 336.807 h -32.00002 v -7.711 z"
+     id="path1453-5" /></g><a
+   href="https://www.rrze.fau.de/serverdienste/matrix/"
+   target="_blank"
+   rel="noopener noreferrer"
+   class="matrix_frame"
+   id="a1460"
+   transform="translate(2348.8353,-367.26564)"
+   style="clip-rule:evenodd;fill-rule:evenodd;image-rendering:optimizeQuality;shape-rendering:geometricPrecision;text-rendering:geometricPrecision"><rect
+     style="opacity:0.992867;fill:#000000;fill-opacity:0;stroke:none;stroke-width:10.0157;stroke-linecap:round;stop-color:#000000"
+     id="rect1457-5"
+     width="359.55981"
+     height="378.63657"
+     x="3022.6746"
+     y="8431.2734" /></a><text
+   xml:space="preserve"
+   x="3332"
+   y="8039"
+   id="t_uni_fau"
+   class="instance_name"
+   style=""><tspan
+     id="tspan2026"
+     x="3332"
+     y="8039"
+     style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:213.333px;stroke-width:10">Friedrich-Alexander-Universität Erlangen-Nürnberg</tspan></text><g
   id="m_tu_b"
   class="matrix_icon"
   transform="translate(7848.4434,3640.8573)"><path
@@ -1499,6 +1532,39 @@
     x="4425.0776"
     y="6007.8989"
     style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:213.333px;stroke-width:10">Bauhaus-Universität Weimar</tspan></text><g
+   id="m_uni_jena"
+   class="matrix_icon"
+   transform="translate(5871.751,6045.405)"
+   style="clip-rule:evenodd;fill-rule:evenodd;image-rendering:optimizeQuality;shape-rendering:geometricPrecision;text-rendering:geometricPrecision"><path
+     d="m 60.875,59.711 v 321.386 h 23.13 v 7.711 H 52 V 52 h 32 v 7.71 z"
+     id="path1529-2" /><path
+     d="m 150,161.595 v 16.264 h 0.463 c 4.338,-6.191 9.563,-11 15.684,-14.406 6.117,-3.402 13.129,-5.11 21.027,-5.11 7.588,0 14.521,1.475 20.793,4.415 6.274,2.945 11.038,8.131 14.291,15.567 3.56,-5.265 8.4,-9.913 14.521,-13.94 6.117,-4.025 13.358,-6.042 21.724,-6.042 6.351,0 12.234,0.776 17.66,2.325 5.418,1.549 10.065,4.027 13.938,7.434 3.869,3.41 6.889,7.863 9.062,13.357 2.167,5.504 3.253,12.122 3.253,19.869 v 80.385 H 269.41 v -68.074 c 0,-4.025 -0.154,-7.82 -0.465,-11.385 -0.313,-3.56 -1.161,-6.656 -2.555,-9.293 -1.395,-2.631 -3.45,-4.724 -6.157,-6.274 -2.711,-1.543 -6.391,-2.322 -11.037,-2.322 -4.646,0 -8.403,0.896 -11.269,2.671 -2.868,1.784 -5.112,4.109 -6.737,6.971 -1.626,2.869 -2.711,6.12 -3.252,9.762 -0.545,3.638 -0.814,7.318 -0.814,11.035 v 66.91 h -33 v -67.375 c 0,-3.562 -0.081,-7.087 -0.23,-10.57 -0.158,-3.487 -0.814,-6.7 -1.978,-9.645 -1.162,-2.94 -3.1,-5.304 -5.809,-7.088 -2.711,-1.775 -6.7,-2.671 -11.965,-2.671 -1.551,0 -3.603,0.349 -6.156,1.048 -2.556,0.697 -5.036,2.016 -7.435,3.949 -2.404,1.938 -4.454,4.726 -6.158,8.363 -1.705,3.642 -2.556,8.402 -2.556,14.287 v 69.701 H 118.856 V 161.595 Z"
+     id="path1531-9" /><path
+     d="M 360.72381,381.097 V 59.711 h -23.13002 v -7.71 h 32.00002 v 336.807 h -32.00002 v -7.711 z"
+     id="path1533-1" /></g><a
+   href="https://wiki.uni-jena.de/display/URZ010SD/Chatten+mit+Matrix"
+   target="_blank"
+   rel="noopener noreferrer"
+   class="matrix_frame"
+   id="a1540"
+   style="clip-rule:evenodd;fill-rule:evenodd;image-rendering:optimizeQuality;shape-rendering:geometricPrecision;text-rendering:geometricPrecision"
+   transform="translate(4240.1835,701.17842)"><rect
+     style="opacity:0.992867;fill:#000000;fill-opacity:0;stroke:none;stroke-width:10.0157;stroke-linecap:round;stop-color:#000000"
+     id="rect1537-7"
+     width="359.55981"
+     height="378.63657"
+     x="1659.8295"
+     y="5370.8608" /></a><text
+   xml:space="preserve"
+   x="4371"
+   y="5970"
+   id="t_uni_jena"
+   class="instance_name"
+   style="font-size:12px;clip-rule:evenodd;fill-rule:evenodd;stroke-width:1;image-rendering:optimizeQuality;shape-rendering:geometricPrecision;text-rendering:geometricPrecision"><tspan
+     id="tspan5123"
+     x="4371"
+     y="5970"
+     style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:213.333px;stroke-width:10">Friedrich-Schiller-Universität Jena</tspan></text><g
   id="m_uni_bi"
   class="matrix_icon"
   transform="translate(2739.7608,4432.2377)"