corrections to smbclient requirements

admin_manual/configuration_files/external_storage/smb.rst

@@ -5,8 +5,16 @@ SMB/CIFS
 ownCloud can connect to Windows file servers or other SMB-compatible servers
 with the SMB/CIFS backend.
 
+<<<<<<< HEAD
 .. note:: The SMB/CIFS backend requires ``smbclient`` to be installed on the
           ownCloud server. This should be included in any Linux distribution.
+=======
+.. note:: The SMB/CIFS backend requires ``smbclient`` or 
+   the PHP smbclient module to be installed on the ownCloud server. These 
+   should be included in any Linux distribution. (See `PECL smbclient 
+   <https://pecl.php.net/package/smbclient>`_ if your distro does not include 
+   them.)
+>>>>>>> 189c81a... corrections to smbclient requirements
 
 You need the following information:
 

admin_manual/configuration_user/user_auth_ftp_smb_imap.rst

@@ -54,7 +54,7 @@ Provides authentication against Samba servers
 
 - **Class:** OC_User_SMB
 - **Arguments:** the samba server to authenticate against
-- **Dependency:** PHP smbclient module (see 
+- **Dependency:** PHP smbclient module or smbclient (see 
   :doc:`../configuration_files/external_storage/smb`)
 - **Example:**
 

admin_manual/operations/scaling_multiple_machines.rst

@@ -34,7 +34,7 @@ following components were installed on each application server:
 *   PHP-MYSQL
 *   PHP-CURL
 
-Also required is the PHP smbclient module (see 
+Also required is the PHP smbclient module or smbclient (see 
 :doc:`../configuration_files/external_storage/smb`).
 
 It is also worth mentioning that the appropriate exceptions where made in the