update documentation

3 years ago · 64a9527025
parent 26c7928a16
commit 64a9527025
127 changed files with 362 additions and 440 deletions
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@ -55,7 +55,7 @@ further defined and clarified by project maintainers.
 ## Enforcement

 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at contact@qaul.net. All complaints will
+reported by contacting the project team at contact@qaul.org. All complaints will
 be reviewed and investigated and will result in a response that is deemed
 necessary and appropriate to the circumstances. The project team is obligated to
 maintain confidentiality with regard to the reporter of an incident. Further
--- a/Cargo.toml
+++ b/Cargo.toml
@ -3,7 +3,7 @@ members = [
    # Main storage database
    "utils/alexandria",

-    # main qaul.net service library
+    # main qaul service library
    "libqaul",

    # libqaul additions
@ -19,7 +19,7 @@ members = [
    "rpc-layer/ratman-rpc",
    "rpc-layer/service-rpc",

-    # qaul.net main services
+    # qaul main services
    "libqaul/service/chat",
    "libqaul/service/files",
    "libqaul/service/voice",
--- a/README.md
+++ b/README.md
@ -10,12 +10,12 @@ supports many common desktop operating systems (Linux, Windows,
 MacOS, BSD, …), and Android mobile phones.  iOS support is on
 the roadmap.

-**qaul.net** is both a cross-platform application, implementing
+**qaul** is both a cross-platform application, implementing
 **messaging**, **filesharing**, and **voice calls**, but also a
 **development toolkit** to create fully decentralised third-party
 applications.

-In order to be able to run on unpriviledged mobile platforms qaul.net
+In order to be able to run on unpriviledged mobile platforms qaul
 implements **decentralised routing protocols** and utilities entirely
 in userspace.  The codebase is largely written in
 [Rust](https://rustlang.org), with only a few compatibility components
@ -27,15 +27,15 @@ additional information in their respective README files.

 | Component   | Description      |
 |-------------|------------------|
-| [clients]   | qaul.net end-user applications for various platforms |
+| [clients]   | qaul end-user applications for various platforms |
 | [docs]      | Manuals (for both users and developers), and tools to build and deploy documentation |
 | [emberweb]  | Cross-platform web interface bundled in with various user clients |
-| [libqaul]   | Core library of the qaul.net ecosystem.  Provides networking abstractions, user management and discovery |
+| [libqaul]   | Core library of the qaul ecosystem.  Provides networking abstractions, user management and discovery |
 | [licenses]  | Set of license texts that are in use in this repository |
 | [netmods]   | Platform-specific networking interface drivers |
 | [nix]       | [Nix](https://nixos.org) related build utilities |
 | [ratman]    | A decentralised and modular userspace frame router |
-| [rpc-layer] | qaul.net specific rpc system (qrpc) to support third-party components |
+| [rpc-layer] | qaul specific rpc system (qrpc) to support third-party components |
 | [tests]     | Integrated test suite for various components.  Most of the code also has inline tests |
 | [utils]     | Set of utilities that are used in various places and don't fit anywhere else |

@ -62,29 +62,29 @@ governments can easily shut down communication for millions of people,
 potentially putting them at risk, and slowing down or disrupting any
 organisation or activist movement.

-qaul.net aims to solve this issue by creating decentralised circuits
+qaul aims to solve this issue by creating decentralised circuits
 between devices directly.  These direct device-to-device connections can
-be imperfect and unstable.  qaul.net's routing approach takes these
+be imperfect and unstable.  qaul's routing approach takes these
 issues into account by caching undelivered messages, and carrying them
 towards their destination until the receipient comes back online.

-Routing in a qaul.net network is done via a user's ed25519 public keys,
+Routing in a qaul network is done via a user's ed25519 public keys,
 creating a 32 byte large address space.  Connecting devices together happens
 via channel-specific drivers (for example the tcp internet overlay). Therefore
 when creating a circuit, roaming between different connection types is normal,
 and no single technology has to work on all possible devices.

-To learn more about the technical side of qaul.net, check out the
+To learn more about the technical side of qaul, check out the
 [contributor manual].

 ## How to use

-There's no single way to use qaul.net.  Various platforms support
+There's no single way to use qaul.  Various platforms support
 different clients, and a qaul network can consist of many different
 components interacting with each other.  To get started, check out the
 [user manual]!

-[user manual]: https://docs.qaul.net/users
+[user manual]: https://docs.qaul.org/users


 ## Contributing
@ -95,17 +95,17 @@ where we would be happy to answer any questions you have.  For more
 long-form posting we have a [mailing list].  We also accept patches
 via e-mail!

-If you want some inspiration for what you can do with qaul.net, check
+If you want some inspiration for what you can do with qaul, check
 out the [services] section.

-[contributor manual]: https://docs.qaul.net/contributors
+[contributor manual]: https://docs.qaul.org/contributors
 [Matrix]: https://matrix.to/#/!ljaaylfsbkWFYNoNPT:fairydust.space?via=fairydust.space&via=matrix.org&via=public.cat
 [mailing list]: https://lists.sr.ht/~qaul/community
 [services]: ./services

 ## License

-qaul.net is free software licensed under the
+qaul is free software licensed under the
 [GNU Affero General Public License version 3](licenses/agpl-3.0.md) or
 later.

@ -114,7 +114,7 @@ later.
 Provided that you are otherwise in compliance with the AGPLv3 for each
 covered work you convey (including without limitation making the
 Corresponding Source available in compliance with Section 6 of the
-AGPLv3), the qaul.net developers also grant you the additional
+AGPLv3), the qaul developers also grant you the additional
 permission to convey through the Apple App Store non-source executable
 versions of the Program as incorporated into each applicable covered
 work as Executable Versions only under the Mozilla Public License
--- a/clients/android/Dockerfile
+++ b/clients/android/Dockerfile
@ -1,6 +1,6 @@
 FROM ubuntu:18.04

-LABEL maintainer="Katharina Fey, qaul.net community"
+LABEL maintainer="Katharina Fey, qaul community"

 ENV ANDROID_HOME="/opt/android-sdk" \
    ANDROID_NDK="/opt/android-ndk" \
@ -34,7 +34,7 @@ ENV ANDROID_NDK_ROOT="$ANDROID_NDK_HOME"

 ENV PATH="$PATH:$ANDROID_SDK_HOME/emulator:$ANDROID_SDK_HOME/tools/bin:$ANDROID_SDK_HOME/tools:$ANDROID_SDK_HOME/platform-tools:$ANDROID_NDK:$FLUTTER_HOME/bin:$FLUTTER_HOME/bin/cache/dart-sdk/bin"

-WORKDIR /qaul.net/clients/android
+WORKDIR /qaul/clients/android

 # Installing packages
 RUN apt-get update -qq > /dev/null && \
--- a/clients/android/README.md
+++ b/clients/android/README.md
@ -7,7 +7,7 @@ have phones, and that creating small scale networks with phones around
 you, without having to rely to SIM cards, cell towers or pre-setup
 WiFi networks can enable people to avoid censorship and surveillance.

-At the moment the qaul.net android client is a prototype!
+At the moment the qaul android client is a prototype!


 ## Things to do
@ -26,7 +26,7 @@ really work. It crashes when trying to open one of the custom views.

 ### Chat view and chat list view

-One of the main abilities of the qaul.net app is a chat.  There are
+One of the main abilities of the qaul app is a chat.  There are
 already fragment layout XML files for the actual chat view, and the
 chat list view, but none of that is working.

@ -51,7 +51,7 @@ maybe with sliding side tabs?  Maybe something else works better.
 ### Filesharing view

 The filesharing view shows all advertised and local files that are known by
-qaul.net.  Files that are only advertised should have a "get" button,
+qaul.  Files that are only advertised should have a "get" button,
 and files that are local should be able to be swiped away.

 The list should be filterable by "files by friends"
--- a/clients/android/app/src/main/java/net/qaul/app/ffi/models/Id.java
+++ b/clients/android/app/src/main/java/net/qaul/app/ffi/models/Id.java
@ -1,7 +1,7 @@
 package net.qaul.app.ffi.models;

 /**
- * Represents a user ID in qaul.net
+ * Represents a user ID in qaul
 */
 public class Id {
    public String inner;
--- a/clients/android/app/src/main/res/values/strings.xml
+++ b/clients/android/app/src/main/res/values/strings.xml
@ -1,8 +1,8 @@
 <resources>
-    <string name="app_name">qaul.net</string>
-    <string name="title_activity_login">Join qaul.net</string>
+    <string name="app_name">qaul</string>
+    <string name="title_activity_login">Join qaul</string>
    <string name="prompt_password">Password</string>
-    <string name="welcome">Welcome to qaul.net!</string>
+    <string name="welcome">Welcome to qaul!</string>

    <string name="button_login">Login</string>

@ -30,7 +30,7 @@
    <string name="button_register">Register</string>

    <string name="register_hello">Create user identity</string>
-    <string name="register_hello2">All user identities in qaul.net are cryptographically random. For people to know who you are you will need to set a handle and/or name. But note: this is optional! The app is perfectly usable if you\'re just a number</string>
+    <string name="register_hello2">All user identities in qaul are cryptographically random. For people to know who you are you will need to set a handle and/or name. But note: this is optional! The app is perfectly usable if you\'re just a number</string>
    <string name="prompt_handle">\@handle</string>
    <string name="prompt_name">Display Name</string>
    <string name="placeholder_id">5555-4444-3333-2222-1111-ACAB</string>
--- a/clients/android/build.sh
+++ b/clients/android/build.sh
@ -10,10 +10,10 @@ if [ $1 = "dev" ]; then
    echo "Attaching shell for repeated builds."
    echo "Don't invoke gradle yourself! Use 'client/android/.build_nested.sh' instead!"
    echo "Don't forget to run 'export USER=$USER GROUP=$GROUP'!"
-    docker run --rm -it -v $BASEDIR/../../:/qaul.net qaulnet/android-build-env /bin/bash
+    docker run --rm -it -v $BASEDIR/../../:/qaul qaulnet/android-build-env /bin/bash
  
 else
    echo "Running one-shot-build"
-    docker run --rm -it -v $BASEDIR/../../:/qaul.net qaulnet/android-build-env \
-           /qaul.net/clients/android/.build_nested.sh $USER $GROUP
+    docker run --rm -it -v $BASEDIR/../../:/qaul qaulnet/android-build-env \
+           /qaul/clients/android/.build_nested.sh $USER $GROUP
 fi
--- a/clients/android/settings.gradle
+++ b/clients/android/settings.gradle
@ -1,2 +1,2 @@
 include ':app'
-rootProject.name='qaul.net'
+rootProject.name='qaul'
--- a/clients/hubd/Cargo.toml
+++ b/clients/hubd/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "qaul-hubd"
-description = "A modular and easy to use internet overlay router for qaul.net"
+description = "A modular and easy to use internet overlay router for qaul"
 version = "0.2.0"
 authors = ["Katharina Fey <kookie@spacekookie>", "Leonora Tindall <nora@nora.codes>"]
 license = "AGPL-3.0-or-later"
--- a/clients/hubd/README.md
+++ b/clients/hubd/README.md
@ -1,6 +1,6 @@
 # qaul-hubd

-A modular and configurable internet overlay server for qaul.net.
+A modular and configurable internet overlay server for qaul.
 Supports static and semi-dynamic peering over Tcp and Udp.  Used for
 backbone infrastructure (routers, extenders, antenna-arays), and
 development testing.
@ -9,4 +9,4 @@ An open test network is available at `hyperion.kookie.space:11443`

 Learn more about `qaul-hubd` in the [user manual]!

-[user manual]: https://docs.qaul.net/users
+[user manual]: https://docs.qaul.org/users
--- a/clients/hubd/src/main.rs
+++ b/clients/hubd/src/main.rs
@ -1,6 +1,6 @@
 //! # qaul-hubd server
 //!
-//! A modular and configurable internet overlay server for qaul.net.
+//! A modular and configurable internet overlay server for qaul.

 mod cfg;
 mod log;
--- a/clients/hubdctl/src/main.rs
+++ b/clients/hubdctl/src/main.rs
@ -1,5 +1,5 @@
-#![doc(html_favicon_url = "https://qaul.net/favicon.ico")]
-#![doc(html_logo_url = "https://qaul.net/img/qaul_icon-128.png")]
+#![doc(html_favicon_url = "https://qaul.org/favicon.ico")]
+#![doc(html_logo_url = "https://qaul.org/img/qaul_icon-128.png")]

 use futures::join;
 use libqaul::{error::Result, helpers::TagSet, messages::{Mode, IdType}, Qaul};
--- a/clients/linux-http-test/src/main.rs
+++ b/clients/linux-http-test/src/main.rs
@ -1,5 +1,5 @@
-#![doc(html_favicon_url = "https://qaul.net/favicon.ico")]
-#![doc(html_logo_url = "https://qaul.net/img/qaul_icon-128.png")]
+#![doc(html_favicon_url = "https://qaul.org/favicon.ico")]
+#![doc(html_logo_url = "https://qaul.org/img/qaul_icon-128.png")]

 use async_std::sync::Arc;
 use ratman::Router;
--- a/clients/linux-voice-test/src/main.rs
+++ b/clients/linux-voice-test/src/main.rs
@ -1,5 +1,5 @@
-#![doc(html_favicon_url = "https://qaul.net/favicon.ico")]
-#![doc(html_logo_url = "https://qaul.net/img/qaul_icon-128.png")]
+#![doc(html_favicon_url = "https://qaul.org/favicon.ico")]
+#![doc(html_logo_url = "https://qaul.org/img/qaul_icon-128.png")]

 use {
    async_std::{
--- a/clients/linux/src/main.rs
+++ b/clients/linux/src/main.rs
@ -84,7 +84,7 @@
 //     std::thread::sleep_ms(5000);
 // }

-#![doc(html_favicon_url = "https://qaul.net/favicon.ico")]
-#![doc(html_logo_url = "https://qaul.net/img/qaul_icon-128.png")]
+#![doc(html_favicon_url = "https://qaul.org/favicon.ico")]
+#![doc(html_logo_url = "https://qaul.org/img/qaul_icon-128.png")]

 fn main() {}
--- a/clients/multinode-test/Cargo.toml
+++ b/clients/multinode-test/Cargo.toml
@ -2,7 +2,7 @@
 name = "multinode-test"
 description = "Local 3-Node test binary"
 version = "0.1.0"
-authors = ["qaul.net community"]
+authors = ["qaul community"]
 edition = "2018"

 [dependencies]
--- a/clients/multinode-test/README.md
+++ b/clients/multinode-test/README.md
@ -1,6 +1,6 @@
 # Local Multinode Test

-This test set's up a local 3-node qaul.net test network with two 
+This test set's up a local 3-node qaul test network with two 
 WebGUI interface servers.

 The network looks as follows: 
--- a/docs/README.md
+++ b/docs/README.md
@ -1,7 +1,7 @@
-# qaul.net Documentation
+# qaul Documentation

-**This folder contains the qaul.net documentation. You can find them
-online under [https://docs.qaul.net](https://docs.qaul.net)**
+**This folder contains the qaul documentation. You can find them
+online under [https://docs.qaul.org](https://docs.qaul.org)**

 **Your welcome to contribute to them!**

@ -9,9 +9,9 @@ online under [https://docs.qaul.net](https://docs.qaul.net)**
 ## Guides

 * `contributors`: the contributors' guide introduces and explains the
-  structure of qaul.net and should guide you through the steps of how
+  structure of qaul and should guide you through the steps of how
  to the project.
-* `http-api`: contains the documentation of the qaul.net http-api.
+* `http-api`: contains the documentation of the qaul http-api.
 * `index`: this folder contains the overview page.


--- a/docs/banner.svg
+++ b/docs/banner.svg
@ -71,7 +71,7 @@
         id="path863" />
    </g>
    <g
-       aria-label="qaul.net"
+       aria-label="qaul"
       id="text839"
       style="font-style:normal;font-weight:normal;font-size:11.2889px;line-height:1.25;font-family:sans-serif;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.122698">
      <path
--- a/docs/contributors/book.toml
+++ b/docs/contributors/book.toml
@ -2,12 +2,12 @@
 authors = ["Katharina Fey", "Mathias Jud", "Jess 3Jane"]
 multilingual = false
 src = "src"
-title = "qaul.net Contributors Manual"
+title = "qaul Contributors Manual"

 [build]
 create-missing = false

 [output.html]
 preferred-dark-theme = "navy"
-git-repository-url = "https://git.open-communication.net/qaul/qaul.net/-/tree/master/docs%2Fcontributors"
+git-repository-url = "https://git.qaul.org/qaul/qaul/-/tree/develop/docs%2Fcontributors"
 git-repository-icon = "fa-git"
--- a/docs/contributors/deploy.sh
+++ b/docs/contributors/deploy.sh
@ -1,7 +0,0 @@
-#!/bin/sh
-
-# create book
-./build.sh
-
-# upload book to web server
-rsync -azzhe "ssh -p 2222" ./book/ admin@docs.qaul.net:/home/admin/contributors
--- a/docs/contributors/src/SUMMARY.md
+++ b/docs/contributors/src/SUMMARY.md
@ -7,7 +7,7 @@
  - [Code of Conduct](./social/code-of-conduct.md)
 - [Manuals & websites](./manuals/_intro.md)
 - [Technical](./technical/index.md)
-  - [qaul.net Services](./technical/services.md)
+  - [qaul Services](./technical/services.md)
  - [RPC layer](./technical/rpc-layer/index.md)
    - [qrpc-sdk](./technical/rpc-layer/sdk.md)
  
@ -30,7 +30,7 @@
  - [linux-http-test](./test/linux-http-test.md)
 - [Translations](./translations/_intro.md)
 - [Design Guides](./design/_intro.md)
- [qaul.net website](./website/_intro.md)
+- [qaul website](./website/_intro.md)
    - [How to Create a Tutorial](./website/tutorials.md)
    - [Translate the Web Site](./website/translate.md)
 - [Licenses](./legal/README.md)
--- a/docs/contributors/src/assets/apis.svg
+++ b/docs/contributors/src/assets/apis.svg
@ -306,7 +306,7 @@
           id="tspan934"
           x="56.873344"
           y="249.83"
-           style="font-size:6.82692242px;stroke-width:0.60833073">qaul.net GUI</tspan></text>
+           style="font-size:6.82692242px;stroke-width:0.60833073">qaul GUI</tspan></text>
    </g>
    <g
       id="g946"
--- a/docs/contributors/src/intro.md
+++ b/docs/contributors/src/intro.md
@ -1,11 +1,11 @@
-# qaul.net contributors manual
+# qaul contributors manual

 Welcome to the contributors manual.  The purpose of this document is
-to explain qaul.net internal concepts, structures, and protocols.
-It's source code can be [found][repo] in the main qaul.net code repo.
+to explain qaul internal concepts, structures, and protocols.
+It's source code can be [found][repo] in the main qaul code repo.
 If you find any issues with it (typos, outdated sections, unclear
 sections), [open an MR], or [send us a patch]!

-[repo]: https://git.open-communication.net/qaul/qaul.net/tree/master/docs/contributors
+[repo]: https://git.qaul.org/qaul/qaul/tree/develop/docs/contributors
 [open an MR]: social/contributions.html#submitting-a-pr
 [send us a patch]: social/contributions.html#submitting-an-e-mail-patch
--- a/docs/contributors/src/manuals/_intro.md
+++ b/docs/contributors/src/manuals/_intro.md
@ -1,6 +1,6 @@
-# qaul.net documentation
+# qaul documentation

-This section outlines various pieces of the qaul.net project that
+This section outlines various pieces of the qaul project that
 aren't directly code related.


@ -16,57 +16,53 @@ $ cd docs/contributors
 $ mdbook serve
 ```

-If you have access to the qaul.net servers, you can run `./deploy.sh`
-at any level to recursively deploy sections to production.
-
-
 ## Websites

-qaul.net runs many different web services:
+qaul runs many different web services:

-* [qaul.net](https://qaul.net) the qaul.net web site
-  * [contributor manual](https://docs.qaul.net/contributors) (this document)
-  * [user manual](https://docs.qaul.net/users)
-  * [http-api](https://docs.qaul.net/http-api) qaul.net REST API guide
-  * [Rust documentaiion](https://docs.qaul.net/api) the qaul.net rust software API documentation (automatically created from the qaul.net code sources)
-* [get.qaul.net](https://get.qaul.net) the qaul.net download directory for the qaul.net binaries and big content files (e.g. videos, etc.).
+* [qaul.org](https://qaul.org) the qaul web site
+  * [contributor manual](https://docs.qaul.org/contributors) (this document)
+  * [user manual](https://docs.qaul.org/users)
+  * [http-api](https://docs.qaul.org/http-api) qaul REST API guide
+  * [Rust documentaiion](https://docs.qaul.org/api) the qaul rust software API documentation (automatically created from the qaul code sources)
+* [get.qaul.org](https://get.qaul.org) the qaul download directory for the qaul binaries and big content files (e.g. videos, etc.).

 This chapter explains how they are hosted, updated, where to look to
 edit and change them and who to contact when the service is not
 working or you would like to have access to it.


-### qaul.net Web Site
+### qaul Web Site

-There is an [own chapter] in this guide on the editing of the qaul.net
+There is an [own chapter] in this guide on the editing of the qaul
 web site.  Please have a look there on how to edit and translate the
 web site.

-* Server: https://qaul.net
-* Source repository: https://git.open-communication.net/qaul/website
+* Server: https://qaul.org
+* Source repository: https://git.qaul.org/qaul/qaul/blob/develop/docs/website
 * Updated: by deploy script
-* Admin contact: contact@qaul.net
+* Admin contact: contact@qaul.org

 [own chapter]: /website


-### docs.qaul.net Documentation
+### docs.qaul.org Documentation

-The software documentation & guides of qaul.net.
+The software documentation & guides of qaul

-* Server: https://docs.qaul.net
-* Source repository: https://git.open-communication.net/qaul/qaul.net/tree/master/docs/
+* Server: https://docs.qaul.org
+* Source repository: https://git.qaul.org/qaul/qaul/tree/develop/docs/
 * Updated: by deploy script
-* Admin contact: contact@qaul.net
+* Admin contact: contact@qaul.org


-### get.qaul.net Download Directory
+### get.qaul.org Download Directory

 The Download server for the binary builds and big content files such
 as videos etc.

-* Server: https://get.qaul.net
+* Server: https://get.qaul.org
 * Updated:
  * the builds are uploaded by CI
  * content is uploaded manually by the administrators
-* Admin contact: contact@qaul.net
+* Admin contact: contact@qaul.org
--- a/docs/contributors/src/social/_intro.md
+++ b/docs/contributors/src/social/_intro.md
@ -1,12 +1,12 @@
 # Social Documentation

-This section outlines social structures of the qaul.net project, to
+This section outlines social structures of the qaul project, to
 make engaging with us as easy as possible!


 ## Communication

-The qaul.net projet uses [matrix] as development and social chat. Feel
+The qaul projet uses [matrix] as development and social chat. Feel
 free to drop by!

 Our [community mailing list] is for long-form discussion and work log
@ -15,7 +15,7 @@ updates.  You can post questions there, show off your projects using

 We also have an [announcement mailing list], which is very low volume,
 where you will get informed about new versions and releases of the
-qaul.net software and occasional project related news.
+qaul software and occasional project related news.

 We have an open weekly developer voice chat meeting.  We are meeting
 Mondays, at 17:00 UTC on the online platform [jitsi].  The meetings
@ -27,14 +27,14 @@ paused for the time being*
 [matrix]: https://matrix.to/#/!ljaaylfsbkWFYNoNPT:matrix.org
 [announcement mailing list]: https://lists.sr.ht/~qaul/announcements
 [community mailing list]: https://lists.sr.ht/~qaul/community
-[jitsi]: https://meet.jit.si/qaul.net
+[jitsi]: https://meet.jit.si/qaul


 ## Code of Conduct

 **TLDR:** be nice!

-We want to foster an open and engaging atmosphere for qaul.net and the development community around it.
+We want to foster an open and engaging atmosphere for qaul and the development community around it.
 Because of this we follow the ["Contributor Covenant" code of conduct].
 A copy of it should have been included in the sources for this book.

--- a/docs/contributors/src/social/code-of-conduct.md
+++ b/docs/contributors/src/social/code-of-conduct.md
@ -55,7 +55,7 @@ further defined and clarified by project maintainers.
 ## Enforcement

 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at contact@qaul.net. All complaints will
+reported by contacting the project team at contact@qaul.org. All complaints will
 be reviewed and investigated and will result in a response that is deemed
 necessary and appropriate to the circumstances. The project team is obligated to
 maintain confidentiality with regard to the reporter of an incident. Further
--- a/docs/contributors/src/social/contributions.md
+++ b/docs/contributors/src/social/contributions.md
@ -2,8 +2,8 @@

 First of all: thank you for wanting to help out :)

-Day-to-day development of qaul.net happens on [our own gitlab
-instance](https://git.open-communication.net/qaul).
+Day-to-day development of qaul happens on [our own gitlab
+instance](https://git.qaul.org/qaul).


 ## Submitting an MR
--- a/docs/contributors/src/technical/crates.md
+++ b/docs/contributors/src/technical/crates.md
@ -1,11 +1,11 @@
 # Overview of Crates

-The qaul.net project largely exists in one mono-repo, meaning that all
+The qaul project largely exists in one mono-repo, meaning that all
 relevant components are stored in the same git repository.  This makes
 testing easier, but can make it daunting to look at because of the
 sheer volume of code involved.

-This list goes through the qaul.net application stack, starting at the
+This list goes through the qaul application stack, starting at the
 _bottom_ (driver/routing layer).

 **Some of the crates in this list are WIP or don't yet fully exist, as
@ -33,7 +33,7 @@ of 2020-02-08**
  delay tolerant, meaning that it can cache messages that couldn't be
  delivered yet.
  
-* **libqaul** is the main application library for qaul.net.  It
+* **libqaul** is the main application library for qaul.  It
  exposes the user concept, keystore, data store, and service API that
  allows the creation of decentralised, internet independent
  applications that communicate via a fully decentralised mesh
@ -51,7 +51,7 @@ of 2020-02-08**
  remote-procedure-calls.
  
 * **libqaul/ws** is a websocket wrapper for the RPC interface, mostly
-  used by the qaul.net web UI.
+  used by the qaul web UI.
  
 * **libqaul/ipc** is a unix socket wrapper for the RPC interface,
  that can be used to write applications on unix systems that talk to
@ -65,7 +65,7 @@ of 2020-02-08**
  sending end of the `libqaul-ipc` interface.
  
 * **utils/ws.js** is a javascript wrapper for the websockets API,
-  used mainly in the qaul.net web interface
+  used mainly in the qaul web interface

-* **clients/desktop-cli** is desktop CLI to run the qaul.net
+* **clients/desktop-cli** is desktop CLI to run the qaul
  application, with an external service bundle
--- a/docs/contributors/src/technical/index.md
+++ b/docs/contributors/src/technical/index.md
@ -1,9 +1,9 @@
 # Technical Documentation

-This is an introductory chapter into the technical layers of qaul.net!
+This is an introductory chapter into the technical layers of qaul!
 It is aimed at two different types of people:

-1. People wanting to contribute to the qaul.net core
+1. People wanting to contribute to the qaul core
 2. People wanting to write apps for a qaul network

 Before getting started, we need to cover a few basics in project
@ -13,10 +13,10 @@ that will go into more details.

 ## Introduction

-Fundamentally, qaul.net is a highly distributed system.  It is not
+Fundamentally, qaul is a highly distributed system.  It is not
 accountable to a single set of rules across all devices that are part
 of this system.  It is important to make the distinction between
-"qaul.net", the application, "qaul network", the distributed network
+"qaul", the application, "qaul network", the distributed network
 of devices, and other components provided by the project that can be
 used to write decentralised applications.

@ -33,7 +33,7 @@ send rich-payload messages, that operates on a higher level than the
 libqaul service API.  Other services can then depend on this
 high-level API.

-qaul.net (the app bundle) is primarily a GUI for a collection of
+qaul (the app bundle) is primarily a GUI for a collection of
 services, that all run on the same libqaul instance under the hood.

 Unless otherwise stated, all code is written in Rust.
@ -41,7 +41,7 @@ Unless otherwise stated, all code is written in Rust.

 ## Layers

-The qaul.net stack is heavily abstracted into layers to keep logic
+The qaul stack is heavily abstracted into layers to keep logic
 simple on each layer.  No layer should have to care about data that is
 not meant to be consumed by it.

@ -63,7 +63,7 @@ not meant to be consumed by it.

 A service (app) provides it's own API to clients, either via native
 bindings, or via the common rpc-broker system.  Following is a list of
-all the services that come bundled in qaul.net by default (more
+all the services that come bundled in qaul by default (more
 details [here][services]).

 - feed
@ -72,7 +72,7 @@ details [here][services]).
 - voices
 - radio

-[services]: ./qaul.net/services.html
+[services]: ./qaul/services.html

 When connecting your own apps to a `libqaul` instance you can check
 for the existence of other services, meaning that your application can
@ -82,7 +82,7 @@ kept small and focussed.

 ### RPC broker

-To allow external applications to integrate with an existing qaul.net/
+To allow external applications to integrate with an existing qaul/
 `libqaul` stack, the RPC message broker provides various interfaces to
 integrate with.

@ -90,7 +90,7 @@ integrate with.
 - **[socket-ipc]** - unix ipc socket interface with binary payloads
 - **[android-ipc]** - a specific ipc implementation for Android

-[http/json:api]: https://docs.qaul.net/http-api/
+[http/json:api]: https://docs.qaul.org/http-api/
 [socket-ipc]: ./libqaul/ipc/socket.html
 [android-ipc]: ./libqaul/ipc/android.html

@ -114,7 +114,7 @@ provides an API that takes messages to send to peers on the network,
 and returns messages received from the network.  It handles network
 announcements, network segmentation, message journaling, route
 updates, and networked archive storage.  It's the main driver behind
-qaul.net, and flexible enough to embed into various other use-cases.
+qaul, and flexible enough to embed into various other use-cases.

 Addresses on a ratman network are 32-byte ed25516 public keys, meaning
 that all messages are automatically encrypted.  Additionally this
--- a/docs/contributors/src/technical/libqaul/api.md
+++ b/docs/contributors/src/technical/libqaul/api.md
@ -11,7 +11,7 @@ possible.

 Code and function docs for libqaul can be found [here][libqaul]!

-[libqaul]: https://docs.qaul.net/api/libqaul/index.html
+[libqaul]: https://docs.qaul.org/api/libqaul/index.html

 ## Users

--- a/docs/contributors/src/technical/libqaul/index.md
+++ b/docs/contributors/src/technical/libqaul/index.md
@ -1,5 +1,5 @@
 # libqaul

-The core of qaul.net, providing an API for user profile management,
+The core of qaul, providing an API for user profile management,
 services, and message creation.  It bundles an encrypted database to
 persist data to disk.
--- a/docs/contributors/src/technical/libqaul/internals.md
+++ b/docs/contributors/src/technical/libqaul/internals.md
@ -45,15 +45,15 @@ service handler was found.
 The presistence module is implemented mostly by wrapping internal
 libqaul types with [alexandria] storage callbacks, which is the
 library which implements all of the persistence logic and at-rest
-encryption.  It is developed as part of qaul.net, but pulled out of
+encryption.  It is developed as part of qaul, but pulled out of
 the main tree to make it easier to use in other projects.

-[alexandria]: https://git.open-communication.net/qaul/alexandria
+[alexandria]: https://git.qaul.org/qaul/qaul/blob/develop/utils/alexandria

 ## Routing

 All calls to actually send data into a qaul network are implemented by
 Ratman, the delay tolerant, distance vector based routing protocol
-built specifically for qaul.net.  You can find documentation
+built specifically for qaul.  You can find documentation
 specifically for it in later sections of this manual.

--- a/docs/contributors/src/technical/libqaul/ipc/index.md
+++ b/docs/contributors/src/technical/libqaul/ipc/index.md
@ -1,6 +1,6 @@
 # libqaul IPC Interfaces

-While libqaul and all of the qaul.net services are written in Rust,
+While libqaul and all of the qaul services are written in Rust,
 that doens't mean that you need to write your application in Rust.
 Especially considering that your application might want to connect to
 an already running daemon on a system, your application needs to
@ -16,4 +16,4 @@ Additionally there are more interfaces that are documented in this
 chapter.  Furthermore, if you think that there's a benefit in building
 a new IPC interface for libqaul, get in touch! We're very curious.

-[http]: docs.qaul.net/http-api/
+[http]: docs.qaul.org/http-api/
--- a/docs/contributors/src/technical/ratman/internals/index.md
+++ b/docs/contributors/src/technical/ratman/internals/index.md
@ -1,6 +1,6 @@
 # Internals

-The routing layer of qaul.net is made up of the `R.A.T.M.A.N.` routing
+The routing layer of qaul is made up of the `R.A.T.M.A.N.` routing
 protocol.  It provides fully delay tolerant, distance vector based
 cross-network mesh routing.  Check the graph below for a rough
 overview of components.
--- a/docs/contributors/src/technical/rpc-layer/index.md
+++ b/docs/contributors/src/technical/rpc-layer/index.md
@ -1,13 +1,13 @@
-# qaul.net rpc-layer
+# qaul rpc-layer


-Because qaul.net aims to be an extensible architecture, the core of
+Because qaul aims to be an extensible architecture, the core of
 how services (apps) interact with each other is an RPC (remote
 procedure call) layer.  This means that each service could be running
 in a different process, and communicate with the core (the rpc-broker,
 and libqaul instance) via sockets.

-In actuality the main qaul.net services are all bundled into a single
+In actuality the main qaul services are all bundled into a single
 binary (`qaul-hubd`) that communicate in memory to be more efficient.
 But this doesn't have to be the case for others.

--- a/docs/contributors/src/technical/services.md
+++ b/docs/contributors/src/technical/services.md
@ -1,6 +1,6 @@
-# qaul.net services
+# qaul services

-Following is a list of services that are bundled with qaul.net, and
+Following is a list of services that are bundled with qaul, and
 what they can do for you.

 Services have an internal ID that is used to identify them in
@ -33,7 +33,7 @@ it.  That's what this fundamental service is for!
 This service provides a group management abstraction.  While many app
 services might want to manage groups, doing so in an encrypted system,
 with no direct group leader can be tricky.  To avoid having to
-re-implement this more than once, all qaul.net bundled app services
+re-implement this more than once, all qaul bundled app services
 use this fundamental service, and it is recommended that your app
 services do too!

@ -45,7 +45,7 @@ services do too!

 These are services that provide some user-facing functionality.  Some
 will ship with their own UI, while others will use a UI bundle (such
-as the main qaul.net services).
+as the main qaul services).


 ### Feed
@ -91,7 +91,7 @@ if the original source of a file disappears.
 * Crate name: `qaul-voices`

 Integrates with various platform features to allow voice call
-streaming over the qaul.net, as well as preparing audio messages that
+streaming over the qaul, as well as preparing audio messages that
 can be inlined into messages, or sent to many people via announce
 links.

--- a/docs/contributors/src/test/index.md
+++ b/docs/contributors/src/test/index.md
@ -1,6 +1,6 @@
-# Test qaul.net Application
+# Test qaul Application

-**This Chapter expains how to test the qaul.net application. It will change rapidly until alpha.**
+**This Chapter expains how to test the qaul application. It will change rapidly until alpha.**

 ## Tests

--- a/docs/contributors/src/test/linux-http-test.md
+++ b/docs/contributors/src/test/linux-http-test.md
@ -1,6 +1,6 @@
-# Test qaul.net on Linux with *linux-http-test* Executable
+# Test qaul on Linux with *linux-http-test* Executable

-**Executable to test the qaul.net application with it's WebGui on linux.**
+**Executable to test the qaul application with it's WebGui on linux.**

 ## Prerequisites

@ -12,7 +12,7 @@ To be able to run the test you need to build the following:

 ## Test

-From the qaul.net project folder you can invoke the following command to start the test
+From the qaul project folder you can invoke the following command to start the test

 ```bash
 # start linux-http-test with the path to the built webui content as parameter.
--- a/docs/contributors/src/translations/_intro.md
+++ b/docs/contributors/src/translations/_intro.md
@ -1,6 +1,6 @@
 # Translators Guide

-For the translation of the [qaul.net] web site please see the chapter [Translate the qaul.net Web Site].
+For the translation of the [qaul] web site please see the chapter [Translate the qaul Web Site].

-[qaul.net]: https://qaul.net
-[Translate the qaul.net Web Site]: /website/translate.md
+[qaul]: https://qaul.org
+[Translate the qaul Web Site]: /website/translate.md
--- a/docs/contributors/src/website/_intro.md
+++ b/docs/contributors/src/website/_intro.md
@ -1,8 +1,8 @@
-# qaul.net Web Site
+# qaul Web Site

-**This document is about the editing, translating and building the qaul.net public web site which is availabe under [https://qaul.net]**
+**This document is about the editing, translating and building the qaul public web site which is availabe under [https://qaul.org]**

-The [qaul.net] web site is built via the static site generator [HUGO]. Its content and sources are hosted in a [github repository] and are community editable.
+The qaul web site is built via the static site generator [HUGO]. Its content and sources are hosted in a [gitrepository] and are community editable.

 Your welcome to update, translate, [open a PR] or [send us a patch]!

@ -24,10 +24,10 @@ hugo version

 ### Get the Web Site Sources 

-Clone or download the [github repository] of the web site. All needed files (templates, content, images) are in this repository.
+Clone or download the [git repository](https://git.qaul.org/qaul/qaul). All needed files (templates, content, images) are in the subdirectory `docs/website` of this repository.

 ```bash
-git clone https://git.open-communication.net/qaul/website.git
+git clone https://git.qaul.org/qaul/qaul
 ```


@ -35,7 +35,7 @@ git clone https://git.open-communication.net/qaul/website.git

 ```bash
 # move into your 
-cd qaul-website
+cd qaul/doc/website

 # start test server
 hugo serve
@ -53,19 +53,18 @@ If you're geting an error without changing anything, check your installed HUGO v
 Here a quick overview of the web sites file structure:

 * HTML, CSS & JS Templates
-  * qaul.net theme folder contains all the HTML, CSS and javascript templates `themes/hugo-theme-qaul`. The only exception is the HTML template of the start page.
+  * qaul theme folder contains all the HTML, CSS and javascript templates `themes/hugo-theme-qaul`. The only exception is the HTML template of the start page.
  * The HTML template of the start page is in `layouts/index.html`
 * Web site content
  * The markdown content files and the images are all residing in the `content` folder.
  * The start page content can be found in the `content/index.md` file and in the `content/home` folder. There is a file for each section of the start page.
-  * All the tutorials are in sub folders of `content/tutorials`. Please see the chapter [Write a qaul.net Tutorial](/website/tutorials.md).
+  * All the tutorials are in sub folders of `content/tutorials`. Please see the chapter [Write a qaul Tutorial](/website/tutorials.md).

-For translating the web site see the chapter [Translate the qaul.net Web Site](/website/translate.md).
+For translating the web site see the chapter [Translate the qaul Web Site](/website/translate.md).


-[https://qaul.net]: https://qaul.net
-[qaul.net]: https://qaul.net
+[https://qaul.org]: https://qaul.org
 [HUGO]: https://gohugo.io/
-[github repository]: https://git.open-communication.net/qaul/website
+[git repository]: https://git.qaul.org/qaul/qaul/
 [open a PR]: /social/contributions.html#submitting-a-pr
 [send us a patch]: /social/contributions.html#submitting-an-e-mail-patch
--- a/docs/contributors/src/website/translate.md
+++ b/docs/contributors/src/website/translate.md
@ -1,6 +1,6 @@
-# Translate the qaul.net Web Site
+# Translate the qaul Web Site

-**The [qaul.net] web site is multilingual and can be translated into any language.**
+**The qaul web site is multilingual and can be translated into any language.**


 ## Translating a Content Page
@ -41,6 +41,3 @@ To add a new language there are only a few things to do:
        * `content/_index.md`
        * all files in the folder `content/home`
    * Read the section [Translating a Content Page](#Translating-a-Content-Page) for how to translate a content page.
-
-
-[qaul.net]: https://qaul.net
--- a/docs/contributors/src/website/tutorials.md
+++ b/docs/contributors/src/website/tutorials.md
@ -1,6 +1,6 @@
-# Write a qaul.net Tutorial
+# Write a qaul Tutorial

-**The qaul.net [tutorials] can be easily created. This guide explains how.**
+**The qaul [tutorials] can be easily created. This guide explains how.**

 Each tutorial is an own folder in the `/content/tutorials` folder in the [web site repository]. Please have a look at the existing tutorials to get an idea how this is done.

@ -40,9 +40,9 @@ Below will be shown the first image in my tutorial:



-[tutorials]: https://qaul.net/tutorials/
-[web site repository]: https://git.open-communication.net/qaul/website/tree/master/content/tutorials
+[tutorials]: https://qaul.org/tutorials/
+[web site repository]: https://git.qaul.org/qaul/qaul/tree/develop/docs/website/content/tutorials
 [markdown]: https://www.markdownguide.org/getting-started
-[tutorial overview]: https://qaul.net/tutorials/
+[tutorial overview]: https://qaul.org/tutorials/
 [pull request]: /social/contributions.html#submitting-a-pr
 [mailing list]: https://lists.sr.ht/%7Eqaul/community
--- a/docs/deploy.sh
+++ b/docs/deploy.sh
@ -1,23 +0,0 @@
-#!/bin/sh
-
-# build and upload the contributors manual
-cd contributors
-./deploy.sh
-cd ..
-
-# build and upload the HTTP-API documentation
-cd http-api
-./deploy.sh
-cd ..
-
-# build and upload the users manual
-cd users/
-./deploy.sh
-cd ..
-
-# build and upload the rust documentation
-cd ..
-cargo doc --no-deps
-cp target/doc/settings.html target/doc/index.html
-rsync -azzhe "ssh -p 2222" ./target/doc/ admin@docs.qaul.net:/home/admin/api
-cd docs
--- a/docs/http-api/book.toml
+++ b/docs/http-api/book.toml
@ -1,5 +1,5 @@
 [book]
-authors = ["Jess 3Jane", "qaul.net Community"]
+authors = ["Jess 3Jane", "qaul Community"]
 multilingual = false
 src = "src"
 title = "HTTP API Documentation"
@ -9,5 +9,5 @@ create-missing = false

 [output.html]
 preferred-dark-theme = "navy"
-git-repository-url = "https://git.open-communication.net/qaul/qaul.net/-/tree/master/docs%2Fhttp-api"
+git-repository-url = "https://git.qaul.org/qaul/qaul/-/tree/develop/docs%2Fhttp-api"
 git-repository-icon = "fa-git"
--- a/docs/http-api/deploy.sh
+++ b/docs/http-api/deploy.sh
@ -1,7 +0,0 @@
-#!/bin/sh
-
-# create book
-./build.sh
-
-# upload book to web server
-rsync -azzhe "ssh -p 2222" ./book/ admin@docs.qaul.net:/home/admin/http-api
--- a/docs/http-api/src/http-api/authentication.md
+++ b/docs/http-api/src/http-api/authentication.md
@ -1,6 +1,6 @@
 # Authentication HTTP-API Interface

-Each client needs to authenticate a session in order to be able to interact with the qaul.net daemon and send the session authentication in the http `Authorization` header.
+Each client needs to authenticate a session in order to be able to interact with the qaul daemon and send the session authentication in the http `Authorization` header.

 ## Http Authorization Header

--- a/docs/http-api/src/http-api/test.md
+++ b/docs/http-api/src/http-api/test.md
@ -3,6 +3,6 @@
 There are shell scripts over which you can test all the functions 
 of the HTTP API.

-The bash test scripts are located in the folder [tests/http-api](https://git.open-communication.net/qaul/qaul.net/-/tree/master/tests%2Fhttp-api) of the qaul.net repository.
+The bash test scripts are located in the folder [tests/http-api](https://git.qaul.org/qaul/qaul/-/tree/develop/tests%2Fhttp-api) of the qaul repository.

-How to execute and use the test scripts is documented in the [README.md](https://git.open-communication.net/qaul/qaul.net/-/blob/master/tests/http-api/README.md) file in the test script folder.
+How to execute and use the test scripts is documented in the [README.md](https://git.qaul.org/qaul/qaul/-/blob/develop/tests/http-api/README.md) file in the test script folder.
--- a/docs/http-api/src/intro.md
+++ b/docs/http-api/src/intro.md
@ -1,6 +1,6 @@
 # UI API Documentation

-**There are several ways to communicate with the qaul.net daemon. They all have the same functionality and communicate via JSON over http. If you want to create an UI client for qaul.net this guide documents how to interact with the daemon.**
+**There are several ways to communicate with the qaul daemon. They all have the same functionality and communicate via JSON over http. If you want to create an UI client for qaul this guide documents how to interact with the daemon.**


 ## [JSON-RPC API]
@ -13,7 +13,7 @@ The [JSON-RPC API] uses a single http endpoint for the communication with qaul d
 ## [HTTP-API]

 The [HTTP-API] is the main entry point for the Web-GUI. 
-It uses the http protocol for the communcation and communicates with the EmberJS REST module in the qaul.net WebGUI.
+It uses the http protocol for the communcation and communicates with the EmberJS REST module in the qaul WebGUI.

 [Read more >>][HTTP-API]

--- a/docs/http-api/src/json-rpc/_intro.md
+++ b/docs/http-api/src/json-rpc/_intro.md
@ -1,6 +1,6 @@
 # JSON-RPC API

-**The JSON-RPC API consists of a single http endpoint. Over which all RPC interaction with the qaul.net daemon happens.**
+**The JSON-RPC API consists of a single http endpoint. Over which all RPC interaction with the qaul daemon happens.**


 ## General Concept
--- a/docs/http-api/src/json-rpc/test.md
+++ b/docs/http-api/src/json-rpc/test.md
@ -3,6 +3,6 @@
 There are shell scripts over which you can test all the functions 
 of the JSON RPC API.

-The bash test scripts are located in the folder [tests/json-rpc](https://git.open-communication.net/qaul/qaul.net/-/tree/master/tests%2Fjson-rpc) of the qaul.net repository.
+The bash test scripts are located in the folder [tests/json-rpc](https://git.qaul.org/qaul/qaul/-/tree/develop/tests%2Fjson-rpc) of the qaul repository.

-How to execute and use the test scripts is documented in the [README.md](https://git.open-communication.net/qaul/qaul.net/-/blob/master/tests/json-rpc/README.md) file in the test script folder.
+How to execute and use the test scripts is documented in the [README.md](https://git.qaul.org/qaul/qaul/-/blob/develop/tests/json-rpc/README.md) file in the test script folder.
--- a/docs/users/book.toml
+++ b/docs/users/book.toml
@ -1,6 +1,6 @@
 [book]
-authors = ["The qaul.net developers"]
+authors = ["The qaul developers"]
 language = "en"
 multilingual = false
 src = "src"
-title = "qaul.net users manual"
+title = "qaul users manual"
--- a/docs/users/deploy.sh
+++ b/docs/users/deploy.sh
@ -1,7 +0,0 @@
-#!/bin/sh
-
-# create book
-./build.sh
-
-# upload book to web server
-rsync -azzhe "ssh -p 2222" ./book/ admin@docs.qaul.net:/home/admin/users
--- a/docs/users/src/clients.md
+++ b/docs/users/src/clients.md
@ -1,6 +1,6 @@
 # Available clients

-While a lot of the core tools in qaul.net already exist, the
+While a lot of the core tools in qaul already exist, the
 user-facing applications are mostly still prototypes.  Following is a
 list of supported clients/ platforms with instructions on how to
 build, and configure them.
--- a/docs/users/src/nix.md
+++ b/docs/users/src/nix.md
@ -2,7 +2,7 @@

 While it is possible to install dependencies with platform specific
 tools (such as `apt` on Debian, etc), it is far more recommended to
-use [nix](https://nixos.org) to build qaul.net instead.
+use [nix](https://nixos.org) to build qaul instead.

 While the actual build isn't handled by nix (yet), it makes aquiring
 the dependencies a lot easier.  Follow the instructions on how to
@ -13,7 +13,7 @@ install nix on your platform [here][nix-instructions]

 ## Fetch dependencies

-The `shell.nix` in the qaul.net repo root defines dependencies.  Fetch
+The `shell.nix` in the qaul repo root defines dependencies.  Fetch
 them into your environment by running `nix-shell` in the repo root
 (this might take a while).

@ -26,16 +26,16 @@ The output artefact will be written to `./target/release/qaul-hubd`.
 ## Lorri & direnv

 You can enable automatic environment loading when you enter the
-qaul.net repository, by configuring [lorri] and [direnv] on your system.
+qaul repository, by configuring [lorri] and [direnv] on your system.

 [lorri]: https://github.com/target/lorri
 [direnv]: https://direnv.net/

 ```console
- ❤ (uwu) ~/p/code> cd qaul.net
-direnv: loading ~/projects/code/qaul.net/.envrc
+ ❤ (uwu) ~/p/code> cd qaul
+direnv: loading ~/projects/code/qaul/.envrc
 direnv: export +AR +AR_FOR_TARGET +AS +AS_FOR_TARGET +CC
        // ... snip ...
- ❤ (uwu) ~/p/c/qaul.net> cargo build                           lorri-keep-env-hack-qaul
+ ❤ (uwu) ~/p/c/qaul> cargo build                           lorri-keep-env-hack-qaul
 ...
 ```
--- a/docs/users/src/qaul-hubd/_intro.md
+++ b/docs/users/src/qaul-hubd/_intro.md
@ -1,6 +1,6 @@
 # qaul-hubd

-This is a multi purpose router and database daemon for qaul.net.  It
+This is a multi purpose router and database daemon for qaul.  It
 handles network driver and user state as a detached process, and
 allows both http and unix ipc clients to connect to it.

--- a/docs/users/src/qaul-hubd/build.md
+++ b/docs/users/src/qaul-hubd/build.md
@ -40,8 +40,8 @@ following tools available.
 Clone the main code repo:

 ```console
-$ git clone https://git.open-communication.net/qaul/qaul.net
-$ cd qaul.net/
+$ git clone https://git.qaul.org/qaul/qaul
+$ cd qaul/
 ```

 Then simply run `cargo build --bin qaul-hubd --release` to build the
--- a/docs/users/src/qaul-hubd/config.md
+++ b/docs/users/src/qaul-hubd/config.md
@ -6,7 +6,7 @@ recommended to launch it via a user systemd unit.

 ```systemd
 [Unit]
-Description=qaul.net hub daemon
+Description=qaul hub daemon
 After=network.target

 [Service]
--- a/docs/users/src/webgui/_intro.md
+++ b/docs/users/src/webgui/_intro.md
@ -2,6 +2,6 @@

 This is a web client written in ember.js.  It's meant to be installed
 on a communal computer and can provide multiple users access to an
-underlying qaul.net instance.
+underlying qaul instance.

 Requires a running `qaul-hubd` instance to connect to.
--- a/docs/website/README.md
+++ b/docs/website/README.md
@ -1,8 +1,8 @@
-# qaul.net Web Site
+# qaul Web Site

 **This repository contains the all sources, templates and content of the
-qaul.net project web site at [https://qaul.net](https://qaul.net)**
+qaul project web site at [https://qaul.org](https://qaul.org)**

 Your very welcome to participate in the development of this web site.

-For documentation please have a look at our [contributors guide](https://docs.qaul.net/web-site/_intro.html)
+For documentation please have a look at our [contributors guide](https://docs.qaul.org/web-site/_intro.html)
--- a/docs/website/config.toml
+++ b/docs/website/config.toml
@ -1,5 +1,5 @@
 baseURL = "/"
-title = "qaul.net – قول"
+title = "qaul – قول"
 theme = "qaul-theme"
 DefaultContentLanguage = "en"

--- a/docs/website/content/community.md
+++ b/docs/website/content/community.md
@ -4,9 +4,9 @@ layout: page
 ---


-Do you have questions about qaul.net?  Trouble setting up your client?
+Do you have questions about qaul?  Trouble setting up your client?
 Or do you want to help out with development?  We have an active
-community and development chat on matrix:  [#qaul.net:matrix.org][matrix].
+community and development chat on matrix:  [#qaul.net:fairydust.space][matrix].

 For more long-form discussions, announcements, and work-logs there is
 also a mailing list, hosted on [lists.sr.ht/~qaul/community][mail].
@ -14,10 +14,10 @@ We would be happy to answer your questions on either of those
 platforms.

 The main code repository lives on our own [gitlab
-instance](https://git.open-communication.net/qaul).  A mirror of the
-main repo is available at [github](https://github.com/qaul/qaul.net)
+instance](https://git.qaul.org/qaul).  A mirror of the
+main repo is available at [github](https://github.com/qaul/qaul)


-[matrix]: https://matrix.to/#/!ljaaylfsbkWFYNoNPT:fairydust.space?via=fairydust.space&via=matrix.org&via=public.cat
+[matrix]: https://matrix.to/#/!qaul.net:fairydust.space?via=fairydust.space&via=matrix.org&via=public.cat
 [mail]: https://lists.sr.ht/~qaul/community

--- a/docs/website/content/downloads.md
+++ b/docs/website/content/downloads.md
@ -3,12 +3,12 @@ Title: Downloads
 layout: page
 ---

-Most user-facing qaul.net applications and tools are still very
+Most user-facing qaul applications and tools are still very
 work-in-progress.  Target platforms include Linux, MacOS, Windows,
 Android, and iOS.  However currently only Linux and Android are
 supported!

-Following are instructions on how to build the main qaul.net router
+Following are instructions on how to build the main qaul router
 daemon on Linux, which enables you to join a qaul network over the
 internet.

@ -16,11 +16,11 @@ internet.
 ## qaul-hubd


-1. Clone https://git.open-communication.net/qaul/qaul.net with git
+1. Clone https://git.qaul.org/qaul/qaul with git
   
   ```console
-   $ git clone https://git.open-communication.net/qaul/qaul.net
-   $ cd qaul.net
+   $ git clone https://git.qaul.org/qaul/qaul
+   $ cd qaul
   ```

 2. If you have [nix](https://nixos.org/) installed on your system you
@ -46,7 +46,7 @@ how to configure the daemon!

 ## qauldroid

-The qaul.net Android app is currently still a prototype and not
+The qaul Android app is currently still a prototype and not
 intended for end-users.  Building it requires a full Android
 development setup installed on your system.  To make the Rust
 cross-compilation easier, we created a [docker build
@ -55,11 +55,11 @@ environment][docker]!
 [docker]: https://hub.docker.com/r/qaulnet/android-build-env


-1. Clone the main qaul.net repo as before:
+1. Clone the main qaul repo as before:

   ```console
-   $ git clone https://git.open-communication.net/qaul/qaul.net
-   $ cd qaul.net/clientsl/android
+   $ git clone https://git.qaul.org/qaul/qaul
+   $ cd qaul/clientsl/android
   ```
   
 2. Cross-compile the Rust libraries via docker:
--- a/docs/website/content/home/about.md
+++ b/docs/website/content/home/about.md
@ -1,11 +1,11 @@
 ---
-Introduction_Title: What is qaul.net?
+Introduction_Title: What is qaul?
 Introduction: |
-    **qaul.net** is a set of tools, that allows devices like laptops 
+    **qaul** is a set of tools, that allows devices like laptops 
    and smartphones to create a **wireless mesh network** over Bluetooth 
    and direct WiFi connections, rather than relying on internet access
    via a mobile network.  This **decentralised and open network** extends
-    across any qaul.net-enabled device, so that if two people aren't close
+    across any qaul-enabled device, so that if two people aren't close
    enough to each other for their devices to connect directly, data can
    be sent via other devices in the middle, without those devices being
    able to read or change the messages passing through it.
@ -29,9 +29,9 @@ Meshing: |

    To create these connections, devices can use a variety of methods,
    such as WiFi and Bluetooth, or plain network cables to create links
-    with other qaul.net users around them.
+    with other qaul users around them.

-    The network that is created by qaul.net can serve two purposes:
+    The network that is created by qaul can serve two purposes:
    to connect you with people around you to run applications specifically
-    made for qaul.net, or to act as a tunnel to the traditional Internet.
+    made for qaul, or to act as a tunnel to the traditional Internet.
 ---
--- a/docs/website/content/home/contribute.md
+++ b/docs/website/content/home/contribute.md
@ -2,15 +2,15 @@
 Contribute_Title: Want to learn more?
 Contribute: |
    **Do you have questions about the project or want to talk to us about
-    qaul.net?  Check out the [Community](/community) page to learn how.**
+    qaul?  Check out the [Community](/community) page to learn how.**

    The project is currently undergoing a rewrite.  Many of the core tools
    are already done, but user-facing applications are lacking.  The easiest
-    way to get into **qaul.net** is to download the Linux `qaul-hubd` binary
-    and joining the open qaul.net test network.
+    way to get into **qaul** is to download the Linux `qaul-hubd` binary
+    and joining the open qaul test network.
    [Find out how!](/downloads#qaul-hubd)
    
    If you have trouble setting up the hubd server, check out the 
    [Learn](/learn#manuals) page to find user manuals, and documentation
-    on both code-internals, and qaul.net protocol descriptions.
+    on both code-internals, and qaul protocol descriptions.
 ---
--- a/docs/website/content/home/features.de.md
+++ b/docs/website/content/home/features.de.md
@ -1,5 +1,5 @@
 ---
-title: 'Funktionen von qaul.net'
+title: 'Funktionen von qaul'

 # Feature Text Translations
 TextMessaging: 'Text Mitteilungen'
--- a/docs/website/content/home/intro.md
+++ b/docs/website/content/home/intro.md
@ -3,7 +3,7 @@ Resilient_Title: Build resilient networks
 Resilient: | 
    Whether against an oppressive government or a natural disaster,
    centralised infrastructure is vulnerable to censorship and direct
-    attacks.  qaul.net makes it much harder to shut down a network because
+    attacks.  qaul makes it much harder to shut down a network because
    all participants in it become part of the way data is routed
 Extensible_Title: An extensible architecture
 Extensible: |
@ -13,7 +13,7 @@ Extensible: |
    problems around mesh communication
 FOSS_Title: Free and open-source software
 FOSS: |
-    qaul.net is not owned by a single company or legal entity.  All code
+    qaul is not owned by a single company or legal entity.  All code
    is licensed under a free software license, meaning it will remain open
    and free to use, study, and adapt for anyone, forever
 ---
--- a/docs/website/content/home/mesh.de.md
+++ b/docs/website/content/home/mesh.de.md
@ -1,14 +1,14 @@
 ---
 Description: |
-    **qaul.net** ist eine Internet unabhängiges Kommunikationswerkzeug 
+    **qaul** ist eine Internet unabhängiges Kommunikationswerkzeug 
    um eine direkte, lokale peer-to-peer Kommunikation zu 
    ermöglichen. Alle Geräte wie Computer und Smartphones können 
    direkt zu einem **dezentralisierten, freien Netzwerk** 
    zusammengeschlossen werden und über das Netzwerke Sprachanrufe tätigen, 
-    Textmitteilungen schreiben und Datei teilen. qaul.net vereinigt 
+    Textmitteilungen schreiben und Datei teilen. qaul vereinigt 
    alle diese Kommunikationsmöglichkeiten in einer App.

-    Zusätzlich stellt qaul.net ein API für Programmierer*innen bereit, 
+    Zusätzlich stellt qaul ein API für Programmierer*innen bereit, 
    um das Netzwerk mit eigenen Programme und Services zu erweitern und zu nutzen.
 ---

--- a/docs/website/content/home/nav.md
+++ b/docs/website/content/home/nav.md
@ -1,6 +1,6 @@
 ---
 Title: Internet independent wireless mesh communication
-Tagline: "**qaul.net** is building tools for the next revolution"
+Tagline: "**qaul** is building tools for the next revolution"
 Download: Download
 Community: Community
 Learn: Learn
--- a/docs/website/content/learn.md
+++ b/docs/website/content/learn.md
@ -1,24 +1,24 @@
 ---
-Title: Learn about qaul.net
+Title: Learn about qaul
 layout: learning
 User_Title: For end-users
 Devs_Title: For developers
 Users: |
-    This manual is aimed at end-users of qaul.net.  It guides you through
+    This manual is aimed at end-users of qaul.  It guides you through
    setting up various clients on your computer, and provides additional
    debugging help and FAQs.
    
    If you come across an issue not covered by the manual, feel free to join
    one of our [community](/community) channels to ask for help!
    
-    * [Users Manual](https://docs.qaul.net/users)
+    * [Users Manual](https://docs.qaul.org/users)
 Devs: |
-    This [technical overview][overview] of qaul.net explains some of the
+    This [technical overview][overview] of qaul explains some of the
    core concepts behind the router and network layout.
    
    [overview]: /learn/overview

-    If you want to contribute to qaul.net, the following
+    If you want to contribute to qaul, the following
    resources contain information on where to start.  The Rust docs
    outline the main library APIs and how to use various components
    together.
@ -26,9 +26,9 @@ Devs: |
    The contributors manual gives a broad overview of concepts, 
    components, and protocols.
    
-    * [Rust API docs](https://docs.qaul.net/api)
-    * [HTTP API docs](https://docs.qaul.net/http-api)
-    * [Contributors Manual](https://docs.qaul.net/contributors)
+    * [Rust API docs](https://docs.qaul.org/api)
+    * [HTTP API docs](https://docs.qaul.org/http-api)
+    * [Contributors Manual](https://docs.qaul.org/contributors)
 ---


--- a/docs/website/content/learn/overview.md
+++ b/docs/website/content/learn/overview.md
@ -3,29 +3,29 @@ Title: Networking overview
 layout: page
 ---

-qaul.net implements a heterogenious, fully decentralised mesh network.
+qaul implements a heterogenious, fully decentralised mesh network.
 What this means is that transmission channels can change between
 device links: the network is made up of roaming network shards.  To
-allow routing across network boundries, qaul.net uses a public key
+allow routing across network boundries, qaul uses a public key
 address space, to avoid having to deal with network collisions, and
 NAT.

 For links that rely on regular IP spaces (v4 or v6), a local lookup
 table is kept in each node that operates an overlay endpoint.

-This way qaul.net can run on unpriviledged devices, because it doesn't
+This way qaul can run on unpriviledged devices, because it doesn't
 rely on modifying kernel routing table parameters to create a DHT
 (distributed hash table); all routing is done entirely in userspace.


 ## Breadcrumb routing

-The router behind qaul.net is called "ratman" (route and transmission
+The router behind qaul is called "ratman" (route and transmission
 manager), which works via a gossip announcement protocol.  Each node
 on a network periodically announces itself to it's peers, letting them
 know over which of their local interfaces they can reach this node.
-Because of the coupling between ratman IDs and qaul.net users, this
-corresponds to announcing a user identity on the network for qaul.net,
+Because of the coupling between ratman IDs and qaul users, this
+corresponds to announcing a user identity on the network for qaul,
 but different applications using ratman can bind these IDs to
 different semantics.

@ -53,13 +53,13 @@ performance.

 There are several corner cases for what to do when a loop is
 encountered, or when a network becomes too big that it needs to be
-segmented.  But this covers the basics of how ratman and qaul.net do
+segmented.  But this covers the basics of how ratman and qaul do
 routing.


 ## Automatic roaming

-Because qaul.net is primarily designed to run on unpriviledged mobile
+Because qaul is primarily designed to run on unpriviledged mobile
 devices, a network automatically needs to be able to roam between
 transmission channels.  In fact, because of technical limitations on
 mobile platforms connections between devices can't be long lived and
--- a/docs/website/content/legal/code-of-conduct.md
+++ b/docs/website/content/legal/code-of-conduct.md
@ -58,7 +58,7 @@ further defined and clarified by project maintainers.
 ## Enforcement

 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at contact@qaul.net. All complaints will
+reported by contacting the project team at contact@qaul.org. All complaints will
 be reviewed and investigated and will result in a response that is deemed
 necessary and appropriate to the circumstances. The project team is obligated to
 maintain confidentiality with regard to the reporter of an incident. Further
--- a/docs/website/content/legal/privacy.de.md
+++ b/docs/website/content/legal/privacy.de.md
@ -3,11 +3,11 @@ title: "Datenschutz"
 ---
 # Datenschutz

-Die Internetdienste unter der Domain 'qaul.net' werden auf verschiedenen community betriebenen Web-Servern gehostet. Der Zugriff wird nur zu technischen Betriebszwecken gelogged und analisiert. Die Daten werden nicht an Dritte weitergegeben.
+Die Internetdienste unter der Domain 'qaul' werden auf verschiedenen community betriebenen Web-Servern gehostet. Der Zugriff wird nur zu technischen Betriebszwecken gelogged und analisiert. Die Daten werden nicht an Dritte weitergegeben.

-Eine nicht abschließende Liste von qaul.net Web-Services:
-A non exhaustive list of web services run by qaul.net:
+Eine nicht abschließende Liste von qaul Web-Services:
+A non exhaustive list of web services run by qaul:

-* [www.qaul.net](https://qaul.net) diese Web-Seite web page
-* [docs.qaul.net](https://docs.qaul.net) hostet die qaul.net Dokumentation
-* [get.qaul.net](https://get.qaul.net) ist der qaul.net Downloadserver
+* [www.qaul.org](https://qaul.org) diese Web-Seite web page
+* [docs.qaul.org](https://docs.qaul.org) hostet die qaul Dokumentation
+* [get.qaul.org](https://get.qaul.org) ist der qaul Downloadserver
--- a/docs/website/content/legal/privacy.md
+++ b/docs/website/content/legal/privacy.md
@ -3,10 +3,10 @@ title: "Privacy Statement"
 ---
 # Privacy Statement

-The web services under the domain 'qaul.net' run on different, community driven web servers. The access is only loged and analyzed for technical operating. The data is not passed on to third parties.
+The web services under the domain 'qaul' run on different, community driven web servers. The access is only loged and analyzed for technical operating. The data is not passed on to third parties.

-A non exhaustive list of web services run by qaul.net:
+A non exhaustive list of web services run by qaul:

-* [www.qaul.net](https://qaul.net) hosts this web page
-* [docs.qaul.net](https://docs.qaul.net) hosts the qaul.net documentations
-* [get.qaul.net](https://get.qaul.net) is the qaul.net download server
+* [www.qaul.org](https://qaul.org) hosts this web page
+* [docs.qaul.org](https://docs.qaul.org) hosts the qaul documentations
+* [get.qaul.org](https://get.qaul.org) is the qaul download server
--- a/docs/website/deploy.sh
+++ b/docs/website/deploy.sh
@ -1,10 +0,0 @@
-#!/bin/sh
-
-# remove old build
-rm -R ./public
-
-# build site
-HUGO_DISABLELANGUAGES="ar" hugo
-
-# upload site to web server
-rsync -azzhe "ssh -p 2223" ./public/ admin@qaul.net:/home/admin
--- a/docs/website/themes/hugo-theme-qaul/layouts/partials/header.html
+++ b/docs/website/themes/hugo-theme-qaul/layouts/partials/header.html
@ -35,7 +35,7 @@
            </a>
        </li>
        <li>
-            <a href="https://git.open-communication.net/qaul/qaul.net" target="_blank" class="icons" title="{{ i18n "QaulNetRepository" }}" rel="noopener">
+            <a href="https://git.qaul.org/qaul/qaul" target="_blank" class="icons" title="{{ i18n "QaulRepository" }}" rel="noopener">
                {{ partial "fontawesome.html" "git-square" }}
            </a>
        </li>
--- a/docs/website/themes/qaul-theme/i18n/de.toml
+++ b/docs/website/themes/qaul-theme/i18n/de.toml
@ -28,14 +28,14 @@ other = "Mitmachen"
 [Pages]
 other = "Seiten"

-[QaulNetCommunity]
-other = "qaul.net Community"
+[QaulCommunity]
+other = "qaul Community"

-[AboutQaulNet]
-other = "Über qaul.net"
+[AboutQaul]
+other = "Über qaul"

-[QaulNetRepository]
-other = "qaul.net Quelltext"
+[QaulRepository]
+other = "qaul Quelltext"

 [WebSiteRepository]
 other = "Web Seiten Quelltext"
@ -52,11 +52,11 @@ other = "Entwickler-Dokumentation"
 [Documentation]
 other = "Dokumentation"

-[QaulNetAPI]
-other = "qaul.net API Dokumentation"
+[QaulAPI]
+other = "qaul API Dokumentation"

 [IrcChat]
-other = "IRC: #qaul.net auf freenode"
+other = "IRC: #qaul auf freenode"

 [CommunityMailinglist]
 other = "Community-Mailing-Liste"
--- a/docs/website/themes/qaul-theme/i18n/en.toml
+++ b/docs/website/themes/qaul-theme/i18n/en.toml
@ -28,14 +28,14 @@ other = "Participate"
 [Pages]
 other = "Pages"

-[QaulNetCommunity]
-other = "qaul.net Community"
+[QaulCommunity]
+other = "qaul Community"

-[AboutQaulNet]
-other = "About qaul.net"
+[AboutQaul]
+other = "About qaul"

-[QaulNetRepository]
-other = "qaul.net Repository"
+[QaulRepository]
+other = "qaul Repository"

 [WebSiteRepository]
 other = "Web Site Repository"
@ -52,11 +52,11 @@ other = "Contributors Guide"
 [Documentation]
 other = "Documentation"

-[QaulNetAPI]
-other = "qaul.net API Documentation"
+[QaulAPI]
+other = "qaul API Documentation"

 [IrcChat]
-other = "IRC: #qaul.net on freenode"
+other = "IRC: #qaul on freenode"

 [CommunityMailinglist]
 other = "Community Mailing List"
--- a/docs/website/themes/qaul-theme/layouts/partials/footer.html
+++ b/docs/website/themes/qaul-theme/layouts/partials/footer.html
@ -2,23 +2,23 @@
    <div class="page">
    <nav>
        <div class="box l4 m4 s6">
-            <h5>{{ i18n "QaulNetCommunity" }}</h5>
+            <h5>{{ i18n "QaulCommunity" }}</h5>
            <ul>
-                <li><a href="https://git.open-communication.net/qaul/qaul.net" target="_blank">
+                <li><a href="https://git.qaul.org/qaul/qaul" target="_blank">
                    {{ partial "fontawesome.html" "git-square" }} 
-                    {{ i18n "QaulNetRepository" }}</a></li>
+                    {{ i18n "QaulRepository" }}</a></li>
                <li><a href="https://lists.sr.ht/%7Eqaul/community" target="_blank">
                    {{ partial "fontawesome.html" "envelope-open-text" }}
                    {{ i18n "CommunityMailinglist" }}</a></li>
                <li><a href="https://lists.sr.ht/%7Eqaul/announcements" target="_blank">
                    {{ partial "fontawesome.html" "bullhorn" }}
                    {{ i18n "AnnouncementMailinglist" }}</a></li>
-                <li><a href="mailto:contact@qaul.net">
+                <li><a href="mailto:contact@qaul.org">
                    {{ partial "fontawesome.html" "envelope" }}
-                    contact@qaul.net</a></li>
+                    contact@qaul.org</a></li>
                <li><a href="{{ "legal/privacy" | relLangURL }}">{{ i18n "Privacy" }}</a></li>
                <li><a href="{{ "legal/code-of-conduct" | relLangURL }}">{{ i18n "CodeOfConduct" }}</a></li>
-                <li><a href="{{ "about" | relLangURL }}">{{ i18n "AboutQaulNet" }}</a></li>
+                <li><a href="{{ "about" | relLangURL }}">{{ i18n "AboutQaul" }}</a></li>
            </ul>
        </div>
        <div class="box l2 m2 s4">
--- a/docs/website/themes/qaul-theme/theme.toml
+++ b/docs/website/themes/qaul-theme/theme.toml
@ -2,22 +2,17 @@
 # See https://github.com/gohugoio/hugoThemes#themetoml for an example

 name = "Qaul.Net"
-<<<<<<< HEAD:themes/hugo-theme-qaul/theme.toml
 license = "CC-BY"
-licenselink = "https://git.open-communication.net/qaul/website/blob/master/LICENSE"
-=======
-license = "GPL-3.0"
-licenselink = "https://github.com/yourname/yourtheme/blob/master/LICENSE"
->>>>>>> redesign:themes/qaul-theme/theme.toml
+licenselink = "https://git.qaul.org/qaul/qaul/blob/develop/docs/website/LICENSE"
 description = ""
-homepage = "http://qaul.net/"
+homepage = "http://qaul.org/"
 tags = []
 features = []
 min_version = "0.41"

 [author]
-  name = "qaul.net Community"
-  homepage = "https://qaul.net"
+  name = "qaul Community"
+  homepage = "https://qaul.org"

 # If porting an existing theme
 [original]
--- a/emberweb/README.md
+++ b/emberweb/README.md
@ -1,9 +1,9 @@
-# qaul.net Web GUI
+# qaul Web GUI

-The **web GUI** is the **HTML5 GUI** for qaul.net, which is
-qaul.net's default GUI.
+The **web GUI** is the **HTML5 GUI** for qaul, which is
+qaul's default GUI.

-For how to develop, build and test the web GUI [read the chapter in the contributors' guide](https://docs.qaul.net/contributors/technical/webgui/_intro.html).
+For how to develop, build and test the web GUI [read the chapter in the contributors' guide](https://docs.qaul.org/contributors/technical/webgui/_intro.html).


 ## Prequisites
@ -40,4 +40,4 @@ Now you can open the WebGUI in your web browser: http://localhost:4200/
 ## Documentation

 More documentation you'll find in the contributors guide.
-[read the chapter in the contributors' guide](https://docs.qaul.net/contributors/technical/webgui/_intro.html).
+[read the chapter in the contributors' guide](https://docs.qaul.org/contributors/technical/webgui/_intro.html).
--- a/emberweb/app/index.html
+++ b/emberweb/app/index.html
@ -3,7 +3,7 @@
  <head>
    <meta charset="utf-8">
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <title>qaul.net – قول</title>
+    <title>qaul – قول</title>
    <meta name="description" content="">
    <meta name="viewport" content="width=device-width, initial-scale=1">
    <link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
--- a/emberweb/app/info/template.hbs
+++ b/emberweb/app/info/template.hbs
@ -2,7 +2,7 @@
  <h1>{{fa-icon "info-circle"}} {{t "info.information"}}</h1>

  <div local-class="info panel">
-    <a local-class="item" href=""><span local-class="icon"><FaIcon @icon="info-circle" /></span>{{t "info.aboutQaulNet"}}</a>
+    <a local-class="item" href=""><span local-class="icon"><FaIcon @icon="info-circle" /></span>{{t "info.aboutQaul"}}</a>
    <a local-class="item" href=""><span local-class="icon"><FaIcon @icon="info-circle" /></span>{{t "info.howto"}}</a>
  </div>
 </div>
--- a/emberweb/app/styles/app.css
+++ b/emberweb/app/styles/app.css
@ -1,4 +1,4 @@
-/* qaul.net GUI CSS */
+/* qaul GUI CSS */

 /* set root font size */
 html {
--- a/emberweb/deploy.sh
+++ b/emberweb/deploy.sh
@ -1,11 +0,0 @@
-#!/bin/sh
-
-# Deploy the testing GUI to 
-# https://ember-gui.qaul.net
-
-# Build ember test
-./ember build
-
-# Deploy to server
-rsync -azzhe "ssh -p 2422" ./dist/ admin@ember-gui.qaul.net:/home/admin/
-
--- a/emberweb/translations/ar.yaml
+++ b/emberweb/translations/ar.yaml
@ -10,7 +10,7 @@ settings:
  userProfile: Your User Profile
 info:
  information: Information
-  aboutQaulNet: About qaul.net
+  aboutQaul: About qaul
  howto: How to
  debug: Debugging Information
 nav:
--- a/emberweb/translations/de.yaml
+++ b/emberweb/translations/de.yaml
@ -10,7 +10,7 @@ settings:
  userProfile: Dein Nutzerprofil
 info:
  information: Informationen
-  aboutQaulNet: Über qaul.net
+  aboutQaul: Über qaul
  howto: Nutzer*innenanleitung
  debug: Debugging Informationen
 nav:
--- a/emberweb/translations/en.yaml
+++ b/emberweb/translations/en.yaml
@ -10,7 +10,7 @@ settings:
  userProfile: Your User Profile
 info:
  information: Information
-  aboutQaulNet: About qaul.net
+  aboutQaul: About qaul
  howto: How to
  debug: Debugging Information
 nav:
--- a/libqaul/http/src/lib.rs
+++ b/libqaul/http/src/lib.rs
@ -6,8 +6,8 @@
 //! * the HTTP API for the webGUI
 //! * the RPC API

-#![doc(html_favicon_url = "https://qaul.net/favicon.ico")]
-#![doc(html_logo_url = "https://qaul.net/img/qaul_icon-128.png")]
+#![doc(html_favicon_url = "https://qaul.org/favicon.ico")]
+#![doc(html_logo_url = "https://qaul.org/img/qaul_icon-128.png")]

 use async_std::{sync::Arc, task, task::JoinHandle};
 use std::io::Result;
--- a/libqaul/rpc/src/api/mod.rs
+++ b/libqaul/rpc/src/api/mod.rs
@ -26,7 +26,7 @@ use libqaul::Qaul;

 /// Apply an RPC structure to a libqaul instance
 ///
-/// This trait is used to attach a new function to the qaul.net state
+/// This trait is used to attach a new function to the qaul state
 /// holder, without having to rely on feature flags to libqaul.
 #[async_trait]
 pub trait QaulExt {
--- a/libqaul/rpc/src/api/streamer.rs
+++ b/libqaul/rpc/src/api/streamer.rs
@ -90,7 +90,7 @@ where
    }
 }

-/// A simple wrapper around a common subscription in qaul.net
+/// A simple wrapper around a common subscription in qaul
 #[async_trait]
 pub(crate) trait Subscriber {
    async fn next(&self) -> Option<Response>;
--- a/libqaul/rpc/src/lib.rs
+++ b/libqaul/rpc/src/lib.rs
@ -17,8 +17,8 @@
 //! type definitions.

 #![allow(unused)]
-#![doc(html_favicon_url = "https://qaul.net/favicon.ico")]
-#![doc(html_logo_url = "https://qaul.net/img/qaul_icon-128.png")]
+#![doc(html_favicon_url = "https://qaul.org/favicon.ico")]
+#![doc(html_logo_url = "https://qaul.org/img/qaul_icon-128.png")]

 mod api;
 pub use api::{
--- a/libqaul/service/chat/src/lib.rs
+++ b/libqaul/service/chat/src/lib.rs
@ -1,7 +1,7 @@
-//! `qaul.net` chat service
+//! `qaul` chat service

-#![doc(html_favicon_url = "https://qaul.net/favicon.ico")]
-#![doc(html_logo_url = "https://qaul.net/img/qaul_icon-128.png")]
+#![doc(html_favicon_url = "https://qaul.org/favicon.ico")]
+#![doc(html_logo_url = "https://qaul.org/img/qaul_icon-128.png")]

 mod directory;
 use directory::RoomDirectory;
--- a/libqaul/service/files/src/lib.rs
+++ b/libqaul/service/files/src/lib.rs
@ -1,8 +1,8 @@
-//! `qaul.net` filesharing service
+//! `qaul` filesharing service

 // #![allow(unused)]
-#![doc(html_favicon_url = "https://qaul.net/favicon.ico")]
-#![doc(html_logo_url = "https://qaul.net/img/qaul_icon-128.png")]
+#![doc(html_favicon_url = "https://qaul.org/favicon.ico")]
+#![doc(html_logo_url = "https://qaul.org/img/qaul_icon-128.png")]


 mod directory;
--- a/libqaul/service/voice/src/lib.rs
+++ b/libqaul/service/voice/src/lib.rs
@ -1,4 +1,4 @@
-//! `qaul.net` voice service
+//! `qaul` voice service

 #[macro_use]
 extern crate tracing;
--- a/libqaul/src/api/messages.rs
+++ b/libqaul/src/api/messages.rs
@ -238,7 +238,7 @@ impl<'qaul> Messages<'qaul> {
    /// with it.
    ///
    /// However when users write text-messages to each other in
-    /// qaul.net, these are being sent via the `messaging` service,
+    /// qaul, these are being sent via the `messaging` service,
    /// which implements it's own `Message`, on top of `libqaul`. In
    /// that case a message is plain text and can have binary
    /// attachments.
--- a/libqaul/src/lib.rs
+++ b/libqaul/src/lib.rs
@ -1,5 +1,5 @@
 //! This is the library that sits at the heart of
-//! [qaul.net](https://qaul.net).
+//! [qaul](https://qaul.org).
 //!
 //! Fundamentally, it handles three types of interactions:
 //!
@ -22,7 +22,7 @@
 //!    user stores
 //! 5. API shims such as the `http-api` which exposes the service
 //!    API on a json:api schema
-//! 6. UI threads: either initialise the qaul.net web-frontend or
+//! 6. UI threads: either initialise the qaul web-frontend or
 //!    your own application stack
 //!
 //! `libqaul` handles user registration, sign-in and out, messaging,
@ -38,8 +38,8 @@
 //! point. This initialisation option is available before starting
 //! network bindings.

-#![doc(html_favicon_url = "https://qaul.net/favicon.ico")]
-#![doc(html_logo_url = "https://qaul.net/img/qaul_icon-128.png")]
+#![doc(html_favicon_url = "https://qaul.org/favicon.ico")]
+#![doc(html_logo_url = "https://qaul.org/img/qaul_icon-128.png")]

 // Internal modules
 mod auth;
--- a/libqaul/tide-naive-static-files/README.md
+++ b/libqaul/tide-naive-static-files/README.md
@ -1,4 +1,4 @@
-# Customized Copy of tide-naive-static-files for qaul.net
+# Customized Copy of tide-naive-static-files for qaul

 Please see original repository for information about `tide-naive-static-files`
 library:
--- a/libqaul/tide-naive-static-files/src/lib.rs
+++ b/libqaul/tide-naive-static-files/src/lib.rs
@ -48,7 +48,7 @@ async fn stream_bytes(root: PathBuf, actual_path: &str) -> io::Result<Response>
        // If the file doesn't exist, then bail out.
        if meta.is_none() {
            // ---------------------------------------------
-            // changed for qaul.net
+            // changed for qaul
            // ---------------------------------------------
            // deliver /index.html file for EmberJS WebGUI routing paths
            
--- a/Show More
+++ b/Show More