[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  257ec9c docs: Fix some typos in the idmap backend section.
      from  1ee7053 ctdb-protocol: Fix marshalling for struct ctdb_rec_data

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 257ec9c6e28b1ddc32bd554ff8259f8a067dd44e
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

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

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 c9e5870..1374040 100644
--- a/docs-xml/smbdotconf/winbind/idmapconfig.xml
+++ b/docs-xml/smbdotconf/winbind/idmapconfig.xml
@@ -38,21 +38,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>
@@ -65,9 +60,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 uses 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