[SCM] Samba Shared Repository - branch v4-2-test updated

[Karolin Seeger]

The branch, v4-2-test has been updated
       via  785158f docs: Fix some typos in the idmap backend section.
       via  b83e261 doc: fix a typo in the smb.conf manpage, explanation of idmap config
      from  fdac7f1 s3: smbd: have_file_open_below() fails to enumerate open files below an open directory handle.

https://git.samba.org/?p=samba.git;a=shortlog;h=v4-2-test


- Log -----------------------------------------------------------------
commit 785158fed35a8abd8e7b9bff161bca6242339b12
Author: Karolin Seeger <kseeger at samba.org>
Date:   Thu Nov 26 11:28:34 2015 +0100

    docs: Fix some typos in the idmap backend section.
    
    Signed-off-by: Karolin Seeger <kseeger at samba.org>
    Reviewed-by: Volker Lendecke <vl at samba.org>
    
    Autobuild-User(master): Volker Lendecke <vl at samba.org>
    Autobuild-Date(master): Thu Nov 26 14:47:17 CET 2015 on sn-devel-104
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=11619
    
    (cherry picked from commit 257ec9c6e28b1ddc32bd554ff8259f8a067dd44e)
    
    Autobuild-User(v4-2-test): Karolin Seeger <kseeger at samba.org>
    Autobuild-Date(v4-2-test): Mon Dec  7 13:49:59 CET 2015 on sn-devel-104

commit b83e261035f795c0ad6506dfe2323f08b567432c
Author: Michael Adam <obnox at samba.org>
Date:   Thu Nov 5 16:43:34 2015 +0100

    doc: fix a typo in the smb.conf manpage, explanation of idmap config
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Guenther Deschner <gd at samba.org>
    
    Autobuild-User(master): Günther Deschner <gd at samba.org>
    Autobuild-Date(master): Fri Nov  6 06:26:34 CET 2015 on sn-devel-104
    
    (cherry picked from commit c6ae462a020648c851fe6f6724ae9cf32c9d0ab8)

-----------------------------------------------------------------------

Summary of changes:
 docs-xml/smbdotconf/winbind/idmapconfig.xml | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/smbdotconf/winbind/idmapconfig.xml b/docs-xml/smbdotconf/winbind/idmapconfig.xml
index 30925a2..f27de11 100644
--- a/docs-xml/smbdotconf/winbind/idmapconfig.xml
+++ b/docs-xml/smbdotconf/winbind/idmapconfig.xml
@@ -39,21 +39,16 @@
 		(<citerefentry><refentrytitle>idmap_tdb2</refentrytitle> <manvolnum>8</manvolnum></citerefentry>),
 		ldap
 		(<citerefentry><refentrytitle>idmap_ldap</refentrytitle> <manvolnum>8</manvolnum></citerefentry>),
-		,
 		rid
 		(<citerefentry><refentrytitle>idmap_rid</refentrytitle> <manvolnum>8</manvolnum></citerefentry>),
-		,
 		hash
 		(<citerefentry><refentrytitle>idmap_hash</refentrytitle> <manvolnum>8</manvolnum></citerefentry>),
-		,
 		autorid
 		(<citerefentry><refentrytitle>idmap_autorid</refentrytitle> <manvolnum>8</manvolnum></citerefentry>),
-		,
 		ad
-		(<citerefentry><refentrytitle>idmap_ad</refentrytitle> <manvolnum>8</manvolnum></citerefentry>),
-		,
-		and nss.
-		(<citerefentry><refentrytitle>idmap_nss</refentrytitle> <manvolnum>8</manvolnum></citerefentry>),
+		(<citerefentry><refentrytitle>idmap_ad</refentrytitle> <manvolnum>8</manvolnum></citerefentry>)
+		and nss
+		(<citerefentry><refentrytitle>idmap_nss</refentrytitle> <manvolnum>8</manvolnum></citerefentry>).
 		The corresponding manual pages contain the details, but
 		here is a summary.
 		</para>
@@ -66,9 +61,9 @@
 		mixture of the tdb and rid backend. It creates ranges for
 		each domain encountered and then uses the rid algorithm for each
 		of these automatically configured domains individually.
-		The ad backend usees unix IDs stored in Active Directory via
+		The ad backend uses unix ids stored in Active Directory via
 		the standard schema extensions. The nss backend reverses
-		the standard winbindd setup and gets the unixids via names
+		the standard winbindd setup and gets the unix ids via names
 		from nsswitch which can be useful in an ldap setup.
 		</para></listitem>
 		</varlistentry>


-- 
Samba Shared Repository