Merge pull request #14719 from nextcloud/backport/14642/stable33

Author: skjnldsv

admin_manual/desktop/configfile.rst

@@ -76,7 +76,7 @@ Some interesting values that can be set on the configuration file are:
 +---------------------------------+---------------+--------------------------------------------------------------------------------------------------------+
 | ``host``                        | ``127.0.0.1`` | The address of the proxy server.                                                                       |
 +---------------------------------+---------------+--------------------------------------------------------------------------------------------------------+
-| ``port``                        | ``8080``      | The port were the proxy is listening.                                                                  |
+| ``port``                        | ``8080``      | The port where the proxy is listening.                                                                 |
 +---------------------------------+---------------+--------------------------------------------------------------------------------------------------------+
 | ``type``                        | ``2``         | ``0`` for System Proxy.                                                                                |
 +                                 +               +--------------------------------------------------------------------------------------------------------+

admin_manual/desktop/envvars.rst

@@ -8,7 +8,7 @@ The environment variables are:
 
 - `OWNCLOUD_CHUNK_SIZE` (default: 5242880; 5 MiB) – Specifies the chunk size of uploaded files in bytes. Increasing this value may help with synchronization problems in certain configurations.  
 - `OWNCLOUD_TIMEOUT` (default: 300 s) – The timeout for network connections in seconds.
-- `OWNCLOUD_CRITICAL_FREE_SPACE_BYTES` (default: 512\*1000\*1000 bytes) - The minimum disk space needed for operation. A fatal error is raised if less free space is available. 
+- `OWNCLOUD_CRITICAL_FREE_SPACE_BYTES` (default: 512\*1000\*1000 bytes) - The minimum disk space needed for operation. A fatal error is raised if less free space is available.
 - `OWNCLOUD_FREE_SPACE_BYTES` (default: 1000\*1000\*1000 bytes) - Downloads that would reduce the free space below this value are skipped. More information available under the "Low Disk Space" section. 
 - `OWNCLOUD_MAX_PARALLEL` (default: 6) - Maximum number of parallel jobs. 
 - `OWNCLOUD_BLACKLIST_TIME_MIN` (default: 25 s) - Minimum timeout for blacklisted files.

user_manual/files/desktop_mobile_sync.rst

@@ -26,6 +26,6 @@ Visit your Personal page in your Nextcloud Web interface to find download links
 for Android and iOS mobile sync clients. Or, visit the `Nextcloud download page
 <https://nextcloud.com/install/>`_.  
 
-Unfortunately, 2-way-sync, a.k.a bidirectional sync, isn't fully implemented in
-the Android client yet. See `this issue on GitHub <https://github.com/nextcloud/android/issues/19>`_
-for the current feature's status.
+Bidirectional sync (2-way-sync) has not yet been fully implemented in the Android
+client. See `this issue on GitHub <https://github.com/nextcloud/android/issues/19>`_
+for the current status.

user_manual/files/encrypting_files.rst

@@ -22,7 +22,7 @@ to outside service providers.
 If your Nextcloud server is not connected to any remote storage services, then
 it is better to use some other form of encryption such as file-level or whole
 disk encryption. Because the keys are kept on your Nextcloud server, it is
-possible for your Nextcloud administrator to snoop in your files, and if the server is
+possible for your Nextcloud administrator to access your unencrypted files, and if the server is
 compromised the intruder may get access to your files. (Read
 `Encryption in Nextcloud <https://nextcloud.com/blog/encryption-in-nextcloud/>`_
 to learn more.)

user_manual/files/file_drop.rst

@@ -17,7 +17,7 @@ made to:
 
 .. image:: ../images/anonym_click_sharing.png
 
-Check Share Link, Allow editing, Hide file listing:
+Enable **Share Link**, **Allow editing**, and **Hide file listing**:
 
 .. image:: ../images/anonym_hide_file_listing.png
 

user_manual/files/transfer_ownership.rst

@@ -2,8 +2,8 @@
 Transfer Ownership
 ==================
 
-Users can transfer the ownership of files and folders to other users. Sharing
-ownerships of those transferred files/folders will also be transferred.
+Users can transfer the ownership of files and folders to other users. Sharing settings and permissions for transferred files and folders will also
+be transferred to the new owner.
 
 #. Navigate to *Settings* (top-right menu) > *Sharing*.
 #. In the *Files* section, click on *Choose file or folder to transfer*. A file picker opens, showing all files and folders in the user's account.

