Merge remote-tracking branch 'origin/master' into fix/clarification-rest-ocs

Author: christianlupus

.devcontainer/Dockerfile

@@ -6,7 +6,7 @@ USER root
 RUN export DEBIAN_FRONTEND=noninteractive \
     && apt-get update \
     && apt-get -y install --no-install-recommends \
-        curl gnupg2 git nano make graphviz imagemagick inkscape sass unzip wget php-cli npm latexmk texlive-latex-extra tex-gyre \
+        curl gnupg2 git nano make graphviz imagemagick inkscape sass unzip wget php-cli npm latexmk texlive-latex-extra tex-gyre texlive-xetex \
     && wget https://getcomposer.org/installer -qO /tmp/composer-setup.php \
     && php /tmp/composer-setup.php \
     && mv composer.phar /usr/local/bin/composer \

.github/workflows/check-occ-command.yml

@@ -10,7 +10,7 @@ jobs:
     name: Check occ command syntax
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Run script
         run: |

.github/workflows/codespell.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: self-hosted
     steps:
       - name: Check out code
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493 # v4.2.2
         with:
           persist-credentials: false
 

.github/workflows/generate_catalog_templates.yml

@@ -13,11 +13,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493 # v4.2.2
         with:
           persist-credentials: false
 
-      - uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
+      - uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
         with:
           python-version: '3.13'
 

.github/workflows/openapi.yml

@@ -15,12 +15,12 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493 # v4.2.2
         with:
           submodules: true
 
       - name: Set up php
-        uses: shivammathur/setup-php@cf4cade2721270509d5b1c766ab3549210a39a2a # v2
+        uses: shivammathur/setup-php@ec406be512d7077f68eed36e63f4d91bc006edc4 # v2
         with:
           php-version: '8.1'
           # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation

.github/workflows/sphinxbuild.yml

@@ -11,8 +11,8 @@ jobs:
   user_manual:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-    - uses: actions/setup-python@v5
+    - uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493
+    - uses: actions/setup-python@v6
       with:
         python-version: '3.10'
         cache: 'pip'
@@ -32,8 +32,8 @@ jobs:
   user_manual-en:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-    - uses: actions/setup-python@v5
+    - uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493
+    - uses: actions/setup-python@v6
       with:
         python-version: '3.10'
         cache: 'pip'
@@ -45,8 +45,8 @@ jobs:
   developer_manual:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-    - uses: actions/setup-python@v5
+    - uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493
+    - uses: actions/setup-python@v6
       with:
         python-version: '3.10'
         cache: 'pip'
@@ -66,8 +66,8 @@ jobs:
   admin_manual:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-    - uses: actions/setup-python@v5
+    - uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493
+    - uses: actions/setup-python@v6
       with:
         python-version: '3.10'
         cache: 'pip'

README.rst

@@ -69,6 +69,12 @@ To edit a document, you can edit the .rst files on your local system, or work
 directly on GitHub. The latter is only suitable for small fixes and improvements
 because substantial editing efforts can better be controlled on your local PC.
 
+.. tip::
+   If you're getting to know our documentation syntax, `give Documatt Snippets
+   <https://snippets.documatt.com/>`_ a try. This online editor is a great way 
+   to practice with reStructuredText and Sphinx, and it provides a more accurate
+   preview of your work than GitHub does.
+
 The best way is to install a complete Sphinx build environment and work on your
 local PC. You will be able to make your own local builds, which is the fastest
 and best way to preview for errors. Sphinx will report syntax errors, missing
@@ -99,7 +105,7 @@ which if you have privacy enabled will be github.username@users.noreply.github.c
 Translations
 ------------
 
-`Help translate the documentation <https://www.transifex.com/nextcloud/nextcloud-user-documentation/dashboard/>`_.
+`Help translate the documentation <https://explore.transifex.com/nextcloud/nextcloud-user-documentation/>`_.
 
 For developers that want to ease the translation process, please read `this documentation <https://docs.transifex.com/integrations/sphinx-doc>`_.
 
@@ -143,6 +149,17 @@ Using venv
 5. Now you can use ``make ...`` to build all the stuff - for example ``make html`` to build the HTML flavor of all manuals
    The build assets will be put into the individual documentation subdirectories like ``developer_manual/_build/html/com``
 
+Building translated versions
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Only available in user_manual:
+
+1. Build the english version as described above before
+2. Create translation files: ``../build/change_file_extension.sh``
+3. Create German (``de``) version: ``make html-lang-de``
+4. Find the HTML files in ``_build/html/de/index.html``
+5. Before building another language you have to delete the complete ``_build`` directory
+
 Autobuilding
 ^^^^^^^^^^^^
 
@@ -157,6 +174,27 @@ When editing the documentation installing ``sphinx-autobuild`` though pip can be
 Building PDF
 ============
 
