Merge pull request #578 from NethServer/master

Update stable branch
NethServer · Apr 26, 2021 · c2dc0ae · c2dc0ae
2 parents efd30d4 + 6acee49
commit c2dc0ae
Show file tree

Hide file tree

Showing 33 changed files with 256 additions and 25 deletions.
diff --git a/administrator-manual/en/collabora.rst b/administrator-manual/en/collabora.rst
@@ -63,3 +63,18 @@ Admin user
 After installation, admin dashboard can be enabled with ``loolconfig set-admin-password`` and accessible at: ::
 
   https://collabora.yourdomain.com/loleaflet/dist/admin/admin.html
+
+
+CODE repository
+===============
+
+Collabora Online comes from the CODE edition (Collabora Office development edition). To list the available packages: ::
+
+  yum list available --disablerepo=* enablerepo=collaboraoffice
+
+you can update or install directly from the CODE repository: ::
+
+  yum update --enablerepo=collaboraoffice
+  yum install collaboraofficebasis6.4-fr collaboraoffice6.4-dict-fr --enablerepo=collaboraoffice
+
+The repository is disabled by default to avoid breaking updates.
diff --git a/administrator-manual/en/nscom/_static/webtop-cf1.png b/administrator-manual/en/nscom/_static/webtop-cf1.png
diff --git a/administrator-manual/en/nscom/_static/webtop-cf2.png b/administrator-manual/en/nscom/_static/webtop-cf2.png
diff --git a/administrator-manual/en/nscom/_static/webtop-cf3.png b/administrator-manual/en/nscom/_static/webtop-cf3.png
diff --git a/administrator-manual/en/nscom/_static/webtop-cf4.png b/administrator-manual/en/nscom/_static/webtop-cf4.png
diff --git a/administrator-manual/en/nscom/_static/webtop-cf5.png b/administrator-manual/en/nscom/_static/webtop-cf5.png
diff --git a/administrator-manual/en/nscom/_static/webtop-panels.png b/administrator-manual/en/nscom/_static/webtop-panels.png
diff --git a/administrator-manual/en/nscom/_static/webtop-tags1.png b/administrator-manual/en/nscom/_static/webtop-tags1.png
diff --git a/administrator-manual/en/nscom/_static/webtop_cockpit_panel_jitsi.png b/administrator-manual/en/nscom/_static/webtop_cockpit_panel_jitsi.png
diff --git a/administrator-manual/en/nscom/_static/webtop_geologip.png b/administrator-manual/en/nscom/_static/webtop_geologip.png
diff --git a/administrator-manual/en/nscom/_static/webtop_jitsi1.png b/administrator-manual/en/nscom/_static/webtop_jitsi1.png
diff --git a/administrator-manual/en/nscom/_static/webtop_jitsi2.png b/administrator-manual/en/nscom/_static/webtop_jitsi2.png
diff --git a/administrator-manual/en/nscom/_static/webtop_jitsi3.png b/administrator-manual/en/nscom/_static/webtop_jitsi3.png
diff --git a/administrator-manual/en/nscom/_static/webtop_jitsi4.png b/administrator-manual/en/nscom/_static/webtop_jitsi4.png
diff --git a/administrator-manual/en/nscom/_static/webtop_jitsi5.png b/administrator-manual/en/nscom/_static/webtop_jitsi5.png
diff --git a/administrator-manual/en/nscom/_static/webtop_search_access_log.png b/administrator-manual/en/nscom/_static/webtop_search_access_log.png
diff --git a/administrator-manual/en/nsent/_static/webtop-cf1.png b/administrator-manual/en/nsent/_static/webtop-cf1.png
@@ -0,0 +1 @@
+../../nscom/_static/webtop-cf1.png
diff --git a/administrator-manual/en/nsent/_static/webtop-cf2.png b/administrator-manual/en/nsent/_static/webtop-cf2.png
@@ -0,0 +1 @@
+../../nscom/_static/webtop-cf2.png
diff --git a/administrator-manual/en/nsent/_static/webtop-cf3.png b/administrator-manual/en/nsent/_static/webtop-cf3.png
@@ -0,0 +1 @@
+../../nscom/_static/webtop-cf3.png
diff --git a/administrator-manual/en/nsent/_static/webtop-cf4.png b/administrator-manual/en/nsent/_static/webtop-cf4.png
@@ -0,0 +1 @@
+../../nscom/_static/webtop-cf4.png
diff --git a/administrator-manual/en/nsent/_static/webtop-cf5.png b/administrator-manual/en/nsent/_static/webtop-cf5.png
@@ -0,0 +1 @@
+../../nscom/_static/webtop-cf5.png
diff --git a/administrator-manual/en/nsent/_static/webtop-mailcard_editor.png b/administrator-manual/en/nsent/_static/webtop-mailcard_editor.png
diff --git a/administrator-manual/en/nsent/_static/webtop-mailcard_editor.png b/administrator-manual/en/nsent/_static/webtop-mailcard_editor.png
@@ -0,0 +1 @@
+../../nscom/_static/webtop-mailcard_editor.png
diff --git a/administrator-manual/en/nsent/_static/webtop-panels.png b/administrator-manual/en/nsent/_static/webtop-panels.png
@@ -0,0 +1 @@
+../../nscom/_static/webtop-panels.png
diff --git a/administrator-manual/en/nsent/_static/webtop-tags1.png b/administrator-manual/en/nsent/_static/webtop-tags1.png
@@ -0,0 +1 @@
+../../nscom/_static/webtop-tags1.png
diff --git a/administrator-manual/en/nsent/_static/webtop_cockpit_panel_jitsi.png b/administrator-manual/en/nsent/_static/webtop_cockpit_panel_jitsi.png
@@ -0,0 +1 @@
+../../nscom/_static/webtop_cockpit_panel_jitsi.png
diff --git a/administrator-manual/en/nsent/_static/webtop_geologip.png b/administrator-manual/en/nsent/_static/webtop_geologip.png
@@ -0,0 +1 @@
+../../nscom/_static/webtop_geologip.png
diff --git a/administrator-manual/en/nsent/_static/webtop_jitsi1.png b/administrator-manual/en/nsent/_static/webtop_jitsi1.png
@@ -0,0 +1 @@
+../../nscom/_static/webtop_jitsi1.png
diff --git a/administrator-manual/en/nsent/_static/webtop_jitsi2.png b/administrator-manual/en/nsent/_static/webtop_jitsi2.png
@@ -0,0 +1 @@
+../../nscom/_static/webtop_jitsi2.png
diff --git a/administrator-manual/en/nsent/_static/webtop_jitsi3.png b/administrator-manual/en/nsent/_static/webtop_jitsi3.png
@@ -0,0 +1 @@
+../../nscom/_static/webtop_jitsi3.png
diff --git a/administrator-manual/en/nsent/_static/webtop_jitsi4.png b/administrator-manual/en/nsent/_static/webtop_jitsi4.png
@@ -0,0 +1 @@
+../../nscom/_static/webtop_jitsi4.png
diff --git a/administrator-manual/en/nsent/_static/webtop_jitsi5.png b/administrator-manual/en/nsent/_static/webtop_jitsi5.png
@@ -0,0 +1 @@
+../../nscom/_static/webtop_jitsi5.png
diff --git a/administrator-manual/en/nsent/_static/webtop_search_access_log.png b/administrator-manual/en/nsent/_static/webtop_search_access_log.png
@@ -0,0 +1 @@
+../../nscom/_static/webtop_search_access_log.png
diff --git a/administrator-manual/en/webtop5.rst b/administrator-manual/en/webtop5.rst