Skip to content

Commit d2e3035

Browse files
authored
Merge pull request #14697 from nextcloud/backport/14610/stable32
2 parents b58a536 + 73135fe commit d2e3035

8 files changed

Lines changed: 16 additions & 12 deletions

File tree

admin_manual/configuration_files/encryption_configuration.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ Here is a reference table for common occ commands:
219219
* - occ encryption:enable-master-key
220220
- Enable master key mode
221221
* - occ encryption:disable-master-key
222-
- Enable user key mode
222+
- Disable master key mode
223223
* - occ encryption:fix-encrypted-version
224224
- Fix bad signature errors
225225
* - occ encryption:fix-key-location [user]

admin_manual/configuration_server/dashboard_configuration.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ Enabling the dashboard app
1010
The Dashboard App is shipped and enabled by default. If it is not enabled
1111
simply go to your Nextcloud Apps page to enable it.
1212

13-
Configuring your Nextcloud for the activity app
14-
-----------------------------------------------
13+
Configuring your Nextcloud for the dashboard app
14+
-------------------------------------------------
1515

1616
The dashboard widgets are provided by apps and have a unique identifier. This can be used to customize the default layout of the dashboard as an administrator. The layout is stored as a comma-separated list of widget identifiers.
1717

admin_manual/configuration_server/email_configuration.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ connect Nextcloud to a remote SMTP server:
5252

5353
.. warning:: There were changes to the 3rd party mailer library in Nextcloud 26:
5454

55-
* STARTTLS cannot be enforced. It will be used automatically if the mail server supports it. The encryption type should be set to 'None/STARTTLS' in this case. See :ref:`here<TLSPeerVerification>` for an example on how to configure self signed certificates.
55+
* STARTTLS cannot be enforced; it is used automatically if the mail server supports it. Set the encryption type to **None/STARTTLS** to allow this automatic upgrade. See :ref:`here<TLSPeerVerification>` for an example on how to configure self-signed certificates.
5656
* NTLM authentication for Microsoft Exchange is not supported by the new mailer library. Try using `basic authentication <https://learn.microsoft.com/en-us/exchange/client-developer/exchange-web-services/authentication-and-ews-in-exchange#basic-authentication>`_ instead.
5757
* Outlook and Microsoft Exchange have discontinued support for Basic authentication. It is no longer possible to use their services as your default email handler.
5858

admin_manual/configuration_user/user_provisioning_api.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ info, and to enable or disable an app remotely. HTTP
1111
requests can be used via a Basic Auth header to perform any of the functions
1212
listed above. The Provisioning API app is enabled by default.
1313

14-
The base URL for all calls to the share API is ``https://cloud.example.com/ocs/v1.php/cloud``.
14+
The base URL for all calls to the Provisioning API is ``https://cloud.example.com/ocs/v1.php/cloud``.
1515

1616
All calls to OCS endpoints require the ``OCS-APIRequest`` header to be set to ``true``.
1717

admin_manual/desktop/troubleshooting.rst

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -278,11 +278,8 @@ you set it to a verbose level like ``Debug`` or ``Info``.
278278
You can view the server log file using the web interface or you can open it
279279
directly from the file system in the Nextcloud server data directory.
280280

281-
.. todo:: Need more information on this. How is the log file accessed?
282-
Need to explore procedural steps in access and in saving this file ... similar
283-
to how the log file is managed for the client. Perhaps it is detailed in the
284-
Admin Guide and a link should be provided from here. I will look into that
285-
when I begin heavily editing the Admin Guide.
281+
See :doc:`/configuration_server/logging_configuration` in the admin manual for
282+
details on configuring log levels and log file locations.
286283

287284
Webserver Log Files
288285
~~~~~~~~~~~~~~~~~~~

admin_manual/installation/example_centos.rst

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@
22

33
Example installation on CentOS 8
44
================================
5+
6+
.. warning::
7+
CentOS 8 reached end-of-life on December 31, 2021 and no longer receives
8+
security updates. This guide is preserved for reference only and may be
9+
outdated. For production deployments, use a currently supported Linux
10+
distribution.
11+
512
In this install tutorial we will be deploying CentOS 8, PHP 7.4, MariaDB, Redis as memcache and Nextcloud running on Apache.
613

714
Start off by installing a CentOS 8 minimal install. This should provide a sufficient platform to run a successful Nextcloud instance.

admin_manual/installation/source_installation.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ If you prefer an automated installation, you have the option to:
1919
In case you prefer installing from the source tarball, you can setup Nextcloud
2020
from scratch using a classic LAMP stack (Linux, Apache, MySQL/MariaDB, PHP).
2121
This document provides a complete walk-through for installing Nextcloud on
22-
Ubuntu 18.04 LTS Server with Apache and MariaDB, using `the Nextcloud .tar
22+
Ubuntu 24.04 LTS Server with Apache and MariaDB, using `the Nextcloud .tar
2323
archive <https://nextcloud.com/install/>`_. This method is recommended to install Nextcloud.
2424

2525
This installation guide is giving a general overview of required dependencies and their configuration. For a distribution specific setup guide have a look at the :doc:`./example_ubuntu` and :doc:`./example_centos`.

admin_manual/installation/system_requirements.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ To ensure the full functionality of your Nextcloud, please make sure that the se
4545

4646
CPU Architecture and OS
4747
^^^^^^^^^^^^^^^^^^^^^^^
48-
A 64-bit CPU, OS and PHP is required for Nextcloud to run well.
48+
A 64-bit CPU, OS and PHP is strongly recommended for Nextcloud.
4949

5050
32-bit systems are supported, with the following known limitations:
5151

0 commit comments

Comments
 (0)