[SCM] Samba Shared Repository - branch v3-5-test updated

[Karolin Seeger]

The branch, v3-5-test has been updated
       via  fb1b090... s3-docs: Improve "winbind nss info" section in man 
smb.conf.
      from  12936bf... Fix bug #7288 - SMB job IDs in CUPS job names wrong.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test


- Log -----------------------------------------------------------------
commit fb1b0901ec93afe998145bb7a7549bbdb13c712c
Author: Karolin Seeger <ksee...@samba.org>
Date:   Fri Apr 16 09:23:30 2010 +0200

    s3-docs: Improve "winbind nss info" section in man smb.conf.
    
    Karolin
    (cherry picked from commit 20fc769179377bf037f4d5efe1afbaf77d4c9292)

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

Summary of changes:
 docs-xml/smbdotconf/winbind/winbindnssinfo.xml |   18 ++++++++----------
 1 files changed, 8 insertions(+), 10 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/smbdotconf/winbind/winbindnssinfo.xml 
b/docs-xml/smbdotconf/winbind/winbindnssinfo.xml
index d6e40c6..318727c 100644
--- a/docs-xml/smbdotconf/winbind/winbindnssinfo.xml
+++ b/docs-xml/smbdotconf/winbind/winbindnssinfo.xml
@@ -6,35 +6,33 @@
 <description>
 
        <para>This parameter is designed to control how Winbind retrieves Name
-       Service Information to construct a user's home directory and login 
shell. 
-       Currently the following settings are available: 
+       Service Information to construct a user's home directory and login 
shell.
+       Currently the following settings are available:
 
        <itemizedlist>
                <listitem>
-                       <para><parameter moreinfo="none">template</parameter> 
-                       - The default, using the parameters of <parameter 
moreinfo="none">template 
+                       <para><parameter moreinfo="none">template</parameter>
+                       - The default, using the parameters of <parameter 
moreinfo="none">template
                        shell</parameter> and <parameter 
moreinfo="none">template homedir</parameter>)
                        </para>
                </listitem>
-                       
+
                <listitem>
                        <para><parameter moreinfo="none">&lt;sfu | rfc2307 
&gt;</parameter>
                        - When Samba is running in security = ads and your 
Active Directory
                        Domain Controller does support the Microsoft "Services 
for Unix" (SFU)
                        LDAP schema, winbind can retrieve the login shell and 
the home
                        directory attributes directly from your Directory 
Server. Note that
-                       retrieving UID and GID from your ADS-Server requires to 
-                       use <parameter moreinfo="non">idmap backend</parameter> 
= ad 
-                       or <parameter moreinfo="non">idmap config 
DOMAIN:backend</parameter> = ad 
+                       retrieving UID and GID from your ADS-Server requires to
+                       use <parameter moreinfo="none">idmap config 
DOMAIN:backend</parameter> = ad
                        as well.
                        </para>
                </listitem>
-                       
        </itemizedlist>
 
 </para>
 </description>
 
 <value type="default">template</value>
-<value type="example">template sfu</value>
+<value type="example">sfu</value>
 </samba:parameter>


-- 
Samba Shared Repository