WIP

about/zammad.rst

@@ -1,26 +1,32 @@
 Zammad
 ======
 
-Do you receive many emails and want to answer them with a team of agents?
+The Software
+------------
 
-You're going to love Zammad_!
+Do you receive many emails and want to answer them with a team of agents?
+You're going to love `Zammad <https://zammad.org/>`_!
 
 Zammad is a web based open source helpdesk/customer support system with many
 features to manage customer communication via several channels like chat,
 email, facebook, phone, and Whatsapp.
-It is distributed under version 3 of the GNU AFFERO General Public License
-(GNU AGPLv3).
 
-.. hint::
+The Zammad software is and will stay Open Source. You can find it on GitHub.
+It is licensed under the GNU AGPLv3. The source code is
+`available on GitHub <https://github.com/zammad/zammad>`_ and owned by the
+`Zammad Foundation <https://zammad-foundation.org/>`_, which is independent
+of commercial providers such as Zammad GmbH.
 
-   The easiest way to get to a running Zammad is to use our
-   `cloud services <https://zammad.com/en/pricing>`_. Give it a try by
-   registering a `free trial instance <https://zammad.com/en/getting-started>`_!
+The Company - Zammad GmbH
+-------------------------
 
-   These services provide a hassle-free experience, avoid a
-   complex setup, system configuration and backup and update processes.
+The development of Zammad is carried out by `Zammad GmbH <https://zammad.com/>`_ in
+collaboration with the community. Even the documentation you are looking at is mainly
+written by Zammad employees. When we talk about "us" in this documentation, we refer
+to the amazing `Zammad team <https://zammad.com/en/company>`_ of people who love to
+create open source software for you.
 
-The code is open source, and `available on GitHub`_!
+If you want to ensure the Zammad software has a bright and sustainable future, consider
+becoming a Zammad customer!
 
-.. _Zammad: https://zammad.org/
-.. _available on GitHub: https://github.com/zammad/zammad
+.. include:: /install/includes/hosted-services.rst

install/docker-compose.rst

@@ -1,20 +1,17 @@
 Install with Docker
 ===================
 
+.. include:: /install/includes/hosted-services.rst
+
 Zammad can be deployed using Docker-Compose. You can even use
 graphical docker front ends like
 `Portainer <https://www.portainer.io/>`_.
 
-.. include:: /install/includes/hosted-services.rst
-
 .. hint::
 
    We do not provide support in terms of Docker (-Compose) or Portainer specific problems.
    If you choose to run Zammad via Docker, support is only provided for the Zammad application.
 
-   In case you're not too familiar with Docker and the way it works, you may want
-   to stick with :doc:`the package installation </install/package/>` instead.
-
 Prerequisites
 -------------
 

install/includes/hosted-services.rst

@@ -1,12 +1,10 @@
 .. orphan
 
-.. hint::
+.. tip::
 
-   Let us handle this stuff for you!
+   Are you tired of complex setup, configuration, backup and update tasks?
+   Let :doc:`us </about/zammad>` handle this stuff for you! 🚀
 
-   The easiest way to get to a running Zammad is to use our
-   `cloud services <https://zammad.com/en/pricing>`_. Give it a try by
-   registering a `free trial instance <https://zammad.com/en/getting-started>`_!
-
-   These services provide a hassle-free experience, avoid a
-   complex setup, system configuration and backup and update processes.
+   The easiest and often most cost-effective way to operate Zammad is our
+   `cloud service <https://zammad.com/en/pricing>`_. Give it a try with
+   a `free trial instance <https://zammad.com/en/getting-started>`_!

install/kubernetes.rst

@@ -1,13 +1,13 @@
 Install on Kubernetes
 =====================
 
+.. include:: /install/includes/hosted-services.rst
+
+You can find installation instructions
+`in the documentation of our helm chart <https://github.com/zammad/zammad-helm/blob/main/zammad/README.md>`_.
+
 .. hint::
 
    We do not provide support in terms of Kubernetes specific problems.
    If you choose to run Zammad via Kubernetes, support is only provided for the
    Zammad application.
-
-.. include:: /install/includes/hosted-services.rst
-
-You can find installation instructions
-`in the documentation of our helm chart <https://github.com/zammad/zammad-helm/blob/main/zammad/README.md>`_.

install/source.rst

@@ -1,6 +1,8 @@
 Install from Source
 ===================
 
+.. include:: /install/includes/hosted-services.rst
+
 The source installation is the most difficult installation type of Zammad.
 If you're not too experienced with Linux and all that, you may want to use
 another installation type:
@@ -76,8 +78,8 @@ compilation. See `pnpm.io <https://pnpm.io/>`_ for more information.
       Install RVM
          .. code-block:: sh
 
-            $ apt install curl git patch build-essential bison zlib1g-dev libssl-dev libxml2-dev libxml2-dev autotools-dev\ 
-              libxslt1-dev libyaml-0-2 autoconf automake libreadline-dev libyaml-dev libtool libgmp-dev libgdbm-dev libncurses5-dev\ 
+            $ apt install curl git patch build-essential bison zlib1g-dev libssl-dev libxml2-dev libxml2-dev autotools-dev\
+              libxslt1-dev libyaml-0-2 autoconf automake libreadline-dev libyaml-dev libtool libgmp-dev libgdbm-dev libncurses5-dev\
               pkg-config libffi-dev libimlib2-dev gawk software-properties-common
 
             $ apt-add-repository -y ppa:rael-gc/rvm
@@ -98,8 +100,8 @@ compilation. See `pnpm.io <https://pnpm.io/>`_ for more information.
       Install RVM
          .. code-block:: sh
 
-            $ apt install curl git patch build-essential bison zlib1g-dev libssl-dev libxml2-dev libxml2-dev autotools-dev\ 
-              libxslt1-dev libyaml-0-2 autoconf automake libreadline-dev libyaml-dev libtool libgmp-dev libgdbm-dev libncurses5-dev\ 
+            $ apt install curl git patch build-essential bison zlib1g-dev libssl-dev libxml2-dev libxml2-dev autotools-dev\
+              libxslt1-dev libyaml-0-2 autoconf automake libreadline-dev libyaml-dev libtool libgmp-dev libgdbm-dev libncurses5-dev\
               pkg-config libffi-dev libimlib2-dev gawk
 
             $ gpg --keyserver keyserver.ubuntu.com --recv-keys\