Merge branch 'master' into protocol

.github/CODEOWNERS

@@ -1,2 +1,4 @@
-* @MarcelCoding
-*.md @MarcelCoding @cryptic-game/text
+* @JannikEmmerich @MarcelCoding
+*.md @cryptic-game/text @JannikEmmerich @MarcelCoding
+/docs/python/ @cryptic-game/text @cryptic-game/head-of-python-backend @cryptic-game/head-assistant-of-python-backend @Defelo
+/docs/java/ @cryptic-game/text @cryptic-game/head-of-java-backend @cryptic-game/head-assistant-of-java-backend

docs/deployment/public-instances.md

@@ -0,0 +1,26 @@
+# Public Instances
+
+The team behind Cryptic is currently hosting two instances of Cryptic.
+
+## Production Instance
+
+The production instance is the instance where the actual game takes place.
+This instance is always running the latest stable version.
+
+| Endpoint                                                                     | Description                                                                                     |
+|------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------|
+| [`https://play.cryptic-game.net`](https://play.cryptic-game.net)             | The offical frontend.                                                                           |
+| `wss://server.cryptic-game.net/ws`                                           | The actual api for the frontend. ([Learn more](../protocol/websocket.md))                       |
+| [`https://server.cryptic-game.net/api`](https://server.cryptic-game.net/api) | The rest api for the game. (e.g. authentication, statistics, [Learn more](../protocol/rest.md)) |
+
+## Staging Instance
+
+The staging instance is the instance on which the game is tested. It is not recommended to play seriously on this instance.
+The database is reset periodically and money and other resources are freely distributed by developers to test new features.
+This instance is always running the current latest **unstable** version.
+
+| Endpoint                                                                                     | Description                                                                                     |
+|----------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------|
+| [`https://play.staging.cryptic-game.net`](https://play.staging.cryptic-game.net)             | The offical frontend.                                                                           |
+| `wss://server.staging.cryptic-game.net/ws`                                                   | The actual api for the frontend. ([Learn more](../protocol/websocket.md))                       |
+| [`https://server.staging.cryptic-game.net/api`](https://server.staging.cryptic-game.net/api) | The rest api for the game. (e.g. authentication, statistics [Learn more](../protocol/rest.md)) |

mkdocs.yml

@@ -1,12 +1,15 @@
 site_name: Cryptic Documentation
-repo_url: https://github.com/cryptic-game/docs
 repo_name: cryptic-game/docs
-edit_uri: edit/main/docs/
+repo_url: https://github.com/cryptic-game/docs
+edit_uri: edit/master/docs/
 
 theme:
   name: material
 #  logo: assets/logo.svg
   favicon: assets/favicon.ico
+  font:
+    text: Public Sans
+    code: Roboto Mono
   palette:
     primary: light green
     accent: deep orange
@@ -30,7 +33,7 @@ plugins:
   - git-revision-date
   - redirects:
         redirect_maps:
-            'index.md': 'infrastructure/index.md'
+            'index.md': 'deployment/public-instances.md'
   - minify:
       minify_html: true
       minify_js: true