[Pkg-owncloud-commits] [owncloud-doc] 16/110: adds the domain name as possibility to the user

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud-doc.

commit 4cc65148d8a0806d62b4fab61b246e799024be97
Author: Martin <martin.mattel at diemattels.at>
Date:   Thu Dec 11 18:56:25 2014 +0100

    adds the domain name as possibility to the user
---
 .../configuration/external_storage_configuration.rst   | 18 +++++++++++++++++-
 .../external_storage_configuration_gui.rst             |  2 +-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/admin_manual/configuration/external_storage_configuration.rst b/admin_manual/configuration/external_storage_configuration.rst
index f0997b4..2881b2b 100644
--- a/admin_manual/configuration/external_storage_configuration.rst
+++ b/admin_manual/configuration/external_storage_configuration.rst
@@ -190,7 +190,7 @@ storage support’ app, the class to be used is **\\OC\\Files\\Storage\\SMB**\
 takes the following options:
 
 -  **host**: the host name of the samba server
--  **user**: the user name used to login on the samba server
+-  **user**: the username or domain/username to login on the samba server
 -  **password**: the password to login on the samba server
 -  **share**: the share on the samba server to mount
 -  **root**: the folder inside the samba share to mount (optional, defaults
@@ -200,6 +200,7 @@ takes the following options:
 
 Example
 ^^^^^^^
+With username only:
 
 .. code-block:: json
 
@@ -213,6 +214,21 @@ Example
         },
         "priority":100
     }
+    
+With domainname and username:
+
+.. code-block:: json
+
+    {   "class":"\\OC\\Files\\Storage\\SMB",
+        "options":{
+            "host":"myhost.com",
+            "user":"domain\/johndoe",
+            "password":"secret",
+            "share":"\/test",
+            "root":"\/Pictures"
+        },
+        "priority":100
+    }
 
 WebDAV
 ~~~~~~
diff --git a/admin_manual/configuration/external_storage_configuration_gui.rst b/admin_manual/configuration/external_storage_configuration_gui.rst
index 4f5b105..2b087bf 100644
--- a/admin_manual/configuration/external_storage_configuration_gui.rst
+++ b/admin_manual/configuration/external_storage_configuration_gui.rst
@@ -265,7 +265,7 @@ You need the following information:
 
 *   Folder name -- Whatever name you want for your local mountpoint.
 *   Host -- The URL of the Samba server.
-*   Username -- The user name used to login to the Samba server.
+*   Username -- The username or domain/username used to login to the Samba server.
 *   Password -- The password to login to the Samba server.
 *   Share -- The share on the Samba server to mount.
 *   Root -- The folder inside the Samba share to mount (optional, defaults to 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-doc.git