Use \ rather then + as the example winbind separator as + causes problems on systems with NIS (#1092)

(This used to be commit e7a338890affed608faca0aa34cc76561db23f67)

5 files changed, 44 insertions, 49 deletions

diff --git a/docs/Samba-HOWTO-Collection/FastStart.xml b/docs/Samba-HOWTO-Collection/FastStart.xml
index 1e4c08e20c..c2c11bc447 100644
--- a/docs/Samba-HOWTO-Collection/FastStart.xml
+++ b/docs/Samba-HOWTO-Collection/FastStart.xml
@@ -660,7 +660,6 @@ smb: \> <userinput>q</userinput>
 <smbconfoption><name>show add printer wizard</name><value>No</value></smbconfoption>
 <smbconfoption><name>idmap uid</name><value>15000-20000</value></smbconfoption>
 <smbconfoption><name>idmap gid</name><value>15000-20000</value></smbconfoption>
-<smbconfoption><name>winbind separator</name><value>+</value></smbconfoption>
 <smbconfoption><name>winbind use default domain</name><value>Yes</value></smbconfoption>
 <smbconfoption><name>use sendfile</name><value>Yes</value></smbconfoption>
 <smbconfoption><name>printing</name><value>cups</value></smbconfoption>
@@ -749,18 +748,18 @@ hosts:  files dns winbind
 			Validate that domain user and group credentials can be correctly resolved by executing:
 <screen>
 &rootprompt;<userinput>wbinfo -u</userinput>
-MIDEARTH+maryo
-MIDEARTH+jackb
-MIDEARTH+ameds
+MIDEARTH\maryo
+MIDEARTH\jackb
+MIDEARTH\ameds
 ...
-MIDEARTH+root
+MIDEARTH\root
 
 &rootprompt;<userinput>wbinfo -g</userinput>
-MIDEARTH+Domain Users
-MIDEARTH+Domain Admins
-MIDEARTH+Domain Guests
+MIDEARTH\Domain Users
+MIDEARTH\Domain Admins
+MIDEARTH\Domain Guests
 ...
-MIDEARTH+Accounts
+MIDEARTH\Accounts
 </screen>
 			</para></step>
 
@@ -1187,7 +1186,6 @@ userPassword: {SSHA}0jBHgQ1vp4EDX2rEMMfIudvRMJoGwjVb
 <smbconfoption><name>ldap passwd sync</name><value>Yes</value></smbconfoption>
 <smbconfoption><name>idmap uid</name><value>15000-20000</value></smbconfoption>
 <smbconfoption><name>idmap gid</name><value>15000-20000</value></smbconfoption>
-<smbconfoption><name>winbind separator</name><value>+</value></smbconfoption>
 <smbconfoption><name>printing</name><value>cups</value></smbconfoption>
 <member>...</member>
 </smbconfexample>
@@ -1250,7 +1248,6 @@ userPassword: {SSHA}0jBHgQ1vp4EDX2rEMMfIudvRMJoGwjVb
 <smbconfoption><name>ldap passwd sync</name><value>Yes</value></smbconfoption>
 <smbconfoption><name>idmap uid</name><value>15000-20000</value></smbconfoption>
 <smbconfoption><name>idmap gid</name><value>15000-20000</value></smbconfoption>
-<smbconfoption><name>winbind separator</name><value>+</value></smbconfoption>
 <smbconfoption><name>printing</name><value>cups</value></smbconfoption>
 <member>...</member>
 </smbconfexample>
diff --git a/docs/Samba-HOWTO-Collection/IDMAP.xml b/docs/Samba-HOWTO-Collection/IDMAP.xml
index 88df84e330..7669c03746 100644
--- a/docs/Samba-HOWTO-Collection/IDMAP.xml
+++ b/docs/Samba-HOWTO-Collection/IDMAP.xml
@@ -404,7 +404,6 @@ Domain Member Servers (DMSs) and Domain Member Clients (DMCs).
         idmap gid = 10000-20000
         template primary group = "Domain Users"
         template shell = /bin/bash
-        winbind separator = +
 </screen>
 	</para>
 
diff --git a/docs/Samba-HOWTO-Collection/PAM.xml b/docs/Samba-HOWTO-Collection/PAM.xml
index 49ff65f25a..d5240f021a 100644
--- a/docs/Samba-HOWTO-Collection/PAM.xml
+++ b/docs/Samba-HOWTO-Collection/PAM.xml
@@ -874,7 +874,7 @@ password required /lib/security/pam_stack.so service=system-auth
 
 	<para>
 	When I open a new console with [ctrl][alt][F1], I can't log in with my user <quote>pitie</quote>.
-	I have tried with user <quote>scienceu+pitie</quote> also.
+	I have tried with user <quote>scienceu\pitie</quote> also.
 	</para>
 
 	<para>
@@ -903,18 +903,18 @@ password required /lib/security/pam_stack.so service=system-auth
 
 <para><screen>
 &rootprompt;<userinput>wbinfo -u</userinput>
-MIDEARTH+maryo
-MIDEARTH+jackb
-MIDEARTH+ameds
+MIDEARTH\maryo
+MIDEARTH\jackb
+MIDEARTH\ameds
 ...
-MIDEARTH+root
+MIDEARTH\root
 
 &rootprompt;<userinput>wbinfo -g</userinput>
-MIDEARTH+Domain Users
-MIDEARTH+Domain Admins
-MIDEARTH+Domain Guests
+MIDEARTH\Domain Users
+MIDEARTH\Domain Admins
+MIDEARTH\Domain Guests
 ...
-MIDEARTH+Accounts
+MIDEARTH\Accounts
 
 &rootprompt;<userinput>getent passwd</userinput>
 root:x:0:0:root:/root:/bin/bash
diff --git a/docs/Samba-HOWTO-Collection/Winbind.xml b/docs/Samba-HOWTO-Collection/Winbind.xml
index 8e1862a65e..f531336b43 100644
--- a/docs/Samba-HOWTO-Collection/Winbind.xml
+++ b/docs/Samba-HOWTO-Collection/Winbind.xml
@@ -583,8 +583,8 @@ linkend="winbindcfg">the next example</link>, was modified to include the necess
 		<title>smb.conf for Winbind set-up</title>
 <smbconfsection>[global]</smbconfsection>
      &lt;...&gt;
-<smbconfcomment> separate domain and username with '+', like DOMAIN+username</smbconfcomment>
-<smbconfoption><name>winbind separator</name><value>+</value></smbconfoption>
+<smbconfcomment> separate domain and username with '\', like DOMAIN\username</smbconfcomment>
+<smbconfoption><name>winbind separator</name><value>\</value></smbconfoption>
 <smbconfcomment> use uids from 10000 to 20000 for domain users</smbconfcomment>
 <smbconfoption><name>idmap uid</name><value>10000-20000</value></smbconfoption>
 <smbconfcomment> use gids from 10000 to 20000 for domain groups</smbconfcomment>
@@ -686,16 +686,16 @@ your PDC. For example, I get the following response:
 </para>
 
 <para><screen>
-	CEO+Administrator
-	CEO+burdell
-	CEO+Guest
-	CEO+jt-ad
-	CEO+krbtgt
-	CEO+TsInternetUser
+	CEO\Administrator
+	CEO\burdell
+	CEO\Guest
+	CEO\jt-ad
+	CEO\krbtgt
+	CEO\TsInternetUser
 </screen></para>
 
 <para>
-Obviously, I have named my domain <quote>CEO</quote> and my <smbconfoption><name>winbind separator</name></smbconfoption> is <quote>+</quote>.
+Obviously, I have named my domain <quote>CEO</quote> and my <smbconfoption><name>winbind separator</name></smbconfoption> is <quote>\</quote>.
 </para>
 
 <para>
@@ -704,15 +704,15 @@ You can do the same sort of thing to get group information from the PDC:
 
 <para><screen>
 &rootprompt;<userinput>/usr/local/samba/bin/wbinfo -g</userinput>
-	CEO+Domain Admins
-	CEO+Domain Users
-	CEO+Domain Guests
-	CEO+Domain Computers
-	CEO+Domain Controllers
-	CEO+Cert Publishers
-	CEO+Schema Admins
-	CEO+Enterprise Admins
-	CEO+Group Policy Creator Owners
+	CEO\Domain Admins
+	CEO\Domain Users
+	CEO\Domain Guests
+	CEO\Domain Computers
+	CEO\Domain Controllers
+	CEO\Cert Publishers
+	CEO\Schema Admins
+	CEO\Enterprise Admins
+	CEO\Group Policy Creator Owners
 </screen></para>
 
 <para>
@@ -1201,18 +1201,18 @@ cost of running a mixed UNIX and NT network.</para>
 
 <para><screen>
 &rootprompt;<userinput>wbinfo -u</userinput>
-MIDEARTH+maryo
-MIDEARTH+jackb
-MIDEARTH+ameds
+MIDEARTH\maryo
+MIDEARTH\jackb
+MIDEARTH\ameds
 ...
-MIDEARTH+root
+MIDEARTH\root
 
 &rootprompt;<userinput>wbinfo -g</userinput>
-MIDEARTH+Domain Users
-MIDEARTH+Domain Admins
-MIDEARTH+Domain Guests
+MIDEARTH\Domain Users
+MIDEARTH\Domain Admins
+MIDEARTH\Domain Guests
 ...
-MIDEARTH+Accounts
+MIDEARTH\Accounts
 
 &rootprompt;<userinput>getent passwd</userinput>
 root:x:0:0:root:/root:/bin/bash
diff --git a/docs/Samba-HOWTO-Collection/index.xml b/docs/Samba-HOWTO-Collection/index.xml
index 0ebb2877f1..10b7a492de 100644
--- a/docs/Samba-HOWTO-Collection/index.xml
+++ b/docs/Samba-HOWTO-Collection/index.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-
+<!DOCTYPE book PUBLIC "-//samba//DTD Samba XML V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc" [
 <!ENTITY % globalentities SYSTEM '../entities/global.entities'> %globalentities;
 ]>