--- samba-2.2.4/docs/manpages/nmbd.8	Fri May  3 03:02:05 2002
+++ samba-2.2.4/docs/manpages/nmbd.8.org	Mon May 20 10:31:37 2002
@@ -91,7 +91,7 @@
 
 The default path to this file is compiled into 
 Samba as part of the build process. Common defaults 
-are \fI/usr/local/samba/lib/lmhosts\fR,
+are \fI/etc/samba/lmhosts\fR,
 \fI/usr/samba/lib/lmhosts\fR or
 \fI/etc/lmhosts\fR. See the  \fIlmhosts(5)\fRman page for details on the 
 contents of this file.
@@ -149,7 +149,7 @@
 .TP
 \fB-s <configuration file>\fR
 The default configuration file name
-is set at build time, typically as \fI /usr/local/samba/lib/smb.conf\fR, but
+is set at build time, typically as \fI /etc/samba/smb.conf\fR, but
 this may be changed when Samba is autoconfigured.
 
 The file specified contains the configuration details
@@ -180,12 +180,12 @@
 See the UNIX_INSTALL.html
 document for details.
 .TP
-\fB\fI/usr/local/samba/lib/smb.conf\fB\fR
+\fB\fI/etc/samba/smb.conf\fB\fR
 This is the default location of the
 \fIsmb.conf\fR
 server configuration file. Other common places that systems
 install this file are \fI/usr/samba/lib/smb.conf\fR
-and \fI/etc/smb.conf\fR.
+and \fI/etc/samba/smb.conf\fR.
 
 When run as a WINS server (see the
 wins support
@@ -211,7 +211,7 @@
 .PP
 \fBnmbd\fR will accept SIGHUP, which will cause
 it to dump out its namelists into the file \fInamelist.debug
-\fRin the \fI/usr/local/samba/var/locks\fR
+\fRin the \fI/var/lock/samba\fR
 directory (or the \fIvar/locks\fR directory configured
 under wherever Samba was configured to install itself). This will also
 cause \fBnmbd\fR to dump out its server database in
--- samba-2.2.4/docs/manpages/smb.conf.5	Fri May  3 03:24:14 2002
+++ samba-2.2.4/docs/manpages/smb.conf.5.org	Mon May 20 10:28:07 2002
@@ -1526,7 +1526,7 @@
 Default: \fBnone\fR
 .PP
 .PP
-Example: \fBadd share command = /usr/local/bin/addshare\fR
+Example: \fBadd share command = /usr/bin/addshare\fR
 .PP
 .TP
 \fBadd user script (G)\fR
@@ -1569,7 +1569,7 @@
 
 Default: \fBadd user script = <empty string>
 \fR
-Example: \fBadd user script = /usr/local/samba/bin/add_user 
+Example: \fBadd user script = /usr/bin/add_user 
 %u\fR
 .TP
 \fBadmin users (S)\fR
@@ -1802,7 +1802,7 @@
 Default: \fBnone\fR
 .PP
 .PP
-Example: \fBchange share command = /usr/local/bin/addshare\fR
+Example: \fBchange share command = /usr/bin/addshare\fR
 .PP
 .TP
 \fBcharacter set (G)\fR
@@ -2037,7 +2037,7 @@
 (allowing you to special case the config files of just a few 
 clients).
 
-Example: \fBconfig file = /usr/local/samba/lib/smb.conf.%m
+Example: \fBconfig file = /etc/samba/smb.conf.%m
 \fR.TP
 \fBcopy (S)\fR
 This parameter allows you to "clone" service 
@@ -2321,7 +2321,7 @@
 Default: \fBnone\fR
 .PP
 .PP
-Example: \fBdelete share command = /usr/local/bin/delshare\fR
+Example: \fBdelete share command = /usr/bin/delshare\fR
 .PP
 .TP
 \fBdelete user script (G)\fR
@@ -2367,7 +2367,7 @@
 
 Default: \fBdelete user script = <empty string>
 \fR
-Example: \fBdelete user script = /usr/local/samba/bin/del_user 
+Example: \fBdelete user script = /usr/bin/del_user 
 %u\fR
 .TP
 \fBdelete veto files (S)\fR
@@ -2425,7 +2425,7 @@
 Default: \fBBy default internal routines for 
 determining the disk capacity and remaining space will be used.
 \fR
-Example: \fBdfree command = /usr/local/samba/bin/dfree
+Example: \fBdfree command = /usr/bin/dfree
 \fR
 Where the script dfree (which must be made executable) could be:
 
@@ -3250,7 +3250,7 @@
 
 Default: \fBno file included\fR
 
-Example: \fBinclude = /usr/local/samba/lib/admin_smb.conf
+Example: \fBinclude = /etc/samba/admin_smb.conf
 \fR.TP
 \fBinherit acls (S)\fR
 This parameter can be used to ensure
@@ -3680,7 +3680,7 @@
 This option takes the standard substitutions, allowing 
 you to have separate log files for each user or machine.
 
-Example: \fBlog file = /usr/local/samba/var/log.%m
+Example: \fBlog file = /var/log/samba/log.%m
 \fR.TP
 \fBlog level (G)\fR
 The value of the parameter (an integer) allows 
@@ -3793,11 +3793,11 @@
 file is recommended.
 
 The script must be a relative path to the [netlogon] 
-service. If the [netlogon] service specifies a  \fIpath\fR of \fI/usr/local/samba/netlogon
+service. If the [netlogon] service specifies a  \fIpath\fR of \fI/etc/samba/netlogon
 \fR, and \fBlogon script = STARTUP.BAT\fR, then 
 the file that will be downloaded is:
 
-\fI/usr/local/samba/netlogon/STARTUP.BAT\fR
+\fI/etc/samba/netlogon/STARTUP.BAT\fR
 
 The contents of the batch file are entirely your choice. A 
 suggested command would be to add \fBNET TIME \\\\SERVER /SET 
@@ -5182,7 +5182,7 @@
 is an example:
 
 \fBpreexec = csh -c 'echo \\"Welcome to %S!\\" |
-/usr/local/samba/bin/smbclient -M %m -I %I' & \fR
+/usr/bin/smbclient -M %m -I %I' & \fR
 
 Of course, this could get annoying after a while :-)
 
