The branch, master has been updated via 4639f6d docs: Fix typos in smb.conf (inherit acls) via 679d77a Redescribe --userou usage from 332eeb8 ctdbd_conn: Only poll if there's a timeout
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 4639f6d7bab9d8d6ee46bf5c65ff73a17a56cb17 Author: Marc Muehlfeld <mmuehlf...@samba.org> Date: Wed Aug 6 21:36:26 2014 +0200 docs: Fix typos in smb.conf (inherit acls) Bug: https://bugzilla.samba.org/show_bug.cgi?id=10761 Signed-off-by: Marc Muehlfeld <mmuehlf...@samba.org> Reviewed-by: David Disseldorp <dd...@samba.org> Autobuild-User(master): David Disseldorp <dd...@samba.org> Autobuild-Date(master): Thu Aug 7 00:52:42 CEST 2014 on sn-devel-104 commit 679d77a2267bfdee99c57665b530580807f83f80 Author: Marc Muehlfeld <mmuehlf...@samba.org> Date: Wed Aug 6 19:52:21 2014 +0200 Redescribe --userou usage Signed-off-by: Marc Muehlfeld <mmuehlf...@samba.org> Reviewed-by: David Disseldorp <dd...@samba.org> ----------------------------------------------------------------------- Summary of changes: docs-xml/smbdotconf/security/inheritowner.xml | 6 +++--- python/samba/netcmd/user.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) Changeset truncated at 500 lines: diff --git a/docs-xml/smbdotconf/security/inheritowner.xml b/docs-xml/smbdotconf/security/inheritowner.xml index ba4fc61..0ed8285 100644 --- a/docs-xml/smbdotconf/security/inheritowner.xml +++ b/docs-xml/smbdotconf/security/inheritowner.xml @@ -10,9 +10,9 @@ by the ownership of the parent directory.</para> <para>Common scenarios where this behavior is useful is in - implementing drop-boxes where users can create and edit files but not - delete them and to ensure that newly create files in a user's - roaming profile directory are actually owner by the user.</para> + implementing drop-boxes, where users can create and edit files but + not delete them and ensuring that newly created files in a user's + roaming profile directory are actually owned by the user.</para> </description> <related>inherit permissions</related> diff --git a/python/samba/netcmd/user.py b/python/samba/netcmd/user.py index b98ec34..24dd77d 100644 --- a/python/samba/netcmd/user.py +++ b/python/samba/netcmd/user.py @@ -62,7 +62,7 @@ sudo samba-tool user add User2 passw2rd --given-name=Jane --surname=Doe --must-c Example2 shows how to create a new user in the domain against the local server. sudo is used so a user may run the command as root. In this example, after User2 is created, he/she will be forced to change their password when they logon. Example3: -samba-tool user add User3 passw3rd --userou=OrgUnit +samba-tool user add User3 passw3rd --userou='OU=OrgUnit' Example3 shows how to create a new user in the OrgUnit organizational unit. @@ -87,7 +87,7 @@ Example4 shows how to create a new user with Unix UID, GID and login-shell set f help="Force use of username as user's CN", action="store_true"), Option("--userou", - help="Alternative location (without domainDN counterpart) to default CN=Users in which new user object will be created", + help="DN of alternative location (without domainDN counterpart) to default CN=Users in which new user object will be created. E. g. 'OU=<OU name>'", type=str), Option("--surname", help="User's surname", type=str), Option("--given-name", help="User's given name", type=str), -- Samba Shared Repository