--- /dev/null
+diff -Nru samba-2.0.6/docs/manpages/nmbd.8 samba-2.0.6.new/docs/manpages/nmbd.8
+--- samba-2.0.6/docs/manpages/nmbd.8 Thu Nov 11 03:52:15 1999
++++ samba-2.0.6.new/docs/manpages/nmbd.8 Sun Nov 28 21:04:26 1999
+@@ -78,7 +78,7 @@
+ \fIONLY\fP\&.
+ .IP
+ 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\fP,
++build process\&. Common defaults are \fI/etc/samba/lmhosts\fP,
+ \fI/usr/samba/lib/lmhosts\fP or \fI/etc/lmhosts\fP\&. See the
+ \fBlmhosts (5)\fP man page for details on the contents of this file\&.
+ .IP
+@@ -111,7 +111,7 @@
+ data\&.
+ .IP
+ The default log file path is compiled into Samba as part of the
+-build process\&. Common defaults are \fI/usr/local/samba/var/log\&.nmb\fP,
++build process\&. Common defaults are \fI/var/log/samba/log\&.nmb\fP,
+ \fI/usr/samba/var/log\&.nmb\fP or \fI/var/log/log\&.nmb\fP\&.
+ .IP
+ .IP "\fB-n primary NetBIOS name\fP"
+@@ -130,7 +130,7 @@
+ .IP
+ .IP "\fB-s configuration file\fP"
+ The default configuration file name is
+-set at build time, typically as \fI/usr/local/samba/lib/smb\&.conf\fP, but
++set at build time, typically as \fI/etc/samba/smb\&.conf\fP, but
+ this may be changed when Samba is autoconfigured\&.
+ .IP
+ The file specified contains the configuration details required by the
+@@ -159,7 +159,7 @@
+ If running the server as a daemon at startup, this file will need to
+ contain an appropriate startup sequence for the server\&.
+ .PP
+-\fB/usr/local/samba/lib/smb\&.conf\fP
++\fB/etc/samba/smb\&.conf\fP
+ .PP
+ This is the default location of the
+ \fBsmb\&.conf\fP server configuration
+@@ -186,7 +186,7 @@
+ .PP
+ \fBnmbd\fP will accept SIGHUP, which will cause it to dump out it\'s
+ namelists into the file \f(CWnamelist\&.debug\fP in the
+-\fI/usr/local/samba/var/locks\fP directory (or the \fIvar/locks\fP
++\fI/car/lock/samba/\fP directory (or the \fIvar/locks\fP
+ directory configured under wherever Samba was configured to install
+ itself)\&. This will also cause \fBnmbd\fP to dump out it\'s server database in
+ the log\&.nmb file\&. In addition, the debug log level of nmbd may be raised
+diff -Nru samba-2.0.6/docs/manpages/smb.conf.5 samba-2.0.6.new/docs/manpages/smb.conf.5
+--- samba-2.0.6/docs/manpages/smb.conf.5 Thu Nov 11 03:52:15 1999
++++ samba-2.0.6.new/docs/manpages/smb.conf.5 Sun Nov 28 21:02:43 1999
+@@ -1775,7 +1775,7 @@
+ to special case the config files of just a few clients)\&.
+ .IP
+ \fBExample:\fP
+-\f(CW config file = /usr/local/samba/lib/smb\&.conf\&.%m\fP
++\f(CW config file = /usr/etc/samba/smb\&.conf\&.%m\fP
+ .IP
+ .IP "\fBcopy (S)\fP"
+ .IP
+@@ -3224,7 +3224,7 @@
+ \f(CW lock directory = /tmp/samba\fP
+ .IP
+ \fBExample:\fP
+-\f(CW lock directory = /usr/local/samba/var/locks\fP
++\f(CW lock directory = /var/lock/samba\fP
+ .IP
+ .IP "\fBlocking (S)\fP"
+ .IP
+@@ -3260,7 +3260,7 @@
+ separate log files for each user or machine\&.
+ .IP
+ \fBExample:\fP
+-\f(CW log file = /usr/local/samba/var/log\&.%m\fP
++\f(CW log file = /var/log/samba/log\&.%m\fP
+ .IP
+ .IP "\fBlog level (G)\fP"
+ .IP
+@@ -4647,7 +4647,7 @@
+ .DS
+
+
+- preexec = csh -c \'echo \e"Welcome to %S!\e" | /usr/local/samba/bin/smbclient -M %m -I %I\' &
++ preexec = csh -c \'echo \e"Welcome to %S!\e" | /usr/bin/smbclient -M %m -I %I\' &
+
+ .DE
+
+@@ -4778,7 +4778,7 @@
+ \f(CW print command = lp -d%p -s %s; rm %s\fP
+ .IP
+ \fBExample:\fP
+-\f(CW print command = /usr/local/samba/bin/myprintscript %p %s\fP
++\f(CW print command = /usr/local/bin/myprintscript %p %s\fP
+ .IP
+ .IP "\fBprint ok (S)\fP"
+ .IP
+@@ -5676,7 +5676,7 @@
+ \f(CW smbrun=<compiled default>\fP
+ .IP
+ \fBExample:\fP
+-\f(CW smbrun = /usr/local/samba/bin/smbrun\fP
++\f(CW smbrun = /usr/local/bin/smbrun\fP
+ .IP
+ .IP "\fBsocket address (G)\fP"
+ .IP
+diff -Nru samba-2.0.6/docs/manpages/swat.8 samba-2.0.6.new/docs/manpages/swat.8
+--- samba-2.0.6/docs/manpages/swat.8 Thu Nov 11 03:52:16 1999
++++ samba-2.0.6.new/docs/manpages/swat.8 Sun Nov 28 20:27:39 1999
+@@ -41,50 +41,6 @@
+ .IP
+ Do NOT enable this option on a production server\&.
+ .IP
+-.PP
+-.SH "INSTALLATION"
+-.PP
+-After you compile SWAT you need to run \f(CW"make install"\fP to install the
+-swat binary and the various help files and images\&. A default install
+-would put these in:
+-.PP
+-
+-.DS
+-
+-
+-/usr/local/samba/bin/swat
+-/usr/local/samba/swat/images/*
+-/usr/local/samba/swat/help/*
+-
+-.DE
+-
+-
+-.PP
+-.SH "INETD INSTALLATION"
+-.PP
+-You need to edit your \f(CW/etc/inetd\&.conf\fP and \f(CW/etc/services\fP to
+-enable \fBSWAT\fP to be launched via inetd\&.
+-.PP
+-In \f(CW/etc/services\fP you need to add a line like this:
+-.PP
+-\f(CWswat 901/tcp\fP
+-.PP
+-Note for NIS/YP users - you may need to rebuild the NIS service maps
+-rather than alter your local \f(CW/etc/services\fP file\&.
+-.PP
+-the choice of port number isn\'t really important except that it should
+-be less than 1024 and not currently used (using a number above 1024
+-presents an obscure security hole depending on the implementation
+-details of your \fBinetd\fP daemon)\&.
+-.PP
+-In \f(CW/etc/inetd\&.conf\fP you should add a line like this:
+-.PP
+-\f(CWswat stream tcp nowait\&.400 root /usr/local/samba/bin/swat swat\fP
+-.PP
+-One you have edited \f(CW/etc/services\fP and \f(CW/etc/inetd\&.conf\fP you need
+-to send a HUP signal to inetd\&. To do this use \f(CW"kill -1 PID"\fP where
+-PID is the process ID of the inetd daemon\&.
+-.PP
+ .SH "LAUNCHING"
+ .PP
+ To launch \fBswat\fP just run your favorite web browser and point it at
+@@ -97,21 +53,19 @@
+ .PP
+ .SH "FILES"
+ .PP
+-\fB/etc/inetd\&.conf\fP
++\fB/etc/sysconfig/rc-inetd/swat\fP
+ .PP
+-This file must contain suitable startup information for the
+-meta-daemon\&.
++This is rc-inetd service description file\&.
+ .PP
+ \fB/etc/services\fP
+ .PP
+ This file must contain a mapping of service name (e\&.g\&., swat) to
+ service port (e\&.g\&., 901) and protocol type (e\&.g\&., tcp)\&.
+ .PP
+-\fB/usr/local/samba/lib/smb\&.conf\fP
++\fB/etc/samba/smb\&.conf\fP
+ .PP
+ This is the default location of the \fIsmb\&.conf\fP server configuration
+-file that \fBswat\fP edits\&. Other common places that systems install
+-this file are \fI/usr/samba/lib/smb\&.conf\fP and \fI/etc/smb\&.conf\fP\&.
++file that \fBswat\fP edits\&.
+ .PP
+ This file describes all the services the server is to make available
+ to clients\&. See \fBsmb\&.conf (5)\fP for more information\&.