@@ -5332,7 +5332,7 @@
 and if SAMBA is compiled against libcups, any manually 
 set print command will be ignored.
 
-Example: \fBprint command = /usr/local/samba/bin/myprintscript
+Example: \fBprint command = /usr/bin/myprintscript
 %p %s\fR
 .TP
 \fBprint ok (S)\fR
@@ -5462,7 +5462,7 @@
 Default: \fBNone (set in compile).\fR
 
 Example: \fBprinter driver file = 
-/usr/local/samba/printers/drivers.def\fR
+/etc/samba/drivers.def\fR
 .TP
 \fBprinter driver location (S)\fR
 \fBNote :\fRThis is a deprecated 
@@ -6291,7 +6291,7 @@
 Examples: \fBsource environment = |/etc/smb.conf.sh
 \fR
 Example: \fBsource environment = 
-/usr/local/smb_env_vars\fR
+/etc/samba/smb_env_vars\fR
 .TP
 \fBssl (G)\fR
 This variable is part of SSL-enabled Samba. This 
@@ -6321,7 +6321,7 @@
 directory that don't fit into this naming scheme are ignored. You 
 don't need this variable if you don't verify client certificates.
 
-Default: \fBssl CA certDir = /usr/local/ssl/certs
+Default: \fBssl CA certDir = /etc/samba/ssl/certs
 \fR.TP
 \fBssl CA certFile (G)\fR
 This variable is part of SSL-enabled Samba. This 
