.gitlab-ci.yml

-stages: [ build ]
+stages:
+  - build
+  - publish
 
-job_build:
+.template:build_guide:
   stage: build
-  image: ubuntu:latest
-  script:
-    - apt update
-    - apt install -y --no-install-recommends asciidoctor
+  image: alpine
+  before_script:
+    - apk update
+    - apk add --no-cache ruby asciidoctor git
     - gem install asciidoctor-pdf --pre
-    - asciidoctor-pdf -o angelguide_en.pdf guide.adoc
-    - asciidoctor-pdf -a lang=de -o angelguide_de.pdf guide.adoc
   artifacts:
     paths:
       - "angelguide_en.pdf"
       - "angelguide_de.pdf"
-    expire_in: 12 month
+    expire_in: 12 months
\ No newline at end of file
+
+build_guide_by_tag:
+  extends: .template:build_guide
+  script:
+    - ./build.sh $CI_COMMIT_TAG
+  rules:
+    - if: $CI_COMMIT_TAG != null
+      when: always
+  
+build_guide:
+  extends: .template:build_guide
+  script:
+    - ./build.sh $CI_COMMIT_SHORT_SHA
+  rules:
+    - if: $CI_COMMIT_TAG == null
+      when: always
+
+publish_guide:
+  stage: publish
+  image: kroniak/ssh-client
+  before_script:
+    - apk update
+    - apk add --no-cache rsync
+    - mkdir -p ~/.ssh
+    - chmod 700 ~/.ssh
+    - eval $(ssh-agent -s)
+    - echo -n "$SSH_PRIVATE_KEY" | ssh-add -
+    - ssh-keyscan -H "$PUBLISH_HOST" >> ~/.ssh/known_hosts
+    - chmod 644 ~/.ssh/known_hosts
+  script:
+    - 'rsync -av angelguide_*.pdf $PUBLISH_USER@$PUBLISH_HOST:$PUBLISH_PATH'
+  rules:
+    - if: $CI_COMMIT_TAG != null
+      when: manual
\ No newline at end of file

README.md

@@ -3,13 +3,14 @@
 This guide is written in Asciidoc.
 
 ## Requirements
+
 * asciidoctor
 * asciidoctor-pdf
 
 ## Asciidoctor resources
 