user_manual/files/version_control.rst

@@ -5,8 +5,8 @@ Version control
 Nextcloud supports simple version control system for files. Versioning creates
 backups of files which are accessible via the Versions tab on the Details
 sidebar. This tab contains the history of the file where you can roll back a
-file to any previous version. Changes made at intervals greater than two minutes
-are saved in **data/[user]/files_versions**.
+file to any previous version. A new version is saved only if at least two minutes
+have passed since the last version was created. Versions are stored in **data/[user]/files_versions**.
 
 .. figure:: ../images/files_versioning.png
 

user_manual/groupware/mail.rst

@@ -258,15 +258,15 @@ You can also set the date and time for the send operation to a point in the futu
 
 The outbox is only visible when there is a message waiting to be handled by the outbox.
 
-You can re- open the composer for a message in the outbox any time before the "send"- operation is triggered.
+You can reopen the composer for a message in the outbox any time before the send operation is triggered.
 
 .. note::
    When an error occurs during sending, three error messages are possible:
 
    Could not copy to "Sent" mailbox
       The mail was sent but couldn't be copied to the "Sent" mailbox. This error will be handled by the outbox and the copy operation will be tried again.
    Mail server error
-      Sending was unsuccessful with a state than can be retried (ex: the SMTP server couldn't be reached). The outbox will retry sending the message.
+      Sending was unsuccessful with a state that can be retried (ex: the SMTP server couldn't be reached). The outbox will retry sending the message.
    Message could not be sent
       Sending might or might not have failed. The mail server can't tell us the state of the message. Since the Mail app has no way to determine the state of the message (sent or unsent) the message will stay in the outbox and the account user has to decide how to proceed.
 
@@ -301,7 +301,7 @@ Create an event for a certain message/thread directly via mail app
 2. Click *More actions*
 3. Click *Create event*
 
-.. note:: Event title and an agenda is created for you if the administrator has enabled it.
+.. note:: An event title and agenda are created for you if the administrator has enabled it.
 
 Create a task
 ~~~~~~~~~~~~~

user_manual/talk/advanced_features.rst

@@ -222,7 +222,7 @@ The recording will start shortly, and you will see a red indicator next to the c
 .. image:: images/stop-recording.png
     :width: 500px
 
-After stopping a recording, the server will take some time to prepare and save the recorded file. The moderator, who started the recording, receives a notification when the file is uploaded. From there, it can be shared in the chat.
+After stopping a recording, the server will take a few seconds to prepare and save the recorded file. The moderator, who started the recording, receives a notification when the file is uploaded. From there, it can be shared in the chat.
 
 .. image:: images/share-recording-notification.png
     :width: 300px

user_manual/talk/talk_basics.rst

@@ -165,7 +165,7 @@ You can add more files until you are done and decide to share the files. You can
 .. image:: images/talk-upload-files.png
    :width: 500px
 
-All users will be able to click the files to view, edit or download them, irrespective of them having a user account. Users with an account will have the file automatically shared with them while external guest users will get them shared as a public link.
+All users will be able to click the files to view, edit or download them, regardless of whether they have a Nextcloud account. Users with an account will have the file automatically shared with them while external guest users will get them shared as a public link.
 
 .. image:: images/editing-document-in-chat-room.png
    :width: 600px
@@ -426,7 +426,7 @@ If somebody else has started a call already, the button will change in a green `
 .. image:: images/join-call.png
     :width: 600px
 
-During a call, you can mute your microphone and disable your video with the buttons on the right side of the top bar, or using the shortcuts ``M`` to mute audio and ``V`` to disable video. You can also use the space bar to toggle mute. When you are muted, pressing space will unmute you so you can speak until you let go of the space bar. If you are unmuted, pressing space will mute you until you let go.
+During a call, you can mute your microphone and disable your video with the buttons on the right side of the top bar, or using the shortcuts ``M`` to mute audio and ``V`` to disable video. You can also use the space bar for push-to-talk: holding space temporarily unmutes you while muted, or temporarily mutes you while unmuted.
 
 You can hide your video (useful during a screen share) with the little arrow just above the video stream. Bring it back with the little arrow again.