+Building inside docker
+^^^^^^^^^^^^^^^^^^^^^^
+
+1. Create a docker:: ``docker run --platform linux/amd64 --volume .:/docs --interactive --tty --name nextcloud-docs ghcr.io/nextcloud/continuous-integration-documentation:documentation-15 bash``
+2. Change into the documentation directory: ``cd /docs``
+3. Only once: Create a venv: ``python -m venv venv``
+4. Activate the environment: ``source venv/bin/activate``
+5. Install the dependencies ``pip install -r requirements.txt``
+6. Change into the documentation of choice (admin, developer, user): ``cd /docs/user_manual``
+7. To build the English version: ``make latexpdf``
+8. To build the translated version (only available in user_manual):
+   1. Create translation files: ``../build/change_file_extension.sh``
+   2. Create German (``de``) version: ``make latexpdf-lang-de``
+   3. Find the file in ``_build/latex/Nextcloud_User_Manual.pdf``
+   4. Before building another language you have to delete the complete ``_build`` directory
+
+Building locally
+^^^^^^^^^^^^^^^^
+
+.. note:: Because of the many dependencies LaTeX and the other tools bring in, it is not recommended to install the tools locally.
+
 1. Follow instructions for "Building HTML" above
 2. Install ``latexmk`` and ``texlive-latex-extra`` - https://pipenv.readthedocs.io/en/latest/
 3. Create a Python environment (typically inside this repository): ``pipenv --python 3.9``

admin_manual/_templates/versions.html

@@ -2,15 +2,22 @@
 {# Add rst-badge after rst-versions for small badge style. #}
   <div class="rst-versions" data-toggle="rst-versions" role="note" aria-label="versions">
     <span class="rst-current-version" data-toggle="rst-current-version">
-      <span class="fa fa-book"> Read the Docs</span>
-      v: {{ current_version }}
+      ☁️ {{ current_version }}
       <span class="fa fa-caret-down"></span>
     </span>
     <div class="rst-other-versions">
       <dl>
-        <dt>{{ _('Versions') }}</dt>
-        {% for slug, url in versions %}
-          <dd><a href="{{ url }}">{{ slug }}</a></dd>
+        <dt>☁️ {{ _('Versions') }}</dt>
+        {% for slug, url in versions|reverse %}
+        <dd style="width: 32%">
+          <a href="{{ url }}"
+             {% if current_version == slug %}
+             style="color: var(--dark-link-color);"
+             {% endif %}
+          >
+            {{ slug }}
+          </a>
+        </dd>
         {% endfor %}
       </dl>
     </div>

admin_manual/ai/app_assistant.rst

@@ -74,11 +74,8 @@ These apps currently implement the following Assistant Tasks:
 * *Summarize* (Tested with OpenAI GPT-3.5 and Llama 3.1 8B)
 * *Generate headline* (Tested with OpenAI GPT-3.5 and Llama 3.1 8B)
 * *Extract topics* (Tested with OpenAI GPT-3.5 and Llama 3.1 8B)
-
-Additionally, *integration_openai* also implements the following Assistant Tasks:
-
-* *Context write* (Tested with OpenAI GPT-3.5)
-* *Reformulate text* (Tested with OpenAI GPT-3.5)
+* *Context write* (Tested with OpenAI GPT-3.5 and Llama 3.1 8B)
+* *Reformulate text* (Tested with OpenAI GPT-3.5 and Llama 3.1 8B)
 
 These tasks may work with other models, but we can give no guarantees.
 
@@ -98,7 +95,7 @@ In order to make use of our special Context Chat feature, offering in-context in
 
 * :ref:`context_chat + context_chat_backend<ai-app-context_chat>` -  (Customer support available upon request)
 
-You will also need a text processing provider as specified above (ie. llm2 or integration_openai).
+You will also need a text processing provider as specified above (ie. llm2, integration_openai or integration_watsonx).
 
 Context Agent
 ~~~~~~~~~~~~~
@@ -117,6 +114,7 @@ Text-To-Speech
 In order to make use of Text-To-Speech, you will need an app that provides a Text-To-Speech backend:
 
 * *integration_openai* - Integrates with the OpenAI API to provide AI functionality from OpenAI servers  (Customer support available upon request; see :ref:`AI as a Service<ai-ai_as_a_service>`)
+* *text2speech_kokoro* - Runs a local model
 
 Configuration
 -------------
@@ -195,6 +193,14 @@ Set 1 to enable and 0 to disable an implemented task type.
 
 shows statistics for all task processing Tasks.
 
+5. Clean-up old tasks
+
+.. code-block::
+
+   occ taskprocessing:task:cleanup
+
+delete tasks that are older than this number of seconds, defaults to 4 months.
+
 Image storage
 ~~~~~~~~~~~~~