@@ -6338,7 +6338,7 @@
 simple (you won't need to create the hashed file names). You 
 don't need this variable if you don't verify client certificates.
 
-Default: \fBssl CA certFile = /usr/local/ssl/certs/trustedCAs.pem
+Default: \fBssl CA certFile = /etc/samba/ssl/certs/trustedCAs.pem
 \fR.TP
 \fBssl ciphers (G)\fR
 This variable is part of SSL-enabled Samba. This 
@@ -6359,7 +6359,7 @@
 The certificate in this file is used by  \fBsmbclient(1)\fRif it exists. It's needed 
 if the server requires a client certificate.
 
-Default: \fBssl client cert = /usr/local/ssl/certs/smbclient.pem
+Default: \fBssl client cert = /etc/samba/ssl/certs/smbclient.pem
 \fR.TP
 \fBssl client key (G)\fR
 This variable is part of SSL-enabled Samba. This 
@@ -6370,7 +6370,7 @@
 This is the private key for  \fBsmbclient(1)\fR. It's only needed if the 
 client should have a certificate. 
 
-Default: \fBssl client key = /usr/local/ssl/private/smbclient.pem
+Default: \fBssl client key = /etc/samba/ssl/private/smbclient.pem
 \fR.TP
 \fBssl compatibility (G)\fR
 This variable is part of SSL-enabled Samba. This 
@@ -6989,7 +6989,7 @@
 
 Default: \fBno username map\fR
 
-Example: \fBusername map = /usr/local/samba/lib/users.map
+Example: \fBusername map = /etc/samba/users.map
 \fR.TP
 \fButmp (G)\fR
 This boolean parameter is only available if 
--- samba-2.2.4/docs/manpages/smbd.8	Fri May  3 03:02:07 2002
+++ samba-2.2.4/docs/manpages/smbd.8.org	Mon May 20 10:28:07 2002
@@ -190,7 +190,7 @@
 See the UNIX_INSTALL.html
 document for details.
 .TP
-\fB\fI/usr/local/samba/lib/smb.conf\fB\fR
+\fB\fI/etc/samba/smb.conf\fB\fR
 This is the default location of the
 \fIsmb.conf\fR
 server configuration file. Other common places that systems
--- samba-2.2.4/docs/manpages/swat.8	Fri May  3 03:02:08 2002
+++ samba-2.2.4/docs/manpages/swat.8.org	Mon May 20 10:28:07 2002
@@ -47,13 +47,13 @@
 these in: 
 .TP 0.2i
 \(bu
-/usr/local/samba/bin/swat
+/usr/sbin/swat
 .TP 0.2i
 \(bu
-/usr/local/samba/swat/images/*
+/usr/share/swat/images/*
 .TP 0.2i
 \(bu
-/usr/local/samba/swat/help/*
+/usr/share/swat/help/*
 .SS "INETD INSTALLATION"
 .PP
 You need to edit your \fI/etc/inetd.conf
@@ -78,7 +78,7 @@
 add a line like this: 
 .PP
 \fBswat stream tcp nowait.400 root
-/usr/local/samba/bin/swat swat\fR
+/usr/sbin/swat swat\fR
 .PP
 One you have edited \fI/etc/services\fR 
 and \fI/etc/inetd.conf\fR you need to send a 
@@ -104,7 +104,7 @@
 (e.g., swat) to service port (e.g., 901) and protocol type 
 (e.g., tcp). 
 .TP
-\fB\fI/usr/local/samba/lib/smb.conf\fB\fR
+\fB\fI/etc/samba/smb.conf\fB\fR
 This is the default location of the \fIsmb.conf(5)
 \fRserver configuration file that swat edits. Other 
 common places that systems install this file are \fI /usr/samba/lib/smb.conf\fR and \fI/etc/smb.conf
--- samba-2.2.4/docs/manpages/winbindd.8	Fri May  3 03:02:08 2002
+++ samba-2.2.4/docs/manpages/winbindd.8.org	Mon May 20 10:28:07 2002
@@ -364,7 +364,7 @@
 Storage for the Windows NT rid to UNIX user/group 
 id mapping. The lock directory is specified when Samba is initially 
 compiled using the \fI--with-lockdir\fR option.
-This directory is by default \fI/usr/local/samba/var/locks
+This directory is by default \fI/var/lock/samba
 \fR\&. 
 .TP
 \fB$LOCKDIR/winbindd_cache.tdb\fR