-[Quick Reference](https://asciidoctor.org/docs/asciidoc-syntax-quick-reference/)
-[User Manual](https://asciidoctor.org/docs/user-manual/)
+* [Quick Reference](https://asciidoctor.org/docs/asciidoc-syntax-quick-reference/)
+* [User Manual](https://asciidoctor.org/docs/user-manual/)
 
 ## How to build the PDF
 
@@ -21,6 +22,26 @@ the requirements.
 ```
 
 Build the guide in other languages:
+
 ```
   $ asciidoctor-pdf -a lang=de guide.adoc
 ```
+
+## Deployment via CI
+
+The guide can be built and deployed to our web server using Gitlab CI. The
+target server, user and path as well as the SSH key used for deployment are
+configured in the settings of this project and the server can be prepared
+using the `angelguide-deployment` role from our
+[infrastructure repo](https://chaos.expert/himmel/infrastruktur).
+
+`PUBLISH_PATH` is always `/`. `PUBLISH_HOST`, `PUBLISH_USER` and
+`SSH_PRIVATE_KEY` must match the values configured via Ansible.
+
+While the build process of the PDFs is happening automatically for every commit
+and merge request, the deployment job is a manual action. After the deployment,
+the guide will be reachable at:
+
+* <https://c3heaven.de/guide/angelguide_de.pdf> (german)
+* <https://c3heaven.de/guide/angelguide_en.pdf> (english)
+* <https://c3heaven.de/angelguide.pdf> (language determined by browser)

asset/36c3/theme.yml

@@ -2,9 +2,9 @@ extends: default
 font:
   catalog:
     Blackout Midnight:
-      normal: BlackoutMidnight.ttf
+      normal: BlackoutMidnightUmlauts.ttf
       bold: Blackout2AM.ttf
-      italic: BlackoutMidnight.ttf
+      italic: BlackoutMidnightUmlauts.ttf
       bold_italic: FiraSans-Regular.ttf
 
     Fira Sans:

asset/rC3/fonts/OFL.txt

+Copyright 2011 The Montserrat Project Authors (https://github.com/JulietaUla/Montserrat)
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.

asset/rC3/images/rC3_Logo.svg

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 23.0.4, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Ebene_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 1125 2436"
+   style="enable-background:new 0 0 1125 2436;"
+   xml:space="preserve"
+   sodipodi:docname="36C3_Logo.svg"
+   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"><metadata
+   id="metadata118"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs116" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1860"
+   inkscape:window-height="1017"
+   id="namedview114"
+   showgrid="false"
+   inkscape:zoom="0.27401839"
+   inkscape:cx="-1284.4343"
+   inkscape:cy="1142.2851"
+   inkscape:window-x="1980"
+   inkscape:window-y="26"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="Ebene_1" />
+<style
+   type="text/css"
+   id="style2">
+	.st0{fill:none;stroke:#99BA00;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.5;}
+	.st1{fill:none;stroke:#FFC600;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;}
+	.st2{fill:none;stroke:#0076BA;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.5;}
+</style>
+
+
+
+<image
+   y="872.25922"
+   x="293.79877"
+   id="image3734"
+   xlink:href="data:image/png;base64,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 QmCC "
+   style="image-rendering:optimizeSpeed"
+   preserveAspectRatio="none"
+   height="624"
+   width="624" /></svg>
\ No newline at end of file

asset/rC3/theme.yml

+extends: default
+font:
+  catalog:
+    Orbitron:
+      normal: Orbitron-VariableFont_wght.ttf
+      bold: Orbitron-VariableFont_wght.ttf
+      italic: Orbitron-VariableFont_wght.ttf
+      bold_italic: Orbitron-VariableFont_wght.ttf
+    Montserrat:
+      normal: Montserrat-Regular.ttf
+      bold: Montserrat-Bold.ttf
+      italic: Montserrat-Italic.ttf
+      bold_italic: Montserrat-BoldItalic.ttf
+
+  fallbacks:
+    - Montserrat
+
+page:
+  background_color: 160624
+  layout: portrait
+  initial_zoom: FitH
+  margin: [9mm, 6mm, 12mm, 6mm]
+  # margin_inner and margin_outer keys are used for recto/verso print margins when media=prepress
+  margin_inner: 0.75in
+  margin_outer: 0.59in
+  size: A4
+base:
+  align: justify
+  # color as hex string (leading # is optional)
+  font_color: FFFFFF
+  # color as RGB array
+  #font_color: [51, 51, 51]
+  # color as CMYK array (approximated)
+  #font_color: [0, 0, 0, 0.92]
+  #font_color: [0, 0, 0, 92%]
+  font_family: Montserrat
+  # choose one of these font_size/line_height_length combinations
+  #font_size: 14
+  #line_height_length: 20
+  #font_size: 11.25
+  #line_height_length: 18
+  #font_size: 11.2
+  #line_height_length: 16
+  font_size: 10.5
+  #line_height_length: 15
+  # correct line height for Noto Serif metrics
+  line_height_length: 12.5
+  #font_size: 11.25
+  #line_height_length: 18
+  line_height: $base_line_height_length / $base_font_size
+  font_size_large: round($base_font_size * 1.25)
+  font_size_small: round($base_font_size * 0.85)
+  font_size_min: $base_font_size * 0.75
+  font_style: normal
+  border_color: 751DE7
+  border_radius: 4
+  border_width: 0.5
+role:
+  big:
+    font_size: $base_font_size_large
+  small:
+    font_size: $base_font_size_small
+# FIXME vertical_rhythm is weird; we should think in terms of ems
+#vertical_rhythm: $base_line_height_length * 2 / 3
+# correct line height for Noto Serif metrics (comes with built-in line height)
+vertical_rhythm: $base_line_height_length
+horizontal_rhythm: $base_line_height_length
+# QUESTION should vertical_spacing be block_spacing instead?
+vertical_spacing: $vertical_rhythm
+link:
+  font_color: E500FC
+# literal is currently used for inline monospaced in prose and table cells
+literal:
+  font_color: FFFFFF
+  font_family: M+ 1mn
+button:
+  content: "[\u2009%s\u2009]"
+  font_style: bold
+key:
+  background_color: f5f5f5
+  border_color: cccccc
+  border_offset: 1.5
+  border_radius: 2
+  border_width: 0.375
+  font_family: $literal_font_family
+  separator: "\u202f+\u202f"
+mark:
+  background_color: ffff00
+  border_offset: 0.5
+menu:
+  caret_content: " <font size=\"1.15em\"><color rgb=\"b12146\">\u203a</color></font> "
+heading:
+  align: left
+  font_color: 751DE7
+  font_family: Orbitron
+  font_style: normal
+  # h1 is used for part titles (book doctype) or the doctitle (article doctype)
+  h1_font_size: floor($base_font_size * 2.2)
+  # h2 is used for chapter titles (book doctype only)
+  h2_font_size: floor($base_font_size * 2.0)
+  h3_font_size: round($base_font_size * 1.8)
+  h4_font_size: $base_font_size_large
+  h5_font_size: $base_font_size
+  h6_font_size: $base_font_size_small
+  #line_height: 1.4
+  # correct line height for Noto Serif metrics (comes with built-in line height)
+  line_height: 1
+  margin_top: $vertical_rhythm * 0.4
+  margin_bottom: $vertical_rhythm * 0.9
+  min_height_after: $base_line_height_length * 1.5
+title_page:
+  align: right
+  logo:
+    top: -20%
+  title:
+    top: 55%
+    font_family: Orbitron
+    font_style: bold
+    font_size: $heading_h1_font_size
+    font_color: 751DE7
+    line_height: 1
+  subtitle:
+    font_size: $heading_h3_font_size
+    font_style: bold_italic
+    line_height: 1
+  authors:
+    margin_top: $base_font_size * 1.25
+    font_size: $base_font_size_large
+    font_color: FFFFFF
+  revision:
+    margin_top: $base_font_size * 1.25
+    font_size: $base_font_size_small
+block:
+  margin_top: 0
+  margin_bottom: $vertical_rhythm
+caption:
+  align: left
+  font_size: $base_font_size * 0.95
+  font_style: italic
+  # FIXME perhaps set line_height instead of / in addition to margins?
+  margin_inside: $vertical_rhythm / 3
+  #margin_inside: $vertical_rhythm / 4
+  margin_outside: 0
+lead:
+  font_size: $base_font_size_large
+  line_height: 1.4
+abstract:
+  font_color: FFFFFF
+  font_size: $lead_font_size
+  line_height: $lead_line_height
+  font_style: italic
+  first_line_font_style: bold
+  title:
+    align: center
+    font_color: $heading_font_color
+    font_family: $heading_font_family
+    font_size: $heading_h4_font_size
+    font_style: $heading_font_style
+admonition:
+  font_size: $base_font_size_small
+  column_rule_color: $base_border_color
+  column_rule_width: $base_border_width
+  #padding: [0, $horizontal_rhythm, 0, $horizontal_rhythm]
+  padding: [0, 0, 0, $horizontal_rhythm]
+  icon:
+    note:
+      name: fas-info
+      stroke_color: 0076BA
+    tip:
+      name: fas-lightbulb
+      stroke_color: FFC600
+      #size: 24
+    important:
+      name: fas-exclamation
+    warning:
+      stroke_color: D39A00
+  label:
+    text_transform: uppercase
+    font_style: bold
+blockquote:
+  font_color: $base_font_color
+  font_size: $base_font_size_large
+  border_color: $base_border_color
+  border_width: 5
+  # FIXME disable negative padding bottom once margin collapsing is implemented
+  padding: [0, $horizontal_rhythm, $block_margin_bottom * -0.75, $horizontal_rhythm + $blockquote_border_width / 2]
+  cite_font_size: $base_font_size_small
+  cite_font_color: 999999
+# code is used for source blocks (perhaps change to source or listing?)
+code:
+  font_color: $base_font_color
+  font_family: $literal_font_family
+  font_size: ceil($base_font_size)
+  padding: $code_font_size
+  line_height: 1.25
+  # line_gap is an experimental property to control how a background color is applied to an inline block element
+  line_gap: 3.8
+  background_color: f5f5f5
+  border_color: cccccc
+  border_radius: $base_border_radius
+  border_width: 0.75
+conum:
+  font_family: $literal_font_family
+  font_color: $literal_font_color
+  font_size: $base_font_size
+  line_height: 4 / 3
+  glyphs: circled
+example:
+  border_color: $base_border_color
+  border_radius: $base_border_radius
+  border_width: 0.75
+  background_color: ffffff
+  # FIXME reenable padding bottom once margin collapsing is implemented
+  padding: [$vertical_rhythm, $horizontal_rhythm, 0, $horizontal_rhythm]
+image:
+  align: left
+prose:
+  margin_top: $block_margin_top
+  margin_bottom: $block_margin_bottom
+sidebar:
+  background_color: eeeeee
+  border_color: e1e1e1
+  border_radius: $base_border_radius
+  border_width: $base_border_width
+  # FIXME reenable padding bottom once margin collapsing is implemented
+  padding: [$vertical_rhythm, $vertical_rhythm * 1.25, 0, $vertical_rhythm * 1.25]
+  title:
+    align: center
+    font_color: $heading_font_color
+    font_family: $heading_font_family
+    font_size: $heading_h4_font_size
+    font_style: $heading_font_style
+thematic_break:
+  border_color: $base_border_color
+  border_style: solid
+  border_width: $base_border_width
+  margin_top: $vertical_rhythm * 0.5
+  margin_bottom: $vertical_rhythm * 1.5
+description_list:
+  term_font_style: bold
+  term_spacing: $vertical_rhythm / 4
+  description_indent: $horizontal_rhythm * 1.25
+outline_list:
+  indent: $horizontal_rhythm * 1.5
+  #marker_font_color: 404040
+  # NOTE outline_list_item_spacing applies to list items that do not have complex content
+  item_spacing: $vertical_rhythm / 2
+table:
+  background_color: $page_background_color
+  border_color: dddddd
+  border_width: $base_border_width
+  cell_padding: 3
+  head:
+    font_style: bold
+    border_bottom_width: $base_border_width * 2.5
+  body:
+    stripe_background_color: f9f9f9
+  foot:
+    background_color: f0f0f0
+toc:
+  indent: $horizontal_rhythm * 2
+  line_height: 1.4
+  dot_leader:
+    #content: ". "
+    font_color: FFFFFF
+    #levels: 2 3
+footnotes:
+  font_size: round($base_font_size * 0.75)
+  item_spacing: $outline_list_item_spacing / 2
+header:
+  font_size: $base_font_size_small
+  line_height: 1
+  vertical_align: middle
+footer:
+  font_size: $base_font_size_small
+  # NOTE if background_color is set, background and border will span width of page
+  border_color: dddddd
+  border_width: 0.25
+  height: $base_line_height_length * 2.5
+  line_height: 1
+  padding: [$base_line_height_length / 2, 1, 0, 1]
+  vertical_align: top
+  recto:
+    #columns: "<50% =0% >50%"
+    right:
+      content: '{page-number}'
+  verso:
+    #columns: $footer_recto_columns
+    left:
+      content: $footer_recto_right_content

build.sh

+#!/bin/sh
+
+if [ $# -ne 1 ]; then
+	echo expected revision as option >&2
+	exit 1
+fi
+
+revision="$1"
+version=$(echo $revision | grep -Eo 'v[0-9.]*')
+commit_date=$(git show -s --format=%ci ${revision} | cut -c1-10)
+
+if [ -z "${version}" ]; then
+  echo building with revision ${revision}
+  asciidoctor-pdf -a revnumber=${revision} -a revdate=${commit_date} -o angelguide_en.pdf guide.adoc
+  asciidoctor-pdf -a revnumber=${revision} -a revdate=${commit_date} -o angelguide_de.pdf -a lang=de guide.adoc
+else
+  echo building with version ${version}
+  asciidoctor-pdf -a revnumber=${version} -o angelguide_en.pdf guide.adoc
+  asciidoctor-pdf -a revnumber=${version} -o angelguide_de.pdf -a lang=de guide.adoc
+fi

guide.adoc

@@ -11,9 +11,9 @@
 
 ifdef::backend-pdf[]
 :pdf-theme: theme.yml
-:pdf-themesdir: {docdir}/asset/36c3
+:pdf-themesdir: {docdir}/asset/rC3
 :pdf-fontsdir: {pdf-themesdir}/fonts;GEM_FONTS_DIR
-:title-logo-image: image:{pdf-themesdir}/images/36C3_Logo.svg[align=center]
+:title-logo-image: image:{pdf-themesdir}/images/rC3_Logo.svg[align=center]
 endif::[]
 
 
@@ -30,7 +30,9 @@ include::{guide}/quickstart.adoc[]
 
 <<<
 
-include::{guide}/what-is-congress.adoc[]
+//include::{guide}/what-is-congress.adoc[]
+
+include::{guide}/what-is-rC3.adoc[]
 
 include::{guide}/what-is-an-angel.adoc[]
 
@@ -40,11 +42,11 @@ include::{guide}/pack-list.adoc[]
 
 <<<
 
-include::{guide}/when-to-arrive.adoc[]
+//include::{guide}/when-to-arrive.adoc[]
 
 include::{guide}/dect-phones.adoc[]
 
-include::{guide}/radio.adoc[]
+//include::{guide}/radio.adoc[]
 
 include::{guide}/teams.adoc[]
 

guide/de/dect-phones.adoc

-== icon:phone[size=fw]  DECT-Telefone
+== icon:phone[size=fw] SIP-Clients [small]#(DECT-Telefone)#
 
-NOTE: Der Kongress stützt sich in hohem Maße auf das vom POC bereitgestellte DECT-Telefonnetz. +
+NOTE: Eine der Kommunikationsmöglichkeiten auf der rC3 ist das vom POC bereitgestellte DECT- bzw. SIP-Telefonnetz. +
 
-Es wird nicht nur von den Teilnehmern zum Quatschen und Verabreden genutzt, sondern auch von den Kongress-Teams zur Vernetzung.
+Es wird nicht nur von den Teilnehmern zum Quatschen und Verabreden genutzt, sondern auch von den rC3-Teams zur Vernetzung und für Absprachen untereinander.
 
-Der Himmel selbst nutzt DECT-Telefone, um Engel zu erreichen, die eine DECT-Rufnummer im Engelssystem eingetragen haben. Die Mitnahme deines DECT-Telefons zum Kongress und die Registrierung beim POC hilft dem Himmel bei vielen Aufgaben.
+Der Himmel selbst nutzt SIP-Clients oder DECT-Telefone, um Engel zu erreichen, die eine Rufnummer im Engelssystem hinterlegt haben. Die Registrierung einer Telefonnummer für die rC3 hilft dem Himmel daher, dich während deiner Schicht zu erreichen.
+So ermöglichst du dem Himmel eine direkte Kommunikation ohne dass du im Browser auf einen bestimmten Tab achten musst. Oder du kannst während einer Schicht Informationen schneller weitergeben als du sie in einen Chat getippt hast und bist unabhängiger von dem Rechner als primärem Medium.
 
-So könntest du beispielsweise gebeten werden, etwas zu überprüfen und kannst dein Ergebnis zurückmelden, während du noch vor Ort bist, was eine direkte Kommunikation ermöglicht. Oder du kannst während einer Türschicht schnell Informationen weitergeben, wenn jemand versucht, den Veranstaltungsort ohne gültiges Armband zu betreten.
+Du kannst das Telefonnetz entweder in einem Router zuhause konfigurieren und ein bestehendes Telefon verwenden oder du nutzt einen entsprechenden https://en.wikipedia.org/wiki/List_of_SIP_software#Clients[Software-Client].
 
-Der POC stellt eine https://eventphone.de/doku/dect_phone_compatibility_list[Liste der kompatiblen DECT-Telefone] bereit. Wenn du zu Hause kein DECT Telefon besitzt, kannst du in der Liste nachschauen und für ca. 25 € eins im Laden kaufen.
-
-=== Telefonbuch
-* 110 Security
-* 112 CERT
+=== Wichtige Nummern
+* 1818 CERT
 * 113 Awareness Team
 * 1023 Heaven
-* 1111 Info-Desk
+* 1111 Infodesk

guide/de/intro.adoc

-Sehr geehrter Leser, +
+Sehr geehrte Leserinnen und Leser, +
 
 Danke, dass du Teil der Chaos-Community bist und dir die Zeit nimmst, dich zu informieren, wie du am besten helfen kannst! +
 
-Dieser Leitfaden versucht, alle notwendigen Informationen und Eigenheiten zu vermitteln, die dir bei der Mithilfe bei einem Chaosevent begegnen können. +
+Dieser Leitfaden versucht, alle notwendigen Informationen und Eigenheiten zu vermitteln, die dir bei der Mithilfe bei diesem Chaosevent begegnen können. +
 
 Wie bei jedem anderen Leitfaden ist es fast unmöglich, einen vollständigen Leitfaden zu schreiben, also sieh über unsere eigene Unwissenheit hinweg und fühl dich frei, die mailto:angel-guide@c3heaven.de[Autoren] mit jedem neuen Wissen zu erleuchten, auf das du stößt.

guide/de/pack-list.adoc

-== icon:list[size=fw]  Packliste
+== icon:list[size=fw] Technik
 
-Die Teilnahme als Engel in der Chaos-Community funktioniert am besten, wenn du ein wenig Ausrüstung dabei hast. Während dir die meisten Werkzeuge, die zur Erfüllung einer Aufgabe notwendig sind, zur Verfügung gestellt werden, sind einige Gegenstände persönlich und werden am besten von dir selbst mitgebracht. Dies ist eine Liste mit Dingen, die du mitbringen könntest. Die Liste ist nach Priorität geordnet:
+Die Teilnahme als Engel in der Chaos-Community funktioniert am besten, wenn du ein wenig Ausrüstung dabei hast.  Dies ist eine Liste mit Dingen, die du beachten solltest, um optimal mithelfen zu können. Die Liste ist nach Priorität geordnet:
 
-[%interactive]
-* [ ] Nachfüllbare Wasserflasche
-* [ ] Laptop oder Tablet (nicht nur ein Handy)
-* [ ] DECT-Telefon
-* [ ] (zusammenklappbarer) Becher
-* [ ] Einfaches Multi-Tool
+. Endgerät, welches genügend Strom für deine Schicht hat
+. stabile Internetleitung
+. DECT-Telefon oder SIP-Client
+. Headset (je nach Schicht)
+. Webcam (je nach Schicht)
\ No newline at end of file
-* [ ] Schlüsselband
-* [ ] Stromkabel / Euro-Adapter

guide/de/quickstart.adoc

@@ -2,17 +2,16 @@
 
 [square]
 . Erstelle dir selbst einen https://engelsystem.de[Account im Engelsystem]
-. Komm am Veranstaltungsort an
-. Finde und bewege dich zum https://c3nav.de[Himmel]
-. Lasse dich als angekommen markieren und hole dein Badge ab
-  * Frage einen Begrüßungsengel oder einen Schichtkoordinator
+. Komm am virtuellen https://rc3.world[Veranstaltungsort] an
+. Melde dich auf der Plattform an, um automatisch im Engelsystem als angekommen markiert zu werden
+. Finde den Himmel und bewege dich dorthin
+.. Bei Fragen kannst du dich jederzeit an die Schicht-Koordinatoren hinter dem Tresen wenden
 . Nimm an einem Engelmeeting teil
-  * Diese sind in den Engelsystem-News angekündigt
+.. Diese sind in den Engelsystem-News angekündigt
 . Klicke dir eine interessante Schicht
-  * Lies zuerst die Schichtbeschreibungen
+.. Lies zuerst die Schichtbeschreibungen
 . Nimm an deiner Schicht teil
-  * Verwende die https://c3nav.de[Navigation], um den richtigen Ort zu finden
-  * Komm etwas früher zum Treffpunkt
+.. Komm etwas früher zum virtuellen Treffpunkt
 . Pausiere für mindestens eine Stunde
 . Wiederhole ab Schritt 6
 

guide/de/teams.adoc

 == icon:users[size=fw] Teams
 
-Der Kongress wird von verschiedenen Teams organisiert, die jeweils ein eigenes Fachgebiet abdecken.
+Die rC3 wird von verschiedenen Teams organisiert, die jeweils ein eigenes Fachgebiet abdecken.
 
-Alle Teams sind selbst organisiert und bieten dem Kongress ihre eigenen Dienstleistungen an. Um dir einen Überblick zu geben, beschreiben wir hier die Teams, mit denen du am ehesten interagieren wirst und geben einen kurzen Überblick über deren Zusammenspiel.
+Alle Teams sind selbst organisiert und bieten der rC3 ihre eigenen Dienstleistungen an. Um dir einen Überblick zu geben, beschreiben wir hier die Teams, mit denen du am ehesten interagieren wirst und geben einen kurzen Überblick über deren Zusammenspiel.
 
 NOTE: Teams entstehen durch ein unerfülltes Bedürfnis. Sie werden selten von einer Autorität ins Leben gerufen.
 
 <<<
 include::teams/awareness-team.adoc[]
 
-include::teams/boc.adoc[]
+//include::teams/boc.adoc[]
 
-include::teams/bottles-team.adoc[]
+//include::teams/bottles-team.adoc[]
 
 include::teams/cashdesk.adoc[]
 
 include::teams/cert.adoc[]
 
-include::teams/gelb-team.adoc[]
+include::teams/c3gelb.adoc[]
 
-include::teams/hac.adoc[]
+//include::teams/hac.adoc[]
 
 include::teams/heaven.adoc[]
 
 include::teams/infodesk.adoc[]
 
-include::teams/loc.adoc[]
+//include::teams/loc.adoc[]
 
-include::teams/noc.adoc[]
+// include::teams/noc.adoc[]
 
 include::teams/pl.adoc[]
 
 include::teams/poc.adoc[]
 
-include::teams/security.adoc[]
+//include::teams/security.adoc[]
 
 include::teams/voc.adoc[]

guide/de/teams/awareness-team.adoc

 === Awareness-Team
 
-Wenn du während deines Kongresses Probleme auf nicht physische Weise hast, kannst du Hilfe vom Awareness Team erhalten.
+Wenn du während der rC3 Probleme auf nicht physische Weise hast, kannst du Hilfe vom Awareness Team erhalten.
 
 Ihre Expertise sind das Reden über Themen, um die deine Gedanken die ganze Zeit kreisen oder Probleme mit deiner aktuellen Situation in irgendeiner Weise.