mega-merge from 2.2

(This used to be commit c76bf8ed3275e217d1b691879153fe9137bcbe38)

1 files changed, 54 insertions, 75 deletions

diff --git a/docs/docbook/projdoc/printer_driver2.sgml b/docs/docbook/projdoc/printer_driver2.sgml
index 51471ae690..4377303ffb 100644
--- a/docs/docbook/projdoc/printer_driver2.sgml
+++ b/docs/docbook/projdoc/printer_driver2.sgml
@@ -1,4 +1,4 @@
-<chapter>
+<chapter id="printing">
 
 
 <chapterinfo>
@@ -126,12 +126,19 @@ Windows NT print servers to provide support for printer driver
 download).
 </para>
 
-<para>You should modify the server's smb.conf file to create the 
+<para>You should modify the server's smb.conf file to add the global
+parameters and to create the 
 following file share (of course, some of the parameter values,
 such as 'path' are arbitrary and should be replaced with
 appropriate values for your site):</para>
 
 <para><programlisting>
+[global]
+    ; members of the ntadmin group should be able
+    ; to add drivers and set printer properties
+    ; root is implicitly a 'printer admin'
+    printer admin = @ntadmin
+
 [print$]
     path = /usr/local/samba/printers
     guest ok = yes
@@ -142,13 +149,13 @@ appropriate values for your site):</para>
     ; sure this account can copy files to the share.  If this
     ; is setup to a non-root account, then it should also exist
     ; as a 'printer admin'
-    write list = ntadmin
+    write list = @ntadmin,root
 </programlisting></para>
 	
 <para>The <ulink url="smb.conf.5.html#WRITELIST"><parameter>
 write list</parameter></ulink> is used to allow administrative 
 level user accounts to have write access in order to update files 
-on the share.  See the <ulink url="smb./conf.5.html">smb.conf(5) 
+on the share.  See the <ulink url="smb.conf.5.html">smb.conf(5) 
 man page</ulink> for more information on configuring file shares.</para>
 	
 <para>The requirement for <ulink url="smb.conf.5.html#GUESTOK"><command>guest 
@@ -345,7 +352,7 @@ Add Printer Wizard icon.  The APW will be show only if
 <itemizedlist>
 	<listitem><para>The connected user is able to successfully
 	execute an OpenPrinterEx(\\server) with administrative
-	priviledges (i.e. root or <parameter>printer admin</parameter>).
+	privileges (i.e. root or <parameter>printer admin</parameter>).
 	</para></listitem>
 	
 	<listitem><para><ulink url="smb.conf.5.html#SHOWADDPRINTERWIZARD"><parameter>show 
@@ -513,7 +520,7 @@ foreach (supported architecture for a given driver)
 		the Imprints tool set was the name space issues between 
 		various supported client architectures.  For example, Windows 
 		NT includes a driver named "Apple LaserWriter II NTX v51.8" 
-		and Windows 95 callsits version of this driver "Apple 
+		and Windows 95 calls its version of this driver "Apple 
 		LaserWriter II NTX"</para>
 		
 		<para>The problem is how to know what client drivers have 
@@ -547,71 +554,10 @@ foreach (supported architecture for a given driver)
 <para>
 Given that printer driver management has changed (we hope improved) in 
 2.2 over prior releases, migration from an existing setup to 2.2 can 
-follow several paths.
+follow several paths. Here are the possible scenarios for 
+migration:
 </para>
 
