From f09a2a447158022d40bd4fe99454f73c696321b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Mon, 29 Jan 2024 16:41:57 +0100 Subject: [PATCH] Update doc --- doc/ADMIN.md | 10 +--------- doc/ADMIN_fr.md | 9 +-------- doc/POST_INSTALL.md | 1 + doc/PRE_INSTALL.md | 8 ++++++++ doc/PRE_INSTALL_fr.md | 7 +++++++ 5 files changed, 18 insertions(+), 17 deletions(-) create mode 100644 doc/POST_INSTALL.md create mode 100644 doc/PRE_INSTALL.md create mode 100644 doc/PRE_INSTALL_fr.md diff --git a/doc/ADMIN.md b/doc/ADMIN.md index 2b834ac..0f6d826 100644 --- a/doc/ADMIN.md +++ b/doc/ADMIN.md @@ -6,16 +6,8 @@ The settings of Collabora are at `https://__DOMAIN__/browser/dist/admin/admin.ht - User: admin - Password: The password set during the installation. (If you forgot it, you can find it again in `/etc/coolwsd/coolwsd.xml`). -## Connexion to Nextcloud +## Connection to Nextcloud If you want to connect with Nextcloud, you have to install the [Collabora Online](https://apps.nextcloud.com/apps/richdocuments) app in Nextcloud, and configure it with the domain of your Collabora installation. *:warning: There are several Collabora Online apps. Be sure **not** to install the `Collabora Online - Built-in CODE server` apps, which are a lightwheigt version of this Collabora package. :warning:* - -## Limitations - -**ARM platform not supported.** If you want to run Collabora on Nextcloud, there is a lightweight version of the Collabora server for ARM, called [Collabora Online - Built-in CODE Server (ARM64)](https://apps.nextcloud.com/apps/richdocumentscode_arm64) which can easily connect with the [Collabora Online](https://apps.nextcloud.com/apps/richdocuments) app. - -**CODE has a warning limitation** - -![](https://www.libreoffice.org/assets/Uploads/LibreOffice-Online-limit.png) diff --git a/doc/ADMIN_fr.md b/doc/ADMIN_fr.md index cffb337..e29f1d9 100644 --- a/doc/ADMIN_fr.md +++ b/doc/ADMIN_fr.md @@ -11,11 +11,4 @@ Les paramètres de Collabora sont à `https://__DOMAIN__/browser/dist/admin/admi Si vous souhaitez vous connecter à Nextcloud, vous devez installer l'application [Collabora Online](https://apps.nextcloud.com/apps/richdocuments) dans Nextcloud, et la configurer avec le domaine de votre installation Collabora. *:warning: Il existe plusieurs applications Collabora Online. Assurez-vous **de ne pas** installer les applications `Collabora Online - Built-in CODE server`, qui sont une version allégée de ce package Collabora. :warning:* - -## Limites - -**Plateforme ARM non prise en charge.** Si vous souhaitez exécuter Collabora sur Nextcloud, il existe une version allégée du serveur Collabora pour ARM, appelée [Collabora Online - Built-in CODE Server (ARM64)](https://apps.nextcloud.com/apps/richdocumentscode_arm64) qui peut facilement se connecter à l'application [Collabora Online](https://apps.nextcloud.com/apps/richdocuments). - -**CODE a une limitation d'avertissement** - -![](https://www.libreoffice.org/assets/Uploads/LibreOffice-Online-limit.png) +ice-Online-limit.png) diff --git a/doc/POST_INSTALL.md b/doc/POST_INSTALL.md new file mode 100644 index 0000000..20ceac5 --- /dev/null +++ b/doc/POST_INSTALL.md @@ -0,0 +1 @@ +You can now use Collabora Online with Nextcloud, see the admin panel for more information! diff --git a/doc/PRE_INSTALL.md b/doc/PRE_INSTALL.md new file mode 100644 index 0000000..897e4d2 --- /dev/null +++ b/doc/PRE_INSTALL.md @@ -0,0 +1,8 @@ + +## ARM platform not supported + +If you want to run Collabora on Nextcloud, there is a lightweight version of the Collabora server for ARM, called [Collabora Online - Built-in CODE Server (ARM64)](https://apps.nextcloud.com/apps/richdocumentscode_arm64) which can easily connect with the [Nextcloud Office](https://apps.nextcloud.com/apps/richdocuments) app. + +## Usage limitation + +![LibreOffice online has a warning when more than 10 documents or more than 20 connections are in use.](https://www.libreoffice.org/assets/Uploads/LibreOffice-Online-limit.png) diff --git a/doc/PRE_INSTALL_fr.md b/doc/PRE_INSTALL_fr.md new file mode 100644 index 0000000..271e068 --- /dev/null +++ b/doc/PRE_INSTALL_fr.md @@ -0,0 +1,7 @@ +## Plateforme ARM non prise en charge + +Si vous souhaitez exécuter Collabora sur Nextcloud, il existe une version allégée du serveur Collabora pour ARM, appelée [Collabora Online - Built-in CODE Server (ARM64)](https://apps.nextcloud.com/apps/richdocumentscode_arm64) qui peut facilement se connecter à l'application [Collabora Online](https://apps.nextcloud.com/apps/richdocuments). + +## Avertissement de limite d'usage + +![LibreOffice online a un avertissement quand plus de 10 documents ou plus de 20 connections sont utilisées.](https://www.libreoffice.org/assets/Uploads/LibreOff