diff --git a/.github/workflows/sphinxbuild.yml b/.github/workflows/sphinxbuild.yml
index 9d94914091d..8f74692f149 100644
--- a/.github/workflows/sphinxbuild.yml
+++ b/.github/workflows/sphinxbuild.yml
@@ -404,6 +404,7 @@ jobs:
args: |
--root-dir "$(pwd)/stage"
--offline --no-progress
+ --remap "https://docs.nextcloud.com/server/latest/ file://$(pwd)/stage/${{ needs.stage-and-check.outputs.branch_name }}/"
--remap "https://docs.nextcloud.com/server/ file://$(pwd)/stage/"
--exclude 'go\.php' --exclude 'mailto:' --exclude-path '.*/404\.html' --exclude-path '.*/_static/.*'
--exclude "/user_manual/" --include "/user_manual/en/"
diff --git a/admin_manual/index.rst b/admin_manual/index.rst
index 8cb2e40c416..6b1169ddb1a 100644
--- a/admin_manual/index.rst
+++ b/admin_manual/index.rst
@@ -4,9 +4,13 @@ Introduction
**Welcome to the Nextcloud Server Administration Guide.**
-This guide explains how to perform administrative tasks in Nextcloud, a highly versatile and scalable open-source platform for file synchronization and content collaboration.
+This guide explains how to perform administrative tasks in Nextcloud, a highly versatile and scalable
+open-source platform for file synchronization and content collaboration.
-With over 400,000 deployments, Nextcloud can run on a simple two-user Raspberry Pi or scale to support global, distributed installations serving tens of millions of users. It can be deployed on-premises, in private or public clouds, or in hybrid environments. Supported by a large and growing community, Nextcloud is available in more than 60 languages.
+With over 400,000 deployments, Nextcloud can run on a simple two-user Raspberry Pi or scale to support
+global, distributed installations serving tens of millions of users. It can be deployed on-premises,
+in private or public clouds, or in hybrid environments. Supported by a large and growing community,
+Nextcloud is available in more than 60 languages.
The latest editions of the Nextcloud manuals are always available online at
`docs.nextcloud.com `_.
diff --git a/user_manual/session_management.rst b/user_manual/session_management.rst
index 2c9c4212f10..cab5fdbc955 100644
--- a/user_manual/session_management.rst
+++ b/user_manual/session_management.rst
@@ -38,14 +38,14 @@ those individually if necessary:
.. figure:: images/settings_devices_add.png
:alt: Adding a new device.
-.. note:: You have only access to the device password when creating it,
- Nextcloud will not save the plain password, hence it's recommended to
+.. note:: You only have access to the device password when creating it.
+ Nextcloud will not save the plain password, so it is recommended to
enter the password on the new client immediately.
.. note:: If you use :doc:`user_2fa` for your account,
device-specific passwords are the only way to configure clients. The
- server will deny connections of clients using your login password then.
+ server will then deny connections from clients using your login password.
Device-specific passwords and password changes
----------------------------------------------
diff --git a/user_manual/user_2fa.rst b/user_manual/user_2fa.rst
index 92bc822ef28..c202c026674 100644
--- a/user_manual/user_2fa.rst
+++ b/user_manual/user_2fa.rst
@@ -75,6 +75,7 @@ If the code was correct you will be redirected to your Nextcloud account.
Using two-factor authentication with hardware tokens
----------------------------------------------------
+
You can use two-factor authentication based on hardware tokens. The following devices are known to work:
* TOTP based:
@@ -92,12 +93,12 @@ Using client applications with two-factor authentication
Once you have enabled 2FA, your clients will no longer be able to connect with
just your password unless they also have support for two-factor authentication.
-To solve this, you should generate device specific passwords for them. See
+To solve this, you should generate device-specific passwords for them. See
:doc:`session_management` for more information on how to do this.
Considerations
--------------
-If you use WebAuthn to login to your Nextcloud be sure to not use the same token for 2FA. As this
+If you use WebAuthn to log in to your Nextcloud, be sure to not use the same token for 2FA, as this
would mean you are again only using a single factor.
diff --git a/user_manual/userpreferences.rst b/user_manual/userpreferences.rst
index 77e348abf1f..598e5660f83 100644
--- a/user_manual/userpreferences.rst
+++ b/user_manual/userpreferences.rst
@@ -41,7 +41,7 @@ include the following:
* Social sharing links
* Nextcloud version
-.. note:: Available options and settings depending on your administrator's configuration.
+.. note:: Available options and settings depend on your administrator's configuration.
If you are not able to change the password or the display name in your personal settings,
please contact your administrator for help.
@@ -73,7 +73,7 @@ Someone with a public facing role such as marketing or sales might want to share
Restrict who can see your profile data
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-If the profile is enabled by your administrator, then your profile data can be read by other users and guest.
+If the profile is enabled by your administrator, then your profile data can be read by other users and guests.
To control who can see which information you can adjust the scopes already mentioned:
* **Private** will only allow you and users you have added to your phone book to see the data
@@ -87,7 +87,7 @@ On the personal settings you can find the button for profile visibility:
:alt: screenshot of the profile visibility button in personal settings
-Which allows to configure the visibility for each profile attribute:
+Which allows you to configure the visibility for each profile attribute:
.. figure:: images/userdata-visibility.png
:alt: screenshot of scope dropdown on personal information form field
diff --git a/user_manual/webinterface.rst b/user_manual/webinterface.rst
index 12a4ab28326..6c46e39d30c 100644
--- a/user_manual/webinterface.rst
+++ b/user_manual/webinterface.rst
@@ -19,8 +19,8 @@ you use the latest and supported version of a browser from this list:
* Apple **Safari** (Desktop and iOS)
* Microsoft **Edge**
-.. note:: Not all versions are supported. Nextcloud is tested and built to work with `these versions only.
- `_
+.. note:: Not all versions are supported. Nextcloud is tested and built to work with
+ `these browser versions `_ only.
.. note:: If you want to use Nextcloud Talk you need to run Mozilla **Firefox** 52+
or Google **Chrome**/Chromium 49+ to have the full experience with video calls and
@@ -57,7 +57,7 @@ The Nextcloud user interface contains the following fields and functions:
* **Navigation Bar** (4): Located over the main viewing window (the Application
View), this bar provides a type of breadcrumbs navigation that enables you to
- migrate to higher levels of the folder hierarchy up to the root level (home).
+ navigate to higher levels of the folder hierarchy up to the root level (home).
* **New** button (5): Located in the Navigation Bar, the ``New`` button
enables you to create new files, new folders, or upload files.