-<para>
-Windows clients have a tendency to remember things for quite a while.
-For example, if a Windows NT client has attached to a Samba 2.0 server,
-it will remember the server as a LanMan printer server.  Upgrading 
-the Samba host to 2.2 makes support for MSRPC printing possible, but 
-the NT client will still remember the previous setting.
-</para>
-
-<para>
-In order to give an NT client printing "amesia" (only necessary if you 
-want to use the newer MSRPC printing functionality in Samba), delete 
-the registry keys associated with the print server contained in 
-<constant>[HKLM\SYSTEM\CurrentControlSet\Control\Print]</constant>.  The 
-spooler service on the client should be stopped prior to doing this:
-</para>
-
-<para>
-<prompt>C:\WINNT\ ></prompt> <userinput>net stop spooler</userinput>
-</para>
-
-<para>
-<emphasis>All the normal disclaimers about editing the registry go 
-here.</emphasis>  Be careful, and know what you are doing.
-</para>
-
-<para>
-The spooler service should be restarted after you have finished 
-removing the appropriate registry entries by replacing the 
-<command>stop</command> command above with <command>start</command>.
-</para>
-
-<para>
-Windows 9x clients will continue to use LanMan printing calls
-with a 2.2 Samba server so there is no need to perform any of these
-modifications on non-NT clients.
-</para>
-	
-<warning>
-<title>Achtung!</title>
-
-<para>
-The following smb.conf parameters are considered to be depreciated and will 
-be removed soon.  Do not use them in new installations
-</para>
-		
-<itemizedlist>
-	<listitem><para><parameter>printer driver file (G)</parameter>
-	</para></listitem>
-			
-	<listitem><para><parameter>printer driver (S)</parameter>
-	</para></listitem>
-			
-	<listitem><para><parameter>printer driver location (S)</parameter>
-	</para></listitem>
-</itemizedlist>
-</warning>
-
-
-<para>
-Here are the possible scenarios for supporting migration:
-</para>
-	
 <itemizedlist>
 	<listitem><para>If you do not desire the new Windows NT 
 	print driver support, nothing needs to be done.  
@@ -620,13 +566,13 @@ Here are the possible scenarios for supporting migration:
 	<listitem><para>If you want to take advantage of NT printer 
 	driver support but do not want to migrate the 
 	9x drivers to the new setup, the leave the existing 
-	printers.def file.  When smbd attempts to locate a 
+	<filename>printers.def</filename> file.  When smbd attempts 
+	to locate a 
 	9x driver for the printer in the TDB and fails it 
 	will drop down to using the printers.def (and all 
 	associated parameters).  The <command>make_printerdef</command> 
 	tool will also remain for backwards compatibility but will 
-	be moved to the "this tool is the old way of doing it" 
-	pile.</para></listitem>
+	be removed in the next major release.</para></listitem>
 
 	<listitem><para>If you install a Windows 9x driver for a printer 
 	on your Samba host (in the printing TDB), this information will 
@@ -643,6 +589,39 @@ Here are the possible scenarios for supporting migration:
 	</para></listitem>
 </itemizedlist>
 
+
+<warning>
+<title>Achtung!</title>
+
+<para>
+The following <filename>smb.conf</filename> parameters are considered to 
+be deprecated and will be removed soon.  Do not use them in new 
+installations
+</para>
+		
+<itemizedlist>
+	<listitem><para><parameter>printer driver file (G)</parameter>
+	</para></listitem>
+			
+	<listitem><para><parameter>printer driver (S)</parameter>
+	</para></listitem>
+			
+	<listitem><para><parameter>printer driver location (S)</parameter>
+	</para></listitem>
+</itemizedlist>
+</warning>
+
+
+<para>
+The have been two new parameters add in Samba 2.2.2 to for 
+better support of Samba 2.0.x backwards capability (<parameter>disable
+spoolss</parameter>) and for using local printers drivers on Windows 
+NT/2000 clients (<parameter>use client driver</parameter>). Both of 
+these options are described in the smb.coinf(5) man page and are 
+disabled by default.
+</para>
+
+
 </sect1>
 
 
@@ -686,8 +665,8 @@ Here are the possible scenarios for supporting migration:
                  * NT4:
                  * 
                  * On NT4, you only have a global devicemode. This global devicemode can be changed
-                 * by the administrator (or by a user with enough privs). Everytime a user
-                 * wants to print, the devicemode is resetted to the default. In Word, everytime
+                 * by the administrator (or by a user with enough privs). Every time a user
+                 * wants to print, the devicemode is reset to the default. In Word, every time
                  * you print, the printer's characteristics are always reset to the global devicemode.
                  *
                  * NT 2000:
@@ -695,7 +674,7 @@ Here are the possible scenarios for supporting migration:
                  * In W2K, there is the notion of per-user devicemode. The first time you use
                  * a printer, a per-user devicemode is build from the global devicemode.
                  * If you change your per-user devicemode, it is saved in the registry, under the
-                 * H_KEY_CURRENT_KEY sub_tree. So that everytime you print, you have your default
+                 * H_KEY_CURRENT_KEY sub_tree. So that every time you print, you have your default
                  * printer preferences available.
                  *
                  * To change the per-user devicemode: it's the "Printing Preferences ..." button