diff --git a/admin_manual/configuration_files/external_storage/amazons3.rst b/admin_manual/configuration_files/external_storage/amazons3.rst index c9e5d0a21..a8fab9d8b 100644 --- a/admin_manual/configuration_files/external_storage/amazons3.rst +++ b/admin_manual/configuration_files/external_storage/amazons3.rst @@ -8,17 +8,17 @@ To connect your Amazon S3 buckets to Nextcloud, you will need: - S3 secret key - Bucket name -In the **Folder name** field enter a local folder name for your S3 mountpoint. +In the **Folder name** field enter a local folder name for your S3 mountpoint. If this does not exist it will be created. -In the **Available for** field enter the users or groups who have permission to +In the **Available for** field enter the users or groups who have permission to access your S3 mount. -The ``Enable SSL`` checkbox enables HTTPS connections; using HTTPS is always +The ``Enable SSL`` checkbox enables HTTPS connections; using HTTPS is always highly-recommended. .. figure:: images/amazons3.png - :alt: + :alt: Optionally, you can override the hostname, port and region of your S3 server, which is required for non-Amazon servers such as Ceph Object Gateway. @@ -30,9 +30,9 @@ made with ``http://bucket.hostname.domain/``, but with path style enabled, requests are made with ``http://hostname.domain/bucket`` instead. **Legacy authentication** is only required for S3 servers that only implement version 2 authentication, -on default version 4 authentication will be used. +by default version 4 authentication will be used. -See :doc:`../external_storage_configuration_gui` for additional mount +See :doc:`../external_storage_configuration_gui` for additional mount options and information. See :doc:`auth_mechanisms` for more information on authentication schemes. diff --git a/admin_manual/configuration_files/external_storage/auth_mechanisms.rst b/admin_manual/configuration_files/external_storage/auth_mechanisms.rst index 10ae4b5dc..e509bc698 100644 --- a/admin_manual/configuration_files/external_storage/auth_mechanisms.rst +++ b/admin_manual/configuration_files/external_storage/auth_mechanisms.rst @@ -4,7 +4,7 @@ External Storage authentication mechanisms Nextcloud storage backends accept one or more authentication schemes such as passwords, OAuth, or token-based, to name a few examples. Each authentication -scheme may be implemented by multiple authentication mechanisms. Different +scheme may be implemented by combining multiple authentication mechanisms. Different mechanisms require different configuration parameters, depending on their behavior. diff --git a/admin_manual/configuration_files/external_storage/nextcloud.rst b/admin_manual/configuration_files/external_storage/nextcloud.rst index 79a87d766..a05bb6f21 100644 --- a/admin_manual/configuration_files/external_storage/nextcloud.rst +++ b/admin_manual/configuration_files/external_storage/nextcloud.rst @@ -2,8 +2,8 @@ Nextcloud ========= -An Nextcloud storage is a specialized :doc:`webdav` storage, with optimizations -for Nextcloud-Nextcloud communication. See the :doc:`webdav` documentation to +A Nextcloud storage is a specialized :doc:`webdav` storage, with optimizations +for Nextcloud-Nextcloud communication. See the :doc:`webdav` documentation to learn how to configure an Nextcloud external storage. When filling in the **URL** field, use the path to the root of the Nextcloud @@ -11,7 +11,7 @@ installation, rather than the path to the WebDAV endpoint. So, for a server at ``https://example.com/nextcloud``, use ``https://example.com/nextcloud`` and not ``https://example.com/nextcloud/remote.php/dav``. -See :doc:`../external_storage_configuration_gui` for additional mount +See :doc:`../external_storage_configuration_gui` for additional mount options and information. See :doc:`auth_mechanisms` for more information on authentication schemes. diff --git a/admin_manual/configuration_files/external_storage/smb.rst b/admin_manual/configuration_files/external_storage/smb.rst index f6be278be..0d9ac403d 100644 --- a/admin_manual/configuration_files/external_storage/smb.rst +++ b/admin_manual/configuration_files/external_storage/smb.rst @@ -5,11 +5,11 @@ SMB/CIFS Nextcloud can connect to Windows file servers or other SMB-compatible servers with the SMB/CIFS backend. -.. note:: The SMB/CIFS backend requires ``smbclient`` or - the PHP smbclient module to be installed on the Nextcloud server. The PHP - smbclient module is preferred, but either will work. These - should be included in any Linux distribution. (See `PECL smbclient - `_ if your distro does not include +.. note:: The SMB/CIFS backend requires ``smbclient`` or + the PHP smbclient module to be installed on the Nextcloud server. The PHP + smbclient module is preferred, but either will work. These + should be included in any Linux distribution. (See `PECL smbclient + `_ if your distro does not include them.) You need the following information: @@ -20,28 +20,28 @@ You need the following information: server. * Password: the password to login to the Samba server. * Share: The share on the Samba server to mount. -* Remote Subfolder: The remote subfolder inside the Samba share to mount - (optional, defaults to /). To assign the Nextcloud logon username - automatically to the subfolder, use ``$user`` instead of a particular - subfolder name. +* Remote Subfolder: The remote subfolder inside the Samba share to mount + (optional, defaults to /). To assign the Nextcloud logon username + automatically to the subfolder, use ``$user`` instead of a particular + subfolder name. * And finally, the Nextcloud users and groups who get access to the share. -Optionally, you can specify a ``Domain``. This is useful in +Optionally, you can specify a ``Domain``. This is useful in cases where the SMB server requires a domain and a username, and an advanced authentication mechanism like session credentials is used so that the username cannot be modified. This is concatenated with the username, so the backend gets ``domain\username`` -.. note:: For improved reliability and performance, we recommended installing +.. note:: For improved reliability and performance, we recommended installing ``libsmbclient-php``, a native PHP module for connecting to SMB servers. - + .. figure:: images/smb.png :alt: Samba external storage configuration. :scale: 75% -See :doc:`../external_storage_configuration_gui` for additional mount +See :doc:`../external_storage_configuration_gui` for additional mount options and information. See :doc:`auth_mechanisms` for more information on authentication schemes. @@ -50,7 +50,7 @@ SMB update notifications ------------------------ Starting with Nextcloud 10, Nextcloud can use smb update notifications to -listen to changes made to a configured SMB/CIFS storage and detect external +listen for changes made to a configured SMB/CIFS storage and detect external changes made to the storage in near real-time. .. note:: Due to limitations of linux based SMB servers, this feature only works