Attachment 11626 Details for Bug 11619 – Complete patch with cherry-pick information

[patch] Complete patch with cherry-pick information

docs-Fix-typos.patch (text/plain), 4.04 KB, created by Karolin Seeger on 2015-11-27 08:20:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Karolin Seeger

Created: 2015-11-27 08:20:43 UTC

Size: 4.04 KB

patch

obsolete

>From e604010e9d518d060fff9d48f17912dd1735e671 Mon Sep 17 00:00:00 2001
>From: Michael Adam <obnox@samba.org>
>Date: Thu, 5 Nov 2015 16:43:34 +0100
>Subject: [PATCH 1/2] doc: fix a typo in the smb.conf manpage, explanation of
> idmap config
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>Signed-off-by: Michael Adam <obnox@samba.org>
>Reviewed-by: Guenther Deschner <gd@samba.org>
>
>Autobuild-User(master): GÃ¼nther Deschner <gd@samba.org>
>Autobuild-Date(master): Fri Nov  6 06:26:34 CET 2015 on sn-devel-104
>
>(cherry picked from commit c6ae462a020648c851fe6f6724ae9cf32c9d0ab8)
>---
> docs-xml/smbdotconf/winbind/idmapconfig.xml | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/docs-xml/smbdotconf/winbind/idmapconfig.xml b/docs-xml/smbdotconf/winbind/idmapconfig.xml
>index 434d379..1cf5d4a 100644
>--- a/docs-xml/smbdotconf/winbind/idmapconfig.xml
>+++ b/docs-xml/smbdotconf/winbind/idmapconfig.xml
>@@ -65,7 +65,7 @@
> 		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
> 		from nsswitch which can be useful in an ldap setup.
>-- 
>1.9.1
>
>
>From 500d810ef4f6c6142190c26f2ef47e977e99e779 Mon Sep 17 00:00:00 2001
>From: Karolin Seeger <kseeger@samba.org>
>Date: Thu, 26 Nov 2015 11:28:34 +0100
>Subject: [PATCH 2/2] docs: Fix some typos in the idmap backend section.
>
>Signed-off-by: Karolin Seeger <kseeger@samba.org>
>Reviewed-by: Volker Lendecke <vl@samba.org>
>
>Autobuild-User(master): Volker Lendecke <vl@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)
>---
> docs-xml/smbdotconf/winbind/idmapconfig.xml | 15 +++++----------
> 1 file changed, 5 insertions(+), 10 deletions(-)
>
>diff --git a/docs-xml/smbdotconf/winbind/idmapconfig.xml b/docs-xml/smbdotconf/winbind/idmapconfig.xml
>index 1cf5d4a..db24784 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>
>-- 
>1.9.1
>

Flags:

kseeger: review+
obnox: review+

Actions: View

Attachments on bug 11619: 11618 | 11619